From d1b8e518716c887ba75029848f710866a086820e Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Tue, 24 May 2022 15:45:10 +0200
Subject: [PATCH 001/103] Alerting: Make alertmanager datasource stable
 (#49485) (#49491)

(cherry picked from commit 86871807d27a155e044d7c6fb6608efdc2f2974e)
---
 pkg/tests/api/plugins/data/expectedListResp.json       | 2 +-
 public/app/plugins/datasource/alertmanager/plugin.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index 0669cb89090..08430c69ebf 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -1 +1 @@
-[{"name":"Alert list","type":"panel","id":"alertlist","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Shows list of alerts and their current status","links":null,"logos":{"small":"public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg","large":"public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/alertlist/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Annotations list","type":"panel","id":"annolist","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"List annotations","links":null,"logos":{"small":"public/app/plugins/panel/annolist/img/icn-annolist-panel.svg","large":"public/app/plugins/panel/annolist/img/icn-annolist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/annolist/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Azure Monitor","type":"datasource","id":"grafana-azure-monitor-datasource","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Microsoft Azure Monitor \u0026 Application Insights","links":[{"name":"Learn more","url":"https://grafana.com/docs/grafana/latest/datasources/azuremonitor/"},{"name":"Apache License","url":"https://github.com/grafana/azure-monitor-datasource/blob/master/LICENSE"}],"logos":{"small":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg","large":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg"},"build":{},"screenshots":[{"name":"Azure Contoso Loans","path":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/contoso_loans_grafana_dashboard.png"},{"name":"Azure Monitor Network","path":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_network.png"},{"name":"Azure Monitor CPU","path":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_cpu.png"}],"version":"1.0.0","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"5.2.x","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/grafana-azure-monitor-datasource/","category":"cloud","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Bar chart","type":"panel","id":"barchart","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Categorical charts with group support","links":null,"logos":{"small":"public/app/plugins/panel/barchart/img/barchart.svg","large":"public/app/plugins/panel/barchart/img/barchart.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/barchart/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Bar gauge","type":"panel","id":"bargauge","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Horizontal and vertical gauges","links":null,"logos":{"small":"public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg","large":"public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/bargauge/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Candlestick","type":"panel","id":"candlestick","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/candlestick/img/candlestick.svg","large":"public/app/plugins/panel/candlestick/img/candlestick.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/candlestick/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"CloudWatch","type":"datasource","id":"cloudwatch","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Amazon AWS monitoring service","links":null,"logos":{"small":"public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png","large":"public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/cloudwatch/","category":"cloud","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Dashboard list","type":"panel","id":"dashlist","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"List of dynamic links to other dashboards","links":null,"logos":{"small":"public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg","large":"public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/dashlist/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Elasticsearch","type":"datasource","id":"elasticsearch","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source logging \u0026 analytics database","links":[{"name":"Learn more","url":"https://grafana.com/docs/features/datasources/elasticsearch/"}],"logos":{"small":"public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg","large":"public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/elasticsearch/","category":"logging","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Gauge","type":"panel","id":"gauge","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Standard gauge visualization","links":null,"logos":{"small":"public/app/plugins/panel/gauge/img/icon_gauge.svg","large":"public/app/plugins/panel/gauge/img/icon_gauge.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/gauge/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Geomap","type":"panel","id":"geomap","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Geomap panel","links":null,"logos":{"small":"public/app/plugins/panel/geomap/img/icn-geomap.svg","large":"public/app/plugins/panel/geomap/img/icn-geomap.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/geomap/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Getting Started","type":"panel","id":"gettingstarted","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg","large":"public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/gettingstarted/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Google Cloud Monitoring","type":"datasource","id":"stackdriver","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Google's monitoring service (formerly named Stackdriver)","links":null,"logos":{"small":"public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg","large":"public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg"},"build":{},"screenshots":null,"version":"1.0.0","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/stackdriver/","category":"cloud","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Graph (old)","type":"panel","id":"graph","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"The old default graph panel","links":null,"logos":{"small":"public/app/plugins/panel/graph/img/icn-graph-panel.svg","large":"public/app/plugins/panel/graph/img/icn-graph-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/graph/","category":"","state":"deprecated","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Graphite","type":"datasource","id":"graphite","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database","links":[{"name":"Learn more","url":"https://graphiteapp.org/"},{"name":"Graphite 1.1 Release","url":"https://grafana.com/blog/2018/01/11/graphite-1.1-teaching-an-old-dog-new-tricks/"}],"logos":{"small":"public/app/plugins/datasource/graphite/img/graphite_logo.png","large":"public/app/plugins/datasource/graphite/img/graphite_logo.png"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/graphite/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Heatmap","type":"panel","id":"heatmap","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Like a histogram over time","links":[{"name":"Brendan Gregg - Heatmaps","url":"http://www.brendangregg.com/heatmaps.html"},{"name":"Brendan Gregg - Latency Heatmaps","url":" http://www.brendangregg.com/HeatMaps/latency.html"}],"logos":{"small":"public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg","large":"public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/heatmap/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Histogram","type":"panel","id":"histogram","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/histogram/img/histogram.svg","large":"public/app/plugins/panel/histogram/img/histogram.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/histogram/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"InfluxDB","type":"datasource","id":"influxdb","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database","links":null,"logos":{"small":"public/app/plugins/datasource/influxdb/img/influxdb_logo.svg","large":"public/app/plugins/datasource/influxdb/img/influxdb_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/influxdb/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Jaeger","type":"datasource","id":"jaeger","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source, end-to-end distributed tracing","links":[{"name":"Learn more","url":"https://www.jaegertracing.io"},{"name":"GitHub Project","url":"https://github.com/jaegertracing/jaeger"}],"logos":{"small":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg","large":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/jaeger/","category":"tracing","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Logs","type":"panel","id":"logs","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/logs/img/icn-logs-panel.svg","large":"public/app/plugins/panel/logs/img/icn-logs-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/logs/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Loki","type":"datasource","id":"loki","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Like Prometheus but for logs. OSS logging solution from Grafana Labs","links":[{"name":"Learn more","url":"https://grafana.com/loki"},{"name":"GitHub Project","url":"https://github.com/grafana/loki"}],"logos":{"small":"public/app/plugins/datasource/loki/img/loki_icon.svg","large":"public/app/plugins/datasource/loki/img/loki_icon.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/loki/","category":"logging","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Microsoft SQL Server","type":"datasource","id":"mssql","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Microsoft SQL Server compatible databases","links":null,"logos":{"small":"public/app/plugins/datasource/mssql/img/sql_server_logo.svg","large":"public/app/plugins/datasource/mssql/img/sql_server_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/mssql/","category":"sql","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"MySQL","type":"datasource","id":"mysql","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for MySQL databases","links":null,"logos":{"small":"public/app/plugins/datasource/mysql/img/mysql_logo.svg","large":"public/app/plugins/datasource/mysql/img/mysql_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/mysql/","category":"sql","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"News","type":"panel","id":"news","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"RSS feed reader","links":null,"logos":{"small":"public/app/plugins/panel/news/img/news.svg","large":"public/app/plugins/panel/news/img/news.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/news/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Node Graph","type":"panel","id":"nodeGraph","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg","large":"public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/nodeGraph/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"OpenTSDB","type":"datasource","id":"opentsdb","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database","links":null,"logos":{"small":"public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png","large":"public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/opentsdb/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Pie chart","type":"panel","id":"piechart","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"The new core pie chart visualization","links":null,"logos":{"small":"public/app/plugins/panel/piechart/img/icon_piechart.svg","large":"public/app/plugins/panel/piechart/img/icon_piechart.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/piechart/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"PostgreSQL","type":"datasource","id":"postgres","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for PostgreSQL and compatible databases","links":null,"logos":{"small":"public/app/plugins/datasource/postgres/img/postgresql_logo.svg","large":"public/app/plugins/datasource/postgres/img/postgresql_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/postgres/","category":"sql","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Prometheus","type":"datasource","id":"prometheus","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database \u0026 alerting","links":[{"name":"Learn more","url":"https://prometheus.io/"}],"logos":{"small":"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg","large":"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/prometheus/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Stat","type":"panel","id":"stat","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Big stat values \u0026 sparklines","links":null,"logos":{"small":"public/app/plugins/panel/stat/img/icn-singlestat-panel.svg","large":"public/app/plugins/panel/stat/img/icn-singlestat-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/stat/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"State timeline","type":"panel","id":"state-timeline","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"State changes and durations","links":null,"logos":{"small":"public/app/plugins/panel/state-timeline/img/timeline.svg","large":"public/app/plugins/panel/state-timeline/img/timeline.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/state-timeline/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Status history","type":"panel","id":"status-history","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Periodic status history","links":null,"logos":{"small":"public/app/plugins/panel/status-history/img/status.svg","large":"public/app/plugins/panel/status-history/img/status.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/status-history/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Table","type":"panel","id":"table","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Supports many column styles","links":null,"logos":{"small":"public/app/plugins/panel/table/img/icn-table-panel.svg","large":"public/app/plugins/panel/table/img/icn-table-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/table/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Table (old)","type":"panel","id":"table-old","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Table Panel for Grafana","links":null,"logos":{"small":"public/app/plugins/panel/table-old/img/icn-table-panel.svg","large":"public/app/plugins/panel/table-old/img/icn-table-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/table-old/","category":"","state":"deprecated","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Tempo","type":"datasource","id":"tempo","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"High volume, minimal dependency trace storage.  OSS tracing solution from Grafana Labs.","links":[{"name":"GitHub Project","url":"https://github.com/grafana/tempo"}],"logos":{"small":"public/app/plugins/datasource/tempo/img/tempo_logo.svg","large":"public/app/plugins/datasource/tempo/img/tempo_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/tempo/","category":"tracing","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"TestData DB","type":"datasource","id":"testdata","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Generates test data in different forms","links":null,"logos":{"small":"public/app/plugins/datasource/testdata/img/testdata.svg","large":"public/app/plugins/datasource/testdata/img/testdata.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/testdata/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Text","type":"panel","id":"text","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Supports markdown and html content","links":null,"logos":{"small":"public/app/plugins/panel/text/img/icn-text-panel.svg","large":"public/app/plugins/panel/text/img/icn-text-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/text/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Time series","type":"panel","id":"timeseries","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Time based line, area and bar charts","links":null,"logos":{"small":"public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg","large":"public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/timeseries/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Traces","type":"panel","id":"traces","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/traces/img/traces-panel.svg","large":"public/app/plugins/panel/traces/img/traces-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/traces/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Welcome","type":"panel","id":"welcome","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg","large":"public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/welcome/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Zipkin","type":"datasource","id":"zipkin","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Placeholder for the distributed tracing system.","links":[{"name":"Learn more","url":"https://zipkin.io"}],"logos":{"small":"public/app/plugins/datasource/zipkin/img/zipkin-logo.svg","large":"public/app/plugins/datasource/zipkin/img/zipkin-logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/zipkin/","category":"tracing","state":"","signature":"internal","signatureType":"","signatureOrg":""}]
+[{"name":"Alert list","type":"panel","id":"alertlist","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Shows list of alerts and their current status","links":null,"logos":{"small":"public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg","large":"public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/alertlist/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Alertmanager","type":"datasource","id":"alertmanager","enabled":true,"pinned":false,"info":{"author":{"name":"Prometheus alertmanager","url":"https://grafana.com"},"description":"","links":[{"name":"Learn more","url":"https://prometheus.io/docs/alerting/latest/alertmanager/"}],"logos":{"small":"public/app/plugins/datasource/alertmanager/img/logo.svg","large":"public/app/plugins/datasource/alertmanager/img/logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/alertmanager/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Annotations list","type":"panel","id":"annolist","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"List annotations","links":null,"logos":{"small":"public/app/plugins/panel/annolist/img/icn-annolist-panel.svg","large":"public/app/plugins/panel/annolist/img/icn-annolist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/annolist/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Azure Monitor","type":"datasource","id":"grafana-azure-monitor-datasource","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Microsoft Azure Monitor \u0026 Application Insights","links":[{"name":"Learn more","url":"https://grafana.com/docs/grafana/latest/datasources/azuremonitor/"},{"name":"Apache License","url":"https://github.com/grafana/azure-monitor-datasource/blob/master/LICENSE"}],"logos":{"small":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg","large":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg"},"build":{},"screenshots":[{"name":"Azure Contoso Loans","path":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/contoso_loans_grafana_dashboard.png"},{"name":"Azure Monitor Network","path":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_network.png"},{"name":"Azure Monitor CPU","path":"public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_cpu.png"}],"version":"1.0.0","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"5.2.x","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/grafana-azure-monitor-datasource/","category":"cloud","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Bar chart","type":"panel","id":"barchart","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Categorical charts with group support","links":null,"logos":{"small":"public/app/plugins/panel/barchart/img/barchart.svg","large":"public/app/plugins/panel/barchart/img/barchart.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/barchart/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Bar gauge","type":"panel","id":"bargauge","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Horizontal and vertical gauges","links":null,"logos":{"small":"public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg","large":"public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/bargauge/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Candlestick","type":"panel","id":"candlestick","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/candlestick/img/candlestick.svg","large":"public/app/plugins/panel/candlestick/img/candlestick.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/candlestick/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"CloudWatch","type":"datasource","id":"cloudwatch","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Amazon AWS monitoring service","links":null,"logos":{"small":"public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png","large":"public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/cloudwatch/","category":"cloud","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Dashboard list","type":"panel","id":"dashlist","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"List of dynamic links to other dashboards","links":null,"logos":{"small":"public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg","large":"public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/dashlist/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Elasticsearch","type":"datasource","id":"elasticsearch","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source logging \u0026 analytics database","links":[{"name":"Learn more","url":"https://grafana.com/docs/features/datasources/elasticsearch/"}],"logos":{"small":"public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg","large":"public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/elasticsearch/","category":"logging","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Gauge","type":"panel","id":"gauge","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Standard gauge visualization","links":null,"logos":{"small":"public/app/plugins/panel/gauge/img/icon_gauge.svg","large":"public/app/plugins/panel/gauge/img/icon_gauge.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/gauge/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Geomap","type":"panel","id":"geomap","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Geomap panel","links":null,"logos":{"small":"public/app/plugins/panel/geomap/img/icn-geomap.svg","large":"public/app/plugins/panel/geomap/img/icn-geomap.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/geomap/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Getting Started","type":"panel","id":"gettingstarted","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg","large":"public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/gettingstarted/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Google Cloud Monitoring","type":"datasource","id":"stackdriver","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Google's monitoring service (formerly named Stackdriver)","links":null,"logos":{"small":"public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg","large":"public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg"},"build":{},"screenshots":null,"version":"1.0.0","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/stackdriver/","category":"cloud","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Graph (old)","type":"panel","id":"graph","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"The old default graph panel","links":null,"logos":{"small":"public/app/plugins/panel/graph/img/icn-graph-panel.svg","large":"public/app/plugins/panel/graph/img/icn-graph-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/graph/","category":"","state":"deprecated","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Graphite","type":"datasource","id":"graphite","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database","links":[{"name":"Learn more","url":"https://graphiteapp.org/"},{"name":"Graphite 1.1 Release","url":"https://grafana.com/blog/2018/01/11/graphite-1.1-teaching-an-old-dog-new-tricks/"}],"logos":{"small":"public/app/plugins/datasource/graphite/img/graphite_logo.png","large":"public/app/plugins/datasource/graphite/img/graphite_logo.png"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/graphite/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Heatmap","type":"panel","id":"heatmap","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Like a histogram over time","links":[{"name":"Brendan Gregg - Heatmaps","url":"http://www.brendangregg.com/heatmaps.html"},{"name":"Brendan Gregg - Latency Heatmaps","url":" http://www.brendangregg.com/HeatMaps/latency.html"}],"logos":{"small":"public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg","large":"public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/heatmap/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Histogram","type":"panel","id":"histogram","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/histogram/img/histogram.svg","large":"public/app/plugins/panel/histogram/img/histogram.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/histogram/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"InfluxDB","type":"datasource","id":"influxdb","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database","links":null,"logos":{"small":"public/app/plugins/datasource/influxdb/img/influxdb_logo.svg","large":"public/app/plugins/datasource/influxdb/img/influxdb_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/influxdb/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Jaeger","type":"datasource","id":"jaeger","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source, end-to-end distributed tracing","links":[{"name":"Learn more","url":"https://www.jaegertracing.io"},{"name":"GitHub Project","url":"https://github.com/jaegertracing/jaeger"}],"logos":{"small":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg","large":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/jaeger/","category":"tracing","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Logs","type":"panel","id":"logs","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/logs/img/icn-logs-panel.svg","large":"public/app/plugins/panel/logs/img/icn-logs-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/logs/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Loki","type":"datasource","id":"loki","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Like Prometheus but for logs. OSS logging solution from Grafana Labs","links":[{"name":"Learn more","url":"https://grafana.com/loki"},{"name":"GitHub Project","url":"https://github.com/grafana/loki"}],"logos":{"small":"public/app/plugins/datasource/loki/img/loki_icon.svg","large":"public/app/plugins/datasource/loki/img/loki_icon.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/loki/","category":"logging","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Microsoft SQL Server","type":"datasource","id":"mssql","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for Microsoft SQL Server compatible databases","links":null,"logos":{"small":"public/app/plugins/datasource/mssql/img/sql_server_logo.svg","large":"public/app/plugins/datasource/mssql/img/sql_server_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/mssql/","category":"sql","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"MySQL","type":"datasource","id":"mysql","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for MySQL databases","links":null,"logos":{"small":"public/app/plugins/datasource/mysql/img/mysql_logo.svg","large":"public/app/plugins/datasource/mysql/img/mysql_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/mysql/","category":"sql","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"News","type":"panel","id":"news","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"RSS feed reader","links":null,"logos":{"small":"public/app/plugins/panel/news/img/news.svg","large":"public/app/plugins/panel/news/img/news.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/news/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Node Graph","type":"panel","id":"nodeGraph","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg","large":"public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/nodeGraph/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"OpenTSDB","type":"datasource","id":"opentsdb","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database","links":null,"logos":{"small":"public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png","large":"public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/opentsdb/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Pie chart","type":"panel","id":"piechart","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"The new core pie chart visualization","links":null,"logos":{"small":"public/app/plugins/panel/piechart/img/icon_piechart.svg","large":"public/app/plugins/panel/piechart/img/icon_piechart.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/piechart/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"PostgreSQL","type":"datasource","id":"postgres","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Data source for PostgreSQL and compatible databases","links":null,"logos":{"small":"public/app/plugins/datasource/postgres/img/postgresql_logo.svg","large":"public/app/plugins/datasource/postgres/img/postgresql_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/postgres/","category":"sql","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Prometheus","type":"datasource","id":"prometheus","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Open source time series database \u0026 alerting","links":[{"name":"Learn more","url":"https://prometheus.io/"}],"logos":{"small":"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg","large":"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/prometheus/","category":"tsdb","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Stat","type":"panel","id":"stat","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Big stat values \u0026 sparklines","links":null,"logos":{"small":"public/app/plugins/panel/stat/img/icn-singlestat-panel.svg","large":"public/app/plugins/panel/stat/img/icn-singlestat-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/stat/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"State timeline","type":"panel","id":"state-timeline","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"State changes and durations","links":null,"logos":{"small":"public/app/plugins/panel/state-timeline/img/timeline.svg","large":"public/app/plugins/panel/state-timeline/img/timeline.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/state-timeline/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Status history","type":"panel","id":"status-history","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Periodic status history","links":null,"logos":{"small":"public/app/plugins/panel/status-history/img/status.svg","large":"public/app/plugins/panel/status-history/img/status.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/status-history/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Table","type":"panel","id":"table","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Supports many column styles","links":null,"logos":{"small":"public/app/plugins/panel/table/img/icn-table-panel.svg","large":"public/app/plugins/panel/table/img/icn-table-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/table/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Table (old)","type":"panel","id":"table-old","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Table Panel for Grafana","links":null,"logos":{"small":"public/app/plugins/panel/table-old/img/icn-table-panel.svg","large":"public/app/plugins/panel/table-old/img/icn-table-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/table-old/","category":"","state":"deprecated","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Tempo","type":"datasource","id":"tempo","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"High volume, minimal dependency trace storage.  OSS tracing solution from Grafana Labs.","links":[{"name":"GitHub Project","url":"https://github.com/grafana/tempo"}],"logos":{"small":"public/app/plugins/datasource/tempo/img/tempo_logo.svg","large":"public/app/plugins/datasource/tempo/img/tempo_logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/tempo/","category":"tracing","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"TestData DB","type":"datasource","id":"testdata","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Generates test data in different forms","links":null,"logos":{"small":"public/app/plugins/datasource/testdata/img/testdata.svg","large":"public/app/plugins/datasource/testdata/img/testdata.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/testdata/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Text","type":"panel","id":"text","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Supports markdown and html content","links":null,"logos":{"small":"public/app/plugins/panel/text/img/icn-text-panel.svg","large":"public/app/plugins/panel/text/img/icn-text-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/text/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Time series","type":"panel","id":"timeseries","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Time based line, area and bar charts","links":null,"logos":{"small":"public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg","large":"public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/timeseries/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Traces","type":"panel","id":"traces","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/traces/img/traces-panel.svg","large":"public/app/plugins/panel/traces/img/traces-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/traces/","category":"","state":"beta","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Welcome","type":"panel","id":"welcome","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"","links":null,"logos":{"small":"public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg","large":"public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/welcome/","category":"","state":"","signature":"internal","signatureType":"","signatureOrg":""},{"name":"Zipkin","type":"datasource","id":"zipkin","enabled":true,"pinned":false,"info":{"author":{"name":"Grafana Labs","url":"https://grafana.com"},"description":"Placeholder for the distributed tracing system.","links":[{"name":"Learn more","url":"https://zipkin.io"}],"logos":{"small":"public/app/plugins/datasource/zipkin/img/zipkin-logo.svg","large":"public/app/plugins/datasource/zipkin/img/zipkin-logo.svg"},"build":{},"screenshots":null,"version":"","updated":""},"dependencies":{"grafanaDependency":"","grafanaVersion":"*","plugins":[]},"latestVersion":"","hasUpdate":false,"defaultNavUrl":"/plugins/zipkin/","category":"tracing","state":"","signature":"internal","signatureType":"","signatureOrg":""}]
diff --git a/public/app/plugins/datasource/alertmanager/plugin.json b/public/app/plugins/datasource/alertmanager/plugin.json
index d2cd0fe98d1..33a087f5365 100644
--- a/public/app/plugins/datasource/alertmanager/plugin.json
+++ b/public/app/plugins/datasource/alertmanager/plugin.json
@@ -3,7 +3,6 @@
   "name": "Alertmanager",
   "id": "alertmanager",
   "metrics": false,
-  "state": "alpha",
   "routes": [
     {
       "method": "POST",

From 992d6aeed4f2dbbc7afbec8aa075ddfe8c6835e0 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 10:06:14 -0400
Subject: [PATCH 002/103] "Release: Updated versions in package to
 9.0.0-beta.1" (#49488)

---
 lerna.json                                    |  6 ++-
 package.json                                  |  2 +-
 packages/grafana-data/package.json            |  4 +-
 packages/grafana-e2e-selectors/package.json   |  2 +-
 packages/grafana-e2e/package.json             |  4 +-
 packages/grafana-runtime/package.json         |  8 ++--
 packages/grafana-schema/package.json          |  2 +-
 packages/grafana-toolkit/package.json         |  6 +--
 packages/grafana-ui/package.json              |  8 ++--
 packages/jaeger-ui-components/package.json    |  8 ++--
 .../internal/input-datasource/package.json    |  8 ++--
 yarn.lock                                     | 42 +++++++++----------
 12 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9a6406e5399..56b8d14068f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,8 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": ["packages/*"],
-  "version": "9.0.0-pre"
+  "packages": [
+    "packages/*"
+  ],
+  "version": "9.0.0-beta.1"
 }
diff --git a/package.json b/package.json
index 86cd1b81b21..c8ed7d144a1 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "repository": "github:grafana/grafana",
   "scripts": {
     "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index c146bd84cbe..e730ac53804 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.0",
-    "@grafana/schema": "9.0.0-pre",
+    "@grafana/schema": "9.0.0-beta.1",
     "@types/d3-interpolate": "^1.4.0",
     "d3-interpolate": "1.4.0",
     "date-fns": "2.28.0",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 4275ec21598..88c7dc933a5 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index c3a3a2b6216..e358b03e99e 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -48,7 +48,7 @@
     "@babel/core": "7.17.8",
     "@babel/preset-env": "7.17.10",
     "@cypress/webpack-preprocessor": "5.11.1",
-    "@grafana/e2e-selectors": "9.0.0-pre",
+    "@grafana/e2e-selectors": "9.0.0-beta.1",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "8.2.5",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index a5031704fcf..8c9d0934497 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -22,9 +22,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@grafana/data": "9.0.0-pre",
-    "@grafana/e2e-selectors": "9.0.0-pre",
-    "@grafana/ui": "9.0.0-pre",
+    "@grafana/data": "9.0.0-beta.1",
+    "@grafana/e2e-selectors": "9.0.0-beta.1",
+    "@grafana/ui": "9.0.0-beta.1",
     "@sentry/browser": "6.19.7",
     "history": "4.10.1",
     "lodash": "4.17.21",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 2d85d3bea1c..2829323c8c0 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index d0888482471..622fee2cc0a 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/toolkit",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
@@ -28,10 +28,10 @@
   "dependencies": {
     "@babel/core": "7.13.14",
     "@babel/preset-env": "7.13.12",
-    "@grafana/data": "9.0.0-pre",
+    "@grafana/data": "9.0.0-beta.1",
     "@grafana/eslint-config": "2.5.2",
     "@grafana/tsconfig": "^1.2.0-rc1",
-    "@grafana/ui": "9.0.0-pre",
+    "@grafana/ui": "9.0.0-beta.1",
     "@jest/core": "26.6.3",
     "@rushstack/eslint-patch": "1.0.6",
     "@types/command-exists": "^1.2.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 6c7cf6ef5e2..306625e0ae8 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -33,9 +33,9 @@
     "@emotion/css": "11.9.0",
     "@emotion/react": "11.9.0",
     "@grafana/aws-sdk": "0.0.36",
-    "@grafana/data": "9.0.0-pre",
-    "@grafana/e2e-selectors": "9.0.0-pre",
-    "@grafana/schema": "9.0.0-pre",
+    "@grafana/data": "9.0.0-beta.1",
+    "@grafana/e2e-selectors": "9.0.0-beta.1",
+    "@grafana/schema": "9.0.0-beta.1",
     "@grafana/slate-react": "0.22.10-grafana",
     "@monaco-editor/react": "4.3.1",
     "@popperjs/core": "2.11.5",
diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json
index bd6dfb630ee..65b25627557 100644
--- a/packages/jaeger-ui-components/package.json
+++ b/packages/jaeger-ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jaegertracing/jaeger-ui-components",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@emotion/css": "11.9.0",
-    "@grafana/data": "9.0.0-pre",
-    "@grafana/e2e-selectors": "9.0.0-pre",
-    "@grafana/ui": "9.0.0-pre",
+    "@grafana/data": "9.0.0-beta.1",
+    "@grafana/e2e-selectors": "9.0.0-beta.1",
+    "@grafana/ui": "9.0.0-beta.1",
     "chance": "^1.0.10",
     "classnames": "^2.2.5",
     "combokeys": "^3.0.0",
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 6c0b9f5fe15..1ff6c2427c8 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana-plugins/input-datasource",
-  "version": "9.0.0-pre",
+  "version": "9.0.0-beta.1",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -24,9 +24,9 @@
     "webpack": "5.58.1"
   },
   "dependencies": {
-    "@grafana/data": "9.0.0-pre",
-    "@grafana/toolkit": "9.0.0-pre",
-    "@grafana/ui": "9.0.0-pre",
+    "@grafana/data": "9.0.0-beta.1",
+    "@grafana/toolkit": "9.0.0-beta.1",
+    "@grafana/ui": "9.0.0-beta.1",
     "jquery": "3.5.1",
     "react": "17.0.1",
     "react-dom": "17.0.1",
diff --git a/yarn.lock b/yarn.lock
index 14b24a10a8b..1a813b8fd16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4302,9 +4302,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
-    "@grafana/data": 9.0.0-pre
-    "@grafana/toolkit": 9.0.0-pre
-    "@grafana/ui": 9.0.0-pre
+    "@grafana/data": 9.0.0-beta.1
+    "@grafana/toolkit": 9.0.0-beta.1
+    "@grafana/ui": 9.0.0-beta.1
     "@types/jest": 26.0.15
     "@types/lodash": 4.14.149
     "@types/react": 17.0.30
@@ -4345,12 +4345,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/data@9.0.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@9.0.0-beta.1, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
   version: 0.0.0-use.local
   resolution: "@grafana/data@workspace:packages/grafana-data"
   dependencies:
     "@braintree/sanitize-url": 6.0.0
-    "@grafana/schema": 9.0.0-pre
+    "@grafana/schema": 9.0.0-beta.1
     "@grafana/tsconfig": ^1.2.0-rc1
     "@rollup/plugin-commonjs": 22.0.0
     "@rollup/plugin-json": 4.1.0
@@ -4403,7 +4403,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@9.0.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@9.0.0-beta.1, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
   version: 0.0.0-use.local
   resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
   dependencies:
@@ -4427,7 +4427,7 @@ __metadata:
     "@babel/core": 7.17.8
     "@babel/preset-env": 7.17.10
     "@cypress/webpack-preprocessor": 5.11.1
-    "@grafana/e2e-selectors": 9.0.0-pre
+    "@grafana/e2e-selectors": 9.0.0-beta.1
     "@grafana/tsconfig": ^1.2.0-rc1
     "@mochajs/json-file-reporter": ^1.2.0
     "@rollup/plugin-commonjs": 22.0.0
@@ -4534,10 +4534,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": 9.0.0-pre
-    "@grafana/e2e-selectors": 9.0.0-pre
+    "@grafana/data": 9.0.0-beta.1
+    "@grafana/e2e-selectors": 9.0.0-beta.1
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.0.0-pre
+    "@grafana/ui": 9.0.0-beta.1
     "@rollup/plugin-commonjs": 22.0.0
     "@rollup/plugin-node-resolve": 13.3.0
     "@sentry/browser": 6.19.7
@@ -4566,7 +4566,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/schema@9.0.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@9.0.0-beta.1, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
@@ -4613,16 +4613,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/toolkit@9.0.0-pre, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
+"@grafana/toolkit@9.0.0-beta.1, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
   version: 0.0.0-use.local
   resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
   dependencies:
     "@babel/core": 7.13.14
     "@babel/preset-env": 7.13.12
-    "@grafana/data": 9.0.0-pre
+    "@grafana/data": 9.0.0-beta.1
     "@grafana/eslint-config": 2.5.2
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.0.0-pre
+    "@grafana/ui": 9.0.0-beta.1
     "@jest/core": 26.6.3
     "@rushstack/eslint-patch": 1.0.6
     "@types/command-exists": ^1.2.0
@@ -4706,7 +4706,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/ui@9.0.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@9.0.0-beta.1, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
   version: 0.0.0-use.local
   resolution: "@grafana/ui@workspace:packages/grafana-ui"
   dependencies:
@@ -4714,9 +4714,9 @@ __metadata:
     "@emotion/css": 11.9.0
     "@emotion/react": 11.9.0
     "@grafana/aws-sdk": 0.0.36
-    "@grafana/data": 9.0.0-pre
-    "@grafana/e2e-selectors": 9.0.0-pre
-    "@grafana/schema": 9.0.0-pre
+    "@grafana/data": 9.0.0-beta.1
+    "@grafana/e2e-selectors": 9.0.0-beta.1
+    "@grafana/schema": 9.0.0-beta.1
     "@grafana/slate-react": 0.22.10-grafana
     "@grafana/tsconfig": ^1.2.0-rc1
     "@mdx-js/react": 1.6.22
@@ -4952,10 +4952,10 @@ __metadata:
   resolution: "@jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components"
   dependencies:
     "@emotion/css": 11.9.0
-    "@grafana/data": 9.0.0-pre
-    "@grafana/e2e-selectors": 9.0.0-pre
+    "@grafana/data": 9.0.0-beta.1
+    "@grafana/e2e-selectors": 9.0.0-beta.1
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.0.0-pre
+    "@grafana/ui": 9.0.0-beta.1
     "@testing-library/react": 12.1.4
     "@testing-library/user-event": 14.2.0
     "@types/classnames": ^2.2.7

From ba4c292f67d29ec31d6e05eef4856d9edfc62991 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 10:47:57 -0400
Subject: [PATCH 003/103] Fix escape in Modal/DashboardSettings + add some unit
 tests (#49500) (#49504)

(cherry picked from commit 8166d7dc4d70b45ab3a76ba25e1d83a380d5d0f7)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 .../src/components/Drawer/Drawer.tsx          |  2 +
 .../src/components/Modal/Modal.test.tsx       | 19 +++++++
 .../grafana-ui/src/components/Modal/Modal.tsx |  2 +-
 .../DashboardSettings.test.tsx                | 51 +++++++++++++++++++
 .../DashboardSettings/DashboardSettings.tsx   |  8 ++-
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx

diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 7bf729d0334..55b61dc0cd5 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -55,6 +55,8 @@ export function Drawer({
   const { overlayProps } = useOverlay(
     {
       isDismissable: true,
+      isOpen,
+      onClose,
     },
     overlayRef
   );
diff --git a/packages/grafana-ui/src/components/Modal/Modal.test.tsx b/packages/grafana-ui/src/components/Modal/Modal.test.tsx
index 08d558d395b..7f4a79d8480 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.test.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.test.tsx
@@ -1,4 +1,5 @@
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { Modal } from './Modal';
@@ -22,4 +23,22 @@ describe('Modal', () => {
 
     expect(screen.getByTestId('modal-content')).toBeInTheDocument();
   });
+
+  it('pressing escape calls onDismiss correctly', async () => {
+    const onDismiss = jest.fn();
+
+    render(
+      <Modal title="Some Title" isOpen onDismiss={onDismiss}>
+        <div data-testid="modal-content">Content</div>
+      </Modal>
+    );
+
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+    expect(screen.getByLabelText('Some Title')).toBeInTheDocument();
+    expect(screen.getByTestId('modal-content')).toBeInTheDocument();
+
+    await userEvent.keyboard('{Escape}');
+
+    expect(onDismiss).toHaveBeenCalled();
+  });
 });
diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/grafana-ui/src/components/Modal/Modal.tsx
index 8b2e6adc175..a3f6aeba5df 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.tsx
@@ -53,7 +53,7 @@ export function Modal(props: PropsWithChildren<Props>) {
   // Handle interacting outside the dialog and pressing
   // the Escape key to close the modal.
   const { overlayProps, underlayProps } = useOverlay(
-    { isKeyboardDismissDisabled: closeOnEscape, isOpen, onClose: onDismiss },
+    { isKeyboardDismissDisabled: !closeOnEscape, isOpen, onClose: onDismiss },
     ref
   );
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx
new file mode 100644
index 00000000000..a694be7c3f6
--- /dev/null
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx
@@ -0,0 +1,51 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { BrowserRouter } from 'react-router-dom';
+
+import { locationService, setBackendSrv } from '@grafana/runtime';
+import { configureStore } from 'app/store/configureStore';
+
+import { DashboardModel } from '../../state';
+
+import { DashboardSettings } from './DashboardSettings';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  locationService: {
+    partial: jest.fn(),
+  },
+}));
+
+setBackendSrv({
+  get: jest.fn().mockResolvedValue({}),
+} as any);
+
+describe('DashboardSettings', () => {
+  it('pressing escape navigates away correctly', async () => {
+    jest.spyOn(locationService, 'partial');
+    const dashboard = new DashboardModel(
+      {
+        title: 'Foo',
+      },
+      {
+        folderId: 1,
+      }
+    );
+    const store = configureStore();
+    render(
+      <Provider store={store}>
+        <BrowserRouter>
+          <DashboardSettings editview="settings" dashboard={dashboard} />
+        </BrowserRouter>
+      </Provider>
+    );
+
+    expect(screen.getByText('Foo / Settings')).toBeInTheDocument();
+
+    await userEvent.keyboard('{Escape}');
+
+    expect(locationService.partial).toHaveBeenCalledWith({ editview: null });
+  });
+});
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index d8494fe6c59..363eae8acc6 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -49,7 +49,13 @@ const MakeEditable = (props: { onMakeEditable: () => any }) => (
 
 export function DashboardSettings({ dashboard, editview }: Props) {
   const ref = useRef<HTMLDivElement>(null);
-  const { overlayProps } = useOverlay({}, ref);
+  const { overlayProps } = useOverlay(
+    {
+      isOpen: true,
+      onClose,
+    },
+    ref
+  );
   const { dialogProps } = useDialog(
     {
       'aria-label': 'Dashboard settings',

From 4dd08e7da62f1ad40261127e2596b5c76483ecbe Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 11:21:27 -0400
Subject: [PATCH 004/103] Alerting: Validate alert notification UID length
 (#45546) (#49513)

* validate alert notification UID length

* simplify-ish

* remove unused field

* whoopsie

* delete newline

* remove check

* apply feedback

(cherry picked from commit 635fa4ab0f349a9e7a6baa09c69414960c57a44e)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
---
 pkg/services/alerting/service.go      | 13 +++++++++++++
 pkg/services/alerting/service_test.go | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/pkg/services/alerting/service.go b/pkg/services/alerting/service.go
index 34e683561fc..7c30b0a635f 100644
--- a/pkg/services/alerting/service.go
+++ b/pkg/services/alerting/service.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 type AlertNotificationService struct {
@@ -33,6 +34,10 @@ func (s *AlertNotificationService) GetAlertNotifications(ctx context.Context, qu
 }
 
 func (s *AlertNotificationService) CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) error {
+	if util.IsShortUIDTooLong(cmd.Uid) {
+		return ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
+	}
+
 	var err error
 	cmd.EncryptedSecureSettings, err = s.EncryptionService.EncryptJsonData(ctx, cmd.SecureSettings, setting.SecretKey)
 	if err != nil {
@@ -53,6 +58,10 @@ func (s *AlertNotificationService) CreateAlertNotificationCommand(ctx context.Co
 }
 
 func (s *AlertNotificationService) UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) error {
+	if util.IsShortUIDTooLong(cmd.Uid) {
+		return ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
+	}
+
 	var err error
 	cmd.EncryptedSecureSettings, err = s.EncryptionService.EncryptJsonData(ctx, cmd.SecureSettings, setting.SecretKey)
 	if err != nil {
@@ -99,6 +108,10 @@ func (s *AlertNotificationService) GetAlertNotificationsWithUid(ctx context.Cont
 }
 
 func (s *AlertNotificationService) UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) error {
+	if util.IsShortUIDTooLong(cmd.Uid) || util.IsShortUIDTooLong(cmd.NewUid) {
+		return ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
+	}
+
 	return s.SQLStore.UpdateAlertNotificationWithUid(ctx, cmd)
 }
 
diff --git a/pkg/services/alerting/service_test.go b/pkg/services/alerting/service_test.go
index edd58a5da30..0d8e19245a3 100644
--- a/pkg/services/alerting/service_test.go
+++ b/pkg/services/alerting/service_test.go
@@ -2,6 +2,7 @@ package alerting
 
 import (
 	"context"
+	"strings"
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -112,6 +113,26 @@ func TestService(t *testing.T) {
 		err = s.DeleteAlertNotification(context.Background(), &delCmd)
 		require.NoError(t, err)
 	})
+
+	t.Run("create alert notification should reject an invalid command", func(t *testing.T) {
+		uid := strings.Repeat("A", 41)
+
+		err := s.CreateAlertNotificationCommand(context.Background(), &models.CreateAlertNotificationCommand{Uid: uid})
+		require.ErrorIs(t, err, ValidationError{Reason: "Invalid UID: Must be 40 characters or less"})
+	})
+
+	t.Run("update alert notification should reject an invalid command", func(t *testing.T) {
+		ctx := context.Background()
+
+		uid := strings.Repeat("A", 41)
+		expectedErr := ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
+
+		err := s.UpdateAlertNotification(ctx, &models.UpdateAlertNotificationCommand{Uid: uid})
+		require.ErrorIs(t, err, expectedErr)
+
+		err = s.UpdateAlertNotificationWithUid(ctx, &models.UpdateAlertNotificationWithUidCommand{NewUid: uid})
+		require.ErrorIs(t, err, expectedErr)
+	})
 }
 
 func registerTestNotifier(notifierType string) {

From b8544741aa560ecd7a6a6a55838db3317ff5428d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 12:16:55 -0400
Subject: [PATCH 005/103] AzureAD: Fallback to no groups if user does not have
 permission to query groups from azure  (#49506) (#49522)

* If GroupMemver.Read.All permissions is not configured return no groups

* fix log

(cherry picked from commit 624f8ef40de6d2855911752bd0e0c716d477d213)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 pkg/login/social/azuread_oauth.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/login/social/azuread_oauth.go b/pkg/login/social/azuread_oauth.go
index ff1d51a7a4e..774e7bdfa55 100644
--- a/pkg/login/social/azuread_oauth.go
+++ b/pkg/login/social/azuread_oauth.go
@@ -213,7 +213,8 @@ func extractGroups(client *http.Client, claims azureClaims, token *oauth2.Token)
 
 	if res.StatusCode != http.StatusOK {
 		if res.StatusCode == http.StatusForbidden {
-			logger.Error("AzureAD OAuth: failed to fetch user groups. Token need User.Read and GroupMember.Read.All permission")
+			logger.Warn("AzureAD OAuh: Token need GroupMember.Read.All permission to fetch all groups")
+			return []string{}, nil
 		}
 		return nil, errors.New("error fetching groups")
 	}

From 0704838c952fe913c5bbdcdfc653221aad60792e Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 13:44:11 -0400
Subject: [PATCH 006/103] InfluxDB: Removing influxDB backend migration feature
 flag (#49531) (#49532)

Removing the `influxdbBackendMigration` feature toggle default value.

(cherry picked from commit 27c26c30d1a6fabd48ed1bdacde8e3481f9a9b4c)

Co-authored-by: Sriram <yesoreyeram@gmail.com>
---
 conf/defaults.ini | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 2120725f2ca..1fa6c669021 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1174,9 +1174,6 @@ promQueryBuilder = true
 # The new loki visual query builder
 lokiQueryBuilder = true
 
-# InfluxDB backend migration
-influxdbBackendMigration = true
-
 # Experimental Explore to Dashboard workflow
 explore2Dashboard = true
 

From d77a09e2d8bc84a71ca4967c0142e6b5886af2a1 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 14:36:10 -0400
Subject: [PATCH 007/103] upgrade grabpl (#49534) (#49536)

(cherry picked from commit 61101056b6058d552c792ed52637c142f4f676ad)

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
---
 .drone.yml                   | 76 ++++++++++++++++++------------------
 scripts/drone/steps/lib.star |  2 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 12334803eb9..40305f9faf0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,7 +15,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -80,7 +80,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -168,7 +168,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -434,7 +434,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -504,7 +504,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -594,7 +594,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -683,7 +683,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -744,7 +744,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -828,7 +828,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1261,7 +1261,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1334,7 +1334,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -1422,7 +1422,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1507,7 +1507,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1813,7 +1813,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1937,7 +1937,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2014,7 +2014,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -2073,7 +2073,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2430,7 +2430,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2609,7 +2609,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2733,7 +2733,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -2808,7 +2808,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2886,7 +2886,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2947,7 +2947,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3026,7 +3026,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3088,7 +3088,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3126,7 +3126,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3164,7 +3164,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3220,7 +3220,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3268,7 +3268,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3317,7 +3317,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3593,7 +3593,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3711,7 +3711,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3782,7 +3782,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -3830,7 +3830,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4185,7 +4185,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4355,7 +4355,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4470,7 +4470,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -4667,6 +4667,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 39c6fd27fc223b7bc99242101d28f508cdbbf01b561330bb52979f1d032af5d5
+hmac: a697f4b02af2da0fc6c0d751e40e59db542541d6024e5f0c2b062c7060d635ab
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index d4b96bf754d..1f369b422e0 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1,6 +1,6 @@
 load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
 
-grabpl_version = 'v2.9.48'
+grabpl_version = 'v2.9.49'
 build_image = 'grafana/build-container:1.5.4'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'

From 1e2708cbcf2732cccb122088393a57900e680985 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 24 May 2022 16:35:19 -0400
Subject: [PATCH 008/103] Prometheus: Streaming JSON parser performance
 improvements (#48792) (#49542)

(cherry picked from commit 94b9c524a81df2085ad769229ca09cfd1923a8e9)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
---
 .../src/types/featureToggles.gen.ts           |    1 +
 pkg/services/featuremgmt/registry.go          |    5 +
 pkg/services/featuremgmt/toggles_gen.go       |    4 +
 pkg/tsdb/loki/api.go                          |    2 +-
 pkg/tsdb/prometheus/prometheus.go             |    2 +-
 pkg/tsdb/prometheus/querydata/framing_test.go |   69 +-
 .../querydata/prometeus_bench_test.go         |    2 +-
 pkg/tsdb/prometheus/querydata/request.go      |    2 +
 pkg/tsdb/prometheus/querydata/request_test.go |   46 +-
 pkg/tsdb/prometheus/querydata/response.go     |   41 +-
 .../range_infinity.buffered.result.golden.txt |   24 +
 ...infinity.result.streaming-wide.golden.json |   60 +
 ..._infinity.result.streaming-wide.golden.txt |   24 +
 .../range_missing.buffered.result.golden.txt  |   24 +
 ..._missing.result.streaming-wide.golden.json |   53 +
 ...e_missing.result.streaming-wide.golden.txt |   24 +
 .../range_nan.buffered.result.golden.txt      |   24 +
 ...ange_nan.result.streaming-wide.golden.json |   63 +
 ...range_nan.result.streaming-wide.golden.txt |   24 +
 .../range_simple.buffered.result.golden.txt   |   46 +
 .../testdata/range_simple.result.golden.json  |    2 -
 .../testdata/range_simple.result.golden.txt   |    5 +-
 .../testdata/range_simple.result.json         |    1 -
 ...e_simple.result.streaming-wide.golden.json |   74 +
 ...ge_simple.result.streaming-wide.golden.txt |   24 +
 .../range_simple.result.streaming.golden.json |    2 -
 .../range_simple.result.streaming.golden.txt  |    5 +-
 pkg/util/converter/prom.go                    |  139 +-
 pkg/util/converter/prom_test.go               |   76 +-
 .../testdata/loki-streams-a-frame.json        |   52 +-
 .../testdata/loki-streams-a-wide-frame.json   |   90 +
 .../testdata/loki-streams-a-wide-golden.txt   |   56 +
 .../testdata/loki-streams-b-frame.json        |   18 +-
 .../testdata/loki-streams-b-wide-frame.json   |   90 +
 .../testdata/loki-streams-b-wide-golden.txt   |   55 +
 .../testdata/prom-error-wide-frame.json       |    3 +
 .../testdata/prom-error-wide-golden.txt       |    3 +
 .../testdata/prom-exemplars-wide-frame.json   |  116 ++
 .../testdata/prom-exemplars-wide-golden.txt   |   39 +
 .../testdata/prom-labels-wide-frame.json      |   24 +
 .../testdata/prom-labels-wide-golden.txt      |   25 +
 ...matrix-histogram-no-labels-wide-frame.json |   70 +
 ...matrix-histogram-no-labels-wide-golden.txt |   27 +
 ...trix-histogram-partitioned-wide-frame.json | 1636 +++++++++++++++++
 ...trix-histogram-partitioned-wide-golden.txt |  490 +++++
 .../testdata/prom-matrix-wide-frame.json      |   62 +
 .../testdata/prom-matrix-wide-golden.txt      |   23 +
 .../prom-matrix-with-nans-wide-frame.json     |   59 +
 .../prom-matrix-with-nans-wide-golden.txt     |   23 +
 .../testdata/prom-scalar-wide-frame.json      |   43 +
 .../testdata/prom-scalar-wide-golden.txt      |   21 +
 .../testdata/prom-series-wide-frame.json      |   44 +
 .../testdata/prom-series-wide-golden.txt      |   18 +
 .../testdata/prom-string-wide-frame.json      |   43 +
 .../testdata/prom-string-wide-golden.txt      |   21 +
 ...vector-histogram-no-labels-wide-frame.json |   70 +
 ...vector-histogram-no-labels-wide-golden.txt |   27 +
 .../testdata/prom-vector-wide-frame.json      |  127 ++
 .../testdata/prom-vector-wide-golden.txt      |   22 +
 .../testdata/prom-warnings-wide-frame.json    |  137 ++
 .../testdata/prom-warnings-wide-golden.txt    |   32 +
 61 files changed, 4279 insertions(+), 155 deletions(-)
 create mode 100644 pkg/tsdb/prometheus/testdata/range_infinity.buffered.result.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.json
 create mode 100644 pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_missing.buffered.result.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.json
 create mode 100644 pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_nan.buffered.result.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.json
 create mode 100644 pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_simple.buffered.result.golden.txt
 create mode 100644 pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json
 create mode 100644 pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt
 create mode 100644 pkg/util/converter/testdata/loki-streams-a-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/loki-streams-a-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/loki-streams-b-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/loki-streams-b-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-error-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-error-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-exemplars-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-exemplars-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-labels-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-labels-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-matrix-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-matrix-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-matrix-with-nans-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-scalar-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-scalar-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-series-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-series-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-string-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-string-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-vector-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-vector-wide-golden.txt
 create mode 100644 pkg/util/converter/testdata/prom-warnings-wide-frame.json
 create mode 100644 pkg/util/converter/testdata/prom-warnings-wide-golden.txt

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 0a148018e63..2267c7a0115 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -60,4 +60,5 @@ export interface FeatureToggles {
   traceToMetrics?: boolean;
   prometheusStreamingJSONParser?: boolean;
   validateDashboardsOnSave?: boolean;
+  prometheusWideSeries?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index d0e19ce8dff..7e0b0066c38 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -249,5 +249,10 @@ var (
 			State:           FeatureStateAlpha,
 			RequiresRestart: true,
 		},
+		{
+			Name:        "prometheusWideSeries",
+			Description: "Enable wide series responses in the Prometheus datasource",
+			State:       FeatureStateAlpha,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index da68445c912..66508a05e7f 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -182,4 +182,8 @@ const (
 	// FlagValidateDashboardsOnSave
 	// Validate dashboard JSON POSTed to api/dashboards/db
 	FlagValidateDashboardsOnSave = "validateDashboardsOnSave"
+
+	// FlagPrometheusWideSeries
+	// Enable wide series responses in the Prometheus datasource
+	FlagPrometheusWideSeries = "prometheusWideSeries"
 )
diff --git a/pkg/tsdb/loki/api.go b/pkg/tsdb/loki/api.go
index 609ae9308f3..2bbe18aba30 100644
--- a/pkg/tsdb/loki/api.go
+++ b/pkg/tsdb/loki/api.go
@@ -160,7 +160,7 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery) (data.Frames
 	}
 
 	iter := jsoniter.Parse(jsoniter.ConfigDefault, resp.Body, 1024)
-	res := converter.ReadPrometheusStyleResult(iter)
+	res := converter.ReadPrometheusStyleResult(iter, converter.Options{MatrixWideSeries: false, VectorWideSeries: false})
 
 	if res.Error != nil {
 		return nil, res.Error
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index 1be52be6b08..d4e0362c220 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -74,7 +74,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		return nil, err
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagPrometheusStreamingJSONParser) {
+	if s.features.IsEnabled(featuremgmt.FlagPrometheusStreamingJSONParser) || s.features.IsEnabled(featuremgmt.FlagPrometheusWideSeries) {
 		return i.queryData.Execute(ctx, req)
 	}
 
diff --git a/pkg/tsdb/prometheus/querydata/framing_test.go b/pkg/tsdb/prometheus/querydata/framing_test.go
index 50526ebec98..32ee249bc68 100644
--- a/pkg/tsdb/prometheus/querydata/framing_test.go
+++ b/pkg/tsdb/prometheus/querydata/framing_test.go
@@ -34,39 +34,46 @@ func TestMatrixResponses(t *testing.T) {
 	}
 
 	for _, test := range tt {
-		t.Run(test.name, func(t *testing.T) {
-			queryFileName := filepath.Join("../testdata", test.filepath+".query.json")
-			responseFileName := filepath.Join("../testdata", test.filepath+".result.json")
-			goldenFileName := filepath.Join("../testdata", test.filepath+".result.streaming.golden")
+		enableWideSeries := false
+		queryFileName := filepath.Join("../testdata", test.filepath+".query.json")
+		responseFileName := filepath.Join("../testdata", test.filepath+".result.json")
+		goldenFileName := filepath.Join("../testdata", test.filepath+".result.streaming.golden")
+		t.Run(test.name, goldenScenario(test.name, queryFileName, responseFileName, goldenFileName, enableWideSeries))
+		enableWideSeries = true
+		goldenFileName = filepath.Join("../testdata", test.filepath+".result.streaming-wide.golden")
+		t.Run(test.name, goldenScenario(test.name, queryFileName, responseFileName, goldenFileName, enableWideSeries))
+	}
+}
 
-			query, err := loadStoredQuery(queryFileName)
+func goldenScenario(name, queryFileName, responseFileName, goldenFileName string, wide bool) func(t *testing.T) {
+	return func(t *testing.T) {
+		query, err := loadStoredQuery(queryFileName)
+		require.NoError(t, err)
+
+		responseBytes, err := os.ReadFile(responseFileName)
+		require.NoError(t, err)
+
+		result, err := runQuery(responseBytes, query, wide)
+		require.NoError(t, err)
+		require.Len(t, result.Responses, 1)
+
+		dr, found := result.Responses["A"]
+		require.True(t, found)
+
+		actual, err := json.MarshalIndent(&dr, "", "  ")
+		require.NoError(t, err)
+
+		// nolint:gosec
+		// We can ignore the gosec G304 because this is a test with static defined paths
+		expected, err := ioutil.ReadFile(goldenFileName + ".json")
+		if err != nil || update {
+			err = os.WriteFile(goldenFileName+".json", actual, 0600)
 			require.NoError(t, err)
+		}
 
-			responseBytes, err := os.ReadFile(responseFileName)
-			require.NoError(t, err)
+		require.JSONEq(t, string(expected), string(actual))
 
-			result, err := runQuery(responseBytes, query)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			dr, found := result.Responses["A"]
-			require.True(t, found)
-
-			actual, err := json.MarshalIndent(&dr, "", "  ")
-			require.NoError(t, err)
-
-			// nolint:gosec
-			// We can ignore the gosec G304 because this is a test with static defined paths
-			expected, err := ioutil.ReadFile(goldenFileName + ".json")
-			if err != nil || update {
-				err = os.WriteFile(goldenFileName+".json", actual, 0600)
-				require.NoError(t, err)
-			}
-
-			require.JSONEq(t, string(expected), string(actual))
-
-			require.NoError(t, experimental.CheckGoldenDataResponse(goldenFileName+".txt", &dr, update))
-		})
+		require.NoError(t, experimental.CheckGoldenDataResponse(goldenFileName+".txt", &dr, update))
 	}
 }
 
@@ -123,8 +130,8 @@ func loadStoredQuery(fileName string) (*backend.QueryDataRequest, error) {
 	}, nil
 }
 
-func runQuery(response []byte, q *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	tCtx := setup()
+func runQuery(response []byte, q *backend.QueryDataRequest, wide bool) (*backend.QueryDataResponse, error) {
+	tCtx := setup(wide)
 	res := &http.Response{
 		StatusCode: 200,
 		Body:       ioutil.NopCloser(bytes.NewReader(response)),
diff --git a/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go b/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
index 50c1cfb3ea9..b7ce55437bb 100644
--- a/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
+++ b/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
@@ -22,7 +22,7 @@ import (
 // - go tool pprof -http=localhost:6061 memprofile.out
 func BenchmarkJson(b *testing.B) {
 	body, q := createJsonTestData(1642000000, 1, 300, 400)
-	tCtx := setup()
+	tCtx := setup(true)
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
 		res := http.Response{
diff --git a/pkg/tsdb/prometheus/querydata/request.go b/pkg/tsdb/prometheus/querydata/request.go
index 1078a33c6fe..2e7ebac3c45 100644
--- a/pkg/tsdb/prometheus/querydata/request.go
+++ b/pkg/tsdb/prometheus/querydata/request.go
@@ -41,6 +41,7 @@ type QueryData struct {
 	ID                 int64
 	URL                string
 	TimeInterval       string
+	enableWideSeries   bool
 }
 
 func New(
@@ -75,6 +76,7 @@ func New(
 		TimeInterval:       timeInterval,
 		ID:                 settings.ID,
 		URL:                settings.URL,
+		enableWideSeries:   features.IsEnabled(featuremgmt.FlagPrometheusWideSeries),
 	}, nil
 }
 
diff --git a/pkg/tsdb/prometheus/querydata/request_test.go b/pkg/tsdb/prometheus/querydata/request_test.go
index 03a0a1c86cf..a8f1f4089a5 100644
--- a/pkg/tsdb/prometheus/querydata/request_test.go
+++ b/pkg/tsdb/prometheus/querydata/request_test.go
@@ -58,7 +58,7 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 		}
 
-		tctx := setup()
+		tctx := setup(true)
 
 		qm := models.QueryModel{
 			LegendFormat:  "legend {{app}}",
@@ -119,19 +119,17 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 			JSON: b,
 		}
-		tctx := setup()
+		tctx := setup(true)
 		res, err := execute(tctx, query, result)
 		require.NoError(t, err)
 
 		require.Len(t, res, 1)
-		//require.Equal(t, "legend Application", res[0].Name)
 		require.Len(t, res[0].Fields, 2)
 		require.Len(t, res[0].Fields[0].Labels, 0)
 		require.Equal(t, "Time", res[0].Fields[0].Name)
 		require.Len(t, res[0].Fields[1].Labels, 2)
 		require.Equal(t, "app=Application, tag2=tag2", res[0].Fields[1].Labels.String())
-		require.Equal(t, "Value", res[0].Fields[1].Name)
-		require.Equal(t, "legend Application", res[0].Fields[1].Config.DisplayNameFromDS)
+		require.Equal(t, "legend Application", res[0].Fields[1].Name)
 
 		// Ensure the timestamps are UTC zoned
 		testValue := res[0].Fields[0].At(0)
@@ -167,7 +165,7 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 			JSON: b,
 		}
-		tctx := setup()
+		tctx := setup(true)
 		res, err := execute(tctx, query, result)
 
 		require.NoError(t, err)
@@ -176,8 +174,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 		require.Equal(t, time.Unix(1, 0).UTC(), res[0].Fields[0].At(0))
 		require.Equal(t, time.Unix(4, 0).UTC(), res[0].Fields[0].At(1))
 		require.Equal(t, res[0].Fields[1].Len(), 2)
-		require.Equal(t, float64(1), res[0].Fields[1].At(0).(float64))
-		require.Equal(t, float64(4), res[0].Fields[1].At(1).(float64))
+		require.Equal(t, float64(1), *res[0].Fields[1].At(0).(*float64))
+		require.Equal(t, float64(4), *res[0].Fields[1].At(1).(*float64))
 	})
 
 	t.Run("matrix response with from alerting missed data points should be parsed correctly", func(t *testing.T) {
@@ -209,19 +207,17 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 			JSON: b,
 		}
-		tctx := setup()
+		tctx := setup(true)
 		res, err := execute(tctx, query, result)
 
 		require.NoError(t, err)
 		require.Len(t, res, 1)
-		require.Equal(t, res[0].Name, "{app=\"Application\", tag2=\"tag2\"}")
 		require.Len(t, res[0].Fields, 2)
 		require.Len(t, res[0].Fields[0].Labels, 0)
 		require.Equal(t, res[0].Fields[0].Name, "Time")
 		require.Len(t, res[0].Fields[1].Labels, 2)
 		require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2")
-		require.Equal(t, res[0].Fields[1].Name, "Value")
-		require.Equal(t, res[0].Fields[1].Config.DisplayNameFromDS, "{app=\"Application\", tag2=\"tag2\"}")
+		require.Equal(t, "{app=\"Application\", tag2=\"tag2\"}", res[0].Fields[1].Name)
 	})
 
 	t.Run("matrix response with NaN value should be changed to null", func(t *testing.T) {
@@ -252,12 +248,12 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			JSON: b,
 		}
 
-		tctx := setup()
+		tctx := setup(true)
 		res, err := execute(tctx, query, result)
 		require.NoError(t, err)
 
-		require.Equal(t, res[0].Fields[1].Name, "Value")
-		require.True(t, math.IsNaN(res[0].Fields[1].At(0).(float64)))
+		require.Equal(t, "{app=\"Application\"}", res[0].Fields[1].Name)
+		require.True(t, math.IsNaN(*res[0].Fields[1].At(0).(*float64)))
 	})
 
 	t.Run("vector response should be parsed normally", func(t *testing.T) {
@@ -281,20 +277,18 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 		query := backend.DataQuery{
 			JSON: b,
 		}
-		tctx := setup()
+		tctx := setup(true)
 		res, err := execute(tctx, query, qr)
 		require.NoError(t, err)
 
 		require.Len(t, res, 1)
-		require.Equal(t, res[0].Name, "legend Application")
 		require.Len(t, res[0].Fields, 2)
 		require.Len(t, res[0].Fields[0].Labels, 0)
 		require.Equal(t, res[0].Fields[0].Name, "Time")
 		require.Equal(t, res[0].Fields[0].Name, "Time")
 		require.Len(t, res[0].Fields[1].Labels, 2)
 		require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2")
-		require.Equal(t, res[0].Fields[1].Name, "Value")
-		require.Equal(t, res[0].Fields[1].Config.DisplayNameFromDS, "legend Application")
+		require.Equal(t, "legend Application", res[0].Fields[1].Name)
 
 		// Ensure the timestamps are UTC zoned
 		testValue := res[0].Fields[0].At(0)
@@ -321,17 +315,15 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 		query := backend.DataQuery{
 			JSON: b,
 		}
-		tctx := setup()
+		tctx := setup(true)
 		res, err := execute(tctx, query, qr)
 		require.NoError(t, err)
 
 		require.Len(t, res, 1)
-		require.Equal(t, res[0].Name, "1")
 		require.Len(t, res[0].Fields, 2)
 		require.Len(t, res[0].Fields[0].Labels, 0)
 		require.Equal(t, res[0].Fields[0].Name, "Time")
-		require.Equal(t, res[0].Fields[1].Name, "Value")
-		require.Equal(t, res[0].Fields[1].Config.DisplayNameFromDS, "1")
+		require.Equal(t, "1", res[0].Fields[1].Name)
 
 		// Ensure the timestamps are UTC zoned
 		testValue := res[0].Fields[0].At(0)
@@ -397,7 +389,7 @@ type testContext struct {
 	queryData    *querydata.QueryData
 }
 
-func setup() *testContext {
+func setup(wideFrames bool) *testContext {
 	tracer, err := tracing.InitializeTracerForTest()
 	if err != nil {
 		panic(err)
@@ -414,7 +406,7 @@ func setup() *testContext {
 	queryData, _ := querydata.New(
 		httpProvider,
 		setting.NewCfg(),
-		&fakeFeatureToggles{enabled: true},
+		&fakeFeatureToggles{flags: map[string]bool{"prometheusStreamingJSONParser": true, "prometheusWideSeries": wideFrames}},
 		tracer,
 		backend.DataSourceInstanceSettings{URL: "http://localhost:9090", JSONData: json.RawMessage(`{"timeInterval": "15s"}`)},
 		&fakeLogger{},
@@ -427,11 +419,11 @@ func setup() *testContext {
 }
 
 type fakeFeatureToggles struct {
-	enabled bool
+	flags map[string]bool
 }
 
 func (f *fakeFeatureToggles) IsEnabled(feature string) bool {
-	return f.enabled
+	return f.flags[feature]
 }
 
 type fakeHttpClientProvider struct {
diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/tsdb/prometheus/querydata/response.go
index 08d4618c4d5..258b06e5edf 100644
--- a/pkg/tsdb/prometheus/querydata/response.go
+++ b/pkg/tsdb/prometheus/querydata/response.go
@@ -22,20 +22,27 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
 	}()
 
 	iter := jsoniter.Parse(jsoniter.ConfigDefault, res.Body, 1024)
-	r := converter.ReadPrometheusStyleResult(iter)
+	r := converter.ReadPrometheusStyleResult(iter, converter.Options{
+		MatrixWideSeries: s.enableWideSeries,
+		VectorWideSeries: s.enableWideSeries,
+	})
 	if r == nil {
 		return nil, fmt.Errorf("received empty response from prometheus")
 	}
 
 	// The ExecutedQueryString can be viewed in QueryInspector in UI
 	for _, frame := range r.Frames {
-		addMetadataToFrame(q, frame)
+		if s.enableWideSeries {
+			addMetadataToWideFrame(q, frame)
+		} else {
+			addMetadataToMultiFrame(q, frame)
+		}
 	}
 
 	return r, nil
 }
 
-func addMetadataToFrame(q *models.Query, frame *data.Frame) {
+func addMetadataToMultiFrame(q *models.Query, frame *data.Frame) {
 	if frame.Meta == nil {
 		frame.Meta = &data.FrameMeta{}
 	}
@@ -43,16 +50,32 @@ func addMetadataToFrame(q *models.Query, frame *data.Frame) {
 	if len(frame.Fields) < 2 {
 		return
 	}
-	frame.Name = getName(q, frame)
+	frame.Name = getName(q, frame.Fields[1])
 	frame.Fields[0].Config = &data.FieldConfig{Interval: float64(q.Step.Milliseconds())}
 	if frame.Name != "" {
 		frame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: frame.Name}
 	}
 }
 
+func addMetadataToWideFrame(q *models.Query, frame *data.Frame) {
+	if frame.Meta == nil {
+		frame.Meta = &data.FrameMeta{}
+	}
+	frame.Meta.ExecutedQueryString = executedQueryString(q)
+	if len(frame.Fields) < 2 {
+		return
+	}
+	frame.Fields[0].Config = &data.FieldConfig{Interval: float64(q.Step.Milliseconds())}
+	for _, f := range frame.Fields {
+		if f.Name != data.TimeSeriesTimeFieldName {
+			f.Name = getName(q, f)
+		}
+	}
+}
+
 // this is based on the logic from the String() function in github.com/prometheus/common/model.go
-func metricNameFromLabels(f *data.Frame) string {
-	labels := f.Fields[1].Labels
+func metricNameFromLabels(f *data.Field) string {
+	labels := f.Labels
 	metricName, hasName := labels["__name__"]
 	numLabels := len(labels) - 1
 	if !hasName {
@@ -81,9 +104,9 @@ func executedQueryString(q *models.Query) string {
 	return "Expr: " + q.Expr + "\n" + "Step: " + q.Step.String()
 }
 
-func getName(q *models.Query, frame *data.Frame) string {
-	labels := frame.Fields[1].Labels
-	legend := metricNameFromLabels(frame)
+func getName(q *models.Query, field *data.Field) string {
+	labels := field.Labels
+	legend := metricNameFromLabels(field)
 
 	if q.LegendFormat == legendFormatAuto && len(labels) > 0 {
 		return ""
diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.buffered.result.golden.txt b/pkg/tsdb/prometheus/testdata/range_infinity.buffered.result.golden.txt
new file mode 100644
index 00000000000..b4be2c88386
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_infinity.buffered.result.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: 1 / 0\nStep: 1s"
+}
+Name: 1 / 0
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+------------------+
+| Name: Time                    | Name: Value      |
+| Labels:                       | Labels:          |
+| Type: []time.Time             | Type: []*float64 |
++-------------------------------+------------------+
+| 2022-01-11 08:25:30 +0000 UTC | +Inf             |
+| 2022-01-11 08:25:31 +0000 UTC | +Inf             |
+| 2022-01-11 08:25:32 +0000 UTC | +Inf             |
++-------------------------------+------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.json b/pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.json
new file mode 100644
index 00000000000..06fd2e55e03
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.json
@@ -0,0 +1,60 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "matrix"
+          },
+          "executedQueryString": "Expr: 1 / 0\nStep: 1s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 1000
+            }
+          },
+          {
+            "name": "1 / 0",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {}
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1641889530000,
+            1641889531000,
+            1641889532000
+          ],
+          [
+            null,
+            null,
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "Inf": [
+              0,
+              1,
+              2
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.txt b/pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.txt
new file mode 100644
index 00000000000..00be2bd136f
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_infinity.result.streaming-wide.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: 1 / 0\nStep: 1s"
+}
+Name: 
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+------------------+
+| Name: Time                    | Name: 1 / 0      |
+| Labels:                       | Labels:          |
+| Type: []time.Time             | Type: []*float64 |
++-------------------------------+------------------+
+| 2022-01-11 08:25:30 +0000 UTC | +Inf             |
+| 2022-01-11 08:25:31 +0000 UTC | +Inf             |
+| 2022-01-11 08:25:32 +0000 UTC | +Inf             |
++-------------------------------+------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_missing.buffered.result.golden.txt b/pkg/tsdb/prometheus/testdata/range_missing.buffered.result.golden.txt
new file mode 100644
index 00000000000..0438e6885a6
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_missing.buffered.result.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: test1\nStep: 1s"
+}
+Name: go_goroutines{job="prometheus"}
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+------------------------------------------------+
+| Name: Time                    | Name: Value                                    |
+| Labels:                       | Labels: __name__=go_goroutines, job=prometheus |
+| Type: []time.Time             | Type: []*float64                               |
++-------------------------------+------------------------------------------------+
+| 2022-01-11 08:25:33 +0000 UTC | 21                                             |
+| 2022-01-11 08:25:34 +0000 UTC | 32                                             |
+| 2022-01-11 08:25:37 +0000 UTC | 43                                             |
++-------------------------------+------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.json b/pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.json
new file mode 100644
index 00000000000..21d45174fd2
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.json
@@ -0,0 +1,53 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "matrix"
+          },
+          "executedQueryString": "Expr: test1\nStep: 1s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 1000
+            }
+          },
+          {
+            "name": "go_goroutines{job=\"prometheus\"}",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "go_goroutines",
+              "job": "prometheus"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1641889533000,
+            1641889534000,
+            1641889537000
+          ],
+          [
+            21,
+            32,
+            43
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.txt b/pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.txt
new file mode 100644
index 00000000000..43f07ba119d
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_missing.result.streaming-wide.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: test1\nStep: 1s"
+}
+Name: 
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+------------------------------------------------+
+| Name: Time                    | Name: go_goroutines{job="prometheus"}          |
+| Labels:                       | Labels: __name__=go_goroutines, job=prometheus |
+| Type: []time.Time             | Type: []*float64                               |
++-------------------------------+------------------------------------------------+
+| 2022-01-11 08:25:33 +0000 UTC | 21                                             |
+| 2022-01-11 08:25:34 +0000 UTC | 32                                             |
+| 2022-01-11 08:25:37 +0000 UTC | 43                                             |
++-------------------------------+------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_nan.buffered.result.golden.txt b/pkg/tsdb/prometheus/testdata/range_nan.buffered.result.golden.txt
new file mode 100644
index 00000000000..e8837a0947d
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_nan.buffered.result.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: \nStep: 1s"
+}
+Name: {handler="/api/v1/query_range", job="prometheus"}
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+-----------------------------------------------------+
+| Name: Time                    | Name: Value                                         |
+| Labels:                       | Labels: handler=/api/v1/query_range, job=prometheus |
+| Type: []time.Time             | Type: []*float64                                    |
++-------------------------------+-----------------------------------------------------+
+| 2022-01-11 08:25:30 +0000 UTC | null                                                |
+| 2022-01-11 08:25:31 +0000 UTC | null                                                |
+| 2022-01-11 08:25:32 +0000 UTC | null                                                |
++-------------------------------+-----------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.json b/pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.json
new file mode 100644
index 00000000000..9743b2b9727
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.json
@@ -0,0 +1,63 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "matrix"
+          },
+          "executedQueryString": "Expr: \nStep: 1s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 1000
+            }
+          },
+          {
+            "name": "{handler=\"/api/v1/query_range\", job=\"prometheus\"}",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "handler": "/api/v1/query_range",
+              "job": "prometheus"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1641889530000,
+            1641889531000,
+            1641889532000
+          ],
+          [
+            null,
+            null,
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "NaN": [
+              0,
+              1,
+              2
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.txt b/pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.txt
new file mode 100644
index 00000000000..0febe260032
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_nan.result.streaming-wide.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: \nStep: 1s"
+}
+Name: 
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+---------------------------------------------------------+
+| Name: Time                    | Name: {handler="/api/v1/query_range", job="prometheus"} |
+| Labels:                       | Labels: handler=/api/v1/query_range, job=prometheus     |
+| Type: []time.Time             | Type: []*float64                                        |
++-------------------------------+---------------------------------------------------------+
+| 2022-01-11 08:25:30 +0000 UTC | NaN                                                     |
+| 2022-01-11 08:25:31 +0000 UTC | NaN                                                     |
+| 2022-01-11 08:25:32 +0000 UTC | NaN                                                     |
++-------------------------------+---------------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.buffered.result.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.buffered.result.golden.txt
new file mode 100644
index 00000000000..0c9d0213f62
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_simple.buffered.result.golden.txt
@@ -0,0 +1,46 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: \nStep: 1s"
+}
+Name: prometheus_http_requests_total{code="200", handler="/api/v1/query_range", job="prometheus"}
+Dimensions: 2 Fields by 3 Rows
++-----------------------------------+--------------------------------------------------------------------------------------------------------+
+| Name: Time                        | Name: Value                                                                                            |
+| Labels:                           | Labels: __name__=prometheus_http_requests_total, code=200, handler=/api/v1/query_range, job=prometheus |
+| Type: []time.Time                 | Type: []*float64                                                                                       |
++-----------------------------------+--------------------------------------------------------------------------------------------------------+
+| 2022-01-11 08:25:30.123 +0000 UTC | 21                                                                                                     |
+| 2022-01-11 08:25:31.123 +0000 UTC | 32                                                                                                     |
+| 2022-01-11 08:25:32.123 +0000 UTC | 43                                                                                                     |
++-----------------------------------+--------------------------------------------------------------------------------------------------------+
+
+
+
+Frame[1] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: \nStep: 1s"
+}
+Name: prometheus_http_requests_total{code="400", handler="/api/v1/query_range", job="prometheus"}
+Dimensions: 2 Fields by 3 Rows
++-----------------------------------+--------------------------------------------------------------------------------------------------------+
+| Name: Time                        | Name: Value                                                                                            |
+| Labels:                           | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
+| Type: []time.Time                 | Type: []*float64                                                                                       |
++-----------------------------------+--------------------------------------------------------------------------------------------------------+
+| 2022-01-11 08:25:30.123 +0000 UTC | 54                                                                                                     |
+| 2022-01-11 08:25:31.123 +0000 UTC | 65                                                                                                     |
+| 2022-01-11 08:25:32.123 +0000 UTC | 76                                                                                                     |
++-----------------------------------+--------------------------------------------------------------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////uAMAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAADABAAADAAAApAAAACgAAAAEAAAA5Pz//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAE/f//CAAAAGQAAABbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjIwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAEAAAAbmFtZQAAAAB8/f//CAAAAHAAAABkAAAAeyJ0eXBlIjoidGltZXNlcmllcy1tYW55IiwiY3VzdG9tIjp7InJlc3VsdFR5cGUiOiJtYXRyaXgifSwiZXhlY3V0ZWRRdWVyeVN0cmluZyI6IkV4cHI6IFxuU3RlcDogMXMifQAAAAAEAAAAbWV0YQAAAAACAAAAtAEAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAaAEAAGgBAAAAAAMBaAEAAAMAAAC8AAAALAAAAAQAAABI/v//CAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAABs/v//CAAAAHgAAABtAAAAeyJfX25hbWVfXyI6InByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbCIsImNvZGUiOiIyMDAiLCJoYW5kbGVyIjoiL2FwaS92MS9xdWVyeV9yYW5nZSIsImpvYiI6InByb21ldGhldXMifQAAAAYAAABsYWJlbHMAAPj+//8IAAAAhAAAAHkAAAB7ImRpc3BsYXlOYW1lRnJvbURTIjoicHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9XCIyMDBcIiwgaGFuZGxlcj1cIi9hcGkvdjEvcXVlcnlfcmFuZ2VcIiwgam9iPVwicHJvbWV0aGV1c1wifSJ9AAAABgAAAGNvbmZpZwAAAAAAAFb///8AAAIABQAAAFZhbHVlABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAAKgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEQAAAHsiaW50ZXJ2YWwiOjEwMDB9AAAABgAAAGNvbmZpZwAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAADAAAAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAAFgAAAADAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAYAAAAAAAAAAAAAAACAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAADAGGob1CnJFsDiBFfUKckWwKyfktQpyRYAAAAAAAA1QAAAAAAAAEBAAAAAAACARUAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAABAABAAAAyAMAAAAAAADAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAAAwAQAAAwAAAKQAAAAoAAAABAAAAOT8//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAABP3//wgAAABkAAAAWwAAAHByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbHtjb2RlPSIyMDAiLCBoYW5kbGVyPSIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwgam9iPSJwcm9tZXRoZXVzIn0ABAAAAG5hbWUAAAAAfP3//wgAAABwAAAAZAAAAHsidHlwZSI6InRpbWVzZXJpZXMtbWFueSIsImN1c3RvbSI6eyJyZXN1bHRUeXBlIjoibWF0cml4In0sImV4ZWN1dGVkUXVlcnlTdHJpbmciOiJFeHByOiBcblN0ZXA6IDFzIn0AAAAABAAAAG1ldGEAAAAAAgAAALQBAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAGgBAABoAQAAAAADAWgBAAADAAAAvAAAACwAAAAEAAAASP7//wgAAAAQAAAABQAAAFZhbHVlAAAABAAAAG5hbWUAAAAAbP7//wgAAAB4AAAAbQAAAHsiX19uYW1lX18iOiJwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWwiLCJjb2RlIjoiMjAwIiwiaGFuZGxlciI6Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCJqb2IiOiJwcm9tZXRoZXVzIn0AAAAGAAAAbGFiZWxzAAD4/v//CAAAAIQAAAB5AAAAeyJkaXNwbGF5TmFtZUZyb21EUyI6InByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbHtjb2RlPVwiMjAwXCIsIGhhbmRsZXI9XCIvYXBpL3YxL3F1ZXJ5X3JhbmdlXCIsIGpvYj1cInByb21ldGhldXNcIn0ifQAAAAYAAABjb25maWcAAAAAAABW////AAACAAUAAABWYWx1ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAHgAAACAAAAAAAAACoAAAAACAAAANAAAAAQAAADc////CAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAIAAwACAAEAAgAAAAIAAAAHAAAABEAAAB7ImludGVydmFsIjoxMDAwfQAAAAYAAABjb25maWcAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA6AMAAEFSUk9XMQ==
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json
index 00e6abd5097..4a132324ed8 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json
@@ -99,12 +99,10 @@
         "values": [
           [
             1641889530123,
-            1641889531123,
             1641889532123
           ],
           [
             54,
-            65,
             76
           ]
         ]
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt
index 0c9d0213f62..aa173aa0149 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt
@@ -29,18 +29,17 @@ Frame[1] {
     "executedQueryString": "Expr: \nStep: 1s"
 }
 Name: prometheus_http_requests_total{code="400", handler="/api/v1/query_range", job="prometheus"}
-Dimensions: 2 Fields by 3 Rows
+Dimensions: 2 Fields by 2 Rows
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 | Name: Time                        | Name: Value                                                                                            |
 | Labels:                           | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
 | Type: []time.Time                 | Type: []*float64                                                                                       |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 | 2022-01-11 08:25:30.123 +0000 UTC | 54                                                                                                     |
-| 2022-01-11 08:25:31.123 +0000 UTC | 65                                                                                                     |
 | 2022-01-11 08:25:32.123 +0000 UTC | 76                                                                                                     |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 
 
 ====== TEST DATA RESPONSE (arrow base64) ======
 FRAME=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
-FRAME=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
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.json b/pkg/tsdb/prometheus/testdata/range_simple.result.json
index 4702646eba0..cb77311b908 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.json
@@ -25,7 +25,6 @@
         },
         "values": [
           [1641889530.123, "54"],
-          [1641889531.123, "65"],
           [1641889532.123, "76"]
         ]
       }
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json
new file mode 100644
index 00000000000..d438a646dc2
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json
@@ -0,0 +1,74 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "matrix"
+          },
+          "executedQueryString": "Expr: \nStep: 1s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 1000
+            }
+          },
+          {
+            "name": "prometheus_http_requests_total{code=\"200\", handler=\"/api/v1/query_range\", job=\"prometheus\"}",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "prometheus_http_requests_total",
+              "code": "200",
+              "handler": "/api/v1/query_range",
+              "job": "prometheus"
+            }
+          },
+          {
+            "name": "prometheus_http_requests_total{code=\"400\", handler=\"/api/v1/query_range\", job=\"prometheus\"}",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "prometheus_http_requests_total",
+              "code": "400",
+              "handler": "/api/v1/query_range",
+              "job": "prometheus"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1641889530123,
+            1641889531123,
+            1641889532123
+          ],
+          [
+            21,
+            32,
+            43
+          ],
+          [
+            54,
+            null,
+            76
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt
new file mode 100644
index 00000000000..b0d7e4c2bb7
--- /dev/null
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt
@@ -0,0 +1,24 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "matrix"
+    },
+    "executedQueryString": "Expr: \nStep: 1s"
+}
+Name: 
+Dimensions: 3 Fields by 3 Rows
++-----------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
+| Name: Time                        | Name: prometheus_http_requests_total{code="200", handler="/api/v1/query_range", job="prometheus"}      | Name: prometheus_http_requests_total{code="400", handler="/api/v1/query_range", job="prometheus"}      |
+| Labels:                           | Labels: __name__=prometheus_http_requests_total, code=200, handler=/api/v1/query_range, job=prometheus | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
+| Type: []time.Time                 | Type: []*float64                                                                                       | Type: []*float64                                                                                       |
++-----------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
+| 2022-01-11 08:25:30.123 +0000 UTC | 21                                                                                                     | 54                                                                                                     |
+| 2022-01-11 08:25:31.123 +0000 UTC | 32                                                                                                     | null                                                                                                   |
+| 2022-01-11 08:25:32.123 +0000 UTC | 43                                                                                                     | 76                                                                                                     |
++-----------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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AAAAANT7//8IAAAAcAAAAGQAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLXdpZGUiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6Im1hdHJpeCJ9LCJleGVjdXRlZFF1ZXJ5U3RyaW5nIjoiRXhwcjogXG5TdGVwOiAxcyJ9AAAAAAQAAABtZXRhAAAAAAMAAABcAwAAsAEAAAQAAABq/v//FAAAACABAAAgAQAAAAADASABAAACAAAAgAAAAAQAAACM/P//CAAAAGQAAABbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjQwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAEAAAAbmFtZQAAAAAE/f//CAAAAHgAAABtAAAAeyJfX25hbWVfXyI6InByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbCIsImNvZGUiOiI0MDAiLCJoYW5kbGVyIjoiL2FwaS92MS9xdWVyeV9yYW5nZSIsImpvYiI6InByb21ldGhldXMifQAAAAYAAABsYWJlbHMAAAAAAABW/f//AAACAFsAAABwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWx7Y29kZT0iNDAwIiwgaGFuZGxlcj0iL2FwaS92MS9xdWVyeV9yYW5nZSIsIGpvYj0icHJvbWV0aGV1cyJ9AAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAAgAQAAIAEAAAAAAwEgAQAAAgAAAIAAAAAEAAAANP7//wgAAABkAAAAWwAAAHByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbHtjb2RlPSIyMDAiLCBoYW5kbGVyPSIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwgam9iPSJwcm9tZXRoZXVzIn0ABAAAAG5hbWUAAAAArP7//wgAAAB4AAAAbQAAAHsiX19uYW1lX18iOiJwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWwiLCJjb2RlIjoiMjAwIiwiaGFuZGxlciI6Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCJqb2IiOiJwcm9tZXRoZXVzIn0AAAAGAAAAbGFiZWxzAAAAAAAA/v7//wAAAgBbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjIwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAAABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAAKgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEQAAAHsiaW50ZXJ2YWwiOjEwMDB9AAAABgAAAGNvbmZpZwAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAA4BQAAQVJST1cx
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json
index 4a403d37bd1..0646fa5240d 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json
@@ -97,12 +97,10 @@
         "values": [
           [
             1641889530123,
-            1641889531123,
             1641889532123
           ],
           [
             54,
-            65,
             76
           ]
         ]
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt
index c24f960235c..9856f08b4dc 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt
@@ -29,18 +29,17 @@ Frame[1] {
     "executedQueryString": "Expr: \nStep: 1s"
 }
 Name: prometheus_http_requests_total{code="400", handler="/api/v1/query_range", job="prometheus"}
-Dimensions: 2 Fields by 3 Rows
+Dimensions: 2 Fields by 2 Rows
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 | Name: Time                        | Name: Value                                                                                            |
 | Labels:                           | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
 | Type: []time.Time                 | Type: []float64                                                                                        |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 | 2022-01-11 08:25:30.123 +0000 UTC | 54                                                                                                     |
-| 2022-01-11 08:25:31.123 +0000 UTC | 65                                                                                                     |
 | 2022-01-11 08:25:32.123 +0000 UTC | 76                                                                                                     |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 
 
 ====== TEST DATA RESPONSE (arrow base64) ======
 FRAME=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
-FRAME=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
+FRAME=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
diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go
index c0717926fee..4f74f7ed957 100644
--- a/pkg/util/converter/prom.go
+++ b/pkg/util/converter/prom.go
@@ -16,8 +16,13 @@ func logf(format string, a ...interface{}) {
 	//fmt.Printf(format, a...)
 }
 
+type Options struct {
+	MatrixWideSeries bool
+	VectorWideSeries bool
+}
+
 // ReadPrometheusStyleResult will read results from a prometheus or loki server and return data frames
-func ReadPrometheusStyleResult(iter *jsoniter.Iterator) *backend.DataResponse {
+func ReadPrometheusStyleResult(iter *jsoniter.Iterator, opt Options) *backend.DataResponse {
 	var rsp *backend.DataResponse
 	status := "unknown"
 	errorType := ""
@@ -30,7 +35,7 @@ func ReadPrometheusStyleResult(iter *jsoniter.Iterator) *backend.DataResponse {
 			status = iter.ReadString()
 
 		case "data":
-			rsp = readPrometheusData(iter)
+			rsp = readPrometheusData(iter, opt)
 
 		case "error":
 			err = iter.ReadString()
@@ -84,7 +89,7 @@ func readWarnings(iter *jsoniter.Iterator) []data.Notice {
 	return warnings
 }
 
-func readPrometheusData(iter *jsoniter.Iterator) *backend.DataResponse {
+func readPrometheusData(iter *jsoniter.Iterator, opt Options) *backend.DataResponse {
 	t := iter.WhatIsNext()
 	if t == jsoniter.ArrayValue {
 		return readArrayData(iter)
@@ -107,9 +112,17 @@ func readPrometheusData(iter *jsoniter.Iterator) *backend.DataResponse {
 		case "result":
 			switch resultType {
 			case "matrix":
-				rsp = readMatrixOrVector(iter, resultType)
+				if opt.MatrixWideSeries {
+					rsp = readMatrixOrVectorWide(iter, resultType)
+				} else {
+					rsp = readMatrixOrVectorMulti(iter, resultType)
+				}
 			case "vector":
-				rsp = readMatrixOrVector(iter, resultType)
+				if opt.VectorWideSeries {
+					rsp = readMatrixOrVectorWide(iter, resultType)
+				} else {
+					rsp = readMatrixOrVectorMulti(iter, resultType)
+				}
 			case "streams":
 				rsp = readStream(iter)
 			case "string":
@@ -348,7 +361,113 @@ func readScalar(iter *jsoniter.Iterator) *backend.DataResponse {
 	}
 }
 
-func readMatrixOrVector(iter *jsoniter.Iterator, resultType string) *backend.DataResponse {
+func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string) *backend.DataResponse {
+	rowIdx := 0
+	timeMap := map[int64]int{}
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = data.TimeSeriesTimeFieldName
+	frame := data.NewFrame("", timeField)
+	frame.Meta = &data.FrameMeta{
+		Type:   data.FrameTypeTimeSeriesWide,
+		Custom: resultTypeToCustomMeta(resultType),
+	}
+	rsp := &backend.DataResponse{
+		Frames: []*data.Frame{},
+	}
+
+	for iter.ReadArray() {
+		valueField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, frame.Rows())
+		valueField.Name = data.TimeSeriesValueFieldName
+		valueField.Labels = data.Labels{}
+		frame.Fields = append(frame.Fields, valueField)
+
+		var histogram *histogramInfo
+
+		for l1Field := iter.ReadObject(); l1Field != ""; l1Field = iter.ReadObject() {
+			switch l1Field {
+			case "metric":
+				iter.ReadVal(&valueField.Labels)
+
+			case "value":
+				timeMap, rowIdx = addValuePairToFrame(frame, timeMap, rowIdx, iter)
+
+			// nolint:goconst
+			case "values":
+				for iter.ReadArray() {
+					timeMap, rowIdx = addValuePairToFrame(frame, timeMap, rowIdx, iter)
+				}
+
+			case "histogram":
+				if histogram == nil {
+					histogram = newHistogramInfo()
+				}
+				err := readHistogram(iter, histogram)
+				if err != nil {
+					rsp.Error = err
+				}
+
+			case "histograms":
+				if histogram == nil {
+					histogram = newHistogramInfo()
+				}
+				for iter.ReadArray() {
+					err := readHistogram(iter, histogram)
+					if err != nil {
+						rsp.Error = err
+					}
+				}
+
+			default:
+				iter.Skip()
+				logf("readMatrixOrVector: %s\n", l1Field)
+			}
+		}
+
+		if histogram != nil {
+			histogram.yMin.Labels = valueField.Labels
+			frame := data.NewFrame(valueField.Name, histogram.time, histogram.yMin, histogram.yMax, histogram.count, histogram.yLayout)
+			frame.Meta = &data.FrameMeta{
+				Type: "heatmap-cells-sparse",
+			}
+			if frame.Name == data.TimeSeriesValueFieldName {
+				frame.Name = "" // only set the name if useful
+			}
+			rsp.Frames = append(rsp.Frames, frame)
+		}
+	}
+
+	if len(rsp.Frames) == 0 {
+		rsp.Frames = append(rsp.Frames, frame)
+	}
+
+	return rsp
+}
+
+func addValuePairToFrame(frame *data.Frame, timeMap map[int64]int, rowIdx int, iter *jsoniter.Iterator) (map[int64]int, int) {
+	timeField := frame.Fields[0]
+	valueField := frame.Fields[len(frame.Fields)-1]
+
+	t, v, err := readTimeValuePair(iter)
+	if err != nil {
+		return timeMap, rowIdx
+	}
+
+	ns := t.UnixNano()
+	i, ok := timeMap[ns]
+	if !ok {
+		timeMap[ns] = rowIdx
+		i = rowIdx
+		expandFrame(frame, i)
+		rowIdx++
+	}
+
+	timeField.Set(i, t)
+	valueField.Set(i, &v)
+
+	return timeMap, rowIdx
+}
+
+func readMatrixOrVectorMulti(iter *jsoniter.Iterator, resultType string) *backend.DataResponse {
 	rsp := &backend.DataResponse{}
 
 	for iter.ReadArray() {
@@ -443,6 +562,14 @@ func readTimeValuePair(iter *jsoniter.Iterator) (time.Time, float64, error) {
 	return tt, fv, err
 }
 
+func expandFrame(frame *data.Frame, idx int) {
+	for _, f := range frame.Fields {
+		if idx+1 > f.Len() {
+			f.Extend(idx + 1 - f.Len())
+		}
+	}
+}
+
 type histogramInfo struct {
 	//XMax (time)	YMin	Ymax	Count	YLayout
 	time    *data.Field
diff --git a/pkg/util/converter/prom_test.go b/pkg/util/converter/prom_test.go
index fb71d21f19c..627005a90c9 100644
--- a/pkg/util/converter/prom_test.go
+++ b/pkg/util/converter/prom_test.go
@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"strings"
 	"testing"
 	"time"
 
@@ -33,48 +34,57 @@ func TestReadPromFrames(t *testing.T) {
 	}
 
 	for _, name := range files {
-		t.Run(name, func(t *testing.T) {
-			// nolint:gosec
-			// We can ignore the gosec G304 because this is a test with static defined paths
-			f, err := os.Open(path.Join("testdata", name+".json"))
-			require.NoError(t, err)
+		t.Run(name, runScenario(name, Options{}))
+		t.Run(name, runScenario(name, Options{MatrixWideSeries: true, VectorWideSeries: true}))
+	}
+}
 
-			iter := jsoniter.Parse(jsoniter.ConfigDefault, f, 1024)
-			rsp := ReadPrometheusStyleResult(iter)
+func runScenario(name string, opts Options) func(t *testing.T) {
+	return func(t *testing.T) {
+		// nolint:gosec
+		// We can ignore the gosec G304 because this is a test with static defined paths
+		f, err := os.Open(path.Join("testdata", name+".json"))
+		require.NoError(t, err)
 
-			out, err := jsoniter.MarshalIndent(rsp, "", "  ")
-			require.NoError(t, err)
+		if opts.MatrixWideSeries || opts.VectorWideSeries {
+			name = name + "-wide"
+		}
 
-			save := false
-			fpath := path.Join("testdata", name+"-frame.json")
+		iter := jsoniter.Parse(jsoniter.ConfigDefault, f, 1024)
+		rsp := ReadPrometheusStyleResult(iter, opts)
 
-			// nolint:gosec
-			// We can ignore the gosec G304 because this is a test with static defined paths
-			current, err := ioutil.ReadFile(fpath)
-			if err == nil {
-				same := assert.JSONEq(t, string(out), string(current))
-				if !same {
-					save = true
-				}
-			} else {
-				assert.Fail(t, "missing file: "+fpath)
+		out, err := jsoniter.MarshalIndent(rsp, "", "  ")
+		require.NoError(t, err)
+
+		save := true
+		fpath := path.Join("testdata", name+"-frame.json")
+
+		// nolint:gosec
+		// We can ignore the gosec G304 because this is a test with static defined paths
+		current, err := ioutil.ReadFile(fpath)
+		if err == nil {
+			same := assert.JSONEq(t, string(out), string(current))
+			if !same {
 				save = true
 			}
+		} else {
+			assert.Fail(t, "missing file: "+fpath)
+			save = true
+		}
 
-			if save {
-				err = os.WriteFile(fpath, out, 0600)
-				require.NoError(t, err)
-			}
+		if save {
+			err = os.WriteFile(fpath, out, 0600)
+			require.NoError(t, err)
+		}
 
-			// skip checking golden file for error response. it's not currently supported
-			if name == "prom-error" {
-				return
-			}
+		// skip checking golden file for error response. it's not currently supported
+		if strings.Contains(name, "prom-error") {
+			return
+		}
 
-			fpath = path.Join("testdata", name+"-golden.txt")
-			err = experimental.CheckGoldenDataResponse(fpath, rsp, true)
-			assert.NoError(t, err)
-		})
+		fpath = path.Join("testdata", name+"-golden.txt")
+		err = experimental.CheckGoldenDataResponse(fpath, rsp, true)
+		assert.NoError(t, err)
 	}
 }
 
diff --git a/pkg/util/converter/testdata/loki-streams-a-frame.json b/pkg/util/converter/testdata/loki-streams-a-frame.json
index 622d46826a1..06eb3fe7c06 100644
--- a/pkg/util/converter/testdata/loki-streams-a-frame.json
+++ b/pkg/util/converter/testdata/loki-streams-a-frame.json
@@ -5,35 +5,35 @@
         "meta": {
           "custom": {
             "stats": {
-              "store": {
-                "headChunkBytes": 0,
-                "headChunkLines": 0,
-                "compressedBytes": 31432,
-                "decompressedBytes": 7772,
-                "decompressedLines": 55,
-                "totalDuplicates": 0,
-                "totalChunksRef": 2,
-                "totalChunksDownloaded": 2,
-                "chunksDownloadTime": 0.000390958
-              },
-              "ingester": {
-                "totalReached": 0,
-                "headChunkBytes": 0,
-                "totalDuplicates": 0,
-                "headChunkLines": 0,
-                "decompressedBytes": 0,
-                "decompressedLines": 0,
-                "compressedBytes": 0,
-                "totalChunksMatched": 0,
-                "totalBatches": 0,
-                "totalLinesSent": 0
-              },
               "summary": {
+                "totalLinesProcessed": 55,
+                "execTime": 0.002216125,
                 "bytesProcessedPerSecond": 3507022,
                 "linesProcessedPerSecond": 24818,
-                "totalBytesProcessed": 7772,
-                "totalLinesProcessed": 55,
-                "execTime": 0.002216125
+                "totalBytesProcessed": 7772
+              },
+              "store": {
+                "decompressedLines": 55,
+                "totalChunksRef": 2,
+                "totalChunksDownloaded": 2,
+                "chunksDownloadTime": 0.000390958,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "decompressedBytes": 7772,
+                "compressedBytes": 31432,
+                "totalDuplicates": 0
+              },
+              "ingester": {
+                "totalBatches": 0,
+                "headChunkLines": 0,
+                "decompressedBytes": 0,
+                "totalDuplicates": 0,
+                "totalReached": 0,
+                "totalChunksMatched": 0,
+                "decompressedLines": 0,
+                "compressedBytes": 0,
+                "totalLinesSent": 0,
+                "headChunkBytes": 0
               }
             }
           }
diff --git a/pkg/util/converter/testdata/loki-streams-a-wide-frame.json b/pkg/util/converter/testdata/loki-streams-a-wide-frame.json
new file mode 100644
index 00000000000..18812654643
--- /dev/null
+++ b/pkg/util/converter/testdata/loki-streams-a-wide-frame.json
@@ -0,0 +1,90 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "custom": {
+            "stats": {
+              "ingester": {
+                "compressedBytes": 0,
+                "totalDuplicates": 0,
+                "totalReached": 0,
+                "totalChunksMatched": 0,
+                "totalBatches": 0,
+                "totalLinesSent": 0,
+                "decompressedBytes": 0,
+                "decompressedLines": 0,
+                "headChunkBytes": 0,
+                "headChunkLines": 0
+              },
+              "summary": {
+                "bytesProcessedPerSecond": 3507022,
+                "linesProcessedPerSecond": 24818,
+                "totalBytesProcessed": 7772,
+                "totalLinesProcessed": 55,
+                "execTime": 0.002216125
+              },
+              "store": {
+                "totalChunksRef": 2,
+                "totalChunksDownloaded": 2,
+                "headChunkBytes": 0,
+                "decompressedBytes": 7772,
+                "chunksDownloadTime": 0.000390958,
+                "headChunkLines": 0,
+                "decompressedLines": 55,
+                "compressedBytes": 31432,
+                "totalDuplicates": 0
+              }
+            }
+          }
+        },
+        "fields": [
+          {
+            "name": "__labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "TS",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {"level":"error","location":"moon🌙"},{"level":"info","location":"moon🌙"},{"level":"info","location":"moon🌙"},{"level":"info","location":"moon🌙"},{"level":"info","location":"moon🌙"},{"level":"info","location":"moon🌙"}
+          ],
+          [
+            1645030244810,1645030247027,1645030246277,1645030246277,1645030245539,1645030244091
+          ],
+          [
+            "log line error 1","log line info 1","log line info 2","log line info 2","log line info 3","log line info 4"
+          ],
+          [
+            "1645030244810757120","1645030247027735040","1645030246277587968","1645030246277587968","1645030245539423744","1645030244091700992"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/loki-streams-a-wide-golden.txt b/pkg/util/converter/testdata/loki-streams-a-wide-golden.txt
new file mode 100644
index 00000000000..9d1fdaa4caf
--- /dev/null
+++ b/pkg/util/converter/testdata/loki-streams-a-wide-golden.txt
@@ -0,0 +1,56 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "custom": {
+        "stats": {
+            "ingester": {
+                "compressedBytes": 0,
+                "decompressedBytes": 0,
+                "decompressedLines": 0,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "totalBatches": 0,
+                "totalChunksMatched": 0,
+                "totalDuplicates": 0,
+                "totalLinesSent": 0,
+                "totalReached": 0
+            },
+            "store": {
+                "chunksDownloadTime": 0.000390958,
+                "compressedBytes": 31432,
+                "decompressedBytes": 7772,
+                "decompressedLines": 55,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "totalChunksDownloaded": 2,
+                "totalChunksRef": 2,
+                "totalDuplicates": 0
+            },
+            "summary": {
+                "bytesProcessedPerSecond": 3507022,
+                "execTime": 0.002216125,
+                "linesProcessedPerSecond": 24818,
+                "totalBytesProcessed": 7772,
+                "totalLinesProcessed": 55
+            }
+        }
+    }
+}
+Name: 
+Dimensions: 4 Fields by 6 Rows
++---------------------------------------+-----------------------------------------+------------------+---------------------+
+| Name: __labels                        | Name: Time                              | Name: Line       | Name: TS            |
+| Labels:                               | Labels:                                 | Labels:          | Labels:             |
+| Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string      |
++---------------------------------------+-----------------------------------------+------------------+---------------------+
+| {"level":"error","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC  | log line error 1 | 1645030244810757120 |
+| {"level":"info","location":"moon🌙"}  | 2022-02-16 16:50:47.02773504 +0000 UTC  | log line info 1  | 1645030247027735040 |
+| {"level":"info","location":"moon🌙"}  | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 |
+| {"level":"info","location":"moon🌙"}  | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 |
+| {"level":"info","location":"moon🌙"}  | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3  | 1645030245539423744 |
+| {"level":"info","location":"moon🌙"}  | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4  | 1645030244091700992 |
++---------------------------------------+-----------------------------------------+------------------+---------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/util/converter/testdata/loki-streams-b-frame.json b/pkg/util/converter/testdata/loki-streams-b-frame.json
index 7c8c7dd3610..671a28f708f 100644
--- a/pkg/util/converter/testdata/loki-streams-b-frame.json
+++ b/pkg/util/converter/testdata/loki-streams-b-frame.json
@@ -16,24 +16,24 @@
                 "totalChunksRef": 2,
                 "chunksDownloadTime": 0.000390958,
                 "headChunkLines": 0,
-                "decompressedLines": 55,
-                "totalDuplicates": 0,
+                "decompressedBytes": 7772,
+                "compressedBytes": 31432,
                 "totalChunksDownloaded": 2,
                 "headChunkBytes": 0,
-                "decompressedBytes": 7772,
-                "compressedBytes": 31432
+                "decompressedLines": 55,
+                "totalDuplicates": 0
               },
               "ingester": {
+                "compressedBytes": 0,
+                "totalDuplicates": 0,
                 "totalReached": 0,
-                "totalChunksMatched": 0,
                 "totalLinesSent": 0,
                 "headChunkBytes": 0,
-                "decompressedLines": 0,
-                "totalBatches": 0,
                 "headChunkLines": 0,
+                "totalChunksMatched": 0,
+                "totalBatches": 0,
                 "decompressedBytes": 0,
-                "compressedBytes": 0,
-                "totalDuplicates": 0
+                "decompressedLines": 0
               }
             }
           }
diff --git a/pkg/util/converter/testdata/loki-streams-b-wide-frame.json b/pkg/util/converter/testdata/loki-streams-b-wide-frame.json
new file mode 100644
index 00000000000..160b2e3e68b
--- /dev/null
+++ b/pkg/util/converter/testdata/loki-streams-b-wide-frame.json
@@ -0,0 +1,90 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "custom": {
+            "stats": {
+              "summary": {
+                "bytesProcessedPerSecond": 3507022,
+                "linesProcessedPerSecond": 24818,
+                "totalBytesProcessed": 7772,
+                "totalLinesProcessed": 55,
+                "execTime": 0.002216125
+              },
+              "store": {
+                "headChunkLines": 0,
+                "decompressedBytes": 7772,
+                "totalChunksRef": 2,
+                "chunksDownloadTime": 0.000390958,
+                "decompressedLines": 55,
+                "compressedBytes": 31432,
+                "totalDuplicates": 0,
+                "totalChunksDownloaded": 2,
+                "headChunkBytes": 0
+              },
+              "ingester": {
+                "compressedBytes": 0,
+                "totalDuplicates": 0,
+                "totalReached": 0,
+                "totalBatches": 0,
+                "totalLinesSent": 0,
+                "headChunkBytes": 0,
+                "decompressedLines": 0,
+                "totalChunksMatched": 0,
+                "headChunkLines": 0,
+                "decompressedBytes": 0
+              }
+            }
+          }
+        },
+        "fields": [
+          {
+            "name": "__labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "TS",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {"level":"error","location":"moon"},{"level":"info","location":"moon"},{"level":"info","location":"moon"},{"level":"info","location":"moon"},{"level":"info","location":"moon"}
+          ],
+          [
+            1645030244810,1645030247027,1645030246277,1645030245539,1645030244091
+          ],
+          [
+            "log line error 1","log line info 1","log line info 2","log line info 3","log line info 4"
+          ],
+          [
+            "1645030244810757120","1645030247027735040","1645030246277587968","1645030245539423744","1645030244091700992"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/loki-streams-b-wide-golden.txt b/pkg/util/converter/testdata/loki-streams-b-wide-golden.txt
new file mode 100644
index 00000000000..d8b09e5d00a
--- /dev/null
+++ b/pkg/util/converter/testdata/loki-streams-b-wide-golden.txt
@@ -0,0 +1,55 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "custom": {
+        "stats": {
+            "ingester": {
+                "compressedBytes": 0,
+                "decompressedBytes": 0,
+                "decompressedLines": 0,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "totalBatches": 0,
+                "totalChunksMatched": 0,
+                "totalDuplicates": 0,
+                "totalLinesSent": 0,
+                "totalReached": 0
+            },
+            "store": {
+                "chunksDownloadTime": 0.000390958,
+                "compressedBytes": 31432,
+                "decompressedBytes": 7772,
+                "decompressedLines": 55,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "totalChunksDownloaded": 2,
+                "totalChunksRef": 2,
+                "totalDuplicates": 0
+            },
+            "summary": {
+                "bytesProcessedPerSecond": 3507022,
+                "execTime": 0.002216125,
+                "linesProcessedPerSecond": 24818,
+                "totalBytesProcessed": 7772,
+                "totalLinesProcessed": 55
+            }
+        }
+    }
+}
+Name: 
+Dimensions: 4 Fields by 5 Rows
++-------------------------------------+-----------------------------------------+------------------+---------------------+
+| Name: __labels                      | Name: Time                              | Name: Line       | Name: TS            |
+| Labels:                             | Labels:                                 | Labels:          | Labels:             |
+| Type: []json.RawMessage             | Type: []time.Time                       | Type: []string   | Type: []string      |
++-------------------------------------+-----------------------------------------+------------------+---------------------+
+| {"level":"error","location":"moon"} | 2022-02-16 16:50:44.81075712 +0000 UTC  | log line error 1 | 1645030244810757120 |
+| {"level":"info","location":"moon"}  | 2022-02-16 16:50:47.02773504 +0000 UTC  | log line info 1  | 1645030247027735040 |
+| {"level":"info","location":"moon"}  | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 |
+| {"level":"info","location":"moon"}  | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3  | 1645030245539423744 |
+| {"level":"info","location":"moon"}  | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4  | 1645030244091700992 |
++-------------------------------------+-----------------------------------------+------------------+---------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/util/converter/testdata/prom-error-wide-frame.json b/pkg/util/converter/testdata/prom-error-wide-frame.json
new file mode 100644
index 00000000000..9fa71e9db64
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-error-wide-frame.json
@@ -0,0 +1,3 @@
+{
+  "error": "bad_data: invalid parameter \"start\": cannot parse \"\" to a valid timestamp"
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-error-wide-golden.txt b/pkg/util/converter/testdata/prom-error-wide-golden.txt
new file mode 100644
index 00000000000..c078e905cdf
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-error-wide-golden.txt
@@ -0,0 +1,3 @@
+
+ERROR: bad_data: invalid parameter "start": cannot parse "" to a valid timestamp====== TEST DATA RESPONSE (arrow base64) ======
+ERROR=bad_data: invalid parameter "start": cannot parse "" to a valid timestamp
diff --git a/pkg/util/converter/testdata/prom-exemplars-wide-frame.json b/pkg/util/converter/testdata/prom-exemplars-wide-frame.json
new file mode 100644
index 00000000000..63a0384071f
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-exemplars-wide-frame.json
@@ -0,0 +1,116 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "custom": {
+            "resultType": "exemplar"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "__name__": "test_exemplar_metric_total",
+              "instance": "localhost:8090",
+              "job": "prometheus",
+              "service": "bar"
+            }
+          },
+          {
+            "name": "traceID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "a",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1600096945479
+          ],
+          [
+            6
+          ],
+          [
+            "EpTxMJ40fUus7aGY"
+          ],
+          [
+            "not in next"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "custom": {
+            "resultType": "exemplar"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "__name__": "test_exemplar_metric_total",
+              "instance": "localhost:8090",
+              "job": "prometheus",
+              "service": "foo"
+            }
+          },
+          {
+            "name": "traceID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1600096955479,1600096965489
+          ],
+          [
+            19,20
+          ],
+          [
+            "Olp9XHlq763ccsfa","hCtjygkIHwAN9vs4"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-exemplars-wide-golden.txt b/pkg/util/converter/testdata/prom-exemplars-wide-golden.txt
new file mode 100644
index 00000000000..f3c8d29d514
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-exemplars-wide-golden.txt
@@ -0,0 +1,39 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "custom": {
+        "resultType": "exemplar"
+    }
+}
+Name: 
+Dimensions: 4 Fields by 1 Rows
++-----------------------------------+---------------------------------------------------------------------------------------------------+------------------+----------------+
+| Name: Time                        | Name: Value                                                                                       | Name: traceID    | Name: a        |
+| Labels:                           | Labels: __name__=test_exemplar_metric_total, instance=localhost:8090, job=prometheus, service=bar | Labels:          | Labels:        |
+| Type: []time.Time                 | Type: []float64                                                                                   | Type: []string   | Type: []string |
++-----------------------------------+---------------------------------------------------------------------------------------------------+------------------+----------------+
+| 2020-09-14 15:22:25.479 +0000 UTC | 6                                                                                                 | EpTxMJ40fUus7aGY | not in next    |
++-----------------------------------+---------------------------------------------------------------------------------------------------+------------------+----------------+
+
+
+
+Frame[1] {
+    "custom": {
+        "resultType": "exemplar"
+    }
+}
+Name: 
+Dimensions: 3 Fields by 2 Rows
++-----------------------------------+---------------------------------------------------------------------------------------------------+------------------+
+| Name: Time                        | Name: Value                                                                                       | Name: traceID    |
+| Labels:                           | Labels: __name__=test_exemplar_metric_total, instance=localhost:8090, job=prometheus, service=foo | Labels:          |
+| Type: []time.Time                 | Type: []float64                                                                                   | Type: []string   |
++-----------------------------------+---------------------------------------------------------------------------------------------------+------------------+
+| 2020-09-14 15:22:35.479 +0000 UTC | 19                                                                                                | Olp9XHlq763ccsfa |
+| 2020-09-14 15:22:45.489 +0000 UTC | 20                                                                                                | hCtjygkIHwAN9vs4 |
++-----------------------------------+---------------------------------------------------------------------------------------------------+------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
+FRAME=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
diff --git a/pkg/util/converter/testdata/prom-labels-wide-frame.json b/pkg/util/converter/testdata/prom-labels-wide-frame.json
new file mode 100644
index 00000000000..ce2ea92da99
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-labels-wide-frame.json
@@ -0,0 +1,24 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "__name__","call","code","config","dialer_name","endpoint","event","goversion","handler","instance","interval","job","le","listener_name","name","quantile","reason","role","scrape_job","slice","version"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-labels-wide-golden.txt b/pkg/util/converter/testdata/prom-labels-wide-golden.txt
new file mode 100644
index 00000000000..bcff6d3e963
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-labels-wide-golden.txt
@@ -0,0 +1,25 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] 
+Name: 
+Dimensions: 1 Fields by 21 Rows
++----------------+
+| Name: Value    |
+| Labels:        |
+| Type: []string |
++----------------+
+| __name__       |
+| call           |
+| code           |
+| config         |
+| dialer_name    |
+| endpoint       |
+| event          |
+| goversion      |
+| handler        |
+| ...            |
++----------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////AAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAFAAAAACAAAAKAAAAAQAAACE////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAKT///8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAAAQAAABgAAAAAABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEgAAAAAAAAFRAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAAAAAAAABAAEAAQAAAAFAAAAVmFsdWUAAAD/////mAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAOgAAAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAAEgAAAAVAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAAABYAAAAAAAAAIwAAAAAAAAAAAAAAAEAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAMAAAAEAAAABYAAAAhAAAAKQAAAC4AAAA3AAAAPgAAAEYAAABOAAAAUQAAAFMAAABgAAAAZAAAAGwAAAByAAAAdgAAAIAAAACFAAAAjAAAAF9fbmFtZV9fY2FsbGNvZGVjb25maWdkaWFsZXJfbmFtZWVuZHBvaW50ZXZlbnRnb3ZlcnNpb25oYW5kbGVyaW5zdGFuY2VpbnRlcnZhbGpvYmxlbGlzdGVuZXJfbmFtZW5hbWVxdWFudGlsZXJlYXNvbnJvbGVzY3JhcGVfam9ic2xpY2V2ZXJzaW9uAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAAEAAEAAAAQAQAAAAAAAKAAAAAAAAAA6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFAAAAACAAAAKAAAAAQAAACE////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAKT///8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAAAQAAABgAAAAAABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEgAAAAAAAAFRAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAAAAAAAABAAEAAQAAAAFAAAAVmFsdWUAAAAwAQAAQVJST1cx
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.json b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.json
new file mode 100644
index 00000000000..5b53a2ecc16
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.json
@@ -0,0 +1,70 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00048828125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,0.0000034980928161799282,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00017263349150062194,0.00048828125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,0.0000034980928161799282,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00017263349150062194,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,0.0000034980928161799282,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00017263349150062194,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,2.5936791093020193,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2
+          ],
+          [
+            0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00018825815739843027,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,2.82842712474619,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00018825815739843027,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,2.82842712474619,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00018825815739843027,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2.82842712474619,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.00013311861971011446,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.00013311861971011446,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.00013311861971011446,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154
+          ],
+          [
+            0.0912281686682326,1.5052655709601983,3.687721957559951,3.940352908621686,3.140353893534075,3.4491272391832517,3.536846537427657,3.5473736411518795,3.712286008031362,3.0280735611164142,2.417546839045018,2.0491250846541718,1.7964930748014019,1.035088421057081,0.5649130070825141,0.32982501693048877,0.26315816559062166,0.21052636503677785,0.12982472145340268,0.10175454601489256,0.08070187750154703,0.07719294552226055,0.0807019144357724,0.059649184364635795,0.03157903354908663,0.03508775623281657,0.010526340412520992,0.024561452754866545,0.017543884272170115,0.017543896583693767,0,0.010526328101083735,0,0,0.0035087842413482158,0.0035087596183873034,0.0035087596183873034,0.024561354263022896,0.056140252385694915,0.056140252385694915,0.0666665681751686,0.07368408741194321,0.04912274546035757,0.03508765774105932,0.024561354263022896,0.014035038473549213,0.0771927608502697,0.08421030470991883,0.13684184672323466,0.10877181902214444,0.18947364727751048,0.20350879655434057,0.2701754139752582,0.18596506001967675,0.2210527670070035,0.3368424007411079,0.6982461188105812,0.5929829362924517,0.36491257617961814,0.6175444382938449,1.2666677500866232,1.515790926450568,1.2526324530705588,0.8561410649489343,3.157897827051131,18.354407793322594,51.15093795056361,62.0141089078649,47.72637148699598,27.554419107639355,13.143875038581198,6.003515900325691,3.726320049275038,2.70877510620855,2.361406365054835,2.252634410606189,2.2912312219328377,2.7473713388970427,2.7649151862330865,2.1122827331663294,2.0350900461849424,1.4210542320831565,1.7473706740684587,4.484215155469158,2.2280723792116985,0.6631587319229559,0.3508774884609246,0.30175463219685406,0.20701774084489158,0.1087720036943081,0.07719306863715152,0.08070174207487321,0.12280711603656726,0.08771937211501513,0.0842105878739261,0.07017548784310423,0.035087743921465714,0.3614038288738775,2.0175463342735847,1.2421067405461763,0.3438600800273444,0.10877206525175358,0.028070236996214765,0.02456148968943751,0.010526291166599169,0.014035112342345554,0.014035063096510127,0.010526315789473682,0.017543847337685547,0.010526315789473682,0,0.003508771929824561,0,0.014035087719298244,0.02105261926751011,0.04561398584197026,0.03859646660519565,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0.007017531548211865,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.007017543859649122,0,0.003508771929824561,0.003508771929824561,0.0036261111111111108,0,0,0.0637938660130719,1.4215152026143791,3.5536896887254907,3.402109665849673,2.6349410326797384,2.9075339305555556,2.850494328431372,3.0024724289215685,3.1463935825163407,2.7158130138888894,2.1348795988562093,1.8191187965686275,1.7353841503267975,0.8447863357843137,0.5242529272875818,0.31308197058823534,0.2561575269607843,0.1841881045751634,0.11364103349673205,0.08887290849673203,0.09506850163398693,0.06324278349673204,0.06401875245098039,0.04972979901960784,0.042588529411764706,0.04629039705882353,0.013992486928104576,0.021237459150326803,0.010544208333333334,0.010659312908496733,0.007020604575163399,0.014121029411764706,0,0,0.003466771241830066,0.003466771241830066,0.0035300277777777778,0.0070600555555555555,0.02826001388888889,0.03885405555555556,0.04944413888888889,0.05652002777777778,0.04944413888888889,0.049459972222222225,0.021192041666666668,0.017658055555555555,0.024722069444444446,0.07061638888888888,0.07415406372549019,0.10248221078431373,0.10254042565359478,0.14122193137254901,0.20878059885620914,0.19209755718954247,0.15227395588235293,0.1911960996732026,0.2767643611111111,0.560012633986928,0.5068101511437909,0.3230447116013072,0.47721713807189536,1.034568390522876,1.4658972540849673,1.0146639910130721,0.7116645857843139,2.743197340686275,15.773624514705887,43.52358742156862,54.76741900735295,42.30484877777778,24.266136450163398,12.094812607026146,5.3917965555555565,3.2884932638888893,2.3943452066993465,1.9715330065359475,1.8288977050653594,1.9447070588235293,2.3304484836601307,2.5128566307189537,2.0683444281045755,1.8907336797385623,1.4306746200980394,1.504499804738562,3.71943691503268,1.9213663088235293,0.5214704272875816,0.2727602459150327,0.21250111274509806,0.17663313725490196,0.11299878758169936,0.06362774346405228,0.07109260539215687,0.08474004901960785,0.0642784068627451,0.042364099673202614,0.035102852124183,0.0353818227124183,0.37523963725490195,1.8780912982026141,0.9314658897058823,0.28726889460784316,0.07414933251633987,0.024544237745098042,0.01751213235294118,0.042606702614379086,0.017747972222222224,0.03177798774509804,0.010637597222222222,0.017806333333333334,0.014238902777777777,0.003569625,0.017658055555555555,0.0035300277777777778,0.0142785,0.007099652777777778,0.04978072222222222,0.028406527777777777,0.00713925,0.003569625,0,0.00713925,0.007036396241830066,0,0.003474313725490196,0.00713925,0.00713925,0.010708875,0.003569625,0.003569625,0.003569625,0.003569625,0.003569625,0,0,0.003569625,0.003508771929824561,0,0,0.05614035087719298,1.4982456140350877,3.9122807017543857,3.9964912280701754,2.978947368421052,3.1368421052631574,3.305263157894736,3.2947368421052627,3.4526315789473685,3.2842105263157895,2.543859649122807,2.0771929824561406,2.052631578947368,1.1473684210526318,0.5789473684210527,0.4070175438596491,0.3157894736842105,0.19999999999999996,0.13333333333333333,0.0807017543859649,0.11929824561403506,0.08421052631578947,0.08771929824561403,0.05614035087719297,0.05614035087719298,0.052631578947368404,0.017543859649122806,0.017543859649122806,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.014035087719298244,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.03859649122807017,0.04210526315789473,0.04561403508771929,0.05614035087719298,0.07368421052631577,0.04912280701754385,0.021052631578947364,0.017543859649122806,0.031578947368421054,0.059649122807017535,0.07017543859649122,0.10526315789473684,0.1087719298245614,0.17192982456140352,0.19298245614035087,0.22105263157894733,0.2070175438596491,0.23157894736842105,0.3298245614035088,0.5929824561403508,0.5578947368421053,0.3543859649122807,0.575438596491228,1.1649122807017547,1.7192982456140349,1.1859649122807019,0.7929824561403509,3.066666666666666,17.385964912280688,48.192982456140335,62.66315789473683,48.45263157894737,28.396491228070172,14.066666666666666,6.533333333333332,4.03157894736842,2.9368421052631577,2.371929824561403,2.1087719298245613,2.1859649122807014,2.7684210526315787,2.8771929824561395,2.308771929824561,2.0315789473684207,1.4631578947368422,1.5333333333333332,4.087719298245613,2.1859649122807014,0.6421052631578946,0.34736842105263155,0.24210526315789474,0.20350877192982456,0.15087719298245614,0.11228070175438594,0.10175438596491225,0.09473684210526313,0.07719298245614033,0.03157894736842105,0.03157894736842105,0.035087719298245605,0.45964912280701753,2.1929824561403506,1.0140350877192983,0.28771929824561404,0.06666666666666667,0.03508771929824561,0.017543859649122806,0.04210526315789473,0.021052631578947368,0.031578947368421054,0.014035087719298244,0.017543859649122806,0.014035087719298244,0.003508771929824561,0.017543859649122806,0.003508771929824561,0.014035087719298244,0.010526315789473682,0.02456140350877193,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0.010526315789473682,0.007017543859649122,0,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.014035087719298244,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0,0,0.02807017543859649,1.2035087719298243,3.547368421052631,4.042105263157894,3.0491228070175436,3.2596491228070175,3.4561403508771926,3.396491228070175,3.557894736842105,3.487719298245614,2.585964912280702,2.03859649122807,2.042105263157895,1.2280701754385965,0.5438596491228069,0.4035087719298246,0.27017543859649124,0.17894736842105263,0.14736842105263157,0.059649122807017535,0.11228070175438594,0.07017543859649122,0.0807017543859649,0.04912280701754385,0.059649122807017535,0.03859649122807017,0.014035087719298244,0.014035087719298244,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.014035087719298244,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.04210526315789473,0.059649122807017535,0.07368421052631578,0.06666666666666665,0.07368421052631578,0.04210526315789473,0.010526315789473682,0.021052631578947364,0.04210526315789473,0.07719298245614034,0.07719298245614034,0.11228070175438597,0.17543859649122806,0.15438596491228065,0.19298245614035084,0.22807017543859648,0.19649122807017544,0.27017543859649124,0.38596491228070173,0.5964912280701753,0.5473684210526315,0.35789473684210515,0.6280701754385966,1.2,1.7719298245614032,1.1859649122807017,0.7719298245614036,3.231578947368421,18.22456140350877,49.45614035087718,63.24912280701754,47.582456140350864,27.810526315789467,13.543859649122806,6.736842105263155,3.968421052631578,3.028070175438596,2.452631578947368,2.189473684210526,2.1543859649122803,2.5824561403508772,2.7473684210526317,2.1789473684210527,1.870175438596491,1.2736842105263158,1.4596491228070174,4.038596491228069,2.063157894736842,0.6947368421052632,0.34035087719298246,0.23508771929824562,0.16842105263157894,0.11228070175438595,0.1087719298245614,0.0982456140350877,0.08771929824561402,0.05263157894736841,0.03157894736842105,0.021052631578947368,0.010526315789473682,0.6245614035087719,2.2175438596491226,0.8280701754385963,0.2526315789473684,0.06666666666666665,0.03508771929824561,0.021052631578947368,0.03508771929824561,0.017543859649122806,0.017543859649122806,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.017543859649122806,0.007017543859649122,0.021052631578947368,0.014035087719298244,0.021052631578947364,0.007017543859649122,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.007017543859649122,0.010526315789473682,0,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.017543859649122806,0,0,0.010526315789473682,0.003508771929824561,0.04210526315789473,1.0105263157894735,3.3438596491228063,4.063157894736841,3.1859649122807014,3.4421052631578943,3.6245614035087717,3.575438596491227,3.6421052631578945,3.5333333333333337,2.4526315789473685,2.0421052631578944,1.8982456140350874,1.1649122807017545,0.5298245614035088,0.39649122807017534,0.26315789473684204,0.1543859649122807,0.15087719298245614,0.07719298245614033,0.06666666666666665,0.06666666666666665,0.08421052631578946,0.045614035087719294,0.05614035087719297,0.031578947368421054,0.014035087719298244,0.014035087719298244,0,0.003508771929824561,0.003508771929824561,0.014035087719298244,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0.003508771929824561,0.010526315789473682,0.031578947368421054,0.04561403508771929,0.0807017543859649,0.04912280701754385,0.11929824561403507,0.04561403508771929,0.010526315789473682,0.021052631578947368,0.03157894736842105,0.0631578947368421,0.07017543859649122,0.11929824561403507,0.14035087719298245,0.16491228070175434,0.18596491228070172,0.23859649122807014,0.21403508771929824,0.22807017543859648,0.4140350877192982,0.6526315789473682,0.5263157894736842,0.33333333333333337,0.6350877192982457,1.192982456140351,1.7087719298245614,1.1719298245614036,0.8175438596491229,2.849122807017544,17.761403508771924,51.09473684210525,64.32982456140353,47.99649122807017,27.554385964912274,12.978947368421052,6.592982456140347,3.9789473684210526,2.9929824561403504,2.452631578947368,2.16140350877193,2.021052631578947,2.4491228070175435,2.663157894736842,2.070175438596491,1.7614035087719297,1.0666666666666664,1.2526315789473683,4.035087719298244,2.0175438596491224,0.7263157894736842,0.3192982456140351,0.18245614035087718,0.1263157894736842,0.09473684210526313,0.08771929824561402,0.07368421052631578,0.0807017543859649,0.06315789473684211,0.031578947368421054,0.02807017543859649,0.021052631578947368,0.687719298245614,2.27719298245614,0.775438596491228,0.22105263157894733,0.04210526315789473,0.031578947368421054,0.014035087719298244,0.003508771929824561,0.017543859649122806,0,0.003508771929824561,0.010526315789473682,0.014035087719298244,0.021052631578947364,0.014035087719298244,0.010526315789473682,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.003508771929824561,0,0,0.010526315789473682,0.003508771929824561,0.017543859649122806,0.003508771929824561,0,0.007017543859649122,0.03859649122807017,0.9543859649122806,3.2701754385964916,4.0701754385964914,3.196491228070175,3.691228070175438,3.621052631578947,3.7263157894736842,3.7999999999999994,3.3263157894736843,2.343859649122807,2.150877192982456,1.8877192982456135,1.0350877192982457,0.5017543859649122,0.3614035087719297,0.21754385964912284,0.1614035087719298,0.1333333333333333,0.07719298245614035,0.07368421052631578,0.07017543859649122,0.07719298245614033,0.049122807017543846,0.06666666666666665,0.024561403508771926,0.017543859649122806,0.014035087719298244,0.007017543859649122,0.014035087719298244,0.010526315789473682,0.007017543859649122,0.003508771929824561,0,0,0.003508771929824561,0,0,0.003508771929824561,0.010526315789473682,0.017543859649122806,0.03859649122807017,0.0807017543859649,0.03859649122807017,0.1087719298245614,0.031578947368421054,0.014035087719298244,0.017543859649122806,0.02807017543859649,0.05614035087719298,0.07017543859649122,0.11929824561403507,0.143859649122807,0.1543859649122807,0.19649122807017538,0.21052631578947364,0.20701754385964907,0.21403508771929822,0.4701754385964912,0.6912280701754386,0.4982456140350877,0.3087719298245614,0.6210526315789473,1.3473684210526315,1.670175438596491,1.1157894736842104,0.6912280701754386,3.192982456140351,20.077192982456136,54.11929824561404,64.30877192982457,46.77192982456139,25.82807017543859,12.256140350877194,6.182456140350874,3.9052631578947365,2.859649122807017,2.2912280701754386,2.0982456140350876,1.9228070175438596,2.112280701754386,2.435087719298245,1.9157894736842105,1.7543859649122808,0.9789473684210528,1.1473684210526316,4.0175438596491215,1.9684210526315788,0.7403508771929823,0.2807017543859649,0.12982456140350876,0.08421052631578946,0.0807017543859649,0.0807017543859649,0.06315789473684211,0.07719298245614035,0.06666666666666665,0.05614035087719298,0.04210526315789473,0.03157894736842105,0.7403508771929824,2.4,0.575438596491228,0.22807017543859645,0.03508771929824561,0.03508771929824561,0.017543859649122806,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.014035087719298244,0.014035087719298244,0.017543859649122806,0.003508771929824561,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0,0.007017543859649122,0.007017543859649122,0.014035087719298244,0.003508771929824561,0,0.007017543859649122,0.003508771929824561,0.03859649122807017,0.9122807017543859,3.245614035087719,3.9999999999999996,3.266666666666666,3.4771929824561396,3.5052631578947366,3.789473684210526,3.8912280701754387,3.2771929824561408,2.4771929824561405,2.266666666666666,1.8912280701754383,1.0105263157894737,0.49473684210526314,0.3789473684210526,0.24210526315789474,0.18245614035087718,0.13684210526315788,0.1087719298245614,0.07368421052631578,0.05964912280701753,0.0631578947368421,0.05263157894736841,0.05614035087719298,0.017543859649122806,0.03157894736842105,0.007017543859649122,0.007017543859649122,0.014035087719298244,0.007017543859649122,0.003508771929824561,0,0,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.010526315789473682,0.03508771929824561,0.05263157894736842,0.07719298245614034,0.06666666666666665,0.1087719298245614,0.05263157894736842,0.02807017543859649,0.014035087719298244,0.035087719298245605,0.059649122807017535,0.09473684210526315,0.12982456140350876,0.11228070175438595,0.1754385964912281,0.2175438596491228,0.1894736842105263,0.20701754385964913,0.22456140350877188,0.5052631578947369,0.6982456140350878,0.4842105263157895,0.29824561403508776,0.6175438596491226,1.3929824561403508,1.6421052631578947,1.1543859649122807,0.7543859649122809,3.536842105263158,20.761403508771924,54.23859649122807,63.37543859649122,46.38245614035087,25.298245614035082,12.424561403508772,6.028070175438595,3.9789473684210526,2.7122807017543855,2.340350877192982,2.003508771929824,1.870175438596491,2.23859649122807,2.4315789473684206,2.087719298245614,1.859649122807017,1.0701754385964912,1.1543859649122807,3.831578947368421,2.0421052631578944,0.7543859649122806,0.3298245614035088,0.16842105263157897,0.12280701754385963,0.12280701754385963,0.08771929824561402,0.07719298245614034,0.1087719298245614,0.10526315789473681,0.08771929824561403,0.07017543859649121,0.0631578947368421,0.687719298245614,2.3543859649122805,0.6491228070175437,0.25263157894736843,0.05263157894736841,0.059649122807017535,0.031578947368421054,0.014035087719298244,0.014035087719298244,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.014035087719298244,0.014035087719298244,0.024561403508771926,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.014035087719298244,0.003508771929824561,0.007017543859649122,0,0,0,0.003508771929824561,0.010526315789473682,0.014035087719298244,0.010526315789473682,0.003508771929824561,0,0,0.007017543859649122
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-golden.txt b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-golden.txt
new file mode 100644
index 00000000000..22e63353e7f
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-golden.txt
@@ -0,0 +1,27 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 932 Rows
++-------------------------------+------------------------+------------------------+--------------------+---------------+
+| Name: xMax                    | Name: yMin             | Name: yMax             | Name: count        | Name: yLayout |
+| Labels:                       | Labels:                | Labels:                | Labels:            | Labels:       |
+| Type: []time.Time             | Type: []float64        | Type: []float64        | Type: []float64    | Type: []int8  |
++-------------------------------+------------------------+------------------------+--------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 4.536465129862675e-06  | 4.947050303081549e-06  | 0.0912281686682326 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 4.947050303081549e-06  | 5.394796609394436e-06  | 1.5052655709601983 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 5.394796609394436e-06  | 5.883067418700946e-06  | 3.687721957559951  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 5.883067418700946e-06  | 6.415530511884418e-06  | 3.940352908621686  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 6.415530511884418e-06  | 6.9961856323598564e-06 | 3.140353893534075  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 6.9961856323598564e-06 | 7.62939453125e-06      | 3.4491272391832517 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 7.62939453125e-06      | 8.319913731882154e-06  | 3.536846537427657  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 8.319913731882154e-06  | 9.07293025972535e-06   | 3.5473736411518795 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06   | 9.894100606163098e-06  | 3.712286008031362  | 0             |
+| ...                           | ...                    | ...                    | ...                | ...           |
++-------------------------------+------------------------+------------------------+--------------------+---------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////+AIAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAJAAAAADAAAATAAAACgAAAAEAAAAnP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAC8/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAANz9//8IAAAAKAAAAB8AAAB7InR5cGUiOiJoZWF0bWFwLWNlbGxzLXNwYXJzZSJ9AAQAAABtZXRhAAAAAAUAAADEAQAAMAEAANAAAABwAAAABAAAAGL+//8UAAAAPAAAAEQAAAAAAAACSAAAAAEAAAAEAAAAUP7//wgAAAAQAAAABwAAAHlMYXlvdXQABAAAAG5hbWUAAAAAAAAAAAgADAAIAAcACAAAAAAAAAEIAAAABwAAAHlMYXlvdXQAyv7//xQAAAA8AAAAPAAAAAAAAAM8AAAAAQAAAAQAAAC4/v//CAAAABAAAAAFAAAAY291bnQAAAAEAAAAbmFtZQAAAAAAAAAArv7//wAAAgAFAAAAY291bnQAAAAm////FAAAADwAAAA8AAAAAAAAAzwAAAABAAAABAAAABT///8IAAAAEAAAAAQAAAB5TWF4AAAAAAQAAABuYW1lAAAAAAAAAAAK////AAACAAQAAAB5TWF4AAAAAIL///8UAAAAYAAAAGAAAAAAAAADYAAAAAIAAAAsAAAABAAAAHT///8IAAAAEAAAAAQAAAB5TWluAAAAAAQAAABuYW1lAAAAAJj///8IAAAADAAAAAIAAAB7fQAABgAAAGxhYmVscwAAAAAAAIr///8AAAIABAAAAHlNaW4AABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAeE1heAAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAAB4TWF4AAAAAAAAAAD/////SAEAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACh4AAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAALgAAACkAwAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIB0AAAAAAAAgHQAAAAAAAAAAAAAAAAAAIB0AAAAAAAAgHQAAAAAAAEA6AAAAAAAAAAAAAAAAAABAOgAAAAAAACAdAAAAAAAAYFcAAAAAAAAAAAAAAAAAAGBXAAAAAAAAIB0AAAAAAACAdAAAAAAAAAAAAAAAAAAAgHQAAAAAAACkAwAAAAAAAAAAAAAFAAAApAMAAAAAAAAAAAAAAAAAAKQDAAAAAAAAAAAAAAAAAACkAwAAAAAAAAAAAAAAAAAApAMAAAAAAAAAAAAAAAAAAKQDAAAAAAAAAAAAAAAAAAAAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAaO4k4djlFgBo7iTh2OUWAGjuJOHY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgBQZW342OUWAFBlbfjY5RYAUGVt+NjlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfX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
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.json b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.json
new file mode 100644
index 00000000000..a5f87e8d990
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.json
@@ -0,0 +1,1636 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_cardinality_label_names"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_cardinality_label_values"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_label_name_values"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_labels"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_metadata"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_query"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_query_exemplars"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_query_range"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_rules"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000
+          ],
+          [
+            0.05255602595335715
+          ],
+          [
+            0.057312752700291944
+          ],
+          [
+            0.003508784241348215
+          ],
+          [
+            0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_api_v1_series"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ],
+          [
+            
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_push"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.2726269331663144,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25
+          ],
+          [
+            0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.29730177875068026,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144
+          ],
+          [
+            0.0035087596183873042,0.02105265620208107,0.03508778085595028,0.09473695290949442,0.11228089873902361,0.16491241612920574,0.12982470914248379,0.16842120037107233,0.30175469375429953,0.6210531486658782,0.5543864819986932,0.3052634903069123,0.515790126197556,1.0736853924377703,1.2877209356835302,0.9719308956675901,0.5789482794757901,3.0210559187709687,18.26668860587992,51.077253863151675,61.98954755360188,47.68075750115402,27.494770071012404,13.098261077362105,5.97895454606267,3.7087762019373525,2.701757574660338,2.3473712773355366,2.24561686674654,2.2736873869065892,2.7333362634891816,2.7508801108252254,2.1052651893066803,2.0280725023252932,1.3964928408858217,1.7368443705904222,4.466671308131474,2.21052854418545,0.6596499599931314,0.3438599569127127,0.2982458602670295,0.19649143736685512,0.10175444752313532,0.07368429670732696,0.06666666666701224,0.10175449676905715,0.07368429670715415,0.0807018282555388,0.07017548784310423,0.031578971991641155,0.3614038288738775,2.0140375746551973,1.2421067405461763,0.3403513204089571,0.10526329332192902,0.024561465066390203,0.02456148968943751,0,0.0070175684826964315,0.00701754385973552,0.003474313725490196,0.014128571895424836,0.035295675653594774,0.07389402859477125,0.1450737933006536,0.11763832107843136,0.10248531699346405,0.1519302246732026,0.24471693055555555,0.5208259534313725,0.47118913725490197,0.28745537826797385,0.381324318627451,0.9279072933006536,1.252551309640523,0.8046421576797387,0.5407502385620916,2.6045680073529414,15.67413830637255,43.484638324346406,54.75321970179739,42.28362505555556,24.223681089052285,12.0806885375817,5.377672486111112,3.2884932638888893,2.3908151789215686,1.9715330065359475,1.8288977050653594,1.9376074060457515,2.3304484836601307,2.5128566307189537,2.0683444281045755,1.8836300686274512,1.4021572173202614,1.5009301797385621,3.71229766503268,1.907167003267974,0.5214704272875816,0.2656605931372549,0.20896712663398695,0.16599949836601308,0.11299878758169936,0.06005811846405229,0.05688934150326797,0.07050114624183007,0.057139156862745094,0.038834071895424836,0.028003199346405227,0.02827821160130719,0.37523963725490195,1.8745612704248364,0.9314658897058823,0.2837388668300654,0.07057970751633988,0.02101025163398693,0.013982104575163402,0.014208091503267973,0.0035051111111111116,0.006941084967320262,0.0036387083333333336,0.003508771929824561,0.010526315789473682,0.042105263157894736,0.08070175438596491,0.13333333333333333,0.14035087719298245,0.12982456140350876,0.1894736842105263,0.2771929824561403,0.5508771929824561,0.5017543859649123,0.31228070175438594,0.42807017543859643,1.0210526315789474,1.4350877192982454,0.9368421052631578,0.6280701754385963,2.898245614035087,17.252631578947366,48.14035087719298,62.65614035087718,48.435087719298245,28.357894736842105,14.045614035087718,6.522807017543859,4.028070175438596,2.933333333333333,2.371929824561403,2.1087719298245613,2.1789473684210523,2.7684210526315787,2.8771929824561395,2.308771929824561,2.0245614035087716,1.4421052631578948,1.5298245614035086,4.07719298245614,2.1754385964912277,0.6421052631578946,0.33684210526315783,0.23157894736842102,0.19298245614035084,0.15087719298245614,0.11228070175438594,0.08771929824561402,0.09122807017543857,0.06666666666666665,0.02807017543859649,0.024561403508771926,0.02807017543859649,0.45964912280701753,2.1929824561403506,1.0140350877192983,0.28421052631578947,0.06315789473684211,0.031578947368421054,0.014035087719298244,0.014035087719298244,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.014035087719298244,0.06666666666666665,0.07368421052631577,0.1263157894736842,0.15789473684210525,0.12280701754385963,0.22807017543859648,0.32631578947368417,0.5438596491228069,0.48070175438596485,0.30877192982456136,0.4666666666666666,1.0210526315789472,1.4526315789473683,0.894736842105263,0.5824561403508772,3.0350877192982453,18.059649122807016,49.40350877192982,63.214035087719296,47.56140350877192,27.782456140350874,13.512280701754385,6.715789473684209,3.9649122807017534,3.021052631578947,2.4421052631578943,2.164912280701754,2.1508771929824557,2.5719298245614035,2.729824561403509,2.1719298245614036,1.8526315789473682,1.2596491228070175,1.4491228070175437,4.024561403508772,2.052631578947368,0.6842105263157895,0.32982456140350874,0.22807017543859648,0.16491228070175437,0.11228070175438595,0.1087719298245614,0.09473684210526315,0.08421052631578946,0.04210526315789473,0.03157894736842105,0.010526315789473682,0.007017543859649122,0.6245614035087719,2.2175438596491226,0.8280701754385963,0.2526315789473684,0.06666666666666665,0.03508771929824561,0.017543859649122806,0.017543859649122806,0.010526315789473682,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.014035087719298244,0.05964912280701754,0.07017543859649122,0.11929824561403507,0.14736842105263157,0.15087719298245614,0.18245614035087718,0.36842105263157887,0.5859649122807016,0.45964912280701753,0.2596491228070175,0.49122807017543857,0.982456140350877,1.4596491228070174,0.870175438596491,0.575438596491228,2.666666666666666,17.652631578947368,51.031578947368416,64.27368421052631,47.9578947368421,27.529824561403505,12.943859649122805,6.564912280701753,3.9719298245614034,2.9859649122807013,2.4385964912280698,2.136842105263158,2.0175438596491224,2.435087719298245,2.6421052631578945,2.063157894736842,1.7473684210526315,1.0561403508771927,1.23859649122807,4.0210526315789465,2.0105263157894733,0.712280701754386,0.30877192982456136,0.17543859649122803,0.1263157894736842,0.09122807017543857,0.08421052631578946,0.07368421052631578,0.07719298245614034,0.04912280701754386,0.031578947368421054,0.024561403508771926,0.017543859649122806,0.687719298245614,2.27719298245614,0.775438596491228,0.22105263157894733,0.04210526315789473,0.031578947368421054,0.014035087719298244,0.003508771929824561,0.017543859649122806,0,0.003508771929824561,0.024561403508771926,0.059649122807017535,0.08070175438596491,0.14035087719298242,0.1333333333333333,0.1333333333333333,0.16842105263157892,0.4210526315789473,0.6280701754385964,0.44561403508771924,0.24561403508771928,0.5087719298245613,1.1122807017543859,1.4280701754385963,0.870175438596491,0.4596491228070174,3.052631578947368,20.00350877192982,54.08070175438597,64.27368421052631,46.73333333333333,25.81052631578947,12.221052631578948,6.150877192982456,3.894736842105263,2.8491228070175434,2.2736842105263158,2.0736842105263156,1.919298245614035,2.0982456140350876,2.4140350877192978,1.9052631578947368,1.7403508771929825,0.9684210526315791,1.1298245614035087,4.007017543859648,1.9649122807017543,0.7333333333333332,0.2771929824561403,0.12982456140350876,0.0807017543859649,0.07719298245614034,0.07719298245614034,0.06315789473684211,0.07719298245614035,0.05263157894736842,0.05614035087719298,0.03859649122807017,0.02807017543859649,0.7403508771929824,2.4,0.575438596491228,0.22807017543859645,0.03508771929824561,0.03508771929824561,0.017543859649122806,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.007017543859649122,0.024561403508771926,0.05263157894736842,0.08421052631578949,0.1508771929824561,0.1263157894736842,0.13684210526315788,0.17543859649122803,0.4631578947368421,0.6245614035087719,0.431578947368421,0.22807017543859648,0.49122807017543857,1.1087719298245613,1.375438596491228,0.9052631578947368,0.487719298245614,3.371929824561403,20.68070175438596,54.192982456140356,63.329824561403505,46.35087719298245,25.280701754385962,12.382456140350877,6.003508771929824,3.9403508771929823,2.701754385964912,2.326315789473684,2.003508771929824,1.8666666666666665,2.2245614035087717,2.410526315789473,2.070175438596491,1.8491228070175434,1.056140350877193,1.119298245614035,3.8210526315789473,2.0350877192982453,0.7473684210526315,0.32280701754385965,0.1649122807017544,0.11929824561403507,0.11228070175438595,0.0807017543859649,0.07719298245614034,0.1087719298245614,0.09473684210526313,0.08070175438596491,0.07017543859649121,0.05614035087719298,0.687719298245614,2.3473684210526313,0.6456140350877191,0.23859649122807017,0.045614035087719294,0.03859649122807017,0.021052631578947368,0.010526315789473682,0.014035087719298244,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_prom_rules"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000
+          ],
+          [
+            1
+          ],
+          [
+            1.0905077326652577
+          ],
+          [
+            0.0035087596183873042
+          ],
+          [
+            0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "api_v1_rules"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963400000,1649963400000,1649963500000,1649963500000,1649963600000,1649963600000
+          ],
+          [
+            0.8408964152537144,1,0.8408964152537144,1,0.8408964152537144,1
+          ],
+          [
+            0.9170040432046711,1.0905077326652577,0.9170040432046711,1.0905077326652577,0.9170040432046711,1.0905077326652577
+          ],
+          [
+            0.003466771241830066,0.003474313725490196,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw",
+              "route": "root"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.0000034980928161799282,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00017263349150062194,0.0000034980928161799282,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00017263349150062194,0.0000034980928161799282,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00017263349150062194,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125
+          ],
+          [
+            0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00018825815739843027,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00018825815739843027,0.000003814697265625,0.000004159956865941077,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00018825815739843027,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.00013311861971011446,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.00013311861971011446,0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00007915280484930479,0.00008631674575031097,0.00009412907869921513,0.00010264848819015068,0.0001119389701177577,0.0001220703125,0.00013311861971011446
+          ],
+          [
+            0.0912281686682326,1.5052655709601983,3.687721957559951,3.936844149003299,3.140353893534075,3.4491272391832517,3.53333777780927,3.4947421237616973,3.533338799658994,2.891231652836252,2.2982487781025416,1.8912305078607508,1.6736861803719147,0.9473692336144023,0.5298253370300174,0.31929872576388957,0.24561430594149886,0.18596501077375494,0.1263159495235781,0.10175454601489256,0.07368434595333517,0.06315787011439958,0.07719314250594785,0.056140412434811236,0.03157903354908663,0.02456144044334289,0.010526340412520992,0.021052680825041983,0.014035112342345554,0.017543896583693767,0,0.010526328101083735,0,0,0.0035087842413482158,0.0036261111111111108,0,0,0.0637938660130719,1.4215152026143791,3.5536896887254907,3.398579638071895,2.6349410326797384,2.9075339305555556,2.8469643006535943,2.974030262254902,2.968779526960785,2.595538666666667,2.060555001633987,1.6630769215686274,1.622086705882353,0.7881237524509804,0.49588203839869294,0.30598231781045754,0.23838463807189542,0.16296042401960786,0.11364103349673205,0.08887290849673203,0.09153847385620915,0.05260914460784315,0.06044912745098039,0.042665785130718954,0.042588529411764706,0.03565279983660131,0.013992486928104576,0.01770347303921569,0.007010222222222223,0.010659312908496733,0.007020604575163399,0.014121029411764706,0,0,0.003466771241830066,0.003466771241830066,0.003508771929824561,0,0,0.05614035087719298,1.4982456140350877,3.9122807017543857,3.992982456140351,2.978947368421052,3.133333333333333,3.298245614035087,3.2807017543859645,3.2491228070175437,3.1368421052631574,2.4491228070175435,1.8807017543859648,1.9192982456140348,1.0736842105263158,0.5473684210526315,0.3964912280701754,0.2947368421052631,0.18245614035087715,0.12982456140350876,0.0807017543859649,0.1157894736842105,0.0736842105263158,0.08421052631578947,0.04912280701754385,0.05614035087719298,0.049122807017543846,0.017543859649122806,0.014035087719298244,0.007017543859649122,0.007017543859649122,0.007017543859649122,0.010526315789473682,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0.02807017543859649,1.2035087719298243,3.547368421052631,4.042105263157894,3.0491228070175436,3.2526315789473683,3.4491228070175435,3.385964912280701,3.3614035087719296,3.3228070175438593,2.484210526315789,1.8315789473684205,1.880701754385965,1.1719298245614034,0.519298245614035,0.3894736842105263,0.2526315789473684,0.16842105263157892,0.143859649122807,0.059649122807017535,0.10877192982456138,0.07017543859649122,0.07719298245614034,0.045614035087719294,0.059649122807017535,0.03859649122807017,0.014035087719298244,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.04210526315789473,1.0105263157894735,3.3438596491228063,4.063157894736841,3.1859649122807014,3.435087719298245,3.621052631578947,3.5649122807017535,3.459649122807017,3.357894736842105,2.3368421052631576,1.8807017543859645,1.7473684210526315,1.0982456140350876,0.4842105263157894,0.36842105263157887,0.24561403508771923,0.14385964912280702,0.14736842105263157,0.07368421052631577,0.06666666666666665,0.06666666666666665,0.07719298245614034,0.045614035087719294,0.05614035087719297,0.031578947368421054,0.014035087719298244,0.007017543859649122,0,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0.003508771929824561,0.03859649122807017,0.9543859649122806,3.2701754385964916,4.0701754385964914,3.196491228070175,3.6877192982456135,3.621052631578947,3.705263157894737,3.652631578947368,3.16140350877193,2.2245614035087717,1.9789473684210526,1.71578947368421,0.968421052631579,0.44561403508771924,0.33684210526315783,0.2,0.1508771929824561,0.1333333333333333,0.0736842105263158,0.07368421052631578,0.07017543859649122,0.06666666666666665,0.049122807017543846,0.0631578947368421,0.024561403508771926,0.017543859649122806,0.007017543859649122,0.007017543859649122,0.014035087719298244,0.010526315789473682,0.007017543859649122,0.003508771929824561,0,0,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0.03859649122807017,0.9122807017543859,3.245614035087719,3.9999999999999996,3.266666666666666,3.4771929824561396,3.5052631578947366,3.757894736842105,3.7368421052631575,3.1228070175438596,2.364912280701754,2.098245614035087,1.7263157894736838,0.9403508771929825,0.4350877192982456,0.34736842105263155,0.21754385964912282,0.1719298245614035,0.13684210526315788,0.10526315789473684,0.07368421052631578,0.05964912280701753,0.05614035087719298,0.05263157894736841,0.05263157894736842,0.017543859649122806,0.03157894736842105,0.003508771929824561,0.007017543859649122,0.014035087719298244,0.007017543859649122,0.003508771929824561,0,0,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_prom_api_v1_label_name_values"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.45850202160233555,0.5,0.5452538663326288,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.08838834764831843,0.0963881765879963,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687
+          ],
+          [
+            0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.5,0.5452538663326288,0.5946035575013605,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.0963881765879963,0.1051120519067143,0.2102241038134286,0.22925101080116778,0.25,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926
+          ],
+          [
+            0.007017543859649122,0.014035087719298244,0.04912280701754385,0.02105261926751011,0.04210522622358295,0.049122782394669336,0.02807017543859649,0.03859646660519566,0.06666662973235489,0.024561391197334668,0.02105257002176108,0.010526303478036425,0.010526315789473682,0.010526315789473682,0.028070150815721975,0.014035087719298244,0.02105260695607285,0.0035087596183873034,0.003508771929824561,0.007017531548211864,0.010526315789473682,0.007017543859649122,0.01754383502624829,0.0035087596183873034,0.007017531548211864,0.003508771929824561,0,0.014035075407860986,0.007017531548211864,0.007017531548211864,0.007017519236774607,0,0,0,0.007017531548211864,0,0,0.010526303478036425,0.010526303478036425,0.010526303478036425,0.0035087596183873034,0,0.003508771929824561,0,0.0035087596183873034,0,0.0035087596183873034,0,0,0,0.010526291166599169,0.007017543859649122,0.007017519236774607,0.007017543859649122,0.014035075407860986,0.010526315789473682,0.0035087596183873034,0.03157889812267202,0.02105260695607285,0.014238902777777777,0.028521361111111112,0.014171583333333335,0.046076458333333334,0.024836902777777777,0.07087772222222222,0.02848176388888889,0.021267277777777777,0.021188083333333333,0.014207222222222222,0.007099652777777778,0.00713925,0.014163666666666666,0.003569625,0.0035300277777777778,0,0,0.007099652777777778,0.014238902777777777,0,0,0.0070600555555555555,0,0,0,0.007064013888888889,0,0,0.010633638888888889,0.010669277777777778,0.003569625,0.0035300277777777778,0.0035300277777777778,0.007103611111111111,0,0.0035300277777777778,0,0.0035300277777777778,0,0,0,0.02839861111111111,0.01424286111111111,0.024836902777777777,0.007067972222222223,0.014167625,0.014238902777777777,0,0.017658055555555555,0.0035300277777777778,0,0.0035300277777777778,0.03193259722222222,0.021267277777777777,0.007017543859649122,0.010526315789473682,0.04210526315789473,0.017543859649122806,0.08771929824561402,0.03859649122807017,0.07719298245614034,0.02456140350877193,0.017543859649122806,0.017543859649122806,0.021052631578947368,0.007017543859649122,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0,0.007017543859649122,0.014035087719298244,0,0,0.007017543859649122,0,0,0,0.007017543859649122,0,0,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0,0,0.02807017543859649,0.014035087719298244,0.02456140350877193,0.007017543859649122,0.014035087719298244,0.014035087719298244,0,0.017543859649122806,0.003508771929824561,0.010526315789473682,0.02456140350877193,0.04912280701754385,0.03157894736842105,0.10175438596491228,0.05263157894736842,0.07719298245614034,0.03508771929824561,0.021052631578947364,0.02807017543859649,0.04912280701754385,0.017543859649122806,0.02807017543859649,0.007017543859649122,0.003508771929824561,0,0.003508771929824561,0,0.007017543859649122,0.010526315789473682,0.02456140350877193,0.003508771929824561,0.007017543859649122,0.014035087719298244,0.007017543859649122,0.014035087719298244,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.017543859649122806,0.007017543859649122,0.017543859649122806,0.003508771929824561,0,0.017543859649122806,0.003508771929824561,0.014035087719298244,0.03859649122807017,0.05263157894736842,0.0631578947368421,0.10526315789473684,0.045614035087719294,0.04210526315789473,0.04210526315789473,0.024561403508771926,0.031578947368421054,0.04912280701754385,0.02456140350877193,0.03859649122807017,0.017543859649122806,0.003508771929824561,0.007017543859649122,0.010526315789473682,0,0.007017543859649122,0.010526315789473682,0.02456140350877193,0.003508771929824561,0.007017543859649122,0.017543859649122806,0.007017543859649122,0.014035087719298244,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0.003508771929824561,0.007017543859649122,0.024561403508771926,0.045614035087719294,0.05614035087719298,0.06666666666666665,0.05263157894736842,0.03859649122807017,0.03508771929824561,0.031578947368421054,0.017543859649122806,0.017543859649122806,0.014035087719298244,0.017543859649122806,0.017543859649122806,0.003508771929824561,0.007017543859649122,0.010526315789473682,0,0.010526315789473682,0.014035087719298244,0.02456140350877193,0.003508771929824561,0.007017543859649122,0.017543859649122806,0.007017543859649122,0.014035087719298244,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.007017543859649122,0.024561403508771926,0.045614035087719294,0.059649122807017535,0.07368421052631578,0.07719298245614034,0.042105263157894736,0.03508771929824561,0.03859649122807017,0.02807017543859649,0.014035087719298244,0.021052631578947364,0.017543859649122806,0.014035087719298244,0.003508771929824561,0.014035087719298244,0.007017543859649122,0.017543859649122806,0.010526315789473682,0.010526315789473682,0,0.003508771929824561,0.010526315789473682,0.017543859649122806,0.014035087719298244,0.010526315789473682,0.007017543859649122,0.021052631578947364,0.003508771929824561,0.003508771929824561,0,0,0,0.007017543859649122,0,0.003508771929824561,0,0.003508771929824561,0,0.014035087719298244,0.007017543859649122,0.021052631578947364,0.010526315789473682
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_prom_api_v1_labels"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.004645340292979379,0.005065779510355506,0.005524271728019902,0.009290680585958758,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.009290680585958758,0.028656376350145972,0.04052623608284405,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.007164094087536493,0.009290680585958758,0.028656376350145972,0.04052623608284405,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.028656376350145972,0.08838834764831843,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.08838834764831843,0.004259795830723663,0.004645340292979379,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.08838834764831843,0.004259795830723663,0.004645340292979379,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.03716272234383503,0.11462550540058389
+          ],
+          [
+            0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.010131559020711013,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.010131559020711013,0.03125,0.044194173824159216,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.0078125,0.010131559020711013,0.03125,0.044194173824159216,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.03125,0.0963881765879963,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.0963881765879963,0.004645340292979379,0.005065779510355506,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.0963881765879963,0.004645340292979379,0.005065779510355506,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.04052623608284405,0.125
+          ],
+          [
+            0.007017531548211864,0.003508771929824561,0.010526315789473682,0.0035087596183873034,0.003508771929824561,0.003508771929824561,0.0035087596183873034,0.0035339861111111114,0.00713925,0.0035300277777777778,0,0.003569625,0.0035300277777777778,0.003569625,0.0035300277777777778,0.007017543859649122,0,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0,0.010526315789473682,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0.010526315789473682,0.007017543859649122,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.007017543859649122,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.010526315789473682,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_prom_api_v1_query"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.1621049443313762,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.1621049443313762,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.1621049443313762,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.011048543456039804,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.03125
+          ],
+          [
+            0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.17677669529663687,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.17677669529663687,0.006569503244169644,0.007164094087536493,0.0078125,0.17677669529663687,0.006569503244169644,0.007164094087536493,0.0078125,0.012048522073499537,0.006569503244169644,0.007164094087536493,0.0078125,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.0340783666457893
+          ],
+          [
+            0.007017531548211864,0.0035087596183873034,0,0.003508771929824561,0,0.0035087596183873034,0.003508771929824561,0.0035300277777777778,0.0035300277777777778,0.0035300277777777778,0.0035339861111111114,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0.007017543859649122,0.003508771929824561,0,0,0.007017543859649122,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0.007017543859649122,0.003508771929824561,0.003508771929824561,0,0.007017543859649122,0,0,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_prom_api_v1_query_range"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.009290680585958758,0.010131559020711013,0.018581361171917516,0.044194173824159216,0.010131559020711013,0.044194173824159216,0.17677669529663687,0.010131559020711013,0.04052623608284405,0.044194173824159216,0.17677669529663687,0.010131559020711013,0.04052623608284405,0.07432544468767006,0.17677669529663687,0.009290680585958758,0.010131559020711013,0.04052623608284405,0.07432544468767006,0.3855527063519852,0.009290680585958758,0.010131559020711013,0.07432544468767006,0.3855527063519852,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.04052623608284405,0.3855527063519852
+          ],
+          [
+            0.010131559020711013,0.011048543456039804,0.020263118041422026,0.04819408829399815,0.011048543456039804,0.04819408829399815,0.1927763531759926,0.011048543456039804,0.044194173824159216,0.04819408829399815,0.1927763531759926,0.011048543456039804,0.044194173824159216,0.0810524721656881,0.1927763531759926,0.010131559020711013,0.011048543456039804,0.044194173824159216,0.0810524721656881,0.4204482076268572,0.010131559020711013,0.011048543456039804,0.0810524721656881,0.4204482076268572,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.044194173824159216,0.4204482076268572
+          ],
+          [
+            0.003508771929824561,0.007017519236774607,0.003508771929824561,0.003508771929824561,0.0070600555555555555,0.0035339861111111114,0.0035300277777777778,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_prom_api_v1_series"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.006569503244169644,0.007164094087536493,0.0078125,0.024097044146999074,0.04052623608284405,0.0078125,0.009290680585958758,0.024097044146999074,0.0060242610367497685,0.009290680585958758,0.024097044146999074,0.0060242610367497685,0.009290680585958758,0.011048543456039804,0.024097044146999074,0.0060242610367497685,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.0060242610367497685,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.0060242610367497685,0.012048522073499537,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.125
+          ],
+          [
+            0.007164094087536493,0.0078125,0.008519591661447326,0.026278012976678575,0.044194173824159216,0.008519591661447326,0.010131559020711013,0.026278012976678575,0.006569503244169644,0.010131559020711013,0.026278012976678575,0.006569503244169644,0.010131559020711013,0.012048522073499537,0.026278012976678575,0.006569503244169644,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.006569503244169644,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.006569503244169644,0.013139006488339287,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.1363134665831572
+          ],
+          [
+            0.007017531548211864,0,0.0035087596183873034,0.003508771929824561,0.003508771929824561,0.0035300277777777778,0.0035339861111111114,0.007103611111111111,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_prom_push"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.04052623608284405,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.04052623608284405,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.04052623608284405
+          ],
+          [
+            0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.044194173824159216,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.044194173824159216,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.044194173824159216
+          ],
+          [
+            0.003508771929824561,0,0.01754383502624829,0.02105261926751011,0.02807015081572197,0.042105189289271185,0.05964904893839399,0.056140289320006684,0.07368416128056675,0.05614035087719298,0.04561402277628204,0.017543859649122806,0.024561403508771926,0.010526315789473682,0.007017543859649122,0.024561403508771926,0.05263157894736842,0.04210525084645747,0.05263157894736842,0.024561391197334668,0.007017543859649122,0,0.003508771929824561,0.0035087596183873034,0.03508764542962206,0.014035063096423729,0.014035050784986472,0.003508771929824561,0.0035339861111111114,0.028252097222222224,0.010669277777777778,0.028327333333333333,0.03193655555555555,0.04260979166666667,0.03899661111111111,0.05680909722222222,0.042728583333333334,0.039265875,0.028517402777777777,0.02141775,0.003569625,0.017848125,0.028517402777777777,0.02141775,0.032126625,0.049935152777777776,0.02141775,0.010708875,0.007099652777777778,0,0,0.0070600555555555555,0.03182172222222222,0.0035339861111111114,0.014124069444444444,0.007017543859649122,0.024561403508771926,0.017543859649122806,0.031578947368421054,0.03508771929824561,0.05263157894736841,0.04210526315789473,0.0631578947368421,0.06666666666666665,0.03859649122807017,0.04210526315789473,0.02807017543859649,0.014035087719298244,0.021052631578947364,0.02807017543859649,0.017543859649122806,0.04912280701754385,0.05614035087719298,0.014035087719298244,0.010526315789473682,0.014035087719298244,0.003508771929824561,0,0.010526315789473682,0.031578947368421054,0.014035087719298244,0.010526315789473682,0.003508771929824561,0.007017543859649122,0.021052631578947364,0.021052631578947368,0.031578947368421054,0.04210526315789473,0.04561403508771929,0.05263157894736842,0.05964912280701754,0.06315789473684211,0.03859649122807017,0.04561403508771929,0.021052631578947364,0.017543859649122806,0.014035087719298244,0.017543859649122806,0.024561403508771926,0.05614035087719298,0.04912280701754385,0.024561403508771926,0.007017543859649122,0.014035087719298244,0.003508771929824561,0,0.010526315789473682,0.021052631578947364,0.021052631578947364,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.017543859649122806,0.045614035087719294,0.021052631578947364,0.06315789473684211,0.05263157894736841,0.07719298245614034,0.04561403508771929,0.04210526315789473,0.024561403508771926,0.024561403508771926,0.014035087719298244,0.010526315789473682,0.010526315789473682,0.04561403508771929,0.05614035087719298,0.03859649122807017,0.03859649122807017,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.014035087719298244,0.017543859649122806,0.024561403508771926,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.02807017543859649,0.04912280701754386,0.03508771929824561,0.04561403508771929,0.042105263157894736,0.07017543859649121,0.059649122807017535,0.03859649122807017,0.03157894736842105,0.03157894736842105,0.007017543859649122,0.007017543859649122,0.007017543859649122,0.07368421052631578,0.04912280701754385,0.02807017543859649,0.03508771929824561,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.014035087719298244,0.010526315789473682,0.02456140350877193,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.03157894736842105,0.05263157894736841,0.02807017543859649,0.05263157894736842,0.03859649122807017,0.05614035087719298,0.059649122807017535,0.04210526315789473,0.024561403508771926,0.04210526315789473,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.0807017543859649,0.059649122807017535,0.014035087719298244,0.021052631578947364,0.014035087719298244,0.007017543859649122,0,0.007017543859649122,0.010526315789473682,0.010526315789473682,0.024561403508771926,0.007017543859649122,0.014035087719298244,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "api_v1_push"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.00048828125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.012048522073499537,0.05255602595335715,0.00048828125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.018581361171917516,0.020263118041422026,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.012048522073499537,0.018581361171917516,0.020263118041422026,0.057312752700291944,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.057312752700291944,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.020263118041422026,0.022097086912079608,0.057312752700291944
+          ],
+          [
+            0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.013139006488339287,0.057312752700291944,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.020263118041422026,0.022097086912079608,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.013139006488339287,0.020263118041422026,0.022097086912079608,0.0625,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.0625,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.022097086912079608,0.024097044146999074,0.0625
+          ],
+          [
+            0.0035087596183873034,0.0035087596183873034,0.024561354263022896,0.056140252385694915,0.056140252385694915,0.0666665681751686,0.07368408741194321,0.04912274546035757,0.03508765774105932,0.021052582333198337,0.014035038473549213,0.05964892582402141,0.05964892582402141,0.08771903970543161,0.031578848876922985,0.03508764542962206,0.035087608495310285,0.03157883656548573,0,0,0.0035087596183873034,0.0035087596183873034,0.007017519236774607,0.010526315789473682,0.028070126192847458,0.11228060326288788,0.12631566635931163,0.1403507417671726,0.15789462603916993,0.08771917513124144,0.06666658048660586,0.04210514004352216,0.007017519236774607,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.0035300277777777778,0.0070600555555555555,0.02826001388888889,0.03885405555555556,0.04944413888888889,0.05652002777777778,0.04944413888888889,0.049459972222222225,0.021192041666666668,0.017658055555555555,0.021188083333333333,0.042364291666666665,0.06001047222222222,0.060026305555555555,0.03530819444444445,0.02471811111111111,0.024710194444444444,0.01765013888888889,0.0070600555555555555,0,0.0035300277777777778,0.0035300277777777778,0.0035300277777777778,0.003569625,0.021298958333333333,0.06040644444444444,0.11034159722222223,0.12450130555555555,0.11399041666666666,0.09610269444444444,0.07107968055555555,0.028279819444444444,0.0035300277777777778,0,0,0.0035300277777777778,0.007017543859649122,0.03859649122807017,0.04210526315789473,0.04561403508771929,0.05614035087719298,0.07368421052631577,0.04912280701754385,0.021052631578947364,0.017543859649122806,0.02456140350877193,0.035087719298245605,0.04912280701754385,0.06315789473684211,0.03157894736842105,0.03859649122807017,0.017543859649122806,0.017543859649122806,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.024561403508771926,0.07017543859649122,0.13684210526315788,0.11929824561403507,0.10175438596491226,0.10877192982456138,0.08421052631578946,0.02456140350877193,0.003508771929824561,0,0,0.003508771929824561,0.010526315789473682,0.04210526315789473,0.059649122807017535,0.07368421052631578,0.06666666666666665,0.07368421052631578,0.04210526315789473,0.010526315789473682,0.021052631578947364,0.03508771929824561,0.05614035087719298,0.05263157894736841,0.06666666666666667,0.06666666666666665,0.03508771929824561,0.014035087719298244,0.010526315789473682,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.007017543859649122,0,0.003508771929824561,0.03508771929824561,0.08421052631578946,0.16491228070175437,0.15438596491228068,0.11578947368421053,0.11578947368421053,0.0807017543859649,0.014035087719298244,0.007017543859649122,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.031578947368421054,0.04561403508771929,0.0807017543859649,0.04912280701754385,0.11929824561403507,0.04561403508771929,0.010526315789473682,0.021052631578947368,0.02807017543859649,0.059649122807017535,0.04912280701754385,0.059649122807017535,0.059649122807017535,0.03157894736842105,0.014035087719298244,0.014035087719298244,0.017543859649122806,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0,0.021052631578947364,0.0982456140350877,0.12631578947368421,0.17543859649122806,0.14385964912280702,0.09473684210526315,0.03859649122807017,0.017543859649122806,0.014035087719298244,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.017543859649122806,0.03859649122807017,0.0807017543859649,0.03859649122807017,0.1087719298245614,0.031578947368421054,0.014035087719298244,0.017543859649122806,0.02807017543859649,0.04912280701754385,0.04210526315789473,0.04561403508771929,0.04912280701754385,0.02807017543859649,0.014035087719298244,0.007017543859649122,0.014035087719298244,0.007017543859649122,0.010526315789473682,0.007017543859649122,0,0,0.03508771929824561,0.10526315789473682,0.1263157894736842,0.15438596491228068,0.11929824561403507,0.07017543859649122,0.02456140350877193,0.017543859649122806,0.010526315789473682,0,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.03508771929824561,0.05263157894736842,0.07719298245614034,0.06666666666666665,0.1087719298245614,0.05263157894736842,0.02807017543859649,0.014035087719298244,0.035087719298245605,0.04912280701754385,0.05614035087719298,0.05263157894736842,0.03157894736842105,0.03859649122807017,0.02807017543859649,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.010526315789473682,0.007017543859649122,0,0,0.04210526315789473,0.12280701754385963,0.13684210526315788,0.17543859649122806,0.1508771929824561,0.0807017543859649,0.02807017543859649,0.017543859649122806,0.017543859649122806,0,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "prometheus_api_v1_query"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.07432544468767006,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.07432544468767006,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.07432544468767006,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048
+          ],
+          [
+            0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.0810524721656881,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.0810524721656881,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.0810524721656881,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475
+          ],
+          [
+            0.014035075407860986,0.010526291166599169,0.04561398584197026,0.014035087719298244,0,0.014035087719298244,0.0035087596183873034,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017531548211864,0,0.003508771929824561,0,0,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0,0.014035087719298244,0.017543859649122806,0.010526315789473682,0.003508771929824561,0.010526315789473682,0,0,0.007017543859649122,0.0142785,0,0.00713925,0.003569625,0.003569625,0.003569625,0,0,0.0142785,0,0.010708875,0.003569625,0.00713925,0.003569625,0,0.003569625,0.003508771929824561,0.017543859649122806,0.021052631578947364,0.03859649122807017,0.024561403508771926,0.017543859649122806,0.007017543859649122,0.010526315789473682,0.007017543859649122,0,0.010526315789473682,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0.014035087719298244,0.007017543859649122,0.017543859649122806,0,0.003508771929824561,0.003508771929824561,0,0.007017543859649122,0.003508771929824561,0.017543859649122806,0.021052631578947364,0.03859649122807017,0.024561403508771926,0.017543859649122806,0.007017543859649122,0.010526315789473682,0.010526315789473682,0,0.010526315789473682,0.010526315789473682,0,0,0.003508771929824561,0.003508771929824561,0,0,0.017543859649122806,0.010526315789473682,0.014035087719298244,0.007017543859649122,0.003508771929824561,0.007017543859649122,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.017543859649122806,0.021052631578947364,0.03859649122807017,0.024561403508771926,0.017543859649122806,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.010526315789473682,0.007017543859649122,0,0,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.021052631578947364,0.010526315789473682,0.010526315789473682,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0.024561403508771926,0.024561403508771926,0.03508771929824561,0.02807017543859649,0.017543859649122806,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.010526315789473682,0.017543859649122806,0,0.007017543859649122,0.007017543859649122,0,0,0,0.003508771929824561,0.003508771929824561,0,0.024561403508771926,0.024561403508771926,0.03508771929824561,0.02807017543859649,0.017543859649122806,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.014035087719298244,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.010526315789473682,0.024561403508771926,0.007017543859649122,0.003508771929824561,0.007017543859649122,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "prometheus_api_v1_query_range"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.011048543456039804,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.14865088937534013,0.25,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.14865088937534013,0.25,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.14865088937534013,0.25,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,2.5936791093020193,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,0.005524271728019902,0.0060242610367497685,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2
+          ],
+          [
+            0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.012048522073499537,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.1621049443313762,0.2726269331663144,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1621049443313762,0.2726269331663144,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,2.82842712474619,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1621049443313762,0.2726269331663144,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,2.82842712474619,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2.82842712474619,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,0.0060242610367497685,0.006569503244169644,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.2102241038134286,0.22925101080116778,0.25,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,0.9170040432046711,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154
+          ],
+          [
+            0.007017543859649122,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0,0,0,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.014035087719298244,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0.003508771929824561,0.007017543859649122,0.010526315789473682,0.007017543859649122,0.007017543859649122,0.007017543859649122,0,0.003508771929824561,0.003508771929824561,0.003569625,0.003569625,0.003569625,0.003569625,0.003569625,0,0.003569625,0,0.003569625,0,0.003569625,0.003569625,0.003569625,0,0,0.003569625,0.003569625,0.003569625,0.003569625,0.00713925,0.003569625,0,0,0,0.003569625,0.003569625,0,0,0.00713925,0.00713925,0.010708875,0.003569625,0.003569625,0.003569625,0.003569625,0.003569625,0,0,0.003569625,0.003508771929824561,0,0,0.003508771929824561,0.007017543859649122,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0,0,0.010526315789473682,0.003508771929824561,0.014035087719298244,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0,0,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.007017543859649122,0.007017543859649122,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0.003508771929824561,0.007017543859649122,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0.010526315789473682,0.003508771929824561,0.017543859649122806,0,0,0.010526315789473682,0.003508771929824561,0.003508771929824561,0,0,0.003508771929824561,0.010526315789473682,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0.003508771929824561,0.010526315789473682,0,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0.003508771929824561,0.007017543859649122,0.007017543859649122,0.003508771929824561,0,0,0,0.010526315789473682,0.003508771929824561,0.017543859649122806,0.003508771929824561,0,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.007017543859649122,0,0,0.003508771929824561,0.003508771929824561,0,0,0,0.010526315789473682,0,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0,0.007017543859649122,0.003508771929824561,0.007017543859649122,0,0,0,0.007017543859649122,0.007017543859649122,0.014035087719298244,0.003508771929824561,0,0.007017543859649122,0.017543859649122806,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.007017543859649122,0,0,0,0.010526315789473682,0,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0,0.010526315789473682,0.003508771929824561,0.007017543859649122,0,0,0,0.003508771929824561,0.010526315789473682,0.014035087719298244,0.010526315789473682,0.003508771929824561,0,0,0.007017543859649122
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "cluster": "dev-us-central-0",
+              "job": "cortex-dev-01/cortex-gw-internal",
+              "route": "root"
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963300000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963400000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963500000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963600000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963700000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963800000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000,1649963900000
+          ],
+          [
+            0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00006655930985505723,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.000030517578125,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757
+          ],
+          [
+            0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.0000725834420778028,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000033279654927528616,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534
+          ],
+          [
+            0.0035087596183873034,0,0,0.0035087596183873034,0.052631517390182125,0.17894720837236824,0.13684190828016174,0.1192980609424762,0.1578945767934209,0.12280689442948706,0.0877191874426787,0.03508767005249658,0.010526291166599169,0.017543859649122806,0.024561354263022896,0.003508771929824561,0,0.007017531548211864,0.014035075407860986,0.003508771929824561,0.003508771929824561,0,0.010526315789473682,0,0.003508771929824561,0.003508771929824561,0.0035300277777777778,0,0,0.0035300277777777778,0.028442166666666668,0.17761405555555557,0.12027434722222222,0.07432459722222223,0.156041875,0.11329744444444445,0.056662583333333336,0.02837088888888889,0.007099652777777778,0.017772888888888887,0.021227680555555555,0,0,0.0035300277777777778,0.010633638888888889,0.003569625,0.007064013888888889,0,0.010637597222222222,0,0.0035339861111111114,0.0035339861111111114,0.003508771929824561,0,0.003508771929824561,0.007017543859649122,0.014035087719298244,0.20350877192982453,0.14736842105263157,0.09473684210526315,0.19649122807017544,0.1333333333333333,0.07368421052631578,0.031578947368421054,0.010526315789473682,0.021052631578947364,0.017543859649122806,0.003508771929824561,0,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.007017543859649122,0,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.007017543859649122,0.010526315789473682,0.19649122807017544,0.16491228070175437,0.10175438596491226,0.2070175438596491,0.1614035087719298,0.05614035087719298,0.02456140350877193,0.014035087719298244,0.017543859649122806,0.010526315789473682,0.003508771929824561,0,0.003508771929824561,0,0.003508771929824561,0.003508771929824561,0.003508771929824561,0,0,0,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.18245614035087718,0.17543859649122806,0.11578947368421053,0.1614035087719298,0.1508771929824561,0.06666666666666665,0.04561403508771929,0.02807017543859649,0.017543859649122806,0.010526315789473682,0.003508771929824561,0.003508771929824561,0,0,0.007017543859649122,0.007017543859649122,0,0,0,0.003508771929824561,0.003508771929824561,0,0.021052631578947364,0.14736842105263157,0.16491228070175437,0.11929824561403507,0.1719298245614035,0.1719298245614035,0.06666666666666665,0.05614035087719298,0.024561403508771926,0.017543859649122806,0.010526315789473682,0,0.003508771929824561,0,0,0.010526315789473682,0,0.003508771929824561,0,0,0.007017543859649122,0.031578947368421054,0.15438596491228068,0.15438596491228068,0.11228070175438595,0.16842105263157892,0.16491228070175437,0.07017543859649122,0.059649122807017535,0.03157894736842105,0.024561403508771926,0.010526315789473682,0,0.003508771929824561,0.007017543859649122,0.003508771929824561,0,0,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-golden.txt b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-golden.txt
new file mode 100644
index 00000000000..b7db46c17eb
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-golden.txt
@@ -0,0 +1,490 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                                   | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_cardinality_label_names | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                                              | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[1] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                                    | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_cardinality_label_values | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                                               | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[2] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                             | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_label_name_values | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                                        | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[3] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                  | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_labels | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                             | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[4] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                    | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_metadata | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                               | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[5] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                 | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_query | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                            | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[6] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                           | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_query_exemplars | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                                      | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[7] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                       | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_query_range | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                                  | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[8] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 1 Rows
++-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                 | Name: yMax           | Name: count          | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_rules | Labels:              | Labels:              | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                            | Type: []float64      | Type: []float64      | Type: []int8  |
++-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.05255602595335715                                                                        | 0.057312752700291944 | 0.003508784241348215 | 0             |
++-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+
+
+
+
+Frame[9] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 0 Rows
++-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+| Name: xMax        | Name: yMin                                                                                  | Name: yMax      | Name: count     | Name: yLayout |
+| Labels:           | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_api_v1_series | Labels:         | Labels:         | Labels:       |
+| Type: []time.Time | Type: []float64                                                                             | Type: []float64 | Type: []float64 | Type: []int8  |
++-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
++-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+
+
+
+
+Frame[10] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 426 Rows
++-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                         | Name: yMax            | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_push | Labels:               | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                    | Type: []float64       | Type: []float64       | Type: []int8  |
++-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.0013810679320049755                                                              | 0.0015060652591874421 | 0.0035087596183873042 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0015060652591874421                                                              | 0.001642375811042411  | 0.02105265620208107   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.001642375811042411                                                               | 0.0017910235218841233 | 0.03508778085595028   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0017910235218841233                                                              | 0.001953125           | 0.09473695290949442   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.001953125                                                                        | 0.0021298979153618314 | 0.11228089873902361   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0021298979153618314                                                              | 0.0023226701464896895 | 0.16491241612920574   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0023226701464896895                                                              | 0.002532889755177753  | 0.12982470914248379   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.002532889755177753                                                               | 0.002762135864009951  | 0.16842120037107233   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.002762135864009951                                                               | 0.0030121305183748843 | 0.30175469375429953   | 0             |
+| ...                           | ...                                                                                | ...                   | ...                   | ...           |
++-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+
+
+
+Frame[11] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 1 Rows
++-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                          | Name: yMax         | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_prom_rules | Labels:            | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                     | Type: []float64    | Type: []float64       | Type: []int8  |
++-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 1                                                                                   | 1.0905077326652577 | 0.0035087596183873042 | 0             |
++-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+
+
+
+
+Frame[12] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 6 Rows
++-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                        | Name: yMax         | Name: count          | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=api_v1_rules | Labels:            | Labels:              | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                   | Type: []float64    | Type: []float64      | Type: []int8  |
++-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+
+| 2022-04-14 19:10:00 +0000 UTC | 0.8408964152537144                                                                | 0.9170040432046711 | 0.003466771241830066 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 1                                                                                 | 1.0905077326652577 | 0.003474313725490196 | 0             |
+| 2022-04-14 19:11:40 +0000 UTC | 0.8408964152537144                                                                | 0.9170040432046711 | 0.003508771929824561 | 0             |
+| 2022-04-14 19:11:40 +0000 UTC | 1                                                                                 | 1.0905077326652577 | 0.003508771929824561 | 0             |
+| 2022-04-14 19:13:20 +0000 UTC | 0.8408964152537144                                                                | 0.9170040432046711 | 0.003508771929824561 | 0             |
+| 2022-04-14 19:13:20 +0000 UTC | 1                                                                                 | 1.0905077326652577 | 0.003508771929824561 | 0             |
++-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+
+
+
+
+Frame[13] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 269 Rows
++-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                | Name: yMax             | Name: count        | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw, route=root | Labels:                | Labels:            | Labels:       |
+| Type: []time.Time             | Type: []float64                                                           | Type: []float64        | Type: []float64    | Type: []int8  |
++-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 4.536465129862675e-06                                                     | 4.947050303081549e-06  | 0.0912281686682326 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 4.947050303081549e-06                                                     | 5.394796609394436e-06  | 1.5052655709601983 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 5.394796609394436e-06                                                     | 5.883067418700946e-06  | 3.687721957559951  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 5.883067418700946e-06                                                     | 6.415530511884418e-06  | 3.936844149003299  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 6.415530511884418e-06                                                     | 6.9961856323598564e-06 | 3.140353893534075  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 6.9961856323598564e-06                                                    | 7.62939453125e-06      | 3.4491272391832517 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 7.62939453125e-06                                                         | 8.319913731882154e-06  | 3.53333777780927   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 8.319913731882154e-06                                                     | 9.07293025972535e-06   | 3.4947421237616973 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06                                                      | 9.894100606163098e-06  | 3.533338799658994  | 0             |
+| ...                           | ...                                                                       | ...                    | ...                | ...           |
++-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+
+
+
+
+Frame[14] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 303 Rows
++-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                                      | Name: yMax            | Name: count          | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_prom_api_v1_label_name_values | Labels:               | Labels:              | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                                 | Type: []float64       | Type: []float64      | Type: []int8  |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.002532889755177753                                                                                            | 0.002762135864009951  | 0.007017543859649122 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.002762135864009951                                                                                            | 0.0030121305183748843 | 0.014035087719298244 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0030121305183748843                                                                                           | 0.003284751622084822  | 0.04912280701754385  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.003284751622084822                                                                                            | 0.0035820470437682465 | 0.02105261926751011  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0035820470437682465                                                                                           | 0.00390625            | 0.04210522622358295  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.00390625                                                                                                      | 0.004259795830723663  | 0.049122782394669336 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.004259795830723663                                                                                            | 0.004645340292979379  | 0.02807017543859649  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.004645340292979379                                                                                            | 0.005065779510355506  | 0.03859646660519566  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.005065779510355506                                                                                            | 0.005524271728019902  | 0.06666662973235489  | 0             |
+| ...                           | ...                                                                                                             | ...                   | ...                  | ...           |
++-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+
+
+
+Frame[15] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 56 Rows
++-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                           | Name: yMax            | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_prom_api_v1_labels | Labels:               | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                      | Type: []float64       | Type: []float64       | Type: []int8  |
++-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.004645340292979379                                                                                 | 0.005065779510355506  | 0.007017531548211864  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.005065779510355506                                                                                 | 0.005524271728019902  | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.005524271728019902                                                                                 | 0.0060242610367497685 | 0.010526315789473682  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.009290680585958758                                                                                 | 0.010131559020711013  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0340783666457893                                                                                   | 0.03716272234383503   | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.03716272234383503                                                                                  | 0.04052623608284405   | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.04052623608284405                                                                                  | 0.044194173824159216  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.005065779510355506                                                                                 | 0.005524271728019902  | 0.0035339861111111114 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.005524271728019902                                                                                 | 0.0060242610367497685 | 0.00713925            | 0             |
+| ...                           | ...                                                                                                  | ...                   | ...                   | ...           |
++-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+
+
+
+Frame[16] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 41 Rows
++-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                          | Name: yMax            | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_prom_api_v1_query | Labels:               | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                     | Type: []float64       | Type: []float64       | Type: []int8  |
++-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.005524271728019902                                                                                | 0.0060242610367497685 | 0.007017531548211864  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0060242610367497685                                                                               | 0.006569503244169644  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.006569503244169644                                                                                | 0.007164094087536493  | 0                     | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.007164094087536493                                                                                | 0.0078125             | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0078125                                                                                           | 0.008519591661447326  | 0                     | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.008519591661447326                                                                                | 0.009290680585958758  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.1621049443313762                                                                                  | 0.17677669529663687   | 0.003508771929824561  | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.005524271728019902                                                                                | 0.0060242610367497685 | 0.0035300277777777778 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.0060242610367497685                                                                               | 0.006569503244169644  | 0.0035300277777777778 | 0             |
+| ...                           | ...                                                                                                 | ...                   | ...                   | ...           |
++-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+
+
+
+Frame[17] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 29 Rows
++-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                                | Name: yMax           | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_prom_api_v1_query_range | Labels:              | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                           | Type: []float64      | Type: []float64       | Type: []int8  |
++-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.009290680585958758                                                                                      | 0.010131559020711013 | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.010131559020711013                                                                                      | 0.011048543456039804 | 0.007017519236774607  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.018581361171917516                                                                                      | 0.020263118041422026 | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.044194173824159216                                                                                      | 0.04819408829399815  | 0.003508771929824561  | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.010131559020711013                                                                                      | 0.011048543456039804 | 0.0070600555555555555 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.044194173824159216                                                                                      | 0.04819408829399815  | 0.0035339861111111114 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.17677669529663687                                                                                       | 0.1927763531759926   | 0.0035300277777777778 | 0             |
+| 2022-04-14 19:11:40 +0000 UTC | 0.010131559020711013                                                                                      | 0.011048543456039804 | 0.003508771929824561  | 0             |
+| 2022-04-14 19:11:40 +0000 UTC | 0.04052623608284405                                                                                       | 0.044194173824159216 | 0.003508771929824561  | 0             |
+| ...                           | ...                                                                                                       | ...                  | ...                   | ...           |
++-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+
+
+
+
+Frame[18] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 38 Rows
++-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                           | Name: yMax           | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_prom_api_v1_series | Labels:              | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                      | Type: []float64      | Type: []float64       | Type: []int8  |
++-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.006569503244169644                                                                                 | 0.007164094087536493 | 0.007017531548211864  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.007164094087536493                                                                                 | 0.0078125            | 0                     | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0078125                                                                                            | 0.008519591661447326 | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.024097044146999074                                                                                 | 0.026278012976678575 | 0.003508771929824561  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.04052623608284405                                                                                  | 0.044194173824159216 | 0.003508771929824561  | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.0078125                                                                                            | 0.008519591661447326 | 0.0035300277777777778 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.009290680585958758                                                                                 | 0.010131559020711013 | 0.0035339861111111114 | 0             |
+| 2022-04-14 19:10:00 +0000 UTC | 0.024097044146999074                                                                                 | 0.026278012976678575 | 0.007103611111111111  | 0             |
+| 2022-04-14 19:11:40 +0000 UTC | 0.0060242610367497685                                                                                | 0.006569503244169644 | 0.003508771929824561  | 0             |
+| ...                           | ...                                                                                                  | ...                  | ...                   | ...           |
++-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+
+
+
+
+Frame[19] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 195 Rows
++-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                  | Name: yMax            | Name: count          | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_prom_push | Labels:               | Labels:              | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                             | Type: []float64       | Type: []float64      | Type: []int8  |
++-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.0010649489576809157                                                                       | 0.0011613350732448448 | 0.003508771929824561 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0011613350732448448                                                                       | 0.0012664448775888766 | 0                    | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0012664448775888766                                                                       | 0.0013810679320049755 | 0.01754383502624829  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0013810679320049755                                                                       | 0.0015060652591874421 | 0.02105261926751011  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0015060652591874421                                                                       | 0.001642375811042411  | 0.02807015081572197  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.001642375811042411                                                                        | 0.0017910235218841233 | 0.042105189289271185 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0017910235218841233                                                                       | 0.001953125           | 0.05964904893839399  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.001953125                                                                                 | 0.0021298979153618314 | 0.056140289320006684 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0021298979153618314                                                                       | 0.0023226701464896895 | 0.07368416128056675  | 0             |
+| ...                           | ...                                                                                         | ...                   | ...                  | ...           |
++-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+
+
+
+Frame[20] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 261 Rows
++-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                | Name: yMax            | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=api_v1_push | Labels:               | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                           | Type: []float64       | Type: []float64       | Type: []int8  |
++-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.00048828125                                                                             | 0.0005324744788404579 | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0005324744788404579                                                                     | 0.0005806675366224224 | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0005806675366224224                                                                     | 0.0006332224387944383 | 0.024561354263022896  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0006332224387944383                                                                     | 0.0006905339660024878 | 0.056140252385694915  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0006905339660024878                                                                     | 0.0007530326295937211 | 0.056140252385694915  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0007530326295937211                                                                     | 0.0008211879055212055 | 0.0666665681751686    | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0008211879055212055                                                                     | 0.0008955117609420616 | 0.07368408741194321   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0008955117609420616                                                                     | 0.0009765625          | 0.04912274546035757   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0009765625                                                                              | 0.0010649489576809157 | 0.03508765774105932   | 0             |
+| ...                           | ...                                                                                       | ...                   | ...                   | ...           |
++-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+
+
+
+Frame[21] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 176 Rows
++-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                            | Name: yMax            | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=prometheus_api_v1_query | Labels:               | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                       | Type: []float64       | Type: []float64       | Type: []int8  |
++-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.004645340292979379                                                                                  | 0.005065779510355506  | 0.014035075407860986  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.005065779510355506                                                                                  | 0.005524271728019902  | 0.010526291166599169  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.005524271728019902                                                                                  | 0.0060242610367497685 | 0.04561398584197026   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0060242610367497685                                                                                 | 0.006569503244169644  | 0.014035087719298244  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.006569503244169644                                                                                  | 0.007164094087536493  | 0                     | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.007164094087536493                                                                                  | 0.0078125             | 0.014035087719298244  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0078125                                                                                             | 0.008519591661447326  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.008519591661447326                                                                                  | 0.009290680585958758  | 0.007017543859649122  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.009290680585958758                                                                                  | 0.010131559020711013  | 0.003508771929824561  | 0             |
+| ...                           | ...                                                                                                   | ...                   | ...                   | ...           |
++-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+
+
+
+
+Frame[22] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 255 Rows
++-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                                                  | Name: yMax            | Name: count          | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=prometheus_api_v1_query_range | Labels:               | Labels:              | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                                             | Type: []float64       | Type: []float64      | Type: []int8  |
++-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 0.005065779510355506                                                                                        | 0.005524271728019902  | 0.007017543859649122 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.005524271728019902                                                                                        | 0.0060242610367497685 | 0.007017543859649122 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0060242610367497685                                                                                       | 0.006569503244169644  | 0.003508771929824561 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.006569503244169644                                                                                        | 0.007164094087536493  | 0.003508771929824561 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.011048543456039804                                                                                        | 0.012048522073499537  | 0.003508771929824561 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.03125                                                                                                     | 0.0340783666457893    | 0.003508771929824561 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.0340783666457893                                                                                          | 0.03716272234383503   | 0.007017543859649122 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.03716272234383503                                                                                         | 0.04052623608284405   | 0                    | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 0.04052623608284405                                                                                         | 0.044194173824159216  | 0                    | 0             |
+| ...                           | ...                                                                                                         | ...                   | ...                  | ...           |
++-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+
+
+
+
+Frame[23] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 167 Rows
++-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+
+| Name: xMax                    | Name: yMin                                                                         | Name: yMax             | Name: count           | Name: yLayout |
+| Labels:                       | Labels: cluster=dev-us-central-0, job=cortex-dev-01/cortex-gw-internal, route=root | Labels:                | Labels:               | Labels:       |
+| Type: []time.Time             | Type: []float64                                                                    | Type: []float64        | Type: []float64       | Type: []int8  |
++-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+
+| 2022-04-14 19:08:20 +0000 UTC | 5.883067418700946e-06                                                              | 6.415530511884418e-06  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 6.415530511884418e-06                                                              | 6.9961856323598564e-06 | 0                     | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 6.9961856323598564e-06                                                             | 7.62939453125e-06      | 0                     | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 7.62939453125e-06                                                                  | 8.319913731882154e-06  | 0.0035087596183873034 | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 8.319913731882154e-06                                                              | 9.07293025972535e-06   | 0.052631517390182125  | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06                                                               | 9.894100606163098e-06  | 0.17894720837236824   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 9.894100606163098e-06                                                              | 1.0789593218788871e-05 | 0.13684190828016174   | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 1.0789593218788871e-05                                                             | 1.1766134837401892e-05 | 0.1192980609424762    | 0             |
+| 2022-04-14 19:08:20 +0000 UTC | 1.1766134837401892e-05                                                             | 1.2831061023768835e-05 | 0.1578945767934209    | 0             |
+| ...                           | ...                                                                                | ...                    | ...                   | ...           |
++-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=QVJST1cxAAD/////UAMAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAJAAAAADAAAATAAAACgAAAAEAAAAQP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAABg/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAID9//8IAAAAKAAAAB8AAAB7InR5cGUiOiJoZWF0bWFwLWNlbGxzLXNwYXJzZSJ9AAQAAABtZXRhAAAAAAUAAAAgAgAAMAEAANAAAABwAAAABAAAAAb+//8UAAAAPAAAAEQAAAAAAAACSAAAAAEAAAAEAAAA9P3//wgAAAAQAAAABwAAAHlMYXlvdXQABAAAAG5hbWUAAAAAAAAAAAgADAAIAAcACAAAAAAAAAEIAAAABwAAAHlMYXlvdXQAbv7//xQAAAA8AAAAPAAAAAAAAAM8AAAAAQAAAAQAAABc/v//CAAAABAAAAAFAAAAY291bnQAAAAEAAAAbmFtZQAAAAAAAAAAUv7//wAAAgAFAAAAY291bnQAAADK/v//FAAAADwAAAA8AAAAAAAAAzwAAAABAAAABAAAALj+//8IAAAAEAAAAAQAAAB5TWF4AAAAAAQAAABuYW1lAAAAAAAAAACu/v//AAACAAQAAAB5TWF4AAAAACb///8UAAAAvAAAALwAAAAAAAADvAAAAAIAAAAsAAAABAAAABj///8IAAAAEAAAAAQAAAB5TWluAAAAAAQAAABuYW1lAAAAADz///8IAAAAaAAAAF4AAAB7ImNsdXN0ZXIiOiJkZXYtdXMtY2VudHJhbC0wIiwiam9iIjoiY29ydGV4LWRldi0wMS9jb3J0ZXgtZ3ciLCJyb3V0ZSI6ImFwaV9wcm9tX2FwaV92MV9ydWxlcyJ9AAAGAAAAbGFiZWxzAAAAAAAAiv///wAAAgAEAAAAeU1pbgAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAAB4TWF4AAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAHhNYXgAAAAA/////0gBAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAoAAAAAAAAABQAAAAAAAADBAAKABgADAAIAAQACgAAABQAAAC4AAAAAQAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAgAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAQAAAAAAAAAAAAAABQAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAGjuJOHY5Ras01qZn+iqP4ak+9wYWK0/lAYXMnS+bD8AAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAAEAAEAAABgAwAAAAAAAFABAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAJAAAAADAAAATAAAACgAAAAEAAAAQP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAABg/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAID9//8IAAAAKAAAAB8AAAB7InR5cGUiOiJoZWF0bWFwLWNlbGxzLXNwYXJzZSJ9AAQAAABtZXRhAAAAAAUAAAAgAgAAMAEAANAAAABwAAAABAAAAAb+//8UAAAAPAAAAEQAAAAAAAACSAAAAAEAAAAEAAAA9P3//wgAAAAQAAAABwAAAHlMYXlvdXQABAAAAG5hbWUAAAAAAAAAAAgADAAIAAcACAAAAAAAAAEIAAAABwAAAHlMYXlvdXQAbv7//xQAAAA8AAAAPAAAAAAAAAM8AAAAAQAAAAQAAABc/v//CAAAABAAAAAFAAAAY291bnQAAAAEAAAAbmFtZQAAAAAAAAAAUv7//wAAAgAFAAAAY291bnQAAADK/v//FAAAADwAAAA8AAAAAAAAAzwAAAABAAAABAAAALj+//8IAAAAEAAAAAQAAAB5TWF4AAAAAAQAAABuYW1lAAAAAAAAAACu/v//AAACAAQAAAB5TWF4AAAAACb///8UAAAAvAAAALwAAAAAAAADvAAAAAIAAAAsAAAABAAAABj///8IAAAAEAAAAAQAAAB5TWluAAAAAAQAAABuYW1lAAAAADz///8IAAAAaAAAAF4AAAB7ImNsdXN0ZXIiOiJkZXYtdXMtY2VudHJhbC0wIiwiam9iIjoiY29ydGV4LWRldi0wMS9jb3J0ZXgtZ3ciLCJyb3V0ZSI6ImFwaV9wcm9tX2FwaV92MV9ydWxlcyJ9AAAGAAAAbGFiZWxzAAAAAAAAiv///wAAAgAEAAAAeU1pbgAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAAB4TWF4AAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAHhNYXgAAAAAgAMAAEFSUk9XMQ==
+FRAME=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
+FRAME=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JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA8ECPVdnlFgDwQI9V2eUWAPBAj1XZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfXbNnlFgDYt9ds2eUWANi312zZ5RYA2LfX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
+FRAME=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
+FRAME=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
+FRAME=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ADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpG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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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
+FRAME=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ADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAONy1D9nlFgA43LUP2eUWADjctQ/Z5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAgU/4m2eUWACBT/ibZ5RYAIFP+JtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpGPtnlFgAIykY+2eUWAAjKRj7Z5RYACMpG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
+FRAME=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
diff --git a/pkg/util/converter/testdata/prom-matrix-wide-frame.json b/pkg/util/converter/testdata/prom-matrix-wide-frame.json
new file mode 100644
index 00000000000..13cc8f1e560
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-wide-frame.json
@@ -0,0 +1,62 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "matrix"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "up",
+              "instance": "localhost:9090",
+              "job": "prometheus"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "up",
+              "instance": "localhost:9091",
+              "job": "node"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1435781430781,1435781445781,1435781460781
+          ],
+          [
+            1,1,1
+          ],
+          [
+            0,0,1
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-matrix-wide-golden.txt b/pkg/util/converter/testdata/prom-matrix-wide-golden.txt
new file mode 100644
index 00000000000..4a22daa0195
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-wide-golden.txt
@@ -0,0 +1,23 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "matrix"
+    }
+}
+Name: 
+Dimensions: 3 Fields by 3 Rows
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+
+| Name: Time                        | Name: Value                                                  | Name: Value                                            |
+| Labels:                           | Labels: __name__=up, instance=localhost:9090, job=prometheus | Labels: __name__=up, instance=localhost:9091, job=node |
+| Type: []time.Time                 | Type: []*float64                                             | Type: []*float64                                       |
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+
+| 2015-07-01 20:10:30.781 +0000 UTC | 1                                                            | 0                                                      |
+| 2015-07-01 20:10:45.781 +0000 UTC | 1                                                            | 0                                                      |
+| 2015-07-01 20:11:00.781 +0000 UTC | 1                                                            | 1                                                      |
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////8AIAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAKwAAAADAAAATAAAACgAAAAEAAAAoP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADA/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAOD9//8IAAAARAAAADsAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLXdpZGUiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6Im1hdHJpeCJ9fQAEAAAAbWV0YQAAAAADAAAApAEAANAAAAAEAAAASv///xQAAACYAAAAmAAAAAAAAwGYAAAAAgAAACwAAAAEAAAAbP7//wgAAAAQAAAABQAAAFZhbHVlAAAABAAAAG5hbWUAAAAAkP7//wgAAABEAAAAOgAAAHsiX19uYW1lX18iOiJ1cCIsImluc3RhbmNlIjoibG9jYWxob3N0OjkwOTEiLCJqb2IiOiJub2RlIn0AAAYAAABsYWJlbHMAAAAAAAC6/v//AAACAAUAAABWYWx1ZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAKAAAACgAAAAAAADAaAAAAACAAAALAAAAAQAAAA0////CAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAABY////CAAAAEwAAABAAAAAeyJfX25hbWVfXyI6InVwIiwiaW5zdGFuY2UiOiJsb2NhbGhvc3Q6OTA5MCIsImpvYiI6InByb21ldGhldXMifQAAAAAGAAAAbGFiZWxzAAAAAAAAiv///wAAAgAFAAAAVmFsdWUAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA/////+gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAABIAAAAAAAAABQAAAAAAAADBAAKABgADAAIAAQACgAAABQAAAB4AAAAAwAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAGAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAYAAAAAAAAAAAAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAQLnNrJrr7BNAj98qnuvsE0Bl8aih6+wTAAAAAAAA8D8AAAAAAADwPwAAAAAAAPA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/EAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAQAAQAAAAADAAAAAAAA8AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAArAAAAAMAAABMAAAAKAAAAAQAAACg/f//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAMD9//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAA4P3//wgAAABEAAAAOwAAAHsidHlwZSI6InRpbWVzZXJpZXMtd2lkZSIsImN1c3RvbSI6eyJyZXN1bHRUeXBlIjoibWF0cml4In19AAQAAABtZXRhAAAAAAMAAACkAQAA0AAAAAQAAABK////FAAAAJgAAACYAAAAAAADAZgAAAACAAAALAAAAAQAAABs/v//CAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAACQ/v//CAAAAEQAAAA6AAAAeyJfX25hbWVfXyI6InVwIiwiaW5zdGFuY2UiOiJsb2NhbGhvc3Q6OTA5MSIsImpvYiI6Im5vZGUifQAABgAAAGxhYmVscwAAAAAAALr+//8AAAIABQAAAFZhbHVlABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAoAAAAKAAAAAAAAMBoAAAAAIAAAAsAAAABAAAADT///8IAAAAEAAAAAUAAABWYWx1ZQAAAAQAAABuYW1lAAAAAFj///8IAAAATAAAAEAAAAB7Il9fbmFtZV9fIjoidXAiLCJpbnN0YW5jZSI6ImxvY2FsaG9zdDo5MDkwIiwiam9iIjoicHJvbWV0aGV1cyJ9AAAAAAYAAABsYWJlbHMAAAAAAACK////AAACAAUAAABWYWx1ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAgAwAAQVJST1cx
diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.json b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.json
new file mode 100644
index 00000000000..c2ad842fdb1
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.json
@@ -0,0 +1,59 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "matrix"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "handler": "/api/v1/query_range",
+              "job": "prometheus"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1641889530000,1641889531000,1641889532000
+          ],
+          [
+            null,null,null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "NaN": [
+              1
+            ],
+            "Inf": [
+              0
+            ],
+            "NegInf": [
+              2
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-wide-golden.txt b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-golden.txt
new file mode 100644
index 00000000000..c5c3c77bb3d
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-golden.txt
@@ -0,0 +1,23 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "matrix"
+    }
+}
+Name: 
+Dimensions: 2 Fields by 3 Rows
++-------------------------------+-----------------------------------------------------+
+| Name: Time                    | Name: Value                                         |
+| Labels:                       | Labels: handler=/api/v1/query_range, job=prometheus |
+| Type: []time.Time             | Type: []*float64                                    |
++-------------------------------+-----------------------------------------------------+
+| 2022-01-11 08:25:30 +0000 UTC | +Inf                                                |
+| 2022-01-11 08:25:31 +0000 UTC | NaN                                                 |
+| 2022-01-11 08:25:32 +0000 UTC | -Inf                                                |
++-------------------------------+-----------------------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////MAIAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAKwAAAADAAAATAAAACgAAAAEAAAAZP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAACE/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAKT+//8IAAAARAAAADsAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLXdpZGUiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6Im1hdHJpeCJ9fQAEAAAAbWV0YQAAAAACAAAA4AAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAlAAAAJQAAAAAAAMBlAAAAAIAAAAsAAAABAAAAED///8IAAAAEAAAAAUAAABWYWx1ZQAAAAQAAABuYW1lAAAAAGT///8IAAAAQAAAADQAAAB7ImhhbmRsZXIiOiIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwiam9iIjoicHJvbWV0aGV1cyJ9AAAAAAYAAABsYWJlbHMAAAAAAACK////AAACAAUAAABWYWx1ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAwAAAAAAAAABQAAAAAAAADBAAKABgADAAIAAQACgAAABQAAABYAAAAAwAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAGAAAAAAAAAAAAAAAAgAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAEQVFNQpyRYADrBP1CnJFgDYSovUKckWAAAAAAAA8H8BAAAAAAD4fwAAAAAAAPD/EAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAQAAQAAAEACAAAAAAAAwAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAACsAAAAAwAAAEwAAAAoAAAABAAAAGT+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAAhP7//wgAAAAMAAAAAAAAAAAAAAAEAAAAbmFtZQAAAACk/v//CAAAAEQAAAA7AAAAeyJ0eXBlIjoidGltZXNlcmllcy13aWRlIiwiY3VzdG9tIjp7InJlc3VsdFR5cGUiOiJtYXRyaXgifX0ABAAAAG1ldGEAAAAAAgAAAOAAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAJQAAACUAAAAAAADAZQAAAACAAAALAAAAAQAAABA////CAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAABk////CAAAAEAAAAA0AAAAeyJoYW5kbGVyIjoiL2FwaS92MS9xdWVyeV9yYW5nZSIsImpvYiI6InByb21ldGhldXMifQAAAAAGAAAAbGFiZWxzAAAAAAAAiv///wAAAgAFAAAAVmFsdWUAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAAWAIAAEFSUk9XMQ==
diff --git a/pkg/util/converter/testdata/prom-scalar-wide-frame.json b/pkg/util/converter/testdata/prom-scalar-wide-frame.json
new file mode 100644
index 00000000000..bfac8c9ad91
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-scalar-wide-frame.json
@@ -0,0 +1,43 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-many",
+          "custom": {
+            "resultType": "scalar"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1651680139104
+          ],
+          [
+            0.00002482
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-scalar-wide-golden.txt b/pkg/util/converter/testdata/prom-scalar-wide-golden.txt
new file mode 100644
index 00000000000..22ebd05e759
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-scalar-wide-golden.txt
@@ -0,0 +1,21 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "scalar"
+    }
+}
+Name: 
+Dimensions: 2 Fields by 1 Rows
++-----------------------------------+-----------------+
+| Name: Time                        | Name: Value     |
+| Labels:                           | Labels:         |
+| Type: []time.Time                 | Type: []float64 |
++-----------------------------------+-----------------+
+| 2022-05-04 16:02:19.104 +0000 UTC | 2.482e-05       |
++-----------------------------------+-----------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////6AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAKwAAAADAAAATAAAACgAAAAEAAAArP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAOz+//8IAAAARAAAADsAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLW1hbnkiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6InNjYWxhciJ9fQAEAAAAbWV0YQAAAAACAAAAmAAAAAQAAACC////FAAAAGAAAABgAAAAAAAAA2AAAAACAAAALAAAAAQAAAB0////CAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAACY////CAAAAAwAAAACAAAAe30AAAYAAABsYWJlbHMAAAAAAACK////AAACAAUAAABWYWx1ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAQAAAAAAAAABQAAAAAAAADBAAKABgADAAIAAQACgAAABQAAABYAAAAAQAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAJjc5VXy6xbxVZ9pkQb6PhAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAAEAAEAAAD4AQAAAAAAAMAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAArAAAAAMAAABMAAAAKAAAAAQAAACs/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAMz+//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAA7P7//wgAAABEAAAAOwAAAHsidHlwZSI6InRpbWVzZXJpZXMtbWFueSIsImN1c3RvbSI6eyJyZXN1bHRUeXBlIjoic2NhbGFyIn19AAQAAABtZXRhAAAAAAIAAACYAAAABAAAAIL///8UAAAAYAAAAGAAAAAAAAADYAAAAAIAAAAsAAAABAAAAHT///8IAAAAEAAAAAUAAABWYWx1ZQAAAAQAAABuYW1lAAAAAJj///8IAAAADAAAAAIAAAB7fQAABgAAAGxhYmVscwAAAAAAAIr///8AAAIABQAAAFZhbHVlABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAABACAABBUlJPVzE=
diff --git a/pkg/util/converter/testdata/prom-series-wide-frame.json b/pkg/util/converter/testdata/prom-series-wide-frame.json
new file mode 100644
index 00000000000..397dcef8981
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-series-wide-frame.json
@@ -0,0 +1,44 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "__name__",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "job",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "instance",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "up","up","process_start_time_seconds"
+          ],
+          [
+            "prometheus","node","prometheus"
+          ],
+          [
+            "localhost:9090","localhost:9091","localhost:9090"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-series-wide-golden.txt b/pkg/util/converter/testdata/prom-series-wide-golden.txt
new file mode 100644
index 00000000000..da12d51ed1a
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-series-wide-golden.txt
@@ -0,0 +1,18 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] 
+Name: 
+Dimensions: 3 Fields by 3 Rows
++----------------------------+----------------+----------------+
+| Name: __name__             | Name: job      | Name: instance |
+| Labels:                    | Labels:        | Labels:        |
+| Type: []string             | Type: []string | Type: []string |
++----------------------------+----------------+----------------+
+| up                         | prometheus     | localhost:9090 |
+| up                         | node           | localhost:9091 |
+| process_start_time_seconds | prometheus     | localhost:9090 |
++----------------------------+----------------+----------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAFAAAAACAAAAKAAAAAQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAOz+//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAAAwAAANAAAABoAAAABAAAAE7///8UAAAAQAAAAEAAAAAAAAAFPAAAAAEAAAAEAAAAPP///wgAAAAUAAAACAAAAGluc3RhbmNlAAAAAAQAAABuYW1lAAAAAAAAAAA0////CAAAAGluc3RhbmNlAAAAAK7///8UAAAAOAAAADgAAAAAAAAFNAAAAAEAAAAEAAAAnP///wgAAAAMAAAAAwAAAGpvYgAEAAAAbmFtZQAAAAAAAAAAjP///wMAAABqb2IAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEgAAABMAAAAAAAABUgAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAUAAAACAAAAF9fbmFtZV9fAAAAAAQAAABuYW1lAAAAAAAAAAAEAAQABAAAAAgAAABfX25hbWVfXwAAAAD/////GAEAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAJgAAAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAAKgAAAADAAAAAAAAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAB4AAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAEAAAAAAAAABAAAAAAAAAABgAAAAAAAAAWAAAAAAAAAAAAAAAAAAAAFgAAAAAAAAAEAAAAAAAAABoAAAAAAAAACoAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAQAAAAeAAAAdXB1cHByb2Nlc3Nfc3RhcnRfdGltZV9zZWNvbmRzAAAAAAAACgAAAA4AAAAYAAAAcHJvbWV0aGV1c25vZGVwcm9tZXRoZXVzAAAAAA4AAAAcAAAAKgAAAGxvY2FsaG9zdDo5MDkwbG9jYWxob3N0OjkwOTFsb2NhbGhvc3Q6OTA5MAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAAEAAEAAADQAQAAAAAAACABAAAAAAAAmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFAAAAACAAAAKAAAAAQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAOz+//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAAAwAAANAAAABoAAAABAAAAE7///8UAAAAQAAAAEAAAAAAAAAFPAAAAAEAAAAEAAAAPP///wgAAAAUAAAACAAAAGluc3RhbmNlAAAAAAQAAABuYW1lAAAAAAAAAAA0////CAAAAGluc3RhbmNlAAAAAK7///8UAAAAOAAAADgAAAAAAAAFNAAAAAEAAAAEAAAAnP///wgAAAAMAAAAAwAAAGpvYgAEAAAAbmFtZQAAAAAAAAAAjP///wMAAABqb2IAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEgAAABMAAAAAAAABUgAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAUAAAACAAAAF9fbmFtZV9fAAAAAAQAAABuYW1lAAAAAAAAAAAEAAQABAAAAAgAAABfX25hbWVfXwAAAADwAQAAQVJST1cx
diff --git a/pkg/util/converter/testdata/prom-string-wide-frame.json b/pkg/util/converter/testdata/prom-string-wide-frame.json
new file mode 100644
index 00000000000..dccf8a826b9
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-string-wide-frame.json
@@ -0,0 +1,43 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-many",
+          "custom": {
+            "resultType": "string"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            },
+            "labels": {
+              
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1651680139104
+          ],
+          [
+            "example"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-string-wide-golden.txt b/pkg/util/converter/testdata/prom-string-wide-golden.txt
new file mode 100644
index 00000000000..9de84775012
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-string-wide-golden.txt
@@ -0,0 +1,21 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-many",
+    "custom": {
+        "resultType": "string"
+    }
+}
+Name: 
+Dimensions: 2 Fields by 1 Rows
++-----------------------------------+----------------+
+| Name: Time                        | Name: Value    |
+| Labels:                           | Labels:        |
+| Type: []time.Time                 | Type: []string |
++-----------------------------------+----------------+
+| 2022-05-04 16:02:19.104 +0000 UTC | example        |
++-----------------------------------+----------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////6AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAKwAAAADAAAATAAAACgAAAAEAAAArP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAOz+//8IAAAARAAAADsAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLW1hbnkiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6InN0cmluZyJ9fQAEAAAAbWV0YQAAAAACAAAAmAAAAAQAAACC////FAAAAGAAAABkAAAAAAAABWAAAAACAAAALAAAAAQAAAB0////CAAAABAAAAAFAAAAVmFsdWUAAAAEAAAAbmFtZQAAAACY////CAAAAAwAAAACAAAAe30AAAYAAABsYWJlbHMAAAAAAAAEAAQABAAAAAUAAABWYWx1ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAAAA/////8gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAYAAAAAAAAABQAAAAAAAADBAAKABgADAAIAAQACgAAABQAAABoAAAAAQAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAQAAAAAAAAAAcAAAAAAAAAAAAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAACY3OVV8usWAAAAAAcAAABleGFtcGxlABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAAEAAEAAAD4AQAAAAAAANAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAArAAAAAMAAABMAAAAKAAAAAQAAACs/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAMz+//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAA7P7//wgAAABEAAAAOwAAAHsidHlwZSI6InRpbWVzZXJpZXMtbWFueSIsImN1c3RvbSI6eyJyZXN1bHRUeXBlIjoic3RyaW5nIn19AAQAAABtZXRhAAAAAAIAAACYAAAABAAAAIL///8UAAAAYAAAAGQAAAAAAAAFYAAAAAIAAAAsAAAABAAAAHT///8IAAAAEAAAAAUAAABWYWx1ZQAAAAQAAABuYW1lAAAAAJj///8IAAAADAAAAAIAAAB7fQAABgAAAGxhYmVscwAAAAAAAAQABAAEAAAABQAAAFZhbHVlABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAABACAABBUlJPVzE=
diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.json b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.json
new file mode 100644
index 00000000000..2bf66d9ccff
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.json
@@ -0,0 +1,70 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "heatmap-cells-sparse"
+        },
+        "fields": [
+          {
+            "name": "xMax",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "yMin",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              
+            }
+          },
+          {
+            "name": "yMax",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            }
+          },
+          {
+            "name": "yLayout",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int8"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042,1649967668042
+          ],
+          [
+            0.000004536465129862675,0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.00009412907869921513,0.00010264848819015068,0.0004477558804710308,0.00048828125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,1,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,2.82842712474619
+          ],
+          [
+            0.000004947050303081549,0.000005394796609394436,0.000005883067418700946,0.000006415530511884418,0.0000069961856323598564,0.00000762939453125,0.000008319913731882154,0.00000907293025972535,0.000009894100606163098,0.000010789593218788871,0.000011766134837401892,0.000012831061023768835,0.000013992371264719713,0.0000152587890625,0.000016639827463764308,0.0000181458605194507,0.000019788201212326197,0.000021579186437577742,0.000023532269674803783,0.00002566212204753767,0.000027984742529439426,0.000030517578125,0.000033279654927528616,0.0000362917210389014,0.000039576402424652394,0.000043158372875155485,0.00004706453934960757,0.00005132424409507534,0.00005596948505887885,0.00006103515625,0.00006655930985505723,0.0000725834420778028,0.00010264848819015068,0.0001119389701177577,0.00048828125,0.0005324744788404579,0.0005806675366224224,0.0006332224387944383,0.0006905339660024878,0.0007530326295937211,0.0008211879055212055,0.0008955117609420616,0.0009765625,0.0010649489576809157,0.0011613350732448448,0.0012664448775888766,0.0013810679320049755,0.0015060652591874421,0.001642375811042411,0.0017910235218841233,0.001953125,0.0021298979153618314,0.0023226701464896895,0.002532889755177753,0.002762135864009951,0.0030121305183748843,0.003284751622084822,0.0035820470437682465,0.00390625,0.004259795830723663,0.004645340292979379,0.005065779510355506,0.005524271728019902,0.0060242610367497685,0.006569503244169644,0.007164094087536493,0.0078125,0.008519591661447326,0.009290680585958758,0.010131559020711013,0.011048543456039804,0.012048522073499537,0.013139006488339287,0.014328188175072986,0.015625,0.01703918332289465,0.018581361171917516,0.020263118041422026,0.022097086912079608,0.024097044146999074,0.026278012976678575,0.028656376350145972,0.03125,0.0340783666457893,0.03716272234383503,0.04052623608284405,0.044194173824159216,0.04819408829399815,0.05255602595335715,0.057312752700291944,0.0625,0.0681567332915786,0.07432544468767006,0.0810524721656881,0.08838834764831843,0.0963881765879963,0.1051120519067143,0.11462550540058389,0.125,0.1363134665831572,0.14865088937534013,0.1621049443313762,0.17677669529663687,0.1927763531759926,0.2102241038134286,0.22925101080116778,0.25,0.2726269331663144,0.29730177875068026,0.3242098886627524,0.35355339059327373,0.3855527063519852,0.4204482076268572,0.45850202160233555,0.5,0.5452538663326288,0.5946035575013605,0.6484197773255048,0.7071067811865475,0.7711054127039704,0.8408964152537144,1.0905077326652577,1.189207115002721,1.2968395546510096,1.414213562373095,1.5422108254079407,1.6817928305074288,1.8340080864093422,2,2.1810154653305154,2.378414230005442,2.5936791093020193,2.82842712474619,3.0844216508158815
+          ],
+          [
+            0.13333333333333333,2.0982456140350876,4.224561403508771,4.101754385964911,3.5438596491228074,3.922807017543859,3.8877192982456137,3.480701754385965,3.392982456140351,2.971929824561403,2.028070175438596,1.7087719298245612,1.1614035087719294,0.6210526315789473,0.42105263157894735,0.3192982456140351,0.21052631578947364,0.16842105263157892,0.1333333333333333,0.09122807017543859,0.08771929824561403,0.08421052631578947,0.0631578947368421,0.05964912280701754,0.014035087719298244,0.024561403508771926,0.02456140350877193,0.007017543859649122,0,0.010526315789473682,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.007017543859649122,0.03859649122807017,0.07368421052631578,0.04912280701754385,0.09122807017543859,0.03859649122807017,0.02456140350877193,0.017543859649122806,0.031578947368421054,0.06315789473684211,0.10526315789473682,0.11929824561403507,0.10877192982456138,0.11929824561403507,0.19649122807017538,0.24561403508771926,0.19999999999999998,0.18245614035087715,0.2771929824561403,0.5228070175438596,0.663157894736842,0.4070175438596491,0.4421052631578947,1.0070175438596491,1.4210526315789476,1.3859649122807016,1.0035087719298246,0.8771929824561402,8.273684210526316,32.50877192982456,57.18245614035087,53.82105263157894,39.508771929824555,22.824561403508767,11.554385964912282,6.50877192982456,4.529824561403507,3.5298245614035086,2.7438596491228067,2.284210526315789,1.9192982456140348,2.028070175438596,1.9403508771929823,1.4701754385964911,1.1964912280701754,0.9228070175438596,0.8421052631578947,2.8421052631578942,2.508771929824561,1.0842105263157893,0.3473684210526316,0.2526315789473684,0.1964912280701754,0.09473684210526315,0.07017543859649121,0.10526315789473684,0.07368421052631578,0.07368421052631577,0.06666666666666665,0.04912280701754385,0.05263157894736841,0.38947368421052625,2.9157894736842103,0.5052631578947367,0.11228070175438594,0.05263157894736842,0.04210526315789473,0.02807017543859649,0.010526315789473682,0.010526315789473682,0.003508771929824561,0.010526315789473682,0.003508771929824561,0.007017543859649122,0.007017543859649122,0.024561403508771926,0.017543859649122806,0.02456140350877193,0.04561403508771929,0.014035087719298244,0.021052631578947364,0.007017543859649122,0.003508771929824561,0.003508771929824561,0.007017543859649122,0.003508771929824561,0.010526315789473682,0.010526315789473682,0.021052631578947368,0.003508771929824561,0.003508771929824561,0,0.003508771929824561,0,0,0,0.003508771929824561,0.003508771929824561
+          ],
+          [
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-golden.txt b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-golden.txt
new file mode 100644
index 00000000000..3d4d96bfc94
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-golden.txt
@@ -0,0 +1,27 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "heatmap-cells-sparse"
+}
+Name: 
+Dimensions: 5 Fields by 134 Rows
++-----------------------------------+------------------------+------------------------+---------------------+---------------+
+| Name: xMax                        | Name: yMin             | Name: yMax             | Name: count         | Name: yLayout |
+| Labels:                           | Labels:                | Labels:                | Labels:             | Labels:       |
+| Type: []time.Time                 | Type: []float64        | Type: []float64        | Type: []float64     | Type: []int8  |
++-----------------------------------+------------------------+------------------------+---------------------+---------------+
+| 2022-04-14 20:21:08.042 +0000 UTC | 4.536465129862675e-06  | 4.947050303081549e-06  | 0.13333333333333333 | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 4.947050303081549e-06  | 5.394796609394436e-06  | 2.0982456140350876  | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 5.394796609394436e-06  | 5.883067418700946e-06  | 4.224561403508771   | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 5.883067418700946e-06  | 6.415530511884418e-06  | 4.101754385964911   | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 6.415530511884418e-06  | 6.9961856323598564e-06 | 3.5438596491228074  | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 6.9961856323598564e-06 | 7.62939453125e-06      | 3.922807017543859   | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 7.62939453125e-06      | 8.319913731882154e-06  | 3.8877192982456137  | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 8.319913731882154e-06  | 9.07293025972535e-06   | 3.480701754385965   | 0             |
+| 2022-04-14 20:21:08.042 +0000 UTC | 9.07293025972535e-06   | 9.894100606163098e-06  | 3.392982456140351   | 0             |
+| ...                               | ...                    | ...                    | ...                 | ...           |
++-----------------------------------+------------------------+------------------------+---------------------+---------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////+AIAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAJAAAAADAAAATAAAACgAAAAEAAAAnP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAC8/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAANz9//8IAAAAKAAAAB8AAAB7InR5cGUiOiJoZWF0bWFwLWNlbGxzLXNwYXJzZSJ9AAQAAABtZXRhAAAAAAUAAADEAQAAMAEAANAAAABwAAAABAAAAGL+//8UAAAAPAAAAEQAAAAAAAACSAAAAAEAAAAEAAAAUP7//wgAAAAQAAAABwAAAHlMYXlvdXQABAAAAG5hbWUAAAAAAAAAAAgADAAIAAcACAAAAAAAAAEIAAAABwAAAHlMYXlvdXQAyv7//xQAAAA8AAAAPAAAAAAAAAM8AAAAAQAAAAQAAAC4/v//CAAAABAAAAAFAAAAY291bnQAAAAEAAAAbmFtZQAAAAAAAAAArv7//wAAAgAFAAAAY291bnQAAAAm////FAAAADwAAAA8AAAAAAAAAzwAAAABAAAABAAAABT///8IAAAAEAAAAAQAAAB5TWF4AAAAAAQAAABuYW1lAAAAAAAAAAAK////AAACAAQAAAB5TWF4AAAAAIL///8UAAAAYAAAAGAAAAAAAAADYAAAAAIAAAAsAAAABAAAAHT///8IAAAAEAAAAAQAAAB5TWluAAAAAAQAAABuYW1lAAAAAJj///8IAAAADAAAAAIAAAB7fQAABgAAAGxhYmVscwAAAAAAAIr///8AAAIABAAAAHlNaW4AABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAeE1heAAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAAB4TWF4AAAAAAAAAAD/////SAEAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAEgRAAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAALgAAACGAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAQAAAAAAAAwBAAAAAAAAAAAAAAAAAAAMAQAAAAAAAAwBAAAAAAAAGAIAAAAAAAAAAAAAAAAAABgCAAAAAAAADAEAAAAAAAAkAwAAAAAAAAAAAAAAAAAAJAMAAAAAAAAMAQAAAAAAADAEAAAAAAAAAAAAAAAAAAAwBAAAAAAAACGAAAAAAAAAAAAAAAFAAAAhgAAAAAAAAAAAAAAAAAAAIYAAAAAAAAAAAAAAAAAAACGAAAAAAAAAAAAAAAAAAAAhgAAAAAAAAAAAAAAAAAAAIYAAAAAAAAAAAAAAAAAAACA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUWgOaFKNrc5RaA5oUo2tzlFoDmhSja3OUW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
diff --git a/pkg/util/converter/testdata/prom-vector-wide-frame.json b/pkg/util/converter/testdata/prom-vector-wide-frame.json
new file mode 100644
index 00000000000..6c2cb107cd2
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-vector-wide-frame.json
@@ -0,0 +1,127 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "vector"
+          }
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "up",
+              "instance": "localhost:9090",
+              "job": "prometheus"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "up",
+              "instance": "localhost:9100",
+              "job": "node"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "level": "error",
+              "location": "moon"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "level": "info",
+              "location": "moon"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "level": "debug",
+              "location": "moon"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1435781451781,1645029699000
+          ],
+          [
+            1,null
+          ],
+          [
+            0,null
+          ],
+          [
+            null,null
+          ],
+          [
+            null,null
+          ],
+          [
+            null,null
+          ]
+        ],
+        "entities": [
+          null,
+          null,
+          null,
+          {
+            "Inf": [
+              1
+            ]
+          },
+          {
+            "NegInf": [
+              1
+            ]
+          },
+          {
+            "NaN": [
+              1
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-vector-wide-golden.txt b/pkg/util/converter/testdata/prom-vector-wide-golden.txt
new file mode 100644
index 00000000000..c25da291861
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-vector-wide-golden.txt
@@ -0,0 +1,22 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "vector"
+    }
+}
+Name: 
+Dimensions: 6 Fields by 2 Rows
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+------------------------------------+-----------------------------------+------------------------------------+
+| Name: Time                        | Name: Value                                                  | Name: Value                                            | Name: Value                        | Name: Value                       | Name: Value                        |
+| Labels:                           | Labels: __name__=up, instance=localhost:9090, job=prometheus | Labels: __name__=up, instance=localhost:9100, job=node | Labels: level=error, location=moon | Labels: level=info, location=moon | Labels: level=debug, location=moon |
+| Type: []time.Time                 | Type: []*float64                                             | Type: []*float64                                       | Type: []*float64                   | Type: []*float64                  | Type: []*float64                   |
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+------------------------------------+-----------------------------------+------------------------------------+
+| 2015-07-01 20:10:51.781 +0000 UTC | 1                                                            | 0                                                      | null                               | null                              | null                               |
+| 2022-02-16 16:41:39 +0000 UTC     | null                                                         | null                                                   | +Inf                               | -Inf                              | NaN                                |
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+------------------------------------+-----------------------------------+------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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
diff --git a/pkg/util/converter/testdata/prom-warnings-wide-frame.json b/pkg/util/converter/testdata/prom-warnings-wide-frame.json
new file mode 100644
index 00000000000..b5a8d2c9704
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-warnings-wide-frame.json
@@ -0,0 +1,137 @@
+{
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "custom": {
+            "resultType": "vector"
+          },
+          "notices": [
+            {
+              "severity": "warning",
+              "text": "warning 1"
+            },
+            {
+              "severity": "warning",
+              "text": "warning 2"
+            }
+          ]
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "up",
+              "instance": "localhost:9090",
+              "job": "prometheus"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "__name__": "up",
+              "instance": "localhost:9100",
+              "job": "node"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "level": "error",
+              "location": "moon"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "level": "info",
+              "location": "moon"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "level": "debug",
+              "location": "moon"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1435781451781,1645029699000
+          ],
+          [
+            1,null
+          ],
+          [
+            0,null
+          ],
+          [
+            null,null
+          ],
+          [
+            null,null
+          ],
+          [
+            null,null
+          ]
+        ],
+        "entities": [
+          null,
+          null,
+          null,
+          {
+            "Inf": [
+              1
+            ]
+          },
+          {
+            "NegInf": [
+              1
+            ]
+          },
+          {
+            "NaN": [
+              1
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-warnings-wide-golden.txt b/pkg/util/converter/testdata/prom-warnings-wide-golden.txt
new file mode 100644
index 00000000000..faf0e63abbc
--- /dev/null
+++ b/pkg/util/converter/testdata/prom-warnings-wide-golden.txt
@@ -0,0 +1,32 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] {
+    "type": "timeseries-wide",
+    "custom": {
+        "resultType": "vector"
+    },
+    "notices": [
+        {
+            "severity": "warning",
+            "text": "warning 1"
+        },
+        {
+            "severity": "warning",
+            "text": "warning 2"
+        }
+    ]
+}
+Name: 
+Dimensions: 6 Fields by 2 Rows
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+------------------------------------+-----------------------------------+------------------------------------+
+| Name: Time                        | Name: Value                                                  | Name: Value                                            | Name: Value                        | Name: Value                       | Name: Value                        |
+| Labels:                           | Labels: __name__=up, instance=localhost:9090, job=prometheus | Labels: __name__=up, instance=localhost:9100, job=node | Labels: level=error, location=moon | Labels: level=info, location=moon | Labels: level=debug, location=moon |
+| Type: []time.Time                 | Type: []*float64                                             | Type: []*float64                                       | Type: []*float64                   | Type: []*float64                  | Type: []*float64                   |
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+------------------------------------+-----------------------------------+------------------------------------+
+| 2015-07-01 20:10:51.781 +0000 UTC | 1                                                            | 0                                                      | null                               | null                              | null                               |
+| 2022-02-16 16:41:39 +0000 UTC     | null                                                         | null                                                   | +Inf                               | -Inf                              | NaN                                |
++-----------------------------------+--------------------------------------------------------------+--------------------------------------------------------+------------------------------------+-----------------------------------+------------------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=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

From 0769151da265e5b6d316f60273008af5cfb99412 Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Tue, 24 May 2022 22:09:52 -0400
Subject: [PATCH 009/103] Docs: Fixed typo in what's new in grafana 9 (#49549)

* Fixed typo

* Updated metadata

(cherry picked from commit 3a541ea127f2fe9c67c98247e3f68ff00c320951)
---
 docs/sources/whatsnew/whats-new-in-v9-0.md | 227 +++++++++++++++++++++
 1 file changed, 227 insertions(+)
 create mode 100644 docs/sources/whatsnew/whats-new-in-v9-0.md

diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
new file mode 100644
index 00000000000..ca241500986
--- /dev/null
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -0,0 +1,227 @@
++++
+aliases = ["/docs/grafana/latest/guides/whats-new-in-v9-0/", "/docs/grafana/latest/whatsnew/whats-new-in-v9-0/"]
+description = "Feature and improvement highlights for Grafana v9.0"
+keywords = ["grafana", "new", "documentation", "9.0", "release notes"]
+title = "What's new in Grafana v9.0"
+weight = -33
+
+[_build]
+  list = false
++++
+
+# What’s new in Grafana v9.0
+
+As tradition goes, GrafanaCon - our yearly community event for Grafana open source users, is also where we launch the latest software release of Grafana. Keeping up with tradition, we are excited to be announcing Grafana v9.0 - a release that elevates Grafana’s ease of use, discovery of data through new and improved visualizations and a default unified alerting experience.
+
+A big focus for Grafana is making observability and data visualization and analytics easier and more accessible for everyone. For popular data sources like Prometheus and Loki writing and understanding queries can be hard. This is why we are excited to announce that Grafana 9 comes with new visual query builders for both these data sources. These visual query builders will lower the barrier of entry and they help anyone to compose, understand and learn how the underlying query languages.
+
+The release also includes a brand new powerful and fast heatmap visualization, a more accessible navigation menu, improvements to dashboard search, advanced security and authentication features, and more.
+
+We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post as well. If you’d like all the details you can check out the complete [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
+
+## Prometheus query builder
+
+Prometheus queries are not the easiest to write or understand. The PromQL query language is very complex and advanced. Even relatively simple queries are hard to compose and read for new users. This is why we are introducing a new UI query builder that allows anyone to compose and learn how Prometheus queries work.
+
+{{< figure src="/static/img/docs/prometheus/prom_query_builder_light.png" max-width="750px" caption="Prometheus query builder" >}}
+
+### Metric and label filters
+
+This new query builder allows you to easily search and select a metric as well as building label filters. You can start either the selecting a metric or a label filter as they both act as filters on each other. The metric selector allow you to search on multiple parts of the metric name at the same time, just separate each search string with a whitespace.
+
+### Operations
+
+All functions, aggregations and binary operations are added via the + Operation button. Operations are presented in the order they are executed, not in the inverted order they are written in the text query. This makes queries a lot easier to read and reason about as you now clearly see what function parameter is going to which function as well as information about parameter names and function documentation integrated into the builder.
+
+### Range vector
+
+The query builder will automatically mange and add the range vector, it will be shown as a parameter to the operations that require a range (rate, delta, increase etc).
+
+### Binary operations
+
+Simple binary operations like multiple or divide by scaler are represented via simple operation boxes like other functions but the builder also supports binary operations on nested query expressions.
+
+### Switch between code and builder
+
+You can switch between the text edit mode (Code) and the UI builder mode while having your text changes preserved as the visual builder model is derived from the text query using a full featured PromQL query parser.
+
+## Loki query builder
+
+Loki also has complex and powerful query language in LogQL. In many ways it’s more complex and has more syntax to remember than PromQL. Luckily the new query builder we are introducing in Grafana v 9.0 will help you write and understand Loki queries without knowing any of the syntax. Take a look at this example log query.
+
+{{< figure src="/static/img/docs/loki/loki_query_builder_log_query_light_theme.png" max-width="750px" caption="Loki query builder" >}}
+
+In the query builder you can add and edit label filters, line filters, parsers and functions. The image above shows a log query but you can also do metric queries.
+
+{{< figure src="/static/img/docs/loki/loki_query_builder_log_query_light_theme.png" max-width="750px" caption="Loki query builder" >}}
+
+The Loki query builder supports all the features listed for the prometheus query builder above, including support for nested binary operations, explain mode and switching between text editor and builder while preserving changes.
+
+## New heatmap panel
+
+We are replacing the old heatmap panel with a new modern panel that is using the new panel option architecture.
+
+{{< figure src="/static/img/docs/heatmap-panel/heatmap_panel.png" max-width="500px" caption="New heatmap panel" >}}
+
+New new heatmap panel has a number enhancements compared to the old version.
+
+- Multiple orders of magnitude faster
+- Supports showing exemplars (traces) overlay
+- Supports Prometheus sparse histograms
+- Supports changing number of colors steps
+- For unbucketed data, it performs smarter auto bucket sizing
+- Supports filtering out bucket values close to but not exactly zero
+
+The new heatmap by default assumes that the data is pre-bucked. So if your query returns time series each series is seen as separate bucket (y axis tick). The panel is so much faster than the old one so it can render many time series with thousands of data points each without issue.
+
+{{< figure src="/static/img/docs/heatmap-panel/heatmap_with_time_series_light_theme.png" max-width="500px" caption="Heatmap panel with time series" >}}
+
+## Unified alerting is the default in Grafana 9
+
+Unified alerting is now on by default if you upgrade from an earlier version of Grafana. If you have been using legacy alerting in an earlier version of Grafana and you upgrade to Grafana 9 your alert rules will be automatically migrated and the legacy alerting interface will be replaced by the unified alerting interface.
+
+Unified alerting has been available since June, 2021, it now provides feature parity with legacy alerting and many additional benefits. To find out more on the process to revert back to legacy alerts if needed, click [here]({{< relref "../alerting/opt-in.md#disable-grafana-alertsd#" >}}). Note that if you do revert back (by setting the Grafana config flag GF_UNIFIED_ALERTING_ENABLED to false), that we expect to remove legacy alerting in the next major Grafana release, Grafana 10.
+
+### Alert state history for Grafana managed alerts
+
+Alert state history for Grafana managed alerts indicates the cause of the state. Alert rules can be configured to use the "Alerting" or "OK" states when rule evaluations result in Error or NoData conditions. This change tracks the difference between, for example, Alerting, Alerting (NoData), and Alerting (Error). This change also updates the UI to handle the new serialized states: filtering, sorting, and coloring.
+
+### Images in notifications for Grafana managed alerts
+
+Unified alerting now provides the ability to capture an image for Grafana managed alerts and deliver it via a notification. This is configurable via the contact points tab of Unified alerting . This functionality was available in legacy dashboard alerting, but was missing in unified alerting. It requires the alert to be related to a specific dashboard using the “Dashboard UID” field.
+
+## Envelope encryption is generally available and enabled by default
+
+Grafana now uses envelope encryption to encrypt secrets in the database. Envelope encryption adds a layer of indirection to the encryption process. Instead of encrypting all secrets in the database with a single key, Grafana uses a set of keys called data encryption keys (DEKs) to encrypt them. These data encryption keys are themselves encrypted with a single key encryption key (KEK). This allows you to rotate your KEK and quickly re-encrypt your DEKs in case a key is compromised. In Grafana Enterprise, you can also store your KEK in an external Key Management Service (KMS) like AWS KMS or Azure Key Vault, for extra security. Learn more about envelope encryption in the [docs](https://grafana.com/docs/grafana/next/administration/database-encryption/#envelope-encryption).
+
+{{< figure src="/static/img/docs/enterprise/dashboards/envelope-encryption.png" max-width="750px" caption="Envelope encryption" >}}
+
+## Dashboard previews (opt-in beta)
+
+The dashboard previews initially came to life during our internal [Grafana Labs Hackathon](https://grafana.com/blog/2022/01/14/all-about-the-grafana-labs-hackathon-2.0/?), and are now ready for an opt-in beta release. The previews provide an overview of all available dashboards and help you quickly find the right dashboard when the dashboard names aren’t enough.
+
+Refer to the [Dashboard previews topic](https://grafana.com/docs/grafana/next/dashboards/previews/) for instructions on how to enable the feature and current limitations.
+
+{{< figure src="/static/img/docs/dashboards/dashboard-previews.png" max-width="750px" caption="Dashboard previews" >}}
+
+## Panel title search
+
+In addition to searching dashboards by title, you can now search panels as well. If a panel’s title matches your search query, it will be displayed in the search results.
+
+## Expanding the navigation bar
+
+You can expand the navigation bar for a better overview of Grafana’s features and installed integrations. This is the first improvement to Grafana’s navigation, with more to come in future releases.
+
+{{< figure src="/static/img/docs/expanding-nav-bar-9-0.png" max-width="750px" caption="Expanding nav bar" >}}
+
+## Starred dashboards in the navigation bar
+
+As part of the upcoming improvements to Grafana’s navigation, you can now directly access your starred dashboards from the navigation bar. This is currently an opt-in feature that can be accessed by enabling the savedItems feature flag.
+
+{{< figure src="/static/img/docs/dashboards/starred-dashboards-nav-bar.png" max-width="750px" caption="Starred dashboards" >}}
+
+## Explore to Dashboard
+
+It is now possible to create panels and/or dashboards directly from Explore. When clicking on the “Add to dashboard” button in the Explore toolbar users can now create a panel in a new dashboard or in an existing one. The generated panel contains all the pane’s queries and a default visualization automatically picked from the current results shown in Explore. Dashboards are not automatically saved so that users can go through the current save flow. Optionally, dashboards can be opened in a new tab to preserve Explore’s state.
+
+{{< figure src="/static/img/docs/dashboards/explore-to-dashboard-9-0.png" max-width="500px" caption="Explore to dashboard" >}}
+
+## Command palette
+
+Using cmd+k (macOS) or ctrl+k (Linux/Windows), users can pull up a palette of commands that allow easier navigation and other tasks. <!-- Currently available commands:-->
+
+## List of errors with trace IDs
+
+In order to support debugging issues in Grafana, error alerts that appear in Grafana include a trace ID, and these alerts can be accessed under your Profile. This is currently an opt-in feature that can be accessed by enabling two feature flags:
+
+- `tracing` - enables the tracing id in error messages
+- `persistNotifications` - enables the alerts page under Profile
+
+{{< figure src="/static/img/docs/dashboards/errors-with-trace-ids.png" max-width="500px" caption="Errors with trace IDs" >}}
+
+## Query History migration
+
+Query history is a panel that keeps track of all queries that are run in Explore. So far the history was saved in browser local storage causing some problems, for example running out of storage space or not being able to use the same query history in different browsers. Not anymore! We’re migrating all entries from browser local storage to the database. Migration will happen behind the senses when query history panel is opened. This feature can be disabled using config entry query_history in custom.ini.
+
+{{< figure src="/static/img/docs/panels/query-history-9-0.png" max-width="900px" caption="Query history" >}}
+
+## Enterprise
+
+### Access control
+
+### RBAC is generally available
+
+Fine-grained access control is now called role-based access control, or RBAC. It is now enabled by default in Grafana Enterprise and Grafana Cloud Advanced, so you can create and define custom roles like Annotations Writer, Users Viewer, and Dashboard Permissions Writer for users, teams, or service accounts. Learn more about RBAC in the [docs](https://grafana.com/docs/grafana/next/enterprise/access-control/).
+
+{{< figure src="/static/img/docs/enterprise/rbac-ga.png" max-width="755px" caption="RBAC is GA" >}}
+
+## Reporting
+
+### Add multiple dashboards to a single report
+
+If you have information spread across several dashboards that you’d like to send out to a group of recipients periodically, you can now add multiple dashboards to a single report and send it all in one email. Learn more about Reporting in the [Reporting docs](https://grafana.com/docs/grafana/latest/enterprise/reporting/#reporting).
+
+### Embed an image of a dashboard in a report
+
+Reporting is all about convenience - getting info to eyeballs as quickly as possible. Now you can embed an image of a dashboard directly within a report email, so your recipients can see it right when they open the message instead of opening an attached PDF. This is especially handy for SLOs, financial results, or other at-a-glance data. Learn more about Reporting in the [Reporting docs](https://grafana.com/docs/grafana/latest/enterprise/reporting/#reporting).
+
+{{< figure src="/static/img/docs/dashboards/report-embedded-image.png" max-width="750px" caption="Embed report" >}}
+
+## Breaking Changes
+
+This is a partial list of notable breaking changes. For the complete list, see our [Release Notes](LINK-TO-9.0-RELEASE-NOTES).
+
+### Role-based access control: changes for general release
+
+Fine-grained access control is now called "Role-based access control". As part of the Grafana 9.0 release, the service is generally available, and there are several breaking changes:
+
+Built-in roles are now called basic roles, and they now consist of permissions, not roles
+The Terraform builtin_role_assignment resource is going away.
+Grafana provisioning has a new schema, please refer to the documentation for more information.
+Basic roles no longer support permission inheritance. Previously, when permissions of a Viewer basic role were modified, it was propagated to the Editor and Admin basic roles. With the Grafana 9.0 release, this is not the case anymore.
+
+### Loki: logs data format changed
+
+In the Loki data source, the data format used to represent Loki logs-data has been changed to a more efficient format. (NOTE: this change applies to logs data only, it does not apply to numeric data)
+The logs are represented by a single dataframe with a "labels" field added, instead of separate dataframes for every label combination. Displaying logs data in explore, or in a dashboard using the logs panel will continue to work without changes. But, when displaying logs data in other dashboard panels, for example in a table visualization, changes will be visible, and configurations might need to be adjusted. For example, if the "Labels to fields" transformation was used, it has to be replaced with an “Extract fields” transformation, where the “labels” field is chosen as the source.
+
+### Loki: NaN values representation changed in numeric data
+
+In the Loki data source, when grafana receives numeric data from Loki, it may contain NaN (not a number) values. For consistency and performance reasons we changed how we represent such values in Grafana. In previous versions, the behavior was different between alerting queries and other queries (like dashboard queries or explore queries). Alerting queries kept NaN values unchanged, but other queries converted these values to “null”. Starting with grafana 9.0.0, we will always keep these values unchanged. In other words, queries in dashboards and explore will behave the same as alerting queries in this regard.
+
+### Elasticsearch: Support for versions after their end of life was removed
+
+Support for Elasticsearch versions that are after their end of life ( based on https://www.elastic.co/support/eol ) was removed. This means that versions older than Elasticseach 7.10.0 will not be supported in Grafana 9.0.0.
+
+### Elasticsearch: Support for browser access mode removed
+
+In the Elasticsearch data source, browser access mode was deprecated in grafana 7.4.0 and removed in 9.0.0. If you used this mode, please switch to server access mode on the data source configuration page.
+
+<!-- ### InfluxDB: Support for browser access mode removed (should this stay??)
+
+In the InfluxDB data source, browser access mode was deprecated in grafana 8.0.0 and we are removing this feature in 9.0.0. If you are using this mode, you need to [switch to server access mode]({{< relref "../datasources/influxdb/_index.md##influxql-classic-influxdb-query" >}}) on the data source configuration page or you can do this via provisioning. -->
+
+### Transformations: Allow more complex regex expressions in rename by regex
+
+The rename by regex transformation has been improved to allow global patterns of the form `/<stringToReplace>/g`. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behavior as before by wrapping the match string in forward slashes (/), for example, (._) would become /(._)/. ([Github Issue #48179](https://github.com/grafana/grafana/pull/48179))
+
+## ## A note on Grafana Enterprise licensing
+
+The Rename by regex transformation has been improved to allow global patterns of the form /<stringToReplace>/g. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behavior as before by wrapping the match string in forward slashes (/), e.g. (._) becomes /(._)/
+Github Issue #48179
+
+## Deprecation Notices
+
+When we release Grafana 9.0 on June 14th, Grafana will no longer enforce viewers and editor-admins differently. That means that regardless of whether your Grafana Enterprise license is tiered or combined, instead of seeing this on the Stats & Licensing page:
+
+{{< figure src="/static/img/docs/enterprise/separate-licenses.png" max-width="500px" caption="Separate license" >}}
+
+You will see this:
+
+{{< figure src="/static/img/docs/enterprise/combined-licenses.png" max-width="500px" caption="Combined license" >}}
+
+It also means that Grafana will count all users the same, regardless of their role, including org roles (Viewer, Editor, Admin) and fine-grained roles (Dashboard Editor, Reports Editor, etc.). You won’t see a separate warning banner or see users locked out if you hit your limit of viewers or editor-admins, only your total combined limit of active users.
+
+For example, if you have a license for 10 active admins and 100 active viewers in your Grafana Enterprise license, then starting in v9.0 you will have a limit of 110 active users, and it doesn’t matter what roles those users have, they will all be counted and enforced the same.
+
+This is a more permissive policy than before.

From 9854234c66332ca82e6ae786f592c9f6631f0edc Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 02:33:45 -0400
Subject: [PATCH 010/103] DatePicker: able to set minimum date that can be
 selected (#49503) (#49505)

(cherry picked from commit d373beeb73190241c45ae20fe9d190368f7d8dee)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
---
 .../components/DateTimePickers/DatePicker/DatePicker.tsx  | 8 +++++++-
 .../DatePickerWithInput/DatePickerWithInput.tsx           | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
index 8e2397df452..e39ce8157ce 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
@@ -15,6 +15,7 @@ export interface DatePickerProps {
   onClose: () => void;
   onChange: (value: Date) => void;
   value?: Date;
+  minDate?: Date;
 }
 
 /** @public */
@@ -37,7 +38,7 @@ export const DatePicker = memo<DatePickerProps>((props) => {
 
 DatePicker.displayName = 'DatePicker';
 
-const Body = memo<DatePickerProps>(({ value, onChange }) => {
+const Body = memo<DatePickerProps>(({ value, minDate, onChange }) => {
   const styles = useStyles2(getBodyStyles);
 
   return (
@@ -45,6 +46,7 @@ const Body = memo<DatePickerProps>(({ value, onChange }) => {
       className={styles.body}
       tileClassName={styles.title}
       value={value || new Date()}
+      minDate={minDate}
       nextLabel={<Icon name="angle-right" />}
       prevLabel={<Icon name="angle-left" />}
       onChange={(ev: Date | Date[]) => {
@@ -68,6 +70,10 @@ export const getStyles = (theme: GrafanaTheme2) => {
       background-color: ${theme.colors.background.primary};
       border: 1px solid ${theme.colors.border.weak};
       border-radius: 2px 0 0 2px;
+
+      button:disabled {
+        color: ${theme.colors.text.disabled};
+      }
     `,
   };
 };
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
index ac924d7be24..136cfedce82 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
@@ -12,6 +12,7 @@ export const formatDate = (date: Date | string) => dateTime(date).format('L');
 /** @public */
 export interface DatePickerWithInputProps extends Omit<InputProps, 'ref' | 'value' | 'onChange'> {
   value?: Date | string;
+  minDate?: Date;
   onChange: (value: Date | string) => void;
   /** Hide the calendar when date is selected */
   closeOnSelect?: boolean;
@@ -21,6 +22,7 @@ export interface DatePickerWithInputProps extends Omit<InputProps, 'ref' | 'valu
 /** @public */
 export const DatePickerWithInput = ({
   value,
+  minDate,
   onChange,
   closeOnSelect,
   placeholder = 'Date',
@@ -49,6 +51,7 @@ export const DatePickerWithInput = ({
       <DatePicker
         isOpen={open}
         value={value && typeof value !== 'string' ? value : dateTime().toDate()}
+        minDate={minDate}
         onChange={(ev) => {
           onChange(ev);
           if (closeOnSelect) {

From b5da0dcf3995967f339c669e816340adcf734ccc Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 02:45:19 -0400
Subject: [PATCH 011/103] Search: Add primary background for global search
 container (#49473) (#49499)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Search: Add primarhy background for global search container

* Fix spacing for ActionRow

* Fixing ts issue

(cherry picked from commit 20f8b8625ac0f3f61e8fa33df8552813ea8335c0)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .../features/search/components/ActionRow.tsx    | 17 ++++++++---------
 .../search/components/DashboardSearch.tsx       |  7 +++++--
 .../search/page/components/ActionRow.tsx        |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/public/app/features/search/components/ActionRow.tsx b/public/app/features/search/components/ActionRow.tsx
index ef9c5d13c65..12b5c0a67cd 100644
--- a/public/app/features/search/components/ActionRow.tsx
+++ b/public/app/features/search/components/ActionRow.tsx
@@ -1,9 +1,9 @@
 import { css } from '@emotion/css';
 import React, { FC, ChangeEvent, FormEvent } from 'react';
 
-import { GrafanaTheme, SelectableValue } from '@grafana/data';
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { HorizontalGroup, RadioButtonGroup, stylesFactory, useTheme, Checkbox, InlineSwitch } from '@grafana/ui';
+import { HorizontalGroup, RadioButtonGroup, Checkbox, InlineSwitch, useStyles2 } from '@grafana/ui';
 import { SortPicker } from 'app/core/components/Select/SortPicker';
 import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
 import { SearchSrv } from 'app/core/services/search_srv';
@@ -40,8 +40,7 @@ export const ActionRow: FC<Props> = ({
   hideLayout,
   showPreviews,
 }) => {
-  const theme = useTheme();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
   const previewsEnabled = config.featureToggles.dashboardPreviews;
 
   return (
@@ -78,21 +77,21 @@ export const ActionRow: FC<Props> = ({
 
 ActionRow.displayName = 'ActionRow';
 
-const getStyles = stylesFactory((theme: GrafanaTheme) => {
+export const getStyles = (theme: GrafanaTheme2) => {
   return {
     actionRow: css`
       display: none;
 
-      @media only screen and (min-width: ${theme.breakpoints.md}) {
+      ${theme.breakpoints.up('md')} {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding: ${theme.spacing.lg} 0;
+        padding-bottom: ${theme.spacing(2)};
         width: 100%;
       }
     `,
     rowContainer: css`
-      margin-right: ${theme.spacing.md};
+      margin-right: ${theme.spacing(1)};
     `,
     checkboxWrapper: css`
       label {
@@ -100,4 +99,4 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
       }
     `,
   };
-});
+};
diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx
index 33f7ff2f668..065ce775f38 100644
--- a/public/app/features/search/components/DashboardSearch.tsx
+++ b/public/app/features/search/components/DashboardSearch.tsx
@@ -140,11 +140,14 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
       max-width: 1400px;
       margin: 0 auto;
       padding: ${theme.spacing(2)};
+      background: ${theme.colors.background.primary};
+      border: 1px solid ${theme.components.panel.borderColor};
+      margin-top: ${theme.spacing(4)};
 
       height: 100%;
 
       ${theme.breakpoints.up('md')} {
-        padding: ${theme.spacing(4)};
+        padding: ${theme.spacing(3)};
       }
     `,
     closeBtn: css`
@@ -160,7 +163,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
       display: flex;
       flex-direction: column;
       height: 100%;
-      padding-bottom: ${theme.spacing(3)};
+      padding: ${theme.spacing(2, 0, 3, 0)};
     `,
     input: css`
       box-sizing: border-box;
diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index c6a86240f05..7c309c11cff 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -104,11 +104,11 @@ export const getStyles = (theme: GrafanaTheme2) => {
     actionRow: css`
       display: none;
 
-      @media only screen and (min-width: ${theme.v1.breakpoints.md}) {
+      ${theme.breakpoints.up('md')} {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding: ${theme.v1.spacing.lg} 0;
+        padding-bottom: ${theme.spacing(2)};
         width: 100%;
       }
     `,

From 49e653dbaf0f9884d5dbf25f27f1a82d537598da Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 04:05:02 -0400
Subject: [PATCH 012/103] Prevent exception when panel has multiple queries
 (#49368) (#49562)

This fixes the issues that when a panel has multiple queries this throws an exception if source is not part of the current frame

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit eab806620c84878047eabb455a342da2f9a5a944)

Co-authored-by: Ward Bekker <ward@wardbekker.com>
---
 .../app/features/transformers/extractFields/extractFields.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/transformers/extractFields/extractFields.ts b/public/app/features/transformers/extractFields/extractFields.ts
index 81628b595ed..ede77024b40 100644
--- a/public/app/features/transformers/extractFields/extractFields.ts
+++ b/public/app/features/transformers/extractFields/extractFields.ts
@@ -41,7 +41,8 @@ function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): Da
   }
   const source = findField(frame, options.source);
   if (!source) {
-    throw new Error('json field not found');
+    // this case can happen when there are multiple queries
+    return frame;
   }
 
   const ext = fieldExtractors.getIfExists(options.format ?? FieldExtractorID.Auto);

From 312b57aa76a1e2dd06d77f94fa0a3ace05e6b37b Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 04:17:56 -0400
Subject: [PATCH 013/103] Login: Fix AuthInfo update process (#49556) (#49565)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Login: Fix AuthInfo update process

* Fix GoDoc

* Add regression test for oauth info overwrite

Co-authored-by: jguer <joao.guerreiro@grafana.com>
(cherry picked from commit 73a729bbe8f77e0c120e9a0cf83daf84d6c4da53)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
---
 .../login/authinfoservice/database/database.go       |  6 +++---
 pkg/services/login/authinfoservice/user_auth_test.go | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkg/services/login/authinfoservice/database/database.go b/pkg/services/login/authinfoservice/database/database.go
index b2c2ea070bc..434479d70a3 100644
--- a/pkg/services/login/authinfoservice/database/database.go
+++ b/pkg/services/login/authinfoservice/database/database.go
@@ -146,8 +146,8 @@ func (s *AuthInfoStore) SetAuthInfo(ctx context.Context, cmd *models.SetAuthInfo
 	})
 }
 
-// UpdateAuthInfo updates the auth info for the user with the latest date. Avoids overlapping entries hiding
-// the last used one (ex: LDAP->SAML->LDAP)
+// UpdateAuthInfoDate updates the auth info for the user with the latest date.
+// Avoids overlapping entries hiding the last used one (ex: LDAP->SAML->LDAP).
 func (s *AuthInfoStore) UpdateAuthInfoDate(ctx context.Context, authInfo *models.UserAuth) error {
 	authInfo.Created = GetTime()
 
@@ -157,7 +157,7 @@ func (s *AuthInfoStore) UpdateAuthInfoDate(ctx context.Context, authInfo *models
 		AuthModule: authInfo.AuthModule,
 	}
 	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		_, err := sess.Update(authInfo, cond)
+		_, err := sess.Cols("created").Update(authInfo, cond)
 		return err
 	})
 }
diff --git a/pkg/services/login/authinfoservice/user_auth_test.go b/pkg/services/login/authinfoservice/user_auth_test.go
index 2e07458b436..e03640be847 100644
--- a/pkg/services/login/authinfoservice/user_auth_test.go
+++ b/pkg/services/login/authinfoservice/user_auth_test.go
@@ -278,6 +278,16 @@ func TestUserAuth(t *testing.T) {
 
 			// Now reuse first auth module and make sure it's updated to the most recent
 			database.GetTime = func() time.Time { return fixedTime }
+
+			// add oauth info to auth_info to make sure update date does not overwrite it
+			updateAuthCmd := &models.UpdateAuthInfoCommand{UserId: user.Id, AuthModule: "test1", AuthId: "test1", OAuthToken: &oauth2.Token{
+				AccessToken:  "access_token",
+				TokenType:    "token_type",
+				RefreshToken: "refresh_token",
+				Expiry:       fixedTime,
+			}}
+			err = authInfoStore.UpdateAuthInfo(context.Background(), updateAuthCmd)
+			require.Nil(t, err)
 			user, err = srv.LookupAndUpdate(context.Background(), queryOne)
 
 			require.Nil(t, err)
@@ -287,6 +297,8 @@ func TestUserAuth(t *testing.T) {
 
 			require.Nil(t, err)
 			require.Equal(t, "test1", getAuthQuery.Result.AuthModule)
+			// make sure oauth info is not overwritten by update date
+			require.Equal(t, "access_token", getAuthQuery.Result.OAuthAccessToken)
 
 			// Now reuse second auth module and make sure it's updated to the most recent
 			database.GetTime = func() time.Time { return fixedTime.AddDate(0, 0, 1) }

From 6ab3724a12862cb16b72a596ed12a69daea5608b Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 06:07:59 -0400
Subject: [PATCH 014/103] AngularSupport: Update description for
 angular_support_enabled config option (#49569) (#49574)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* AngularSupport: Update description for angular_support_enabled config option

* Update angular deprecration plan doc

* Update

* Update article

* Updated

(cherry picked from commit e1909fe74b2b67dd91c80ac6ec4075adaf3c7dc7)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 conf/defaults.ini                              | 2 +-
 conf/sample.ini                                | 2 +-
 docs/sources/administration/configuration.md   | 2 +-
 docs/sources/developers/angular_deprecation.md | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 1fa6c669021..3b4edffb543 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -305,7 +305,7 @@ content_security_policy = false
 # $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';"""
 
-# Controls if old angular plugins are supported or not. This will be disabled by default in Grafana v9.
+# Controls if old angular plugins are supported or not. This will be disabled by default in future release
 angular_support_enabled = true
 
 [security.encryption]
diff --git a/conf/sample.ini b/conf/sample.ini
index 2467dc3a22c..8d8fd35ae33 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -305,7 +305,7 @@
 # $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';"""
 
-# Controls if old angular plugins are supported or not. This will be disabled by default in Grafana v9.
+# Controls if old angular plugins are supported or not. This will be disabled by default in future release
 ;angular_support_enabled = true
 
 [security.encryption]
diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md
index a77fe93edae..c121b89bf87 100644
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -602,7 +602,7 @@ Set Content Security Policy template used when adding the Content-Security-Polic
 
 ### angular_support_enabled
 
-This currently defaults to `true` but will in Grafana v9 default to `false`. When set to false the angular framework and support components will not be loaded. This means that
+This currently defaults to `true` but will default to `false` in a future release. When set to false the angular framework and support components will not be loaded. This means that
 all plugins and core features that depend on angular support will stop working.
 
 Current core features that will stop working:
diff --git a/docs/sources/developers/angular_deprecation.md b/docs/sources/developers/angular_deprecation.md
index f908928a606..e03031f1748 100644
--- a/docs/sources/developers/angular_deprecation.md
+++ b/docs/sources/developers/angular_deprecation.md
@@ -7,7 +7,7 @@ weight = 500
 
 # Angular support deprecation
 
-Angular plugin support is deprecated, and it will be removed in a future release. There are still many community plugins that depend on Grafana’s angular plugin support for them to work. The same is true for many internal (private) plugins developed over the years by Grafana users. Grafana version 9 will have a server configuration option, global for the whole instance, that will control if angular plugin support is available or not. By default, angular plugin support will be disabled.
+Angular plugin support is deprecated, and it will be removed in a future release. There are still many community plugins that depend on Grafana’s angular plugin support for them to work. The same is true for many internal (private) plugins developed over the years by Grafana users. Grafana version 9 will have a server configuration option, global for the whole instance, that will control if angular plugin support is available or not. By default angular support is still enabled but this will soon change as we complete the migration of all angular code in the core product.
 
 ## Why are we deprecating angular support?
 
@@ -15,7 +15,7 @@ AngularJS is an old frontend framework that stopped active development many year
 
 ## When will angular plugins stop working?
 
-In Grafana version 9 coming in June 2022, all angular plugins will stop working unless a new server configuration option is turned on. If you still depend on community or internally developed plugins that require AngularJS then you will have to turn this option on.
+We hope to migrate the last remaining angular code in core Grafana later this year. Then the setting enable_angular_support can be disable by default. This will make all angular plugins stop working. If you still depend on community or internally developed plugins that require AngularJS then you will have to enable this option.
 
 This is a good time to start working on migrating plugins to React.
 

From 8d6b47f11de25adfe15e9fa8ecb2a1f9667acaa6 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 07:19:17 -0400
Subject: [PATCH 015/103] don't close drawer when clicking a select within it
 (#49583) (#49600)

(cherry picked from commit 5455174de58b51226c8cba90074d0ca5b5e2d236)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 packages/grafana-ui/src/components/Drawer/Drawer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 55b61dc0cd5..087cd720419 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -54,7 +54,7 @@ export function Drawer({
   const { dialogProps, titleProps } = useDialog({}, overlayRef);
   const { overlayProps } = useOverlay(
     {
-      isDismissable: true,
+      isDismissable: false,
       isOpen,
       onClose,
     },

From fc79360e1539545755e56b5697f35822676a2a8a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 07:28:34 -0400
Subject: [PATCH 016/103] Access control: fix a typo for folder actions
 (#49582) (#49601)

* fix a typo for folder actions

* update dashboard action too

(cherry picked from commit 8d313f54e285b723d6daf205f59170fb77533d60)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
---
 public/app/types/accessControl.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/types/accessControl.ts b/public/app/types/accessControl.ts
index 22bcf3d14c0..d98c1127f4c 100644
--- a/public/app/types/accessControl.ts
+++ b/public/app/types/accessControl.ts
@@ -71,14 +71,14 @@ export enum AccessControlAction {
   DashboardsDelete = 'dashboards:delete',
   DashboardsCreate = 'dashboards:create',
   DashboardsPermissionsRead = 'dashboards.permissions:read',
-  DashboardsPermissionsWrite = 'dashboards.permissions:read',
+  DashboardsPermissionsWrite = 'dashboards.permissions:write',
 
   FoldersRead = 'folders:read',
-  FoldersWrite = 'folders:read',
+  FoldersWrite = 'folders:write',
   FoldersDelete = 'folders:delete',
   FoldersCreate = 'folders:create',
   FoldersPermissionsRead = 'folders.permissions:read',
-  FoldersPermissionsWrite = 'folders.permissions:read',
+  FoldersPermissionsWrite = 'folders.permissions:write',
 
   // Alerting rules
   AlertingRuleCreate = 'alert.rules:create',

From ef458b79d08c5939ea0a414e3372d490d6b20d7b Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 08:16:14 -0400
Subject: [PATCH 017/103] AccessControl: Pass current org id to UsersTable
 (#49584) (#49606)

* Pass current org id to UsersTable

* Mock contextSrv and update snapshot

(cherry picked from commit ef6b53ed23763ffa3bc1e918fb332891fbef14c2)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 .betterer.results                                           | 2 +-
 public/app/features/users/UsersListPage.test.tsx            | 6 ++++++
 public/app/features/users/UsersListPage.tsx                 | 2 ++
 .../users/__snapshots__/UsersListPage.test.tsx.snap         | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.betterer.results b/.betterer.results
index 7c54b12b30d..59543858a39 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -203,7 +203,7 @@ exports[`no enzyme tests`] = {
     "public/app/features/teams/TeamSettings.test.tsx:2043271249": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
-    "public/app/features/users/UsersListPage.test.tsx:3908145117": [
+    "public/app/features/users/UsersListPage.test.tsx:2518052139": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
     "public/app/features/users/UsersTable.test.tsx:263958312": [
diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx
index bc334b6287a..e5a2837e98f 100644
--- a/public/app/features/users/UsersListPage.test.tsx
+++ b/public/app/features/users/UsersListPage.test.tsx
@@ -12,6 +12,12 @@ jest.mock('../../core/app_events', () => ({
   emit: jest.fn(),
 }));
 
+jest.mock('app/core/services/context_srv', () => ({
+  contextSrv: {
+    user: { orgId: 1 },
+  },
+}));
+
 const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {
diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx
index f53b3f47b9f..803deead884 100644
--- a/public/app/features/users/UsersListPage.tsx
+++ b/public/app/features/users/UsersListPage.tsx
@@ -5,6 +5,7 @@ import { renderMarkdown } from '@grafana/data';
 import { HorizontalGroup, Pagination, VerticalGroup } from '@grafana/ui';
 import Page from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
+import { contextSrv } from 'app/core/services/context_srv';
 import { OrgUser, OrgRole, StoreState } from 'app/types';
 
 import InviteesTable from '../invites/InviteesTable';
@@ -106,6 +107,7 @@ export class UsersListPage extends PureComponent<Props, State> {
         <VerticalGroup spacing="md">
           <UsersTable
             users={paginatedUsers}
+            orgId={contextSrv.user.orgId}
             onRoleChange={(role, user) => this.onRoleChange(role, user)}
             onRemoveUser={(user) => this.props.removeUser(user.userId)}
           />
diff --git a/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap b/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap
index 08b3ba0ec22..01d1dbeeba2 100644
--- a/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap
+++ b/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap
@@ -26,6 +26,7 @@ exports[`Render should render List page 1`] = `
       <UsersTable
         onRemoveUser={[Function]}
         onRoleChange={[Function]}
+        orgId={1}
         users={Array []}
       />
       <HorizontalGroup

From a2f545746310387253773b23b4f4f38dc7f469ee Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 08:17:14 -0400
Subject: [PATCH 018/103] AccessControl: Grant data source reader to all users
 when running oss (#49514) (#49604)

* grant data source reader to all users when running oss or enterprise
without license

* fix asserts in alerting tests

* add oss licensing service for test setup

* fix tests to pass in enterprise

* lint

* fix tests

* set setting.IsEnterprise flag for tests

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
(cherry picked from commit 1796a1d27724a2e3818b83f37221a4a99642b451)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 pkg/api/accesscontrol.go                      |  24 ++--
 pkg/api/common_test.go                        |   2 +
 .../api/alerting/api_alertmanager_test.go     | 107 ++++++++++++------
 pkg/tests/testinfra/testinfra.go              |   2 +
 4 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/pkg/api/accesscontrol.go b/pkg/api/accesscontrol.go
index 4d2f33a9516..82c82670bfc 100644
--- a/pkg/api/accesscontrol.go
+++ b/pkg/api/accesscontrol.go
@@ -94,6 +94,11 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		Grants: []string{string(models.ROLE_ADMIN)},
 	}
 
+	// when running oss or enterprise without a license all users should be able to query data sources
+	if !hs.License.FeatureEnabled("accesscontrol.enforcement") {
+		datasourcesReaderRole.Grants = []string{string(models.ROLE_VIEWER)}
+	}
+
 	datasourcesWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Version:     3,
@@ -135,21 +140,6 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		Grants: []string{string(models.ROLE_VIEWER)},
 	}
 
-	datasourcesCompatibilityReaderRole := ac.RoleRegistration{
-		Role: ac.RoleDTO{
-			Version:     3,
-			Name:        "fixed:datasources:compatibility:querier",
-			DisplayName: "Data source compatibility querier",
-			Description: "Only used for open source compatibility. Query data sources.",
-			Group:       "Infrequently used",
-			Permissions: []ac.Permission{
-				{Action: datasources.ActionQuery},
-				{Action: datasources.ActionRead},
-			},
-		},
-		Grants: []string{string(models.ROLE_VIEWER)},
-	}
-
 	apikeyReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Version:     1,
@@ -419,8 +409,8 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	}
 
 	return hs.AccessControl.DeclareFixedRoles(
-		provisioningWriterRole, datasourcesReaderRole, datasourcesWriterRole, datasourcesIdReaderRole,
-		datasourcesCompatibilityReaderRole, orgReaderRole, orgWriterRole,
+		provisioningWriterRole, datasourcesReaderRole, datasourcesWriterRole,
+		datasourcesIdReaderRole, orgReaderRole, orgWriterRole,
 		orgMaintainerRole, teamsCreatorRole, teamsWriterRole, datasourcesExplorerRole,
 		annotationsReaderRole, dashboardAnnotationsWriterRole, annotationsWriterRole,
 		dashboardsCreatorRole, dashboardsReaderRole, dashboardsWriterRole,
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 012380ef0bf..6e0f28266a7 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -33,6 +33,7 @@ import (
 	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
 	"github.com/grafana/grafana/pkg/services/login/logintest"
 	"github.com/grafana/grafana/pkg/services/preference/preftest"
@@ -371,6 +372,7 @@ func setupHTTPServerWithCfgDb(t *testing.T, useFakeAccessControl, enableAccessCo
 		QuotaService:       &quota.QuotaService{Cfg: cfg},
 		RouteRegister:      routeRegister,
 		SQLStore:           store,
+		License:            &licensing.OSSLicensingService{},
 		searchUsersService: searchusers.ProvideUsersService(db, filters.ProvideOSSSearchUserFilter()),
 		dashboardService: dashboardservice.ProvideDashboardService(
 			cfg, dashboardsStore, nil, features,
diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
index 52d2b5db713..d7ff048ab13 100644
--- a/pkg/tests/api/alerting/api_alertmanager_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_test.go
@@ -22,6 +22,7 @@ import (
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	ngstore "github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
 )
 
@@ -2279,9 +2280,9 @@ func TestEval(t *testing.T) {
 	testCases := []struct {
 		desc               string
 		payload            string
-		expectedStatusCode int
-		expectedResponse   string
-		expectedMessage    string
+		expectedStatusCode func() int
+		expectedResponse   func() string
+		expectedMessage    func() string
 	}{
 		{
 			desc: "alerting condition",
@@ -2307,8 +2308,10 @@ func TestEval(t *testing.T) {
 				}
 			}
 			`,
-			expectedStatusCode: http.StatusOK,
-			expectedResponse: `{
+			expectedMessage:    func() string { return "" },
+			expectedStatusCode: func() int { return http.StatusOK },
+			expectedResponse: func() string {
+				return `{
 			"instances": [
 			  {
 				"schema": {
@@ -2342,7 +2345,8 @@ func TestEval(t *testing.T) {
 				}
 			  }
 			]
-		  }`,
+		  }`
+			},
 		},
 		{
 			desc: "normal condition",
@@ -2368,8 +2372,10 @@ func TestEval(t *testing.T) {
 				}
 			}
 			`,
-			expectedStatusCode: http.StatusOK,
-			expectedResponse: `{
+			expectedMessage:    func() string { return "" },
+			expectedStatusCode: func() int { return http.StatusOK },
+			expectedResponse: func() string {
+				return `{
 			"instances": [
 			  {
 				"schema": {
@@ -2403,7 +2409,8 @@ func TestEval(t *testing.T) {
 				}
 			  }
 			]
-		  }`,
+		  }`
+			},
 		},
 		{
 			desc: "condition not found in any query or expression",
@@ -2429,8 +2436,11 @@ func TestEval(t *testing.T) {
 				}
 			}
 			`,
-			expectedStatusCode: http.StatusBadRequest,
-			expectedMessage:    "invalid condition: condition B not found in any query or expression: it should be one of: [A]",
+			expectedStatusCode: func() int { return http.StatusBadRequest },
+			expectedMessage: func() string {
+				return "invalid condition: condition B not found in any query or expression: it should be one of: [A]"
+			},
+			expectedResponse: func() string { return "" },
 		},
 		{
 			desc: "unknown query datasource",
@@ -2454,8 +2464,19 @@ func TestEval(t *testing.T) {
 				}
 			}
 			`,
-			expectedStatusCode: http.StatusUnauthorized,
-			expectedMessage:    "user is not authorized to query one or many data sources used by the rule",
+			expectedStatusCode: func() int {
+				if setting.IsEnterprise {
+					return http.StatusUnauthorized
+				}
+				return http.StatusBadRequest
+			},
+			expectedMessage: func() string {
+				if setting.IsEnterprise {
+					return "user is not authorized to query one or many data sources used by the rule"
+				}
+				return "invalid condition: invalid query A: data source not found: unknown"
+			},
+			expectedResponse: func() string { return "" },
 		},
 	}
 
@@ -2476,12 +2497,12 @@ func TestEval(t *testing.T) {
 			err = json.Unmarshal(b, &res)
 			require.NoError(t, err)
 
-			assert.Equal(t, tc.expectedStatusCode, resp.StatusCode)
-			if tc.expectedResponse != "" {
-				require.JSONEq(t, tc.expectedResponse, string(b))
+			assert.Equal(t, tc.expectedStatusCode(), resp.StatusCode)
+			if tc.expectedResponse() != "" {
+				require.JSONEq(t, tc.expectedResponse(), string(b))
 			}
-			if tc.expectedMessage != "" {
-				assert.Equal(t, tc.expectedMessage, res.Message)
+			if tc.expectedMessage() != "" {
+				assert.Equal(t, tc.expectedMessage(), res.Message)
 				assert.NotEmpty(t, res.TraceID)
 			}
 		})
@@ -2491,9 +2512,9 @@ func TestEval(t *testing.T) {
 	testCases = []struct {
 		desc               string
 		payload            string
-		expectedStatusCode int
-		expectedResponse   string
-		expectedMessage    string
+		expectedStatusCode func() int
+		expectedResponse   func() string
+		expectedMessage    func() string
 	}{
 		{
 			desc: "alerting condition",
@@ -2516,8 +2537,10 @@ func TestEval(t *testing.T) {
 				"now": "2021-04-11T14:38:14Z"
 			}
 			`,
-			expectedStatusCode: http.StatusOK,
-			expectedResponse: `{
+			expectedMessage:    func() string { return "" },
+			expectedStatusCode: func() int { return http.StatusOK },
+			expectedResponse: func() string {
+				return `{
 				"results": {
 				  "A": {
 					"frames": [
@@ -2546,7 +2569,8 @@ func TestEval(t *testing.T) {
 					]
 				  }
 				}
-			}`,
+			}`
+			},
 		},
 		{
 			desc: "normal condition",
@@ -2569,8 +2593,10 @@ func TestEval(t *testing.T) {
 				"now": "2021-04-11T14:38:14Z"
 			}
 			`,
-			expectedStatusCode: http.StatusOK,
-			expectedResponse: `{
+			expectedMessage:    func() string { return "" },
+			expectedStatusCode: func() int { return http.StatusOK },
+			expectedResponse: func() string {
+				return `{
 				"results": {
 				  "A": {
 					"frames": [
@@ -2599,7 +2625,8 @@ func TestEval(t *testing.T) {
 					]
 				  }
 				}
-			}`,
+			}`
+			},
 		},
 		{
 			desc: "unknown query datasource",
@@ -2620,8 +2647,19 @@ func TestEval(t *testing.T) {
 				"now": "2021-04-11T14:38:14Z"
 			}
 			`,
-			expectedStatusCode: http.StatusUnauthorized,
-			expectedMessage:    "user is not authorized to query one or many data sources used by the rule",
+			expectedResponse: func() string { return "" },
+			expectedStatusCode: func() int {
+				if setting.IsEnterprise {
+					return http.StatusUnauthorized
+				}
+				return http.StatusBadRequest
+			},
+			expectedMessage: func() string {
+				if setting.IsEnterprise {
+					return "user is not authorized to query one or many data sources used by the rule"
+				}
+				return "invalid queries or expressions: invalid query A: data source not found: unknown"
+			},
 		},
 	}
 
@@ -2642,13 +2680,12 @@ func TestEval(t *testing.T) {
 			err = json.Unmarshal(b, &res)
 			require.NoError(t, err)
 
-			assert.Equal(t, tc.expectedStatusCode, resp.StatusCode)
-			if tc.expectedResponse != "" {
-				require.JSONEq(t, tc.expectedResponse, string(b))
+			assert.Equal(t, tc.expectedStatusCode(), resp.StatusCode)
+			if tc.expectedResponse() != "" {
+				require.JSONEq(t, tc.expectedResponse(), string(b))
 			}
-
-			if tc.expectedMessage != "" {
-				require.Equal(t, tc.expectedMessage, res.Message)
+			if tc.expectedMessage() != "" {
+				require.Equal(t, tc.expectedMessage(), res.Message)
 				require.NotEmpty(t, res.TraceID)
 			}
 		})
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index 5ebd80e79ba..1213bf8bba5 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -17,6 +17,7 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/grafana/grafana/pkg/api"
+	"github.com/grafana/grafana/pkg/extensions"
 	"github.com/grafana/grafana/pkg/infra/fs"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/server"
@@ -35,6 +36,7 @@ func StartGrafanaEnv(t *testing.T, grafDir, cfgPath string) (string, *server.Tes
 	t.Helper()
 	ctx := context.Background()
 
+	setting.IsEnterprise = extensions.IsEnterprise
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	require.NoError(t, err)
 	cmdLineArgs := setting.CommandLineArgs{Config: cfgPath, HomePath: grafDir}

From 7106106e3b07711df3945a7f5bf16f6998bbec2a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 08:21:18 -0400
Subject: [PATCH 019/103] Chore: Convert a test from enzyme to testing library
 (#49492) (#49576)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f93ad85b0892a851ef70e8457e568eee6e134639)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
---
 .betterer.results                              |  3 ---
 .../RichHistory/RichHistoryStarredTab.test.tsx | 18 +++++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 59543858a39..14981d93b13 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -173,9 +173,6 @@ exports[`no enzyme tests`] = {
     "public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.test.tsx:4164297658": [
       [0, 17, 13, "RegExp match", "2409514259"]
     ],
-    "public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx:523695501": [
-      [0, 17, 13, "RegExp match", "2409514259"]
-    ],
     "public/app/features/folders/FolderSettingsPage.test.tsx:1109052730": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
diff --git a/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx b/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
index e0434713f69..4cedf1e8e8f 100644
--- a/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
@@ -1,4 +1,4 @@
-import { mount } from 'enzyme';
+import { render } from '@testing-library/react';
 import React from 'react';
 
 import { SortOrder } from 'app/core/utils/richHistory';
@@ -44,27 +44,27 @@ const setup = (activeDatasourceOnly = false) => {
     },
   };
 
-  const wrapper = mount(<RichHistoryStarredTab {...props} />);
-  return wrapper;
+  const container = render(<RichHistoryStarredTab {...props} />);
+  return container;
 };
 
 describe('RichHistoryStarredTab', () => {
   describe('sorter', () => {
     it('should render sorter', () => {
-      const wrapper = setup();
-      expect(wrapper.find({ 'aria-label': 'Sort queries' })).toHaveLength(1);
+      const container = setup();
+      expect(container.queryByLabelText('Sort queries')).toBeInTheDocument();
     });
   });
 
   describe('select datasource', () => {
     it('should render select datasource if activeDatasourceOnly is false', () => {
-      const wrapper = setup();
-      expect(wrapper.find({ 'aria-label': 'Filter queries for data sources(s)' }).exists()).toBeTruthy();
+      const container = setup();
+      expect(container.queryByLabelText('Filter queries for data sources(s)')).toBeInTheDocument();
     });
 
     it('should not render select datasource if activeDatasourceOnly is true', () => {
-      const wrapper = setup(true);
-      expect(wrapper.find({ 'aria-label': 'Filter queries for data sources(s)' }).exists()).toBeFalsy();
+      const container = setup(true);
+      expect(container.queryByLabelText('Filter queries for data sources(s)')).not.toBeInTheDocument();
     });
   });
 });

From c0286409c6fa7a1c94050c7a02425033bc6bc0e5 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 08:22:24 -0400
Subject: [PATCH 020/103] Query History: Track query history migration failures
 (#49560) (#49577)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a67add52399e1ad7914a3d0d23a1f198c18f80b9)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
---
 public/app/core/utils/richHistory.test.ts    | 17 ++++++++++++++---
 public/app/core/utils/richHistory.ts         | 13 +++++++++----
 public/app/features/explore/state/history.ts |  7 ++++---
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/public/app/core/utils/richHistory.test.ts b/public/app/core/utils/richHistory.test.ts
index cff9ebe501e..9fbfe9b8a72 100644
--- a/public/app/core/utils/richHistory.test.ts
+++ b/public/app/core/utils/richHistory.test.ts
@@ -15,6 +15,7 @@ import {
   deleteQueryInRichHistory,
   migrateQueryHistoryFromLocalStorage,
   SortOrder,
+  LocalStorageMigrationStatus,
 } from './richHistory';
 
 const richHistoryStorageMock: RichHistoryStorage = {} as RichHistoryStorage;
@@ -187,13 +188,23 @@ describe('richHistory', () => {
       const history = { richHistory: [{ id: 'test' }, { id: 'test2' }], total: 2 };
 
       richHistoryLocalStorageMock.getRichHistory.mockReturnValue(history);
-      await migrateQueryHistoryFromLocalStorage();
+      const migrationResult = await migrateQueryHistoryFromLocalStorage();
       expect(richHistoryRemoteStorageMock.migrate).toBeCalledWith(history.richHistory);
+      expect(migrationResult.status).toBe(LocalStorageMigrationStatus.Successful);
+      expect(migrationResult.error).toBeUndefined();
     });
     it('does not migrate if there are no entries', async () => {
-      richHistoryLocalStorageMock.getRichHistory.mockReturnValue([]);
-      await migrateQueryHistoryFromLocalStorage();
+      richHistoryLocalStorageMock.getRichHistory.mockReturnValue({ richHistory: [] });
+      const migrationResult = await migrateQueryHistoryFromLocalStorage();
       expect(richHistoryRemoteStorageMock.migrate).not.toBeCalled();
+      expect(migrationResult.status).toBe(LocalStorageMigrationStatus.NotNeeded);
+      expect(migrationResult.error).toBeUndefined();
+    });
+    it('propagates thrown errors', async () => {
+      richHistoryLocalStorageMock.getRichHistory.mockRejectedValue(new Error('migration failed'));
+      const migrationResult = await migrateQueryHistoryFromLocalStorage();
+      expect(migrationResult.status).toBe(LocalStorageMigrationStatus.Failed);
+      expect(migrationResult.error?.message).toBe('migration failed');
     });
   });
 
diff --git a/public/app/core/utils/richHistory.ts b/public/app/core/utils/richHistory.ts
index 2b86d4305fd..560aa4a95a5 100644
--- a/public/app/core/utils/richHistory.ts
+++ b/public/app/core/utils/richHistory.ts
@@ -131,7 +131,12 @@ export enum LocalStorageMigrationStatus {
   NotNeeded = 'not-needed',
 }
 
-export async function migrateQueryHistoryFromLocalStorage(): Promise<LocalStorageMigrationStatus> {
+export interface LocalStorageMigrationResult {
+  status: LocalStorageMigrationStatus;
+  error?: Error;
+}
+
+export async function migrateQueryHistoryFromLocalStorage(): Promise<LocalStorageMigrationResult> {
   const richHistoryLocalStorage = new RichHistoryLocalStorage();
   const richHistoryRemoteStorage = new RichHistoryRemoteStorage();
 
@@ -145,14 +150,14 @@ export async function migrateQueryHistoryFromLocalStorage(): Promise<LocalStorag
       to: 14,
     });
     if (richHistory.length === 0) {
-      return LocalStorageMigrationStatus.NotNeeded;
+      return { status: LocalStorageMigrationStatus.NotNeeded };
     }
     await richHistoryRemoteStorage.migrate(richHistory);
     dispatch(notifyApp(createSuccessNotification('Query history successfully migrated from local storage')));
-    return LocalStorageMigrationStatus.Successful;
+    return { status: LocalStorageMigrationStatus.Successful };
   } catch (error) {
     dispatch(notifyApp(createWarningNotification(`Query history migration failed. ${error.message}`)));
-    return LocalStorageMigrationStatus.Failed;
+    return { status: LocalStorageMigrationStatus.Failed, error };
   }
 }
 
diff --git a/public/app/features/explore/state/history.ts b/public/app/features/explore/state/history.ts
index 23aba3ee9e5..e0fe9e9ee19 100644
--- a/public/app/features/explore/state/history.ts
+++ b/public/app/features/explore/state/history.ts
@@ -1,7 +1,7 @@
 import { AnyAction, createAction } from '@reduxjs/toolkit';
 
 import { DataQuery, HistoryItem } from '@grafana/data';
-import { config } from '@grafana/runtime';
+import { config, logError } from '@grafana/runtime';
 import { RICH_HISTORY_SETTING_KEYS } from 'app/core/history/richHistoryLocalStorageUtils';
 import store from 'app/core/store';
 import {
@@ -178,9 +178,10 @@ export const initRichHistory = (): ThunkResult<void> => {
     // the migration attempt happens only once per session, and the user is informed about the failure
     // in a way that can help with potential investigation.
     if (config.queryHistoryEnabled && !queriesMigrated && !migrationFailedDuringThisSession) {
-      const migrationStatus = await migrateQueryHistoryFromLocalStorage();
-      if (migrationStatus === LocalStorageMigrationStatus.Failed) {
+      const migrationResult = await migrateQueryHistoryFromLocalStorage();
+      if (migrationResult.status === LocalStorageMigrationStatus.Failed) {
         dispatch(richHistoryMigrationFailedAction());
+        logError(migrationResult.error!, { explore: { event: 'QueryHistoryMigrationFailed' } });
       } else {
         store.set(RICH_HISTORY_SETTING_KEYS.migrated, true);
       }

From 823a3bfbf9a3c39fb9a195f4ba336f75774ad95a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 08:57:20 -0400
Subject: [PATCH 021/103] Prometheus: Migrate annotation editor to react
 (#48814) (#49518)

* Modify the annotation support api

* Migrate annotation editor component

* Update public/app/features/annotations/standardAnnotationSupport.ts

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* Move the escape hatches out of the public API

* Fix props transforms

* Break import cycle

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 4124294011a54fa3bf209dcf2cf8b38a71abf1d4)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
---
 .../grafana-data/src/types/annotations.ts     |  10 +-
 .../StandardAnnotationQueryEditor.tsx         |  21 ++-
 .../annotations/standardAnnotationSupport.ts  |  28 +++-
 .../AnnotationsQueryRunner.ts                 |   2 +-
 .../LegacyAnnotationQueryRunner.ts            |   5 +
 .../components/LokiQueryEditorSelector.tsx    |  10 +-
 .../components/AnnotationQueryEditor.tsx      | 121 ++++++++++++++++++
 .../datasource/prometheus/datasource.tsx      |   9 ++
 .../components/LabelParamEditor.tsx           |   5 +-
 .../PromQueryBuilderOptions.test.tsx          |   8 ++
 .../components/PromQueryBuilderOptions.tsx    | 105 +++++++++------
 .../components/PromQueryEditorSelector.tsx    |  62 +++++++--
 .../shared/QueryEditorModeToggle.tsx          |  10 +-
 13 files changed, 324 insertions(+), 72 deletions(-)
 create mode 100644 public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx

diff --git a/packages/grafana-data/src/types/annotations.ts b/packages/grafana-data/src/types/annotations.ts
index e701b6b3841..f5c3a72c51b 100644
--- a/packages/grafana-data/src/types/annotations.ts
+++ b/packages/grafana-data/src/types/annotations.ts
@@ -77,6 +77,12 @@ export interface AnnotationEventFieldMapping {
 }
 
 export type AnnotationEventMappings = Partial<Record<keyof AnnotationEvent, AnnotationEventFieldMapping>>;
+type AnnotationQueryEditorProps<TQuery extends DataQuery> = QueryEditorProps<any, TQuery> & {
+  // Needs to be optional otherwise component not using these cannot be used, even though they are passed on and can be
+  // just ignored if not used.
+  annotation?: AnnotationQuery<TQuery>;
+  onAnnotationChange?: (annotation: AnnotationQuery<TQuery>) => void;
+};
 
 /**
  * Since Grafana 7.2
@@ -86,7 +92,7 @@ export type AnnotationEventMappings = Partial<Record<keyof AnnotationEvent, Anno
 export interface AnnotationSupport<TQuery extends DataQuery = DataQuery, TAnno = AnnotationQuery<TQuery>> {
   /**
    * This hook lets you manipulate any existing stored values before running them though the processor.
-   * This is particularly helpful when dealing with migrating old formats.  ie query as a string vs object
+   * This is particularly helpful when dealing with migrating old formats.  ie query as a string vs object.
    */
   prepareAnnotation?(json: any): TAnno;
 
@@ -105,5 +111,5 @@ export interface AnnotationSupport<TQuery extends DataQuery = DataQuery, TAnno =
   /**
    * Specify a custom QueryEditor for the annotation page.  If not specified, the standard one will be used
    */
-  QueryEditor?: ComponentType<QueryEditorProps<any, TQuery>>;
+  QueryEditor?: ComponentType<AnnotationQueryEditorProps<TQuery>>;
 }
diff --git a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
index 3cf223b504c..3d4b60e2fad 100644
--- a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
+++ b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
@@ -9,7 +9,7 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { PanelModel } from 'app/features/dashboard/state';
 
 import { executeAnnotationQuery } from '../executeAnnotationQuery';
-import { standardAnnotationSupport } from '../standardAnnotationSupport';
+import { shouldUseLegacyRunner, shouldUseMappingUI, standardAnnotationSupport } from '../standardAnnotationSupport';
 import { AnnotationQueryResponse } from '../types';
 
 import { AnnotationFieldMapper } from './AnnotationResultMapper';
@@ -33,7 +33,7 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
   }
 
   componentDidUpdate(oldProps: Props) {
-    if (this.props.annotation !== oldProps.annotation) {
+    if (this.props.annotation !== oldProps.annotation && !shouldUseLegacyRunner(this.props.datasource)) {
       this.verifyDataSource();
     }
   }
@@ -57,6 +57,13 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
 
   onRunQuery = async () => {
     const { datasource, annotation } = this.props;
+    if (shouldUseLegacyRunner(datasource)) {
+      // In the new UI the running of query is done so the data can be mapped. In the legacy annotations this does
+      // not exist as the annotationQuery already returns annotation events which cannot be mapped. This means that
+      // right now running a query for data source with legacy runner does not make much sense.
+      return;
+    }
+
     const dashboard = getDashboardSrv().getCurrent();
     if (!dashboard) {
       return;
@@ -156,11 +163,15 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
     );
   }
 
+  onAnnotationChange = (annotation: AnnotationQuery) => {
+    this.props.onChange(annotation);
+  };
+
   render() {
     const { datasource, annotation } = this.props;
     const { response } = this.state;
 
-    // Find the annotaiton runner
+    // Find the annotation runner
     let QueryEditor = datasource.annotations?.QueryEditor || datasource.components?.QueryEditor;
     if (!QueryEditor) {
       return <div>Annotations are not supported. This datasource needs to export a QueryEditor</div>;
@@ -177,8 +188,10 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
           onRunQuery={this.onRunQuery}
           data={response?.panelData}
           range={getTimeSrv().timeRange()}
+          annotation={annotation}
+          onAnnotationChange={this.onAnnotationChange}
         />
-        {datasource.type !== 'datasource' && (
+        {shouldUseMappingUI(datasource) && (
           <>
             {this.renderStatus()}
             <AnnotationFieldMapper response={response} mappings={annotation.mappings} change={this.onMappingChange} />
diff --git a/public/app/features/annotations/standardAnnotationSupport.ts b/public/app/features/annotations/standardAnnotationSupport.ts
index 079a506a94b..710ded708ed 100644
--- a/public/app/features/annotations/standardAnnotationSupport.ts
+++ b/public/app/features/annotations/standardAnnotationSupport.ts
@@ -9,6 +9,7 @@ import {
   AnnotationQuery,
   AnnotationSupport,
   DataFrame,
+  DataSourceApi,
   Field,
   FieldType,
   getFieldDisplayName,
@@ -26,6 +27,7 @@ export const standardAnnotationSupport: AnnotationSupport = {
       return {
         ...rest,
         target: {
+          refId: 'annotation_query',
           query,
         },
         mappings: {},
@@ -35,14 +37,12 @@ export const standardAnnotationSupport: AnnotationSupport = {
   },
 
   /**
-   * Convert the stored JSON model and environment to a standard data source query object.
-   * This query will be executed in the data source and the results converted into events.
-   * Returning an undefined result will quietly skip query execution
+   * Default will just return target from the annotation.
    */
   prepareQuery: (anno: AnnotationQuery) => anno.target,
 
   /**
-   * When the standard frame > event processing is insufficient, this allows explicit control of the mappings
+   * Provides default processing from dataFrame to annotation events.
    */
   processEvents: (anno: AnnotationQuery, data: DataFrame[]) => {
     return getAnnotationsFromData(data, anno.mappings);
@@ -50,7 +50,7 @@ export const standardAnnotationSupport: AnnotationSupport = {
 };
 
 /**
- * Flatten all panel data into a single frame
+ * Flatten all frames into a single frame with mergeTransformer.
  */
 
 export function singleFrameFromPanelData(): OperatorFunction<DataFrame[], DataFrame | undefined> {
@@ -226,3 +226,21 @@ export function getAnnotationsFromData(
     })
   );
 }
+
+// These opt outs are here only for quicker and easier migration to react based annotations editors and because
+// annotation support API needs some work to support less "standard" editors like prometheus and here it is not
+// polluting public API.
+
+/**
+ * Opt out of using the default mapping functionality on frontend.
+ */
+export function shouldUseMappingUI(datasource: DataSourceApi): boolean {
+  return datasource.type !== 'prometheus';
+}
+
+/**
+ * Use legacy runner. Used only as an escape hatch for easier transition to React based annotation editor.
+ */
+export function shouldUseLegacyRunner(datasource: DataSourceApi): boolean {
+  return datasource.type === 'prometheus';
+}
diff --git a/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.ts b/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.ts
index 4eadff44e59..05b5bf7a3bc 100644
--- a/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.ts
@@ -15,7 +15,7 @@ export class AnnotationsQueryRunner implements AnnotationQueryRunner {
       return false;
     }
 
-    return !Boolean(datasource.annotationQuery && !datasource.annotations);
+    return Boolean(!datasource.annotationQuery || datasource.annotations);
   }
 
   run({ annotation, datasource, dashboard, range }: AnnotationQueryRunnerOptions): Observable<AnnotationEvent[]> {
diff --git a/public/app/features/query/state/DashboardQueryRunner/LegacyAnnotationQueryRunner.ts b/public/app/features/query/state/DashboardQueryRunner/LegacyAnnotationQueryRunner.ts
index 5d94911b9ab..f383897f5d9 100644
--- a/public/app/features/query/state/DashboardQueryRunner/LegacyAnnotationQueryRunner.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/LegacyAnnotationQueryRunner.ts
@@ -2,6 +2,7 @@ import { from, Observable, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 import { AnnotationEvent, DataSourceApi } from '@grafana/data';
+import { shouldUseLegacyRunner } from 'app/features/annotations/standardAnnotationSupport';
 
 import { AnnotationQueryRunner, AnnotationQueryRunnerOptions } from './types';
 import { handleAnnotationQueryRunnerError } from './utils';
@@ -12,6 +13,10 @@ export class LegacyAnnotationQueryRunner implements AnnotationQueryRunner {
       return false;
     }
 
+    if (shouldUseLegacyRunner(datasource)) {
+      return true;
+    }
+
     return Boolean(datasource.annotationQuery && !datasource.annotations);
   }
 
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
index 4f43cf5e0d3..fbb5f1d4f82 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
@@ -99,7 +99,15 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
         >
           Run query
         </Button>
-        <QueryEditorModeToggle mode={editorMode!} onChange={onEditorModeChange} />
+        <QueryEditorModeToggle
+          mode={editorMode!}
+          onChange={onEditorModeChange}
+          uiOptions={{
+            [QueryEditorMode.Explain]: true,
+            [QueryEditorMode.Code]: true,
+            [QueryEditorMode.Builder]: true,
+          }}
+        />
       </EditorHeader>
       <Space v={0.5} />
       <EditorRows>
diff --git a/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
new file mode 100644
index 00000000000..cd7bfc987d4
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
@@ -0,0 +1,121 @@
+import React from 'react';
+
+import { AnnotationQuery } from '@grafana/data';
+import { EditorRow, EditorField, EditorSwitch, Space } from '@grafana/experimental';
+import { Input } from '@grafana/ui';
+
+import { PromQueryEditorSelector } from '../querybuilder/components/PromQueryEditorSelector';
+import { QueryEditorMode } from '../querybuilder/shared/types';
+import { PromQuery } from '../types';
+
+import { PromQueryEditorProps } from './types';
+
+type Props = PromQueryEditorProps & {
+  annotation?: AnnotationQuery<PromQuery>;
+  onAnnotationChange?: (annotation: AnnotationQuery<PromQuery>) => void;
+};
+
+export function AnnotationQueryEditor(props: Props) {
+  // This is because of problematic typing. See AnnotationQueryEditorProps in grafana-data/annotations.ts.
+  const annotation = props.annotation!;
+  const onAnnotationChange = props.onAnnotationChange!;
+  return (
+    <>
+      <PromQueryEditorSelector
+        {...props}
+        query={{ expr: annotation.expr, refId: annotation.name, interval: annotation.step }}
+        onChange={(query) =>
+          onAnnotationChange({
+            ...annotation,
+            expr: query.expr,
+            step: query.interval,
+          })
+        }
+        uiOptions={{
+          modes: {
+            [QueryEditorMode.Explain]: false,
+            [QueryEditorMode.Code]: true,
+            [QueryEditorMode.Builder]: true,
+          },
+          runQueryButton: false,
+          options: {
+            exemplars: false,
+            type: false,
+            format: false,
+            minStep: true,
+            legend: false,
+            resolution: false,
+          },
+        }}
+      />
+      <Space v={0.5} />
+      <EditorRow>
+        <EditorField
+          label="Title"
+          tooltip={
+            'Use either the name or a pattern. For example, {{instance}} is replaced with label value for the label instance.'
+          }
+        >
+          <Input
+            type="text"
+            placeholder="alertname"
+            value={annotation.titleFormat}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                titleFormat: event.currentTarget.value,
+              });
+            }}
+          />
+        </EditorField>
+        <EditorField label="Tags">
+          <Input
+            type="text"
+            placeholder="label1,label2"
+            value={annotation.tagKeys}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                tagKeys: event.currentTarget.value,
+              });
+            }}
+          />
+        </EditorField>
+        <EditorField
+          label="Text"
+          tooltip={
+            'Use either the name or a pattern. For example, {{instance}} is replaced with label value for the label instance.'
+          }
+        >
+          <Input
+            type="text"
+            placeholder="instance"
+            value={annotation.textFormat}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                textFormat: event.currentTarget.value,
+              });
+            }}
+          />
+        </EditorField>
+        <EditorField
+          label="Series value as timestamp"
+          tooltip={
+            'The unit of timestamp is milliseconds. If the unit of the series value is seconds, multiply its range vector by 1000.'
+          }
+        >
+          <EditorSwitch
+            value={annotation.useValueForTime}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                useValueForTime: event.currentTarget.value,
+              });
+            }}
+          />
+        </EditorField>
+      </EditorRow>
+    </>
+  );
+}
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index 420d203c817..209112270d2 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -40,6 +40,7 @@ import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_sr
 import { PromApplication, PromApiFeatures } from 'app/types/unified-alerting-dto';
 
 import { addLabelToQuery } from './add_label_to_query';
+import { AnnotationQueryEditor } from './components/AnnotationQueryEditor';
 import PrometheusLanguageProvider from './language_provider';
 import { expandRecordingRules } from './language_utils';
 import { renderLegendFormat } from './legend';
@@ -119,6 +120,14 @@ export class PrometheusDatasource
     this.customQueryParameters = new URLSearchParams(instanceSettings.jsonData.customQueryParameters);
     this.variables = new PrometheusVariableSupport(this, this.templateSrv, this.timeSrv);
     this.exemplarsAvailable = true;
+
+    // This needs to be here and cannot be static because of how annotations typing affects casting of data source
+    // objects to DataSourceApi types.
+    // We don't use the default processing for prometheus.
+    // See standardAnnotationSupport.ts/[shouldUseMappingUI|shouldUseLegacyRunner]
+    this.annotations = {
+      QueryEditor: AnnotationQueryEditor,
+    };
   }
 
   init = async () => {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
index ab95e2798e4..941bb1e11f3 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
@@ -3,7 +3,6 @@ import React, { useState } from 'react';
 import { DataSourceApi, SelectableValue, toOption } from '@grafana/data';
 import { Select } from '@grafana/ui';
 
-import { PrometheusDatasource } from '../../datasource';
 import { promQueryModeller } from '../PromQueryModeller';
 import { getOperationParamId } from '../shared/operationUtils';
 import { QueryBuilderLabelFilter, QueryBuilderOperationParamEditorProps } from '../shared/types';
@@ -49,8 +48,8 @@ async function loadGroupByLabels(
 ): Promise<Array<SelectableValue<any>>> {
   let labels: QueryBuilderLabelFilter[] = query.labels;
 
-  // This function is used by both Prometheus and Loki and this the only difference
-  if (datasource instanceof PrometheusDatasource) {
+  // This function is used by both Prometheus and Loki and this the only difference.
+  if (datasource.type === 'prometheus') {
     labels = [{ label: '__name__', op: '=', value: query.metric }, ...query.labels];
   }
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.test.tsx
index a4df0c00284..9fc5fe05d38 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.test.tsx
@@ -78,6 +78,14 @@ function setup(queryOverrides: Partial<PromQuery> = {}) {
     },
     onRunQuery: jest.fn(),
     onChange: jest.fn(),
+    uiOptions: {
+      exemplars: true,
+      type: true,
+      format: true,
+      minStep: true,
+      legend: true,
+      resolution: true,
+    },
   };
 
   const { container } = render(<PromQueryBuilderOptions {...props} />);
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
index 67ef8b17e7b..17b3b296eea 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
@@ -12,14 +12,24 @@ import { QueryOptionGroup } from '../shared/QueryOptionGroup';
 
 import { getLegendModeLabel, PromQueryLegendEditor } from './PromQueryLegendEditor';
 
+export interface UIOptions {
+  exemplars: boolean;
+  type: boolean;
+  format: boolean;
+  minStep: boolean;
+  legend: boolean;
+  resolution: boolean;
+}
+
 export interface Props {
   query: PromQuery;
   app?: CoreApp;
   onChange: (update: PromQuery) => void;
   onRunQuery: () => void;
+  uiOptions: UIOptions;
 }
 
-export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange, onRunQuery }) => {
+export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange, onRunQuery, uiOptions }) => {
   const onChangeFormat = (value: SelectableValue<string>) => {
     onChange({ ...query, format: value.value });
     onRunQuery();
@@ -50,42 +60,53 @@ export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange
 
   return (
     <EditorRow>
-      <QueryOptionGroup title="Options" collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel)}>
-        <PromQueryLegendEditor
-          legendFormat={query.legendFormat}
-          onChange={(legendFormat) => onChange({ ...query, legendFormat })}
-          onRunQuery={onRunQuery}
-        />
-        <EditorField
-          label="Min step"
-          tooltip={
-            <>
-              An additional lower limit for the step parameter of the Prometheus query and for the{' '}
-              <code>$__interval</code> and <code>$__rate_interval</code> variables.
-            </>
-          }
-        >
-          <AutoSizeInput
-            type="text"
-            aria-label="Set lower limit for the step parameter"
-            placeholder={'auto'}
-            minWidth={10}
-            onCommitChange={onChangeStep}
-            defaultValue={query.interval}
+      <QueryOptionGroup
+        title="Options"
+        collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel, uiOptions)}
+      >
+        {uiOptions.legend && (
+          <PromQueryLegendEditor
+            legendFormat={query.legendFormat}
+            onChange={(legendFormat) => onChange({ ...query, legendFormat })}
+            onRunQuery={onRunQuery}
           />
-        </EditorField>
-        <EditorField label="Format">
-          <Select value={formatOption} allowCustomValue onChange={onChangeFormat} options={FORMAT_OPTIONS} />
-        </EditorField>
-        <EditorField label="Type">
-          <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
-        </EditorField>
-        {shouldShowExemplarSwitch(query, app) && (
+        )}
+        {uiOptions.minStep && (
+          <EditorField
+            label="Min step"
+            tooltip={
+              <>
+                An additional lower limit for the step parameter of the Prometheus query and for the{' '}
+                <code>$__interval</code> and <code>$__rate_interval</code> variables.
+              </>
+            }
+          >
+            <AutoSizeInput
+              type="text"
+              aria-label="Set lower limit for the step parameter"
+              placeholder={'auto'}
+              minWidth={10}
+              onCommitChange={onChangeStep}
+              defaultValue={query.interval}
+            />
+          </EditorField>
+        )}
+        {uiOptions.format && (
+          <EditorField label="Format">
+            <Select value={formatOption} allowCustomValue onChange={onChangeFormat} options={FORMAT_OPTIONS} />
+          </EditorField>
+        )}
+        {uiOptions.type && (
+          <EditorField label="Type">
+            <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
+          </EditorField>
+        )}
+        {uiOptions.exemplars && shouldShowExemplarSwitch(query, app) && (
           <EditorField label="Exemplars">
             <EditorSwitch value={query.exemplar} onChange={onExemplarChange} />
           </EditorField>
         )}
-        {query.intervalFactor && query.intervalFactor > 1 && (
+        {uiOptions.resolution && query.intervalFactor && query.intervalFactor > 1 && (
           <EditorField label="Resolution">
             <Select
               aria-label="Select resolution"
@@ -113,19 +134,23 @@ function getQueryTypeValue(query: PromQuery) {
   return query.range && query.instant ? 'both' : query.instant ? 'instant' : 'range';
 }
 
-function getCollapsedInfo(query: PromQuery, formatOption: string, queryType: string): string[] {
+function getCollapsedInfo(query: PromQuery, formatOption: string, queryType: string, uiOptions: UIOptions): string[] {
   const items: string[] = [];
 
-  items.push(`Legend: ${getLegendModeLabel(query.legendFormat)}`);
-  items.push(`Format: ${formatOption}`);
-
-  if (query.interval) {
+  if (uiOptions.legend) {
+    items.push(`Legend: ${getLegendModeLabel(query.legendFormat)}`);
+  }
+  if (uiOptions.format) {
+    items.push(`Format: ${formatOption}`);
+  }
+  if (uiOptions.minStep && query.interval) {
     items.push(`Step ${query.interval}`);
   }
+  if (uiOptions.type) {
+    items.push(`Type: ${queryType}`);
+  }
 
-  items.push(`Type: ${queryType}`);
-
-  if (query.exemplar) {
+  if (uiOptions.exemplars && query.exemplar) {
     items.push(`Exemplars: true`);
   }
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
index 1c0d61b519a..902faa84b5c 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
@@ -10,17 +10,43 @@ import { PromQuery } from '../../types';
 import { promQueryModeller } from '../PromQueryModeller';
 import { buildVisualQueryFromString } from '../parsing';
 import { FeedbackLink } from '../shared/FeedbackLink';
-import { QueryEditorModeToggle } from '../shared/QueryEditorModeToggle';
+import { QueryEditorModeToggle, UIOptions as ModeToggleUIOptions } from '../shared/QueryEditorModeToggle';
 import { QueryHeaderSwitch } from '../shared/QueryHeaderSwitch';
 import { QueryEditorMode } from '../shared/types';
 import { changeEditorMode, getQueryWithDefaults } from '../state';
 
 import { PromQueryBuilderContainer } from './PromQueryBuilderContainer';
 import { PromQueryBuilderExplained } from './PromQueryBuilderExplained';
-import { PromQueryBuilderOptions } from './PromQueryBuilderOptions';
+import { PromQueryBuilderOptions, UIOptions as OptionsUIOptions } from './PromQueryBuilderOptions';
 import { PromQueryCodeEditor } from './PromQueryCodeEditor';
 
-export const PromQueryEditorSelector = React.memo<PromQueryEditorProps>((props) => {
+interface UIOptions {
+  modes: ModeToggleUIOptions;
+  runQueryButton: boolean;
+  options: OptionsUIOptions;
+}
+
+const defaultOptions: UIOptions = {
+  modes: {
+    [QueryEditorMode.Explain]: true,
+    [QueryEditorMode.Code]: true,
+    [QueryEditorMode.Builder]: true,
+  },
+  runQueryButton: true,
+  options: {
+    exemplars: true,
+    type: true,
+    format: true,
+    minStep: true,
+    legend: true,
+    resolution: true,
+  },
+};
+
+type Props = PromQueryEditorProps & { uiOptions?: UIOptions };
+
+export const PromQueryEditorSelector = React.memo<Props>((props) => {
+  const uiOptions = props.uiOptions || defaultOptions;
   const { onChange, onRunQuery, data, app } = props;
   const [parseModalOpen, setParseModalOpen] = useState(false);
   const [dataIsStale, setDataIsStale] = useState(false);
@@ -104,16 +130,18 @@ export const PromQueryEditorSelector = React.memo<PromQueryEditorProps>((props)
           <FeedbackLink feedbackUrl="https://github.com/grafana/grafana/discussions/47693" />
         )}
         <FlexItem grow={1} />
-        <Button
-          variant={dataIsStale ? 'primary' : 'secondary'}
-          size="sm"
-          onClick={onRunQuery}
-          icon={data?.state === LoadingState.Loading ? 'fa fa-spinner' : undefined}
-          disabled={data?.state === LoadingState.Loading}
-        >
-          Run query
-        </Button>
-        <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} />
+        {uiOptions.runQueryButton && (
+          <Button
+            variant={dataIsStale ? 'primary' : 'secondary'}
+            size="sm"
+            onClick={onRunQuery}
+            icon={data?.state === LoadingState.Loading ? 'fa fa-spinner' : undefined}
+            disabled={data?.state === LoadingState.Loading}
+          >
+            Run query
+          </Button>
+        )}
+        <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} uiOptions={uiOptions.modes} />
       </EditorHeader>
       <Space v={0.5} />
       <EditorRows>
@@ -129,7 +157,13 @@ export const PromQueryEditorSelector = React.memo<PromQueryEditorProps>((props)
         )}
         {editorMode === QueryEditorMode.Explain && <PromQueryBuilderExplained query={query.expr} />}
         {editorMode !== QueryEditorMode.Explain && (
-          <PromQueryBuilderOptions query={query} app={props.app} onChange={onChange} onRunQuery={onRunQuery} />
+          <PromQueryBuilderOptions
+            query={query}
+            app={props.app}
+            onChange={onChange}
+            onRunQuery={onRunQuery}
+            uiOptions={uiOptions.options}
+          />
         )}
       </EditorRows>
     </>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
index 22070b1d595..abf84395bea 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
@@ -5,9 +5,14 @@ import { RadioButtonGroup, Tag } from '@grafana/ui';
 
 import { QueryEditorMode } from './types';
 
+export type UIOptions = {
+  [key in QueryEditorMode]: boolean;
+};
+
 export interface Props {
   mode: QueryEditorMode;
   onChange: (mode: QueryEditorMode) => void;
+  uiOptions: UIOptions;
 }
 
 const editorModes = [
@@ -30,10 +35,11 @@ const editorModes = [
   { label: 'Code', value: QueryEditorMode.Code },
 ];
 
-export function QueryEditorModeToggle({ mode, onChange }: Props) {
+export function QueryEditorModeToggle({ mode, onChange, uiOptions }: Props) {
+  const modes = editorModes.filter((m) => uiOptions[m.value]);
   return (
     <div data-testid={'QueryEditorModeToggle'}>
-      <RadioButtonGroup options={editorModes} size="sm" value={mode} onChange={onChange} />
+      <RadioButtonGroup options={modes} size="sm" value={mode} onChange={onChange} />
     </div>
   );
 }

From 961a8c23de5b6e11c7fb1b7227a498061d52d8ae Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 11:54:38 -0400
Subject: [PATCH 022/103] fix broken alias due to #48635 (#49623) (#49626)

(cherry picked from commit f40248a06d41392758217b4382268d3a30e02551)

Co-authored-by: Dan Cech <dcech@grafana.com>
---
 docs/sources/enterprise/access-control/about-rbac.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/sources/enterprise/access-control/about-rbac.md b/docs/sources/enterprise/access-control/about-rbac.md
index d804e78f626..4eefb2cd96e 100644
--- a/docs/sources/enterprise/access-control/about-rbac.md
+++ b/docs/sources/enterprise/access-control/about-rbac.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/', '/docs/grafana/latest/enterprise/access-control/roles/
+  - /docs/grafana/latest/enterprise/access-control/
+  - /docs/grafana/latest/enterprise/access-control/roles/
   - /docs/grafana/latest/enterprise/access-control/about-rbac/
 description: Role-based access control (RBAC) provides a standardized way of granting,
   changing, and revoking access so that users can view and modify Grafana resources,

From f966aa3474f465cbc98acc303d9fa5d7d4c08c4e Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 11:56:52 -0400
Subject: [PATCH 023/103] Apply .page-toolbar class correctly (#49603) (#49627)

(cherry picked from commit a0b707ebe0807f286fabb5a6462fc205459803d1)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 public/sass/components/_view_states.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss
index b7e15c0701d..ad87d3621c1 100644
--- a/public/sass/components/_view_states.scss
+++ b/public/sass/components/_view_states.scss
@@ -56,7 +56,7 @@
 }
 
 @include media-breakpoint-down(sm) {
-  div.page-toolbar {
+  nav.page-toolbar {
     padding-left: 53px;
 
     &--fullscreen {

From 9e622ec87c542df1eb349d065dffbc52099696fa Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Wed, 25 May 2022 12:27:19 -0400
Subject: [PATCH 024/103] Docs: What's new 9.0 (#49453) (#49628)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* initial commit

* Add to index list

* Improvements to intro section

* missing plural

* Minor fixes

* Some more changes.

* Updated image links

* Hide section "InfluxDB: Support for browser access mode removed

* Checkin more changes

* More changes.

* Fixed more image links

* Last batch of changes

* Fixed a few typos and ran prettier.

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 docs/sources/whatsnew/_index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md
index cc674ab767b..f315e852118 100644
--- a/docs/sources/whatsnew/_index.md
+++ b/docs/sources/whatsnew/_index.md
@@ -9,6 +9,10 @@ weight = 1
 Grafana is changing all the time. For release highlights checkout links below, if you want a complete list of every change, as well
 as info on deprecations, breaking changes and plugin development read the [release notes]({{< relref "../release-notes" >}}).
 
+## Grafana 9
+
+- [What's new in 9.0]({{< relref "whats-new-in-v9-0" >}})
+
 ## Grafana 8
 
 - [What's new in 8.5]({{< relref "whats-new-in-v8-5" >}})

From 0cc75cc593a0ed366d644397946aaef8dc2d6dc1 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 12:36:21 -0400
Subject: [PATCH 025/103] show notification tab only to editor (#49624)
 (#49632)

(cherry picked from commit 307c207a24fcb10cb0b35f04fa4ee2a631a0240f)

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
---
 pkg/api/index.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index ae153feccdd..b68169179ef 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -242,7 +242,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool, prefs *
 	uaVisibleForOrg := hs.Cfg.UnifiedAlerting.IsEnabled() && !uaIsDisabledForOrg
 
 	if setting.AlertingEnabled != nil && *setting.AlertingEnabled {
-		navTree = append(navTree, hs.buildLegacyAlertNavLinks()...)
+		navTree = append(navTree, hs.buildLegacyAlertNavLinks(c)...)
 	} else if uaVisibleForOrg {
 		navTree = append(navTree, hs.buildAlertNavLinks(c)...)
 	}
@@ -512,15 +512,18 @@ func (hs *HTTPServer) buildDashboardNavLinks(c *models.ReqContext, hasEditPerm b
 	return dashboardChildNavs
 }
 
-func (hs *HTTPServer) buildLegacyAlertNavLinks() []*dtos.NavLink {
+func (hs *HTTPServer) buildLegacyAlertNavLinks(c *models.ReqContext) []*dtos.NavLink {
 	var alertChildNavs []*dtos.NavLink
 	alertChildNavs = append(alertChildNavs, &dtos.NavLink{
 		Text: "Alert rules", Id: "alert-list", Url: hs.Cfg.AppSubURL + "/alerting/list", Icon: "list-ul",
 	})
-	alertChildNavs = append(alertChildNavs, &dtos.NavLink{
-		Text: "Notification channels", Id: "channels", Url: hs.Cfg.AppSubURL + "/alerting/notifications",
-		Icon: "comment-alt-share",
-	})
+
+	if c.HasRole(models.ROLE_EDITOR) {
+		alertChildNavs = append(alertChildNavs, &dtos.NavLink{
+			Text: "Notification channels", Id: "channels", Url: hs.Cfg.AppSubURL + "/alerting/notifications",
+			Icon: "comment-alt-share",
+		})
+	}
 
 	return []*dtos.NavLink{
 		{

From 8f8be23032183ff1b2bd865b76546de8422cdc11 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 12:43:43 -0400
Subject: [PATCH 026/103] Canvas: Fix resize breaking certain constraints
 (#49551) (#49553)

Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
---
 public/app/features/canvas/runtime/element.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/features/canvas/runtime/element.tsx b/public/app/features/canvas/runtime/element.tsx
index 4b05a059308..4c03faec006 100644
--- a/public/app/features/canvas/runtime/element.tsx
+++ b/public/app/features/canvas/runtime/element.tsx
@@ -114,6 +114,7 @@ export class ElementState implements LayerElement {
         style.top = `${placement.top}px`;
         style.bottom = `${placement.bottom}px`;
         delete placement.height;
+        style.height = '';
         break;
       case VerticalConstraint.Center:
         placement.top = placement.top ?? 0;
@@ -129,6 +130,7 @@ export class ElementState implements LayerElement {
         style.top = `${placement.top}%`;
         style.bottom = `${placement.bottom}%`;
         delete placement.height;
+        style.height = '';
         break;
     }
 
@@ -153,6 +155,7 @@ export class ElementState implements LayerElement {
         style.left = `${placement.left}px`;
         style.right = `${placement.right}px`;
         delete placement.width;
+        style.width = '';
         break;
       case HorizontalConstraint.Center:
         placement.left = placement.left ?? 0;
@@ -168,6 +171,7 @@ export class ElementState implements LayerElement {
         style.left = `${placement.left}%`;
         style.right = `${placement.right}%`;
         delete placement.width;
+        style.width = '';
         break;
     }
 

From 1d4e2d12da2a4a79c0dc18006e755be8ee26ed97 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 13:12:24 -0400
Subject: [PATCH 027/103] Prometheus: Enable prometheusStreamingJSONParser by
 default (#49475) (#49636)

(cherry picked from commit 70b3a0a5004b342ddbd563b1cdefc45eb8e5966c)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
---
 pkg/services/featuremgmt/registry.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 7e0b0066c38..e1339fcf635 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -241,7 +241,8 @@ var (
 		{
 			Name:        "prometheusStreamingJSONParser",
 			Description: "Enable streaming JSON parser for Prometheus datasource",
-			State:       FeatureStateAlpha,
+			State:       FeatureStateBeta,
+			Expression:  "true", // Enabled by default
 		},
 		{
 			Name:            "validateDashboardsOnSave",

From 4bd6f62dfd19df7e0ecbff9bbb915ecd7f87fea9 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 14:59:47 -0400
Subject: [PATCH 028/103] AccessControl: Replace IsEnterprise checks with
 license checks (#49572) (#49646)

(cherry picked from commit 5caf97be40341e506c742fef8ea69297e65330b5)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 pkg/api/api.go                                |  4 +-
 pkg/api/common_test.go                        |  7 ++-
 pkg/api/org_users.go                          |  9 ++--
 pkg/models/org_user.go                        |  2 +
 .../ossaccesscontrol/permissions_services.go  | 12 ++---
 .../accesscontrol/resourcepermissions/api.go  |  2 +-
 .../resourcepermissions/service.go            | 15 ++++--
 .../resourcepermissions/service_test.go       |  9 +++-
 .../guardian/accesscontrol_guardian_test.go   |  8 ++-
 pkg/services/licensing/licensingtest/fake.go  | 52 +++++++++++++++++++
 pkg/services/sqlstore/org_users.go            |  3 +-
 11 files changed, 98 insertions(+), 25 deletions(-)
 create mode 100644 pkg/services/licensing/licensingtest/fake.go

diff --git a/pkg/api/api.go b/pkg/api/api.go
index d017b7d8465..5f691bbaf08 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -250,15 +250,15 @@ func (hs *HTTPServer) registerRoutes() {
 		// current org without requirement of user to be org admin
 		apiRoute.Group("/org", func(orgRoute routing.RouteRegister) {
 			lookupEvaluator := func() ac.Evaluator {
-				if hs.Cfg.IsEnterprise {
+				if hs.License.FeatureEnabled("accesscontrol.enforcement") {
 					return ac.EvalPermission(ac.ActionOrgUsersRead)
 				}
 				// For oss we allow users with access to update permissions on either folders, teams or dashboards to perform the lookup
 				return ac.EvalAny(
 					ac.EvalPermission(ac.ActionOrgUsersRead),
 					ac.EvalPermission(ac.ActionTeamsPermissionsWrite),
-					ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite),
 					ac.EvalPermission(dashboards.ActionFoldersPermissionsWrite),
+					ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite),
 				)
 			}
 			orgRoute.Get("/users/lookup", authorize(reqOrgAdminFolderAdminOrTeamAdmin, lookupEvaluator()), routing.Wrap(hs.GetOrgUsersForCurrentOrgLookup))
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 6e0f28266a7..9fc72999a08 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -236,6 +236,7 @@ func setupAccessControlScenarioContext(t *testing.T, cfg *setting.Cfg, url strin
 	hs := &HTTPServer{
 		Cfg:                cfg,
 		Live:               newTestLive(t, store),
+		License:            &licensing.OSSLicensingService{},
 		Features:           featuremgmt.WithFeatures(),
 		QuotaService:       &quota.QuotaService{Cfg: cfg},
 		RouteRegister:      routing.NewRouteRegister(),
@@ -325,6 +326,7 @@ func setupSimpleHTTPServer(features *featuremgmt.FeatureManager) *HTTPServer {
 	return &HTTPServer{
 		Cfg:           cfg,
 		Features:      features,
+		License:       &licensing.OSSLicensingService{},
 		AccessControl: accesscontrolmock.New().WithDisabled(),
 	}
 }
@@ -388,7 +390,7 @@ func setupHTTPServerWithCfgDb(t *testing.T, useFakeAccessControl, enableAccessCo
 			acmock = acmock.WithDisabled()
 		}
 		hs.AccessControl = acmock
-		teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, acmock, database.ProvideService(db))
+		teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, acmock, database.ProvideService(db), hs.License)
 		require.NoError(t, err)
 		hs.teamPermissionsService = teamPermissionService
 	} else {
@@ -400,7 +402,7 @@ func setupHTTPServerWithCfgDb(t *testing.T, useFakeAccessControl, enableAccessCo
 		require.NoError(t, err)
 		err = ac.RegisterFixedRoles(context.Background())
 		require.NoError(t, err)
-		teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, ac, database.ProvideService(db))
+		teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, ac, database.ProvideService(db), hs.License)
 		require.NoError(t, err)
 		hs.teamPermissionsService = teamPermissionService
 	}
@@ -464,6 +466,7 @@ func SetupAPITestServer(t *testing.T, opts ...APITestServerOption) *webtest.Serv
 	hs := &HTTPServer{
 		RouteRegister:      routing.NewRouteRegister(),
 		Cfg:                setting.NewCfg(),
+		License:            &licensing.OSSLicensingService{},
 		AccessControl:      accesscontrolmock.New().WithDisabled(),
 		Features:           featuremgmt.WithFeatures(),
 		searchUsersService: &searchusers.OSSService{},
diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go
index b10aae80c45..7d07bc086a2 100644
--- a/pkg/api/org_users.go
+++ b/pkg/api/org_users.go
@@ -89,10 +89,11 @@ func (hs *HTTPServer) GetOrgUsersForCurrentOrg(c *models.ReqContext) response.Re
 // GET /api/org/users/lookup
 func (hs *HTTPServer) GetOrgUsersForCurrentOrgLookup(c *models.ReqContext) response.Response {
 	orgUsers, err := hs.getOrgUsersHelper(c, &models.GetOrgUsersQuery{
-		OrgId: c.OrgId,
-		Query: c.Query("query"),
-		Limit: c.QueryInt("limit"),
-		User:  c.SignedInUser,
+		OrgId:                    c.OrgId,
+		Query:                    c.Query("query"),
+		Limit:                    c.QueryInt("limit"),
+		User:                     c.SignedInUser,
+		DontEnforceAccessControl: !hs.License.FeatureEnabled("accesscontrol.enforcement"),
 	}, c.SignedInUser)
 
 	if err != nil {
diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go
index e08a9352ee3..0b91f064956 100644
--- a/pkg/models/org_user.go
+++ b/pkg/models/org_user.go
@@ -119,6 +119,8 @@ type GetOrgUsersQuery struct {
 	OrgId  int64
 	Query  string
 	Limit  int
+	// Flag used to allow oss edition to query users without access control
+	DontEnforceAccessControl bool
 
 	User   *SignedInUser
 	Result []*OrgUserDTO
diff --git a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
index 65f4621bb7f..e9b704cf548 100644
--- a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
+++ b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
@@ -35,7 +35,7 @@ var (
 
 func ProvideTeamPermissions(
 	cfg *setting.Cfg, router routing.RouteRegister, sql *sqlstore.SQLStore,
-	ac accesscontrol.AccessControl, store resourcepermissions.Store,
+	ac accesscontrol.AccessControl, store resourcepermissions.Store, license models.Licensing,
 ) (*TeamPermissionsService, error) {
 	options := resourcepermissions.Options{
 		Resource:          "teams",
@@ -91,7 +91,7 @@ func ProvideTeamPermissions(
 		},
 	}
 
-	srv, err := resourcepermissions.New(options, cfg, router, ac, store, sql)
+	srv, err := resourcepermissions.New(options, cfg, router, license, ac, store, sql)
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +109,7 @@ var DashboardAdminActions = append(DashboardEditActions, []string{dashboards.Act
 func ProvideDashboardPermissions(
 	cfg *setting.Cfg, router routing.RouteRegister, sql *sqlstore.SQLStore,
 	ac accesscontrol.AccessControl, store resourcepermissions.Store,
-	dashboardStore dashboards.Store,
+	license models.Licensing, dashboardStore dashboards.Store,
 ) (*DashboardPermissionsService, error) {
 	getDashboard := func(ctx context.Context, orgID int64, resourceID string) (*models.Dashboard, error) {
 		query := &models.GetDashboardQuery{Uid: resourceID, OrgId: orgID}
@@ -164,7 +164,7 @@ func ProvideDashboardPermissions(
 		RoleGroup:      "Dashboards",
 	}
 
-	srv, err := resourcepermissions.New(options, cfg, router, ac, store, sql)
+	srv, err := resourcepermissions.New(options, cfg, router, license, ac, store, sql)
 	if err != nil {
 		return nil, err
 	}
@@ -182,7 +182,7 @@ var FolderAdminActions = append(FolderEditActions, []string{dashboards.ActionFol
 func ProvideFolderPermissions(
 	cfg *setting.Cfg, router routing.RouteRegister, sql *sqlstore.SQLStore,
 	accesscontrol accesscontrol.AccessControl, store resourcepermissions.Store,
-	dashboardStore dashboards.Store,
+	license models.Licensing, dashboardStore dashboards.Store,
 ) (*FolderPermissionsService, error) {
 	options := resourcepermissions.Options{
 		Resource:          "folders",
@@ -213,7 +213,7 @@ func ProvideFolderPermissions(
 		WriterRoleName: "Folder permission writer",
 		RoleGroup:      "Folders",
 	}
-	srv, err := resourcepermissions.New(options, cfg, router, accesscontrol, store, sql)
+	srv, err := resourcepermissions.New(options, cfg, router, license, accesscontrol, store, sql)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/accesscontrol/resourcepermissions/api.go b/pkg/services/accesscontrol/resourcepermissions/api.go
index 53fbbf55399..c89ff795af7 100644
--- a/pkg/services/accesscontrol/resourcepermissions/api.go
+++ b/pkg/services/accesscontrol/resourcepermissions/api.go
@@ -118,7 +118,7 @@ func (a *api) getPermissions(c *models.ReqContext) response.Response {
 		return response.Error(http.StatusInternalServerError, "failed to get permissions", err)
 	}
 
-	if a.service.options.Assignments.BuiltInRoles && !a.service.cfg.IsEnterprise {
+	if a.service.options.Assignments.BuiltInRoles && !a.service.license.FeatureEnabled("accesscontrol.enforcement") {
 		permissions = append(permissions, accesscontrol.ResourcePermission{
 			Actions:     a.service.actions,
 			Scope:       "*",
diff --git a/pkg/services/accesscontrol/resourcepermissions/service.go b/pkg/services/accesscontrol/resourcepermissions/service.go
index 90291f16a26..5eb0b1ece9e 100644
--- a/pkg/services/accesscontrol/resourcepermissions/service.go
+++ b/pkg/services/accesscontrol/resourcepermissions/service.go
@@ -46,7 +46,10 @@ type Store interface {
 	GetResourcePermissions(ctx context.Context, orgID int64, query types.GetResourcePermissionsQuery) ([]accesscontrol.ResourcePermission, error)
 }
 
-func New(options Options, cfg *setting.Cfg, router routing.RouteRegister, ac accesscontrol.AccessControl, store Store, sqlStore *sqlstore.SQLStore) (*Service, error) {
+func New(
+	options Options, cfg *setting.Cfg, router routing.RouteRegister, license models.Licensing,
+	ac accesscontrol.AccessControl, store Store, sqlStore *sqlstore.SQLStore,
+) (*Service, error) {
 	var permissions []string
 	actionSet := make(map[string]struct{})
 	for permission, actions := range options.PermissionsToActions {
@@ -71,6 +74,7 @@ func New(options Options, cfg *setting.Cfg, router routing.RouteRegister, ac acc
 		cfg:         cfg,
 		store:       store,
 		options:     options,
+		license:     license,
 		permissions: permissions,
 		actions:     actions,
 		sqlStore:    sqlStore,
@@ -89,10 +93,11 @@ func New(options Options, cfg *setting.Cfg, router routing.RouteRegister, ac acc
 
 // Service is used to create access control sub system including api / and service for managed resource permission
 type Service struct {
-	cfg   *setting.Cfg
-	ac    accesscontrol.AccessControl
-	store Store
-	api   *api
+	cfg     *setting.Cfg
+	ac      accesscontrol.AccessControl
+	store   Store
+	api     *api
+	license models.Licensing
 
 	options     Options
 	permissions []string
diff --git a/pkg/services/accesscontrol/resourcepermissions/service_test.go b/pkg/services/accesscontrol/resourcepermissions/service_test.go
index 622ef8ad617..f5fc1cb0fcb 100644
--- a/pkg/services/accesscontrol/resourcepermissions/service_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/service_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/database"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -221,8 +222,12 @@ func setupTestEnvironment(t *testing.T, permissions []*accesscontrol.Permission,
 	sql := sqlstore.InitTestDB(t)
 	store := database.ProvideService(sql)
 	cfg := setting.NewCfg()
-	cfg.IsEnterprise = true
-	service, err := New(ops, cfg, routing.NewRouteRegister(), accesscontrolmock.New().WithPermissions(permissions), store, sql)
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", "accesscontrol.enforcement").Return(true).Maybe()
+	service, err := New(
+		ops, cfg, routing.NewRouteRegister(), license,
+		accesscontrolmock.New().WithPermissions(permissions), store, sql,
+	)
 	require.NoError(t, err)
 
 	return service, sql
diff --git a/pkg/services/guardian/accesscontrol_guardian_test.go b/pkg/services/guardian/accesscontrol_guardian_test.go
index 00ec21bd7e9..f1c540b76d6 100644
--- a/pkg/services/guardian/accesscontrol_guardian_test.go
+++ b/pkg/services/guardian/accesscontrol_guardian_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashdb "github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -594,11 +595,14 @@ func setupAccessControlGuardianTest(t *testing.T, uid string, permissions []*acc
 	})
 	require.NoError(t, err)
 	ac := accesscontrolmock.New().WithPermissions(permissions)
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", "accesscontrol.enforcement").Return(true).Maybe()
+
 	folderPermissions, err := ossaccesscontrol.ProvideFolderPermissions(
-		setting.NewCfg(), routing.NewRouteRegister(), store, ac, database.ProvideService(store), &dashboards.FakeDashboardStore{})
+		setting.NewCfg(), routing.NewRouteRegister(), store, ac, database.ProvideService(store), license, &dashboards.FakeDashboardStore{})
 	require.NoError(t, err)
 	dashboardPermissions, err := ossaccesscontrol.ProvideDashboardPermissions(
-		setting.NewCfg(), routing.NewRouteRegister(), store, ac, database.ProvideService(store), &dashboards.FakeDashboardStore{})
+		setting.NewCfg(), routing.NewRouteRegister(), store, ac, database.ProvideService(store), license, &dashboards.FakeDashboardStore{})
 	require.NoError(t, err)
 	if dashboardSvc == nil {
 		dashboardSvc = &dashboards.FakeDashboardService{}
diff --git a/pkg/services/licensing/licensingtest/fake.go b/pkg/services/licensing/licensingtest/fake.go
new file mode 100644
index 00000000000..f5d8454ece1
--- /dev/null
+++ b/pkg/services/licensing/licensingtest/fake.go
@@ -0,0 +1,52 @@
+package licensingtest
+
+import (
+	"github.com/stretchr/testify/mock"
+
+	"github.com/grafana/grafana/pkg/models"
+)
+
+var _ models.Licensing = new(FakeLicensing)
+
+func NewFakeLicensing() *FakeLicensing {
+	return &FakeLicensing{&mock.Mock{}}
+}
+
+type FakeLicensing struct {
+	*mock.Mock
+}
+
+func (f *FakeLicensing) Expiry() int64 {
+	mockedArgs := f.Called()
+	return mockedArgs.Get(0).(int64)
+}
+
+func (f *FakeLicensing) Edition() string {
+	mockedArgs := f.Called()
+	return mockedArgs.Get(0).(string)
+}
+
+func (f *FakeLicensing) ContentDeliveryPrefix() string {
+	mockedArgs := f.Called()
+	return mockedArgs.Get(0).(string)
+}
+
+func (f *FakeLicensing) LicenseURL(showAdminLicensingPage bool) string {
+	mockedArgs := f.Called(showAdminLicensingPage)
+	return mockedArgs.Get(0).(string)
+}
+
+func (f *FakeLicensing) StateInfo() string {
+	mockedArgs := f.Called()
+	return mockedArgs.Get(0).(string)
+}
+
+func (f *FakeLicensing) EnabledFeatures() map[string]bool {
+	mockedArgs := f.Called()
+	return mockedArgs.Get(0).(map[string]bool)
+}
+
+func (f *FakeLicensing) FeatureEnabled(feature string) bool {
+	mockedArgs := f.Called(feature)
+	return mockedArgs.Get(0).(bool)
+}
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index 65eb4a67c57..1afea95b156 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -112,7 +112,8 @@ func (ss *SQLStore) GetOrgUsers(ctx context.Context, query *models.GetOrgUsersQu
 		if query.User == nil {
 			ss.log.Warn("Query user not set for filtering.")
 		}
-		if ss.Cfg.IsEnterprise && !accesscontrol.IsDisabled(ss.Cfg) {
+
+		if !query.DontEnforceAccessControl && !accesscontrol.IsDisabled(ss.Cfg) {
 			acFilter, err := accesscontrol.Filter(query.User, "org_user.user_id", "users:id:", accesscontrol.ActionOrgUsersRead)
 			if err != nil {
 				return err

From 4a6b94ae8e013ab19ee90f914aa71c8390318915 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 15:10:21 -0400
Subject: [PATCH 029/103] [v9.0.x] SearchV2 - Fix starred dashboards for new
 organizations error (#49649)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
---
 pkg/api/stars.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/api/stars.go b/pkg/api/stars.go
index 15194d95938..73eeae19ab1 100644
--- a/pkg/api/stars.go
+++ b/pkg/api/stars.go
@@ -27,10 +27,11 @@ func (hs *HTTPServer) GetStars(c *models.ReqContext) response.Response {
 			OrgId: c.OrgId,
 		}
 		err := hs.dashboardService.GetDashboard(c.Req.Context(), query)
-		if err != nil {
-			return response.Error(500, "Failed to get dashboard", err)
+
+		// Grafana admin users may have starred dashboards in multiple orgs.  This will avoid returning errors when the dashboard is in another org
+		if err == nil {
+			uids = append(uids, query.Result.Uid)
 		}
-		uids = append(uids, query.Result.Uid)
 	}
 	return response.JSON(200, uids)
 }

From 81bf7341916061784dbcf6d2c7d365807dc82b40 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 15:25:09 -0400
Subject: [PATCH 030/103] Updated document with Michelle Tan's comments
 (#49648) (#49651)

(cherry picked from commit 1d7d8bbf960a77c9784dccf664f844f8d9d7bf80)

Co-authored-by: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
---
 docs/sources/whatsnew/whats-new-in-v9-0.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index ca241500986..58411e37263 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -9,15 +9,15 @@ weight = -33
   list = false
 +++
 
-# What’s new in Grafana v9.0
+# What’s new in Grafana v9.0 ((beta))
 
 As tradition goes, GrafanaCon - our yearly community event for Grafana open source users, is also where we launch the latest software release of Grafana. Keeping up with tradition, we are excited to be announcing Grafana v9.0 - a release that elevates Grafana’s ease of use, discovery of data through new and improved visualizations and a default unified alerting experience.
 
 A big focus for Grafana is making observability and data visualization and analytics easier and more accessible for everyone. For popular data sources like Prometheus and Loki writing and understanding queries can be hard. This is why we are excited to announce that Grafana 9 comes with new visual query builders for both these data sources. These visual query builders will lower the barrier of entry and they help anyone to compose, understand and learn how the underlying query languages.
 
-The release also includes a brand new powerful and fast heatmap visualization, a more accessible navigation menu, improvements to dashboard search, advanced security and authentication features, and more.
+The release also includes a brand-new powerful and fast heatmap visualization, a more accessible navigation menu, improvements to dashboard search, advanced security and authentication features, and more.
 
-We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post as well. If you’d like all the details you can check out the complete [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
+We’ve summarized what’s new in the beta release here. If you’d like all the details you can check out the complete [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Prometheus query builder
 

From 1a69cc5b218e651a866945d9677f6c471f063024 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 16:09:28 -0400
Subject: [PATCH 031/103] Canvas: Improve changing element options UX (#49555)
 (#49639)

(cherry picked from commit 2449f62dbe0d7dbf2086da71eb04c307957958e4)

Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
---
 public/app/features/canvas/runtime/frame.tsx        |  2 +-
 public/app/features/canvas/runtime/scene.tsx        |  4 ++--
 .../plugins/panel/canvas/editor/PlacementEditor.tsx | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/public/app/features/canvas/runtime/frame.tsx b/public/app/features/canvas/runtime/frame.tsx
index d09be5d7af5..cd1e1364d58 100644
--- a/public/app/features/canvas/runtime/frame.tsx
+++ b/public/app/features/canvas/runtime/frame.tsx
@@ -89,7 +89,7 @@ export class FrameState extends ElementState {
   reinitializeMoveable() {
     // Need to first clear current selection and then re-init moveable with slight delay
     this.scene.clearCurrentSelection();
-    setTimeout(() => this.scene.initMoveable(true, this.scene.isEditingEnabled), 100);
+    setTimeout(() => this.scene.initMoveable(true, this.scene.isEditingEnabled));
   }
 
   // ??? or should this be on the element directly?
diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index e86919a43c6..32719381ca6 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -106,7 +106,7 @@ export class Scene {
         this.currentLayer = this.root;
         this.selection.next([]);
       }
-    }, 100);
+    });
     return this.root;
   }
 
@@ -226,7 +226,7 @@ export class Scene {
         if (this.div) {
           this.initMoveable(true, this.isEditingEnabled);
         }
-      }, 100);
+      });
     }
   };
 
diff --git a/public/app/plugins/panel/canvas/editor/PlacementEditor.tsx b/public/app/plugins/panel/canvas/editor/PlacementEditor.tsx
index 1080cd38179..81cbc37e423 100644
--- a/public/app/plugins/panel/canvas/editor/PlacementEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/PlacementEditor.tsx
@@ -48,6 +48,12 @@ export const PlacementEditor: FC<StandardEditorProps<any, CanvasEditorOptions, P
   const { options } = element;
   const { placement, constraint: layout } = options;
 
+  const reselectElementAfterChange = () => {
+    setTimeout(() => {
+      settings.scene.select({ targets: [element.div!] });
+    });
+  };
+
   const onHorizontalConstraintSelect = (h: SelectableValue<HorizontalConstraint>) => {
     onHorizontalConstraintChange(h.value!);
   };
@@ -57,6 +63,7 @@ export const PlacementEditor: FC<StandardEditorProps<any, CanvasEditorOptions, P
     element.setPlacementFromConstraint();
     settings.scene.revId++;
     settings.scene.save(true);
+    reselectElementAfterChange();
   };
 
   const onVerticalConstraintSelect = (v: SelectableValue<VerticalConstraint>) => {
@@ -68,16 +75,14 @@ export const PlacementEditor: FC<StandardEditorProps<any, CanvasEditorOptions, P
     element.setPlacementFromConstraint();
     settings.scene.revId++;
     settings.scene.save(true);
+    reselectElementAfterChange();
   };
 
   const onPositionChange = (value: number | undefined, placement: keyof Placement) => {
     element.options.placement![placement] = value ?? element.options.placement![placement];
     element.applyLayoutStylesToDiv();
     settings.scene.clearCurrentSelection(true);
-    // TODO: This needs to have a better sync method with where div is
-    setTimeout(() => {
-      settings.scene.select({ targets: [element.div!] });
-    }, 100);
+    reselectElementAfterChange();
   };
 
   const constraint = element.tempConstraint ?? layout ?? {};

From 0726a56956bcce4d8861d2b084ca1a7994492117 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 17:22:50 -0400
Subject: [PATCH 032/103] Util: Improve performance of strings.SplitString
 (#49115) (#49654)

Replaces the regexp with calls to strings.ReplaceAll and strings.Fields
for simplicity and improved performance.

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
(cherry picked from commit 1f85101787a38b430991e112dad21d237a31cacb)

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
---
 pkg/util/strings.go      |  3 +--
 pkg/util/strings_test.go | 47 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/pkg/util/strings.go b/pkg/util/strings.go
index 15c8801b541..e066ca5c2bf 100644
--- a/pkg/util/strings.go
+++ b/pkg/util/strings.go
@@ -3,7 +3,6 @@ package util
 import (
 	"fmt"
 	"math"
-	"regexp"
 	"strings"
 	"time"
 	"unicode"
@@ -34,7 +33,7 @@ func SplitString(str string) []string {
 		return []string{}
 	}
 
-	return regexp.MustCompile("[, ]+").Split(str, -1)
+	return strings.Fields(strings.ReplaceAll(str, ",", " "))
 }
 
 // GetAgeString returns a string representing certain time from years to minutes.
diff --git a/pkg/util/strings_test.go b/pkg/util/strings_test.go
index 7e93cc5ff63..efb3dbbb773 100644
--- a/pkg/util/strings_test.go
+++ b/pkg/util/strings_test.go
@@ -58,6 +58,53 @@ func TestSplitString(t *testing.T) {
 	}
 }
 
+func BenchmarkSplitString(b *testing.B) {
+	b.Run("empty input", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("")
+		}
+	})
+	b.Run("single string", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("test")
+		}
+	})
+	b.Run("space-separated", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("test1 test2 test3")
+		}
+	})
+	b.Run("comma-separated", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("test1,test2,test3")
+		}
+	})
+	b.Run("comma-separated with spaces", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("test1 , test2 test3")
+		}
+	})
+	b.Run("mixed commas and spaces", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("test1 , test2 test3,test4")
+		}
+	})
+	b.Run("very long mixed", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			SplitString("test1 , test2 test3,test4, test5 test6 test7,test8 test9 test10" +
+				" test11 test12 test13,test14 test15 test16,test17 test18 test19,test20 test21 test22" +
+				" test23,test24 test25 test26,test27 test28 test29,test30 test31 test32" +
+				" test33,test34 test35 test36,test37 test38 test39,test40 test41 test42" +
+				" test43,test44 test45 test46,test47 test48 test49,test50 test51 test52" +
+				" test53,test54 test55 test56,test57 test58 test59,test60 test61 test62" +
+				" test63,test64 test65 test66,test67 test68 test69,test70 test71 test72" +
+				" test73,test74 test75 test76,test77 test78 test79,test80 test81 test82" +
+				" test83,test84 test85 test86,test87 test88 test89,test90 test91 test92" +
+				" test93,test94 test95 test96,test97 test98 test99,test100 ")
+		}
+	})
+}
+
 func TestDateAge(t *testing.T) {
 	assert.Equal(t, "?", GetAgeString(time.Time{})) // base case
 

From 7db4119b485d3310f715b9e4fca750c979cefa25 Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Wed, 25 May 2022 18:53:05 -0400
Subject: [PATCH 033/103] Check in changes.

---
 docs/sources/alerting/_index.md               |  5 ++-
 docs/sources/alerting/fundamentals/_index.md  |  1 +
 .../fundamentals/alert-rules/_index.md        | 19 +++++++++
 .../alert-rules/alert-instances.md            | 22 ++++++++++
 .../alert-rules/alert-rule-types.md           | 30 ++++++++++++++
 .../alert-rules/organising-alerts.md          | 22 ++++++++++
 .../alerting/migrating-alerts/opt-out.md      | 40 +++++++++++++++++++
 7 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 docs/sources/alerting/fundamentals/alert-rules/_index.md
 create mode 100644 docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
 create mode 100644 docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
 create mode 100644 docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
 create mode 100644 docs/sources/alerting/migrating-alerts/opt-out.md

diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index 72206e75b36..12e9bfd4bc5 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -23,8 +23,9 @@ For new installations or existing installs without alerting configured, Grafana
 
 Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "./fundamentals/_index.md" >}}) of Grafana alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.
 
-- [Enable Grafana alerting in OSS]({{< relref "./opt-in.md" >}})
-- [Migrating legacy alerts]({{< relref "./migrating-legacy-alerts.md" >}})
+- [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
+- [Migrating legacy alerts]({{< relref "./migrating-alerts/_index.md" >}})
+- [Disable Grafana alerting in OSS]({{< relref "./migrating-alerts/opt-out.md" >}})
 - [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule.md" >}})
 - [Create Grafana Mimir or Loki managed alerting rules]({{< relref "alerting-rules/create-mimir-loki-managed-rule.md" >}})
 - [View existing alerting rules and manage their current state]({{< relref "alerting-rules/rule-list.md" >}})
diff --git a/docs/sources/alerting/fundamentals/_index.md b/docs/sources/alerting/fundamentals/_index.md
index 8826764c5ca..a21778eb7a5 100644
--- a/docs/sources/alerting/fundamentals/_index.md
+++ b/docs/sources/alerting/fundamentals/_index.md
@@ -8,6 +8,7 @@ weight = 110
 
 This section includes the following fundamental concepts of Grafana alerting:
 
+- [Alert rules]({{< relref "./alert-rules/_index.md" >}})
 - [Annotations and labels for alerting rules]({{< relref "./annotation-label/_index.md" >}})
 - [Alertmanager]({{< relref "./alertmanager.md" >}})
 - [State and health of alerting rules]({{< relref "./state-and-health.md" >}})
diff --git a/docs/sources/alerting/fundamentals/alert-rules/_index.md b/docs/sources/alerting/fundamentals/alert-rules/_index.md
new file mode 100644
index 00000000000..8ca7ad6c983
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md
@@ -0,0 +1,19 @@
++++
+title = "Alert rules"
+description = "About Grafana alert rules"
+keywords = ["grafana", "alerting", "rules"]
+weight = 101
++++
+
+# About alert rules
+
+An alerting rule is a set of evaluation criteria that determines whether an alert instance will fire. The rule consists of one or more queries and expressions, a condition, the frequency of evaluation, and optionally, the duration over which the condition is met.
+
+While queries and expressions select the data set to evaluate, a condition sets the threshold that an alert must meet or exceed to create an alert.
+
+An interval specifies how frequently an alerting rule is evaluated. Duration, when configured, indicates how long a condition must be met. The alert rules can also define alerting behavior in the absence of data.
+
+- [Alert rule types]({{< relref "./alert-rule-types.md" >}})
+- [Alert instances]({{< relref "./alert-instances.md" >}})
+- [Organising alert rules]({{< relref "./organising-alerts.md" >}})
+- [Annotation and labels]({{< relref "../annotation-label/_index.md" >}})
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
new file mode 100644
index 00000000000..485c0170b0f
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
@@ -0,0 +1,22 @@
++++
+title = "Alert instances"
+description = "Learn about Grafana alert instances"
+keywords = ["grafana", "alerting", "instances"]
+weight = 103
++++
+
+# Alert instances
+
+Grafana managed alerts support multi-dimensional alerting. Each alert rule can create multiple alert instances. This is exceptionally powerful if you are observing multiple series in a single expression.
+
+Consider the following PromQL expression:
+
+```promql
+sum by(cpu) (
+  rate(node_cpu_seconds_total{mode!="idle"}[1m])
+)
+```
+
+A rule using this expression will create as many alert instances as the amount of CPUs we are observing after the first evaluation, allowing a single rule to report the status of each CPU.
+
+{{< figure src="/static/img/docs/alerting/unified/multi-dimensional-alert.png" caption="A multi-dimensional Grafana managed alert rule" >}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
new file mode 100644
index 00000000000..18b9553f0f8
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
@@ -0,0 +1,30 @@
++++
+title = "Alert rule types"
+description = "Learn about the different alert rule types"
+keywords = ["grafana", "alerting", "rule types"]
+weight = 102
++++
+
+# Alert rule types
+
+Grafana supports several alert rule types, the following sections will explain their merits and demerits and help you choose the right alert type for your use case.
+
+## Grafana managed rules
+
+Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of your existing data sources.
+
+In additional to supporting any datasource you can also add additional [expressions]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md" >}}) to transform your data and express alert conditions.
+
+## Mimir, Loki and Cortex rules
+
+To create Mimir, Loki or Cortex alerts you must have a compatible Prometheus data source. You can check if your data source is compatible by testing the data source and checking the details if the ruler API is supported.
+
+{{< figure src="/static/img/docs/alerting/unified/mimir-datasource-check.png" caption="Successfully connected to a Mimir Prometheus datasource" max-width="40%" >}}
+
+## Recording rules
+
+Recording rules are only available for compatible Prometheus data sources like Mimir, Loki and Cortex.
+
+A recording rule allows you to save an expression's result to a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query the same expression repeatedly.
+
+Read more about [recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) in Prometheus.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
new file mode 100644
index 00000000000..6a6a0cc50fe
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
@@ -0,0 +1,22 @@
++++
+title = "Organising alert rules"
+description = "Learn how to organize alert rules"
+keywords = ["grafana", "alerting", "organization"]
+weight = 104
++++
+
+## Namespaces and groups
+
+Alerts can be organized using Folders for Grafana-managed rules and namespaces for Mimir or Loki rules and group names.
+
+### Namespaces
+
+When creating Grafana-managed rules, the folder can be used to perform access control and grant or deny access to all rules within a specific folder.
+
+### Groups
+
+All rules within a group are evaluated at the same **interval**.
+
+Alert rules and recording rules within a group will always be evaluated **sequentially**, meaning no rules will be evaluated at the same time and in order of appearance.
+
+> **Note** If you want rules to be evaluated concurrently and with different intervals, consider storing them in different groups.
diff --git a/docs/sources/alerting/migrating-alerts/opt-out.md b/docs/sources/alerting/migrating-alerts/opt-out.md
new file mode 100644
index 00000000000..b7756b6b1ff
--- /dev/null
+++ b/docs/sources/alerting/migrating-alerts/opt-out.md
@@ -0,0 +1,40 @@
++++
+aliases = ["/docs/grafana/latest/alerting/opt-in/", "/docs/grafana/latest/alerting/unified-alerting/opt-in/"]
+description = "Disable Grafana alerts"
+title = "Opt-out of Grafana alerting"
+weight = 113
++++
+
+# Opt-out to Grafana alerting in OSS
+
+This topic discusses how to disable Grafana alerting and migrate to legacy dashboard alerting. It also provides guidance on how to enable Grafana alerting once you are ready to migrate to Grafana alerting.
+
+> **Note:** This topic is only relevant for OSS and Enterprise customers. Contact customer support to enable or disable Grafana alerting for your Grafana Cloud stack.
+
+## Before you begin
+
+We recommend that you backup Grafana's database. If you are using PostgreSQL as the backend database, then the minimum required version is 9.5.
+
+## Opt-out of Grafana alerts
+
+To opt-out of Grafana alerts and roll back to legacy dashboard alerting:
+
+1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [Grafana alerting]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
+1. Set the `enabled` property to `false`.
+1. For [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `true`.
+1. Restart Grafana for the configuration changes to take effect.
+
+> **Note:** Rolling back from Grafana to legacy alerting can result in data loss. This is applicable to the fresh installation as well as upgraded setups.
+
+## Opt-in to Grafana alerting
+
+When you are ready to make the switch, the following procedure will help you migrate to Grafana alerting.
+
+To opt-in to Grafana alerts:
+
+1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
+1. Set the `enabled` property to `true`.
+1. Next, for [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
+1. Restart Grafana for the configuration changes to take effect.
+
+> **Note:** The `ngalert` toggle previously used to enable or disable Grafana alerting is no longer available.

From 7ac8527dac0290b64f5c4a7fba19c7695aa65592 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 19:32:33 -0400
Subject: [PATCH 034/103] Timeseries: fix outside range stale state (#49633)
 (#49656)

Co-authored-by: Todd Treece <todd.treece@grafana.com>
(cherry picked from commit df90393057918328a11c16cf758e1b0848edfe27)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .../panel/candlestick/CandlestickPanel.tsx    |  2 +-
 .../state-timeline/StateTimelinePanel.tsx     |  2 +-
 .../status-history/StatusHistoryPanel.tsx     |  2 +-
 .../panel/timeseries/TimeSeriesPanel.tsx      |  2 +-
 .../timeseries/plugins/OutsideRangePlugin.tsx | 27 ++++++++++++-------
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
index 7176739fa1f..c42b7a2fdf2 100644
--- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
+++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
@@ -316,7 +316,7 @@ export const CandlestickPanel: React.FC<CandlestickPanelProps> = ({
               />
             )}
 
-            <OutsideRangePlugin config={config} range={timeRange} onChangeTimeRange={onChangeTimeRange} />
+            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
           </>
         );
       }}
diff --git a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
index 54d5ea2f0b0..3a0f899c06a 100644
--- a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
+++ b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
@@ -118,7 +118,7 @@ export const StateTimelinePanel: React.FC<TimelinePanelProps> = ({
               timeZone={timeZone}
               renderTooltip={renderCustomTooltip}
             />
-            <OutsideRangePlugin config={config} range={timeRange} onChangeTimeRange={onChangeTimeRange} />
+            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
           </>
         );
       }}
diff --git a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
index 3cfea9dc0cb..8a1fcbc2a78 100644
--- a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
+++ b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
@@ -72,7 +72,7 @@ export const StatusHistoryPanel: React.FC<TimelinePanelProps> = ({
           <>
             <ZoomPlugin config={config} onZoom={onChangeTimeRange} />
             <TooltipPlugin data={alignedFrame} config={config} mode={options.tooltip.mode} timeZone={timeZone} />
-            <OutsideRangePlugin config={config} range={timeRange} onChangeTimeRange={onChangeTimeRange} />
+            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
           </>
         );
       }}
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index 9e143d4f976..e727764fa16 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -138,7 +138,7 @@ export const TimeSeriesPanel: React.FC<TimeSeriesPanelProps> = ({
               />
             )}
 
-            <OutsideRangePlugin config={config} range={timeRange} onChangeTimeRange={onChangeTimeRange} />
+            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
           </>
         );
       }}
diff --git a/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx b/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx
index 6cf3cd30532..721c9f45bb3 100644
--- a/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx
@@ -1,34 +1,43 @@
-import React, { useLayoutEffect, useRef } from 'react';
-import uPlot from 'uplot';
+import React, { useLayoutEffect, useRef, useState } from 'react';
+import uPlot, { TypedArray, Scale } from 'uplot';
 
-import { TimeRange, AbsoluteTimeRange } from '@grafana/data';
+import { AbsoluteTimeRange } from '@grafana/data';
 import { UPlotConfigBuilder, Button } from '@grafana/ui';
 
 interface ThresholdControlsPluginProps {
   config: UPlotConfigBuilder;
-  range: TimeRange;
   onChangeTimeRange: (timeRange: AbsoluteTimeRange) => void;
 }
 
-export const OutsideRangePlugin: React.FC<ThresholdControlsPluginProps> = ({ config, range, onChangeTimeRange }) => {
+export const OutsideRangePlugin: React.FC<ThresholdControlsPluginProps> = ({ config, onChangeTimeRange }) => {
   const plotInstance = useRef<uPlot>();
+  const [timevalues, setTimeValues] = useState<number[] | TypedArray>([]);
+  const [timeRange, setTimeRange] = useState<Scale | undefined>();
 
   useLayoutEffect(() => {
     config.addHook('init', (u) => {
       plotInstance.current = u;
     });
+
+    config.addHook('setScale', (u) => {
+      setTimeValues(u.data?.[0] ?? []);
+      setTimeRange(u.scales['x'] ?? undefined);
+    });
   }, [config]);
 
-  const timevalues = plotInstance.current?.data?.[0];
-  if (!timevalues || !plotInstance.current || timevalues.length < 2 || !onChangeTimeRange) {
+  if (timevalues.length < 2 || !onChangeTimeRange) {
+    return null;
+  }
+
+  if (!timeRange || !timeRange.time || !timeRange.min || !timeRange.max!) {
     return null;
   }
 
   // Time values are always sorted for uPlot to work
   const first = timevalues[0];
   const last = timevalues[timevalues.length - 1];
-  const fromX = range.from.valueOf();
-  const toX = range.to.valueOf();
+  const fromX = timeRange.min;
+  const toX = timeRange.max;
 
   // (StartA <= EndB) and (EndA >= StartB)
   if (first <= toX && last >= fromX) {

From e5248a2aa74dbe18cd3893df479aadba8757e9b8 Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Wed, 25 May 2022 19:32:55 -0400
Subject: [PATCH 035/103] Docs: Created separate section for migration under
 alerting (#49616) (#49658)

* Lots of changes, including new topic, also fixed all alerting relrefs

* Push stashed change.

* Updated content to reflect that Grafana alerting is enabled during upgrade.

* Fix typo

* Update docs/sources/alerting/migrating-alerts/_index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Checkin changes.

* Updates from Chris's review.

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit b5d48d217aec05910620e37b0f11d249d039f079)
---
 docs/sources/alerting/_index.md               | 10 +++--
 .../alerting/migrating-alerts/_index.md       | 26 ++++++++++++
 .../migrating-legacy-alerts.md                | 17 ++------
 .../alerting/migrating-alerts/opt-out.md      |  5 +++
 docs/sources/alerting/opt-in.md               | 41 -------------------
 .../rbac-fixed-basic-role-definitions.md      |  2 +-
 docs/sources/whatsnew/whats-new-in-v9-0.md    |  4 +-
 7 files changed, 44 insertions(+), 61 deletions(-)
 create mode 100644 docs/sources/alerting/migrating-alerts/_index.md
 rename docs/sources/alerting/{ => migrating-alerts}/migrating-legacy-alerts.md (62%)
 delete mode 100644 docs/sources/alerting/opt-in.md

diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index 12e9bfd4bc5..84142ce7014 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -1,5 +1,5 @@
 +++
-aliases = ["/docs/grafana/latest/alerting/", "/docs/grafana/latest/alerting/unified-alerting/difference-old-new/"]
+aliases = ["/docs/grafana/latest/alerting/", "/docs/grafana/latest/alerting/unified-alerting/alerting/"]
 title = "Alerting"
 weight = 114
 +++
@@ -18,12 +18,14 @@ For new installations or existing installs without alerting configured, Grafana
 | ----------- | ------------- | ------------- | ------------- |
 | Grafana 9.0 | On by default | On by default | On by default |
 
-- For existing OSS installations with legacy dashboard alerting, you can [opt-in]({{< relref "./opt-in.md" >}}) to Grafana alerting.
-- For Grafana Cloud instances using legacy cloud alerting, contact customer support to migrate to Grafana alerting.
+Existing installations that upgrade to v9.0 will have Grafana alerting enabled by default. For more information on migrating from legacy or the cloud alerting plugin, see [Migrating to Grafana alerting]({{< relref "./migrating-alerts/_index.md" >}}).
 
 Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "./fundamentals/_index.md" >}}) of Grafana alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.
 
-- [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
+<<<<<<< HEAD
+
+- # [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
+  > > > > > > > b5d48d217a (Docs: Created separate section for migration under alerting (#49616))
 - [Migrating legacy alerts]({{< relref "./migrating-alerts/_index.md" >}})
 - [Disable Grafana alerting in OSS]({{< relref "./migrating-alerts/opt-out.md" >}})
 - [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule.md" >}})
diff --git a/docs/sources/alerting/migrating-alerts/_index.md b/docs/sources/alerting/migrating-alerts/_index.md
new file mode 100644
index 00000000000..fad45c086e7
--- /dev/null
+++ b/docs/sources/alerting/migrating-alerts/_index.md
@@ -0,0 +1,26 @@
++++
+aliases = ["/docs/grafana/latest/alerting/migrating-alerts/"]
+description = "Migrate Grafana alerts"
+title = "Migrate to Grafana alerting"
+weight = 113
++++
+
+# Migrate to Grafana alerting
+
+Grafana alerting is the default for new Cloud, Enterprise, and OSS installations. The new installations will only show the Grafana alerting icon in the left navigation panel.
+
+Existing installations that upgrade to v9.0 will have Grafana alerting enabled by default.
+
+| Grafana instance upgraded to v 90 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Cloud                             | Existing Cloud installations with legacy dashboard alerting will have two alerting icons in the left navigation panel - the old alerting plugin icon and the new Grafana alerting icon. During upgrade, existing alerts from the Cloud alerting plugin are migrated to Grafana alerting. Once migration is complete, you can access aman manage the older alerts from the new alerting Grafana alerting icon in the navigation panel. The (older) Cloud alerting plugin is uninstalled from your cloud instance. Contact customer support if you **do not wish** to migrate to Grafana alerting for your Cloud stack. If you choose to use legacy alerting, use the You will see the new Grafana alerting icon as well as the old Cloud alerting plugin in the left navigation panel. |
+| Enterprise                        | Existing Enterprise instances using legacy alerting will have both the old (marked as legacy) and the new alerting icons in the navigation panel. During upgrade, existing legacy alerts are migrated to Grafana alerting. If you wish, you can [opt-out]({{< relref "./opt-out.md" >}}) of Grafana alerting and roll back to legacy alerting. In that case, you can manage your legacy alerts from the alerting icon marked as legacy.                                                                                                                                                                                                                                                                                                                                               |
+| OSS                               | Existing OSS installations with legacy dashboard alerting will have two alerting icons in the left navigation panel - the old alerting icon (marked as legacy) and the new Grafana alerting icon. During upgrade, existing legacy alerts are migrated to Grafana alerting. If you wish, you can [opt-out]({{< relref "./opt-out.md" >}}) of Grafana alerting and roll back to legacy alerting. In that case, you can manage your legacy alerts from the alerting icon marked as legacy.                                                                                                                                                                                                                                                                                               |
+
+During migration from legacy alerting to unified alerting, the legacy alerts are updated to the new alerts type, as a result, the user does not lose alerts or alerting data. However, if a user rolls back to legacy alerting after having migrated to unified alerting, they will only get the legacy alerts they had right before migration.
+
+## Roll back to legacy alerting
+
+Although we encourage you to use Grafana alerting, roll back to legacy alerting is supported in Grafana 9. Rolling back can result in data loss (you will loose all alerts that you created using Grafana alerting). This is applicable to the fresh installation as well as upgraded setups.
+
+> **Note:** Legacy alerting will be deprecated in a future release (v10).
diff --git a/docs/sources/alerting/migrating-legacy-alerts.md b/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md
similarity index 62%
rename from docs/sources/alerting/migrating-legacy-alerts.md
rename to docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md
index 51dfd5ffac7..ee404f55a01 100644
--- a/docs/sources/alerting/migrating-legacy-alerts.md
+++ b/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md
@@ -7,7 +7,9 @@ weight = 114
 
 # Migrating legacy dashboard alerts
 
-When Grafana alerting is enabled or Grafana is upgraded to the latest version, existing legacy dashboard alerts migrate in a format compatible with the Grafana alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside new alerts.
+When Grafana alerting is enabled or Grafana is upgraded to the latest version, existing legacy dashboard alerts migrate in a format compatible with the Grafana alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside any new alerts. This topic explains how legacy dashboard alerts are migrated and some limitations.
+
+> **Note:** This topic is only relevant for OSS and Enterprise customers. Contact customer support to enable or disable Grafana alerting for your Cloud stack.
 
 Read and write access to legacy dashboard alerts and Grafana alerts are governed by the permissions of the folders storing them. During migration, legacy dashboard alert permissions are matched to the new rules permissions as follows:
 
@@ -15,20 +17,9 @@ Read and write access to legacy dashboard alerts and Grafana alerts are governed
 - If there are no dashboard permissions and the dashboard is under a folder, then the rule is linked to this folder and inherits its permissions.
 - If there are no dashboard permissions and the dashboard is under the General folder, then the rule is linked to the `General Alerting` folder, and the rule inherits the default permissions.
 
-> **Note:** Since there is no `Keep Last State` option for [`No Data`]({{< relref "./alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) in Grafana alerting, this option becomes `NoData` during the legacy rules migration. Option "Keep Last State" for [`Error handling`]({{< relref "./alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a [silence]({{< relref "./silences/_index.md" >}}) for each alert rule with a duration of 1 year.
+> **Note:** Since there is no `Keep Last State` option for [`No Data`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) in Grafana alerting, this option becomes `NoData` during the legacy rules migration. Option "Keep Last State" for [`Error handling`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a [silence]({{< relref "../silences/_index.md" >}}) for each alert rule with a duration of 1 year.
 
 Notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
 
 Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts.
 Silences (expiring after one year) are created for all paused dashboard alerts.
-
-## Disable Grafana alerts
-
-To disable Grafana alerts and enable legacy dashboard alerts:
-
-1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [Grafana alerting]({{< relref "../administration/configuration.md#unified_alerting" >}}) section.
-1. Set the `enabled` property to `false`.
-1. For [legacy dashboard alerting]({{< relref "../administration/configuration.md#alerting" >}}), set the `enabled` flag to `true`.
-1. Restart Grafana for the configuration changes to take effect.
-
-> **Note:** Switching from one flavor of alerting to another can result in data loss. This is applicable to the fresh installation as well as upgraded setups.
diff --git a/docs/sources/alerting/migrating-alerts/opt-out.md b/docs/sources/alerting/migrating-alerts/opt-out.md
index b7756b6b1ff..e300e4b9e79 100644
--- a/docs/sources/alerting/migrating-alerts/opt-out.md
+++ b/docs/sources/alerting/migrating-alerts/opt-out.md
@@ -30,7 +30,12 @@ To opt-out of Grafana alerts and roll back to legacy dashboard alerting:
 
 When you are ready to make the switch, the following procedure will help you migrate to Grafana alerting.
 
+<<<<<<< HEAD
 To opt-in to Grafana alerts:
+=======
+To opt-in Grafana alerts:
+
+> > > > > > > b5d48d217a (Docs: Created separate section for migration under alerting (#49616))
 
 1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
 1. Set the `enabled` property to `true`.
diff --git a/docs/sources/alerting/opt-in.md b/docs/sources/alerting/opt-in.md
deleted file mode 100644
index ca31f27b927..00000000000
--- a/docs/sources/alerting/opt-in.md
+++ /dev/null
@@ -1,41 +0,0 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/opt-in/", "/docs/grafana/latest/alerting/unified-alerting/opt-in/"]
-description = "Enable Grafana alerts"
-title = "Opt-in to Grafana alerting"
-weight = 113
-+++
-
-# Opt-in to Grafana alerting in OSS
-
-Grafana alerting is enabled by default for new Cloud and OSS installations.
-
-- For existing OSS installations that use legacy dashboard alerts, unified alerting is still an opt-in feature.
-- For existing Grafana Cloud users, contact customer support to enable Grafana alerting for your Cloud stack.
-
-## Before you begin
-
-We recommend that you backup Grafana's database. If you are using PostgreSQL as the backend database, then the minimum required version is 9.5.
-
-## Enable Grafana alerting
-
-To enable Grafana alerts:
-
-1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../administration/configuration.md#unified_alerting" >}}) section.
-2. Set the `enabled` property to `true`.
-3. Next, for [legacy dashboard alerting]({{< relref "../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
-4. Restart Grafana for the configuration changes to take effect.
-
-> **Note:** The `ngalert` toggle previously used to enable or disable Grafana alerting is no longer available.
-
-Before v8.2, notification logs and silences were stored on a disk. If you did not use persistent disks, you would have lost any configured silences and logs on a restart, resulting in unwanted or duplicate notifications. We no longer require the use of a persistent disk. Instead, the notification logs and silences are stored regularly (every 15 minutes). If you used the file-based approach, Grafana reads the existing file and persists it eventually.
-
-## Disable Grafana alerts
-
-To disable Grafana alerts and roll back to legacy dashboard alerting:
-
-1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [Grafana alerting]({{< relref "../administration/configuration.md#unified_alerting" >}}) section.
-1. Set the `enabled` property to `false`.
-1. For [legacy dashboard alerting]({{< relref "../administration/configuration.md#alerting" >}}), set the `enabled` flag to `true`.
-1. Restart Grafana for the configuration changes to take effect.
-
-> **Note:** Switching from one flavor of alerting to another can result in data loss. This is applicable to the fresh installation as well as upgraded setups.
diff --git a/docs/sources/enterprise/access-control/rbac-fixed-basic-role-definitions.md b/docs/sources/enterprise/access-control/rbac-fixed-basic-role-definitions.md
index 71d56c6528b..70b9a852f15 100644
--- a/docs/sources/enterprise/access-control/rbac-fixed-basic-role-definitions.md
+++ b/docs/sources/enterprise/access-control/rbac-fixed-basic-role-definitions.md
@@ -80,7 +80,7 @@ The following tables list permissions associated with basic and fixed roles.
 
 ### Alerting roles
 
-If alerting is [enabled]({{< relref "../../alerting/opt-in.md" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
+If alerting is [enabled]({{< relref "../../alerting/migrating-alerts/opt-in.md" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
 
 Access to Grafana alert rules is an intersection of many permissions:
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index 58411e37263..abe9118b8ef 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -72,7 +72,7 @@ New new heatmap panel has a number enhancements compared to the old version.
 - For unbucketed data, it performs smarter auto bucket sizing
 - Supports filtering out bucket values close to but not exactly zero
 
-The new heatmap by default assumes that the data is pre-bucked. So if your query returns time series each series is seen as separate bucket (y axis tick). The panel is so much faster than the old one so it can render many time series with thousands of data points each without issue.
+The new heatmap by default assumes that the data is pre-bucketed. So if your query returns time series each series is seen as separate bucket (y axis tick). The panel is so much faster than the old one so it can render many time series with thousands of data points each without issue.
 
 {{< figure src="/static/img/docs/heatmap-panel/heatmap_with_time_series_light_theme.png" max-width="500px" caption="Heatmap panel with time series" >}}
 
@@ -80,7 +80,7 @@ The new heatmap by default assumes that the data is pre-bucked. So if your query
 
 Unified alerting is now on by default if you upgrade from an earlier version of Grafana. If you have been using legacy alerting in an earlier version of Grafana and you upgrade to Grafana 9 your alert rules will be automatically migrated and the legacy alerting interface will be replaced by the unified alerting interface.
 
-Unified alerting has been available since June, 2021, it now provides feature parity with legacy alerting and many additional benefits. To find out more on the process to revert back to legacy alerts if needed, click [here]({{< relref "../alerting/opt-in.md#disable-grafana-alertsd#" >}}). Note that if you do revert back (by setting the Grafana config flag GF_UNIFIED_ALERTING_ENABLED to false), that we expect to remove legacy alerting in the next major Grafana release, Grafana 10.
+Unified alerting has been available since June, 2021, it now provides feature parity with legacy alerting and many additional benefits. To find out more on the process to revert back to legacy alerts if needed, click [here]({{< relref "../alerting/migrating-alerts/opt-out.md" >}}). Note that if you do revert back (by setting the Grafana config flag GF_UNIFIED_ALERTING_ENABLED to false), that we expect to remove legacy alerting in the next major Grafana release, Grafana 10.
 
 ### Alert state history for Grafana managed alerts
 

From 09a93b17d96cf567d060993c464ab95d953aa560 Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Wed, 25 May 2022 18:53:05 -0400
Subject: [PATCH 036/103] Docs: Move alert rule section to alerting
 fundamentals section (#49657)

* initial commit

* Added links to alert rules, and fixes one broken alerting relref.

(cherry picked from commit a968a43e0c6a90122e2982a9d1dd137c4215fd01)
---
 docs/sources/alerting/_index.md                   |  5 +----
 docs/sources/alerting/migrating-alerts/opt-out.md | 11 +++--------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index 84142ce7014..080b0e9bf67 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -22,10 +22,7 @@ Existing installations that upgrade to v9.0 will have Grafana alerting enabled b
 
 Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "./fundamentals/_index.md" >}}) of Grafana alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.
 
-<<<<<<< HEAD
-
-- # [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
-  > > > > > > > b5d48d217a (Docs: Created separate section for migration under alerting (#49616))
+- [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
 - [Migrating legacy alerts]({{< relref "./migrating-alerts/_index.md" >}})
 - [Disable Grafana alerting in OSS]({{< relref "./migrating-alerts/opt-out.md" >}})
 - [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule.md" >}})
diff --git a/docs/sources/alerting/migrating-alerts/opt-out.md b/docs/sources/alerting/migrating-alerts/opt-out.md
index e300e4b9e79..c5a4627a1ab 100644
--- a/docs/sources/alerting/migrating-alerts/opt-out.md
+++ b/docs/sources/alerting/migrating-alerts/opt-out.md
@@ -30,16 +30,11 @@ To opt-out of Grafana alerts and roll back to legacy dashboard alerting:
 
 When you are ready to make the switch, the following procedure will help you migrate to Grafana alerting.
 
-<<<<<<< HEAD
 To opt-in to Grafana alerts:
-=======
-To opt-in Grafana alerts:
-
-> > > > > > > b5d48d217a (Docs: Created separate section for migration under alerting (#49616))
 
 1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
-1. Set the `enabled` property to `true`.
-1. Next, for [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
-1. Restart Grafana for the configuration changes to take effect.
+2. Set the `enabled` property to `true`.
+3. Next, for [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
+4. Restart Grafana for the configuration changes to take effect.
 
 > **Note:** The `ngalert` toggle previously used to enable or disable Grafana alerting is no longer available.

From 324dcae8687d7080f11dd81985be79bfbf726eed Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 25 May 2022 23:50:53 -0400
Subject: [PATCH 037/103] Prometheus: Fix sort issue in wide frames (#49660)
 (#49662)

---
 pkg/tsdb/prometheus/buffered/framing_test.go  |  2 +-
 .../buffered/prometeus_bench_test.go          |  4 ++
 pkg/tsdb/prometheus/querydata/framing_test.go |  2 +-
 .../querydata/prometeus_bench_test.go         |  4 ++
 .../testdata/range_simple.result.golden.json  |  2 +-
 .../testdata/range_simple.result.golden.txt   |  4 +-
 .../testdata/range_simple.result.json         |  2 +-
 ...e_simple.result.streaming-wide.golden.json |  3 ++
 ...ge_simple.result.streaming-wide.golden.txt |  7 +--
 .../range_simple.result.streaming.golden.json |  2 +-
 .../range_simple.result.streaming.golden.txt  |  4 +-
 pkg/util/converter/prom.go                    |  4 ++
 .../testdata/loki-streams-a-frame.json        | 20 ++++----
 .../testdata/loki-streams-a-wide-frame.json   | 34 +++++++-------
 .../testdata/loki-streams-b-frame.json        | 28 +++++------
 .../testdata/loki-streams-b-wide-frame.json   | 46 +++++++++----------
 16 files changed, 92 insertions(+), 76 deletions(-)

diff --git a/pkg/tsdb/prometheus/buffered/framing_test.go b/pkg/tsdb/prometheus/buffered/framing_test.go
index 40a2ead8fb5..9d936bb0ffc 100644
--- a/pkg/tsdb/prometheus/buffered/framing_test.go
+++ b/pkg/tsdb/prometheus/buffered/framing_test.go
@@ -23,7 +23,7 @@ import (
 	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 )
 
-var update = false
+var update = true
 
 func TestMatrixResponses(t *testing.T) {
 	tt := []struct {
diff --git a/pkg/tsdb/prometheus/buffered/prometeus_bench_test.go b/pkg/tsdb/prometheus/buffered/prometeus_bench_test.go
index 25cf7942b84..4a600e472ef 100644
--- a/pkg/tsdb/prometheus/buffered/prometeus_bench_test.go
+++ b/pkg/tsdb/prometheus/buffered/prometeus_bench_test.go
@@ -54,6 +54,10 @@ func makeJsonTestValue(r *rand.Rand) string {
 func makeJsonTestSeries(start int64, step int64, timestampCount int, r *rand.Rand, seriesIndex int) string {
 	var values []string
 	for i := 0; i < timestampCount; i++ {
+		// create out of order timestamps to test sorting
+		if seriesIndex == 0 && i%2 == 0 {
+			continue
+		}
 		value := fmt.Sprintf(`[%d,"%v"]`, start+(int64(i)*step), makeJsonTestValue(r))
 		values = append(values, value)
 	}
diff --git a/pkg/tsdb/prometheus/querydata/framing_test.go b/pkg/tsdb/prometheus/querydata/framing_test.go
index 32ee249bc68..2418db326da 100644
--- a/pkg/tsdb/prometheus/querydata/framing_test.go
+++ b/pkg/tsdb/prometheus/querydata/framing_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
 )
 
-var update = false
+var update = true
 
 func TestMatrixResponses(t *testing.T) {
 	tt := []struct {
diff --git a/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go b/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
index b7ce55437bb..0f610b4a4d2 100644
--- a/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
+++ b/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
@@ -56,6 +56,10 @@ func makeJsonTestValue(r *rand.Rand) string {
 func makeJsonTestSeries(start int64, step int64, timestampCount int, r *rand.Rand, seriesIndex int) string {
 	var values []string
 	for i := 0; i < timestampCount; i++ {
+		// create out of order timestamps to test sorting
+		if seriesIndex == 0 && i%2 == 0 {
+			continue
+		}
 		value := fmt.Sprintf(`[%d,"%v"]`, start+(int64(i)*step), makeJsonTestValue(r))
 		values = append(values, value)
 	}
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json
index 4a132324ed8..3df173ca027 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.json
@@ -98,7 +98,7 @@
       "data": {
         "values": [
           [
-            1641889530123,
+            1641889529123,
             1641889532123
           ],
           [
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt
index aa173aa0149..9df8e3f31f3 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.txt
@@ -35,11 +35,11 @@ Dimensions: 2 Fields by 2 Rows
 | Labels:                           | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
 | Type: []time.Time                 | Type: []*float64                                                                                       |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
-| 2022-01-11 08:25:30.123 +0000 UTC | 54                                                                                                     |
+| 2022-01-11 08:25:29.123 +0000 UTC | 54                                                                                                     |
 | 2022-01-11 08:25:32.123 +0000 UTC | 76                                                                                                     |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 
 
 ====== TEST DATA RESPONSE (arrow base64) ======
 FRAME=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
-FRAME=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
+FRAME=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
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.json b/pkg/tsdb/prometheus/testdata/range_simple.result.json
index cb77311b908..c98977b0bd5 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.json
@@ -24,7 +24,7 @@
           "job": "prometheus"
         },
         "values": [
-          [1641889530.123, "54"],
+          [1641889529.123, "54"],
           [1641889532.123, "76"]
         ]
       }
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json
index d438a646dc2..7f670e39e17 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.json
@@ -53,11 +53,13 @@
       "data": {
         "values": [
           [
+            1641889529123,
             1641889530123,
             1641889531123,
             1641889532123
           ],
           [
+            null,
             21,
             32,
             43
@@ -65,6 +67,7 @@
           [
             54,
             null,
+            null,
             76
           ]
         ]
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt
index b0d7e4c2bb7..be8952b12e1 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming-wide.golden.txt
@@ -8,17 +8,18 @@ Frame[0] {
     "executedQueryString": "Expr: \nStep: 1s"
 }
 Name: 
-Dimensions: 3 Fields by 3 Rows
+Dimensions: 3 Fields by 4 Rows
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
 | Name: Time                        | Name: prometheus_http_requests_total{code="200", handler="/api/v1/query_range", job="prometheus"}      | Name: prometheus_http_requests_total{code="400", handler="/api/v1/query_range", job="prometheus"}      |
 | Labels:                           | Labels: __name__=prometheus_http_requests_total, code=200, handler=/api/v1/query_range, job=prometheus | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
 | Type: []time.Time                 | Type: []*float64                                                                                       | Type: []*float64                                                                                       |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
-| 2022-01-11 08:25:30.123 +0000 UTC | 21                                                                                                     | 54                                                                                                     |
+| 2022-01-11 08:25:29.123 +0000 UTC | null                                                                                                   | 54                                                                                                     |
+| 2022-01-11 08:25:30.123 +0000 UTC | 21                                                                                                     | null                                                                                                   |
 | 2022-01-11 08:25:31.123 +0000 UTC | 32                                                                                                     | null                                                                                                   |
 | 2022-01-11 08:25:32.123 +0000 UTC | 43                                                                                                     | 76                                                                                                     |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
 
 
 ====== TEST DATA RESPONSE (arrow base64) ======
-FRAME=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AAAAANT7//8IAAAAcAAAAGQAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLXdpZGUiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6Im1hdHJpeCJ9LCJleGVjdXRlZFF1ZXJ5U3RyaW5nIjoiRXhwcjogXG5TdGVwOiAxcyJ9AAAAAAQAAABtZXRhAAAAAAMAAABcAwAAsAEAAAQAAABq/v//FAAAACABAAAgAQAAAAADASABAAACAAAAgAAAAAQAAACM/P//CAAAAGQAAABbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjQwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAEAAAAbmFtZQAAAAAE/f//CAAAAHgAAABtAAAAeyJfX25hbWVfXyI6InByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbCIsImNvZGUiOiI0MDAiLCJoYW5kbGVyIjoiL2FwaS92MS9xdWVyeV9yYW5nZSIsImpvYiI6InByb21ldGhldXMifQAAAAYAAABsYWJlbHMAAAAAAABW/f//AAACAFsAAABwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWx7Y29kZT0iNDAwIiwgaGFuZGxlcj0iL2FwaS92MS9xdWVyeV9yYW5nZSIsIGpvYj0icHJvbWV0aGV1cyJ9AAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAAgAQAAIAEAAAAAAwEgAQAAAgAAAIAAAAAEAAAANP7//wgAAABkAAAAWwAAAHByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbHtjb2RlPSIyMDAiLCBoYW5kbGVyPSIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwgam9iPSJwcm9tZXRoZXVzIn0ABAAAAG5hbWUAAAAArP7//wgAAAB4AAAAbQAAAHsiX19uYW1lX18iOiJwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWwiLCJjb2RlIjoiMjAwIiwiaGFuZGxlciI6Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCJqb2IiOiJwcm9tZXRoZXVzIn0AAAAGAAAAbGFiZWxzAAAAAAAA/v7//wAAAgBbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjIwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAAABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAAKgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEQAAAHsiaW50ZXJ2YWwiOjEwMDB9AAAABgAAAGNvbmZpZwAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAA4BQAAQVJST1cx
+FRAME=QVJST1cxAAD/////CAUAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAANgAAAADAAAATAAAACgAAAAEAAAAlPv//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAC0+///CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAANT7//8IAAAAcAAAAGQAAAB7InR5cGUiOiJ0aW1lc2VyaWVzLXdpZGUiLCJjdXN0b20iOnsicmVzdWx0VHlwZSI6Im1hdHJpeCJ9LCJleGVjdXRlZFF1ZXJ5U3RyaW5nIjoiRXhwcjogXG5TdGVwOiAxcyJ9AAAAAAQAAABtZXRhAAAAAAMAAABcAwAAsAEAAAQAAABq/v//FAAAACABAAAgAQAAAAADASABAAACAAAAgAAAAAQAAACM/P//CAAAAGQAAABbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjQwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAEAAAAbmFtZQAAAAAE/f//CAAAAHgAAABtAAAAeyJfX25hbWVfXyI6InByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbCIsImNvZGUiOiI0MDAiLCJoYW5kbGVyIjoiL2FwaS92MS9xdWVyeV9yYW5nZSIsImpvYiI6InByb21ldGhldXMifQAAAAYAAABsYWJlbHMAAAAAAABW/f//AAACAFsAAABwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWx7Y29kZT0iNDAwIiwgaGFuZGxlcj0iL2FwaS92MS9xdWVyeV9yYW5nZSIsIGpvYj0icHJvbWV0aGV1cyJ9AAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAAgAQAAIAEAAAAAAwEgAQAAAgAAAIAAAAAEAAAANP7//wgAAABkAAAAWwAAAHByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbHtjb2RlPSIyMDAiLCBoYW5kbGVyPSIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwgam9iPSJwcm9tZXRoZXVzIn0ABAAAAG5hbWUAAAAArP7//wgAAAB4AAAAbQAAAHsiX19uYW1lX18iOiJwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWwiLCJjb2RlIjoiMjAwIiwiaGFuZGxlciI6Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCJqb2IiOiJwcm9tZXRoZXVzIn0AAAAGAAAAbGFiZWxzAAAAAAAA/v7//wAAAgBbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjIwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAAABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAAKgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEQAAAHsiaW50ZXJ2YWwiOjEwMDB9AAAABgAAAGNvbmZpZwAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAD/////6AAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAHAAAAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAAHgAAAAEAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAQAAAAAAAAAKAAAAAAAAAAgAAAAAAAAAEgAAAAAAAAABAAAAAAAAABQAAAAAAAAACAAAAAAAAAAAAAAAAMAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAABAAAAAAAAAAQAAAAAAAAAAgAAAAAAAADATs/f0ynJFsAYahvUKckWwOIEV9QpyRbArJ+S1CnJFg4AAAAAAAAAAAAAAAAAAAAAAAAAAAA1QAAAAAAAAEBAAAAAAACARUAJAAAAAAAAAAAAAAAAAEtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFNAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAQAAQAAABgFAAAAAAAA8AAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAA2AAAAAMAAABMAAAAKAAAAAQAAACU+///CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAALT7//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAA1Pv//wgAAABwAAAAZAAAAHsidHlwZSI6InRpbWVzZXJpZXMtd2lkZSIsImN1c3RvbSI6eyJyZXN1bHRUeXBlIjoibWF0cml4In0sImV4ZWN1dGVkUXVlcnlTdHJpbmciOiJFeHByOiBcblN0ZXA6IDFzIn0AAAAABAAAAG1ldGEAAAAAAwAAAFwDAACwAQAABAAAAGr+//8UAAAAIAEAACABAAAAAAMBIAEAAAIAAACAAAAABAAAAIz8//8IAAAAZAAAAFsAAABwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWx7Y29kZT0iNDAwIiwgaGFuZGxlcj0iL2FwaS92MS9xdWVyeV9yYW5nZSIsIGpvYj0icHJvbWV0aGV1cyJ9AAQAAABuYW1lAAAAAAT9//8IAAAAeAAAAG0AAAB7Il9fbmFtZV9fIjoicHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFsIiwiY29kZSI6IjQwMCIsImhhbmRsZXIiOiIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwiam9iIjoicHJvbWV0aGV1cyJ9AAAABgAAAGxhYmVscwAAAAAAAFb9//8AAAIAWwAAAHByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbHtjb2RlPSI0MDAiLCBoYW5kbGVyPSIvYXBpL3YxL3F1ZXJ5X3JhbmdlIiwgam9iPSJwcm9tZXRoZXVzIn0AAAASABgAFAATABIADAAAAAgABAASAAAAFAAAACABAAAgAQAAAAADASABAAACAAAAgAAAAAQAAAA0/v//CAAAAGQAAABbAAAAcHJvbWV0aGV1c19odHRwX3JlcXVlc3RzX3RvdGFse2NvZGU9IjIwMCIsIGhhbmRsZXI9Ii9hcGkvdjEvcXVlcnlfcmFuZ2UiLCBqb2I9InByb21ldGhldXMifQAEAAAAbmFtZQAAAACs/v//CAAAAHgAAABtAAAAeyJfX25hbWVfXyI6InByb21ldGhldXNfaHR0cF9yZXF1ZXN0c190b3RhbCIsImNvZGUiOiIyMDAiLCJoYW5kbGVyIjoiL2FwaS92MS9xdWVyeV9yYW5nZSIsImpvYiI6InByb21ldGhldXMifQAAAAYAAABsYWJlbHMAAAAAAAD+/v//AAACAFsAAABwcm9tZXRoZXVzX2h0dHBfcmVxdWVzdHNfdG90YWx7Y29kZT0iMjAwIiwgaGFuZGxlcj0iL2FwaS92MS9xdWVyeV9yYW5nZSIsIGpvYj0icHJvbWV0aGV1cyJ9AAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAAB4AAAAgAAAAAAAAAqAAAAAAgAAADQAAAAEAAAA3P///wgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAACAAMAAgABAAIAAAACAAAABwAAAARAAAAeyJpbnRlcnZhbCI6MTAwMH0AAAAGAAAAY29uZmlnAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAADgFAABBUlJPVzE=
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json
index 0646fa5240d..7e425fd1ea6 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.json
@@ -96,7 +96,7 @@
       "data": {
         "values": [
           [
-            1641889530123,
+            1641889529123,
             1641889532123
           ],
           [
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt
index 9856f08b4dc..028b1598ae0 100644
--- a/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt
+++ b/pkg/tsdb/prometheus/testdata/range_simple.result.streaming.golden.txt
@@ -35,11 +35,11 @@ Dimensions: 2 Fields by 2 Rows
 | Labels:                           | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus |
 | Type: []time.Time                 | Type: []float64                                                                                        |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
-| 2022-01-11 08:25:30.123 +0000 UTC | 54                                                                                                     |
+| 2022-01-11 08:25:29.123 +0000 UTC | 54                                                                                                     |
 | 2022-01-11 08:25:32.123 +0000 UTC | 76                                                                                                     |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------+
 
 
 ====== TEST DATA RESPONSE (arrow base64) ======
 FRAME=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
-FRAME=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
+FRAME=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
diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go
index 4f74f7ed957..34c72442f5a 100644
--- a/pkg/util/converter/prom.go
+++ b/pkg/util/converter/prom.go
@@ -3,11 +3,13 @@ package converter
 import (
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strconv"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
 	jsoniter "github.com/json-iterator/go"
 )
 
@@ -437,6 +439,8 @@ func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string) *backend
 	}
 
 	if len(rsp.Frames) == 0 {
+		sorter := experimental.NewFrameSorter(frame, frame.Fields[0])
+		sort.Sort(sorter)
 		rsp.Frames = append(rsp.Frames, frame)
 	}
 
diff --git a/pkg/util/converter/testdata/loki-streams-a-frame.json b/pkg/util/converter/testdata/loki-streams-a-frame.json
index 06eb3fe7c06..60125db8f94 100644
--- a/pkg/util/converter/testdata/loki-streams-a-frame.json
+++ b/pkg/util/converter/testdata/loki-streams-a-frame.json
@@ -6,34 +6,34 @@
           "custom": {
             "stats": {
               "summary": {
-                "totalLinesProcessed": 55,
                 "execTime": 0.002216125,
                 "bytesProcessedPerSecond": 3507022,
                 "linesProcessedPerSecond": 24818,
-                "totalBytesProcessed": 7772
+                "totalBytesProcessed": 7772,
+                "totalLinesProcessed": 55
               },
               "store": {
-                "decompressedLines": 55,
-                "totalChunksRef": 2,
                 "totalChunksDownloaded": 2,
                 "chunksDownloadTime": 0.000390958,
+                "compressedBytes": 31432,
+                "totalDuplicates": 0,
+                "totalChunksRef": 2,
                 "headChunkBytes": 0,
                 "headChunkLines": 0,
                 "decompressedBytes": 7772,
-                "compressedBytes": 31432,
-                "totalDuplicates": 0
+                "decompressedLines": 55
               },
               "ingester": {
                 "totalBatches": 0,
                 "headChunkLines": 0,
                 "decompressedBytes": 0,
-                "totalDuplicates": 0,
-                "totalReached": 0,
-                "totalChunksMatched": 0,
                 "decompressedLines": 0,
                 "compressedBytes": 0,
+                "totalReached": 0,
                 "totalLinesSent": 0,
-                "headChunkBytes": 0
+                "headChunkBytes": 0,
+                "totalDuplicates": 0,
+                "totalChunksMatched": 0
               }
             }
           }
diff --git a/pkg/util/converter/testdata/loki-streams-a-wide-frame.json b/pkg/util/converter/testdata/loki-streams-a-wide-frame.json
index 18812654643..e5f77993812 100644
--- a/pkg/util/converter/testdata/loki-streams-a-wide-frame.json
+++ b/pkg/util/converter/testdata/loki-streams-a-wide-frame.json
@@ -5,18 +5,6 @@
         "meta": {
           "custom": {
             "stats": {
-              "ingester": {
-                "compressedBytes": 0,
-                "totalDuplicates": 0,
-                "totalReached": 0,
-                "totalChunksMatched": 0,
-                "totalBatches": 0,
-                "totalLinesSent": 0,
-                "decompressedBytes": 0,
-                "decompressedLines": 0,
-                "headChunkBytes": 0,
-                "headChunkLines": 0
-              },
               "summary": {
                 "bytesProcessedPerSecond": 3507022,
                 "linesProcessedPerSecond": 24818,
@@ -26,14 +14,26 @@
               },
               "store": {
                 "totalChunksRef": 2,
-                "totalChunksDownloaded": 2,
                 "headChunkBytes": 0,
-                "decompressedBytes": 7772,
-                "chunksDownloadTime": 0.000390958,
                 "headChunkLines": 0,
+                "totalDuplicates": 0,
+                "totalChunksDownloaded": 2,
+                "chunksDownloadTime": 0.000390958,
+                "decompressedBytes": 7772,
                 "decompressedLines": 55,
-                "compressedBytes": 31432,
-                "totalDuplicates": 0
+                "compressedBytes": 31432
+              },
+              "ingester": {
+                "totalLinesSent": 0,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "compressedBytes": 0,
+                "totalDuplicates": 0,
+                "totalReached": 0,
+                "totalBatches": 0,
+                "decompressedBytes": 0,
+                "decompressedLines": 0,
+                "totalChunksMatched": 0
               }
             }
           }
diff --git a/pkg/util/converter/testdata/loki-streams-b-frame.json b/pkg/util/converter/testdata/loki-streams-b-frame.json
index 671a28f708f..70e0aefa735 100644
--- a/pkg/util/converter/testdata/loki-streams-b-frame.json
+++ b/pkg/util/converter/testdata/loki-streams-b-frame.json
@@ -6,34 +6,34 @@
           "custom": {
             "stats": {
               "summary": {
+                "totalLinesProcessed": 55,
+                "execTime": 0.002216125,
                 "bytesProcessedPerSecond": 3507022,
                 "linesProcessedPerSecond": 24818,
-                "totalBytesProcessed": 7772,
-                "totalLinesProcessed": 55,
-                "execTime": 0.002216125
+                "totalBytesProcessed": 7772
               },
               "store": {
+                "totalChunksDownloaded": 2,
+                "headChunkBytes": 0,
+                "decompressedLines": 55,
+                "totalDuplicates": 0,
                 "totalChunksRef": 2,
                 "chunksDownloadTime": 0.000390958,
                 "headChunkLines": 0,
                 "decompressedBytes": 7772,
-                "compressedBytes": 31432,
-                "totalChunksDownloaded": 2,
-                "headChunkBytes": 0,
-                "decompressedLines": 55,
-                "totalDuplicates": 0
+                "compressedBytes": 31432
               },
               "ingester": {
+                "decompressedBytes": 0,
                 "compressedBytes": 0,
                 "totalDuplicates": 0,
-                "totalReached": 0,
-                "totalLinesSent": 0,
-                "headChunkBytes": 0,
-                "headChunkLines": 0,
                 "totalChunksMatched": 0,
                 "totalBatches": 0,
-                "decompressedBytes": 0,
-                "decompressedLines": 0
+                "headChunkLines": 0,
+                "decompressedLines": 0,
+                "totalReached": 0,
+                "totalLinesSent": 0,
+                "headChunkBytes": 0
               }
             }
           }
diff --git a/pkg/util/converter/testdata/loki-streams-b-wide-frame.json b/pkg/util/converter/testdata/loki-streams-b-wide-frame.json
index 160b2e3e68b..564bafb3ea0 100644
--- a/pkg/util/converter/testdata/loki-streams-b-wide-frame.json
+++ b/pkg/util/converter/testdata/loki-streams-b-wide-frame.json
@@ -5,35 +5,35 @@
         "meta": {
           "custom": {
             "stats": {
+              "store": {
+                "totalChunksDownloaded": 2,
+                "decompressedLines": 55,
+                "totalDuplicates": 0,
+                "totalChunksRef": 2,
+                "chunksDownloadTime": 0.000390958,
+                "headChunkBytes": 0,
+                "headChunkLines": 0,
+                "decompressedBytes": 7772,
+                "compressedBytes": 31432
+              },
+              "ingester": {
+                "totalDuplicates": 0,
+                "totalReached": 0,
+                "totalLinesSent": 0,
+                "decompressedBytes": 0,
+                "compressedBytes": 0,
+                "decompressedLines": 0,
+                "totalChunksMatched": 0,
+                "totalBatches": 0,
+                "headChunkBytes": 0,
+                "headChunkLines": 0
+              },
               "summary": {
                 "bytesProcessedPerSecond": 3507022,
                 "linesProcessedPerSecond": 24818,
                 "totalBytesProcessed": 7772,
                 "totalLinesProcessed": 55,
                 "execTime": 0.002216125
-              },
-              "store": {
-                "headChunkLines": 0,
-                "decompressedBytes": 7772,
-                "totalChunksRef": 2,
-                "chunksDownloadTime": 0.000390958,
-                "decompressedLines": 55,
-                "compressedBytes": 31432,
-                "totalDuplicates": 0,
-                "totalChunksDownloaded": 2,
-                "headChunkBytes": 0
-              },
-              "ingester": {
-                "compressedBytes": 0,
-                "totalDuplicates": 0,
-                "totalReached": 0,
-                "totalBatches": 0,
-                "totalLinesSent": 0,
-                "headChunkBytes": 0,
-                "decompressedLines": 0,
-                "totalChunksMatched": 0,
-                "headChunkLines": 0,
-                "decompressedBytes": 0
               }
             }
           }

From 0a07d97dd1a0fb98ff2248ab12d5901b81ccc3ee Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 03:47:30 -0400
Subject: [PATCH 038/103] Old Graph migration: Preserve null values settings
 (#49493) (#49579)

* Graph migration: Preserve null values settings

* Review

(cherry picked from commit 30880e6e18cec1f0469516da0d497e126d281754)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---
 .../__snapshots__/migrations.test.ts.snap     | 16 ++++++-------
 .../panel/timeseries/migrations.test.ts       | 23 +++++++++++++++++++
 .../plugins/panel/timeseries/migrations.ts    |  2 +-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
index 54174fbd013..60fb6a03a78 100644
--- a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
@@ -12,7 +12,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 5,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
       },
       "nullValueMode": "null",
       "unit": "short",
@@ -120,7 +120,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 1,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
       },
       "nullValueMode": "null",
       "unit": "short",
@@ -176,7 +176,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 1,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
       },
       "nullValueMode": "null",
       "unit": "short",
@@ -259,7 +259,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 5,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
         "stacking": Object {
           "group": "A",
           "mode": "normal",
@@ -346,7 +346,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 5,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
         "stacking": Object {
           "group": "A",
           "mode": "normal",
@@ -404,7 +404,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 1,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
       },
       "displayName": "DISPLAY NAME",
       "nullValueMode": "null",
@@ -444,7 +444,7 @@ Object {
         "lineInterpolation": "stepAfter",
         "lineWidth": 5,
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
       },
       "nullValueMode": "null",
       "unit": "short",
@@ -554,7 +554,7 @@ Object {
           "type": "log",
         },
         "showPoints": "never",
-        "spanNulls": true,
+        "spanNulls": false,
       },
       "decimals": 3,
       "max": 1000,
diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts
index 767c528464a..1d4a553c40c 100644
--- a/public/app/plugins/panel/timeseries/migrations.test.ts
+++ b/public/app/plugins/panel/timeseries/migrations.test.ts
@@ -426,6 +426,29 @@ describe('Graph Migrations', () => {
       expect(panel.fieldConfig).toMatchSnapshot();
     });
   });
+
+  describe('null values', () => {
+    test('nullPointMode = null', () => {
+      const old: any = {
+        angular: {
+          nullPointMode: 'null',
+        },
+      };
+      const panel = {} as PanelModel;
+      panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
+      expect(panel.fieldConfig.defaults.custom.spanNulls).toBeFalsy();
+    });
+    test('nullPointMode = connected', () => {
+      const old: any = {
+        angular: {
+          nullPointMode: 'connected',
+        },
+      };
+      const panel = {} as PanelModel;
+      panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
+      expect(panel.fieldConfig.defaults.custom.spanNulls).toBeTruthy();
+    });
+  });
 });
 
 const customColor = {
diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts
index 56beb024450..a19e7017cdb 100644
--- a/public/app/plugins/panel/timeseries/migrations.ts
+++ b/public/app/plugins/panel/timeseries/migrations.ts
@@ -296,7 +296,7 @@ export function flotToGraphOptions(angular: any): { fieldConfig: FieldConfigSour
     graph.fillOpacity = angular.fillGradient * 10; // fill is 0-10
   }
 
-  graph.spanNulls = angular.nullPointMode === NullValueMode.Null;
+  graph.spanNulls = angular.nullPointMode === NullValueMode.Ignore;
 
   if (angular.steppedLine) {
     graph.lineInterpolation = LineInterpolation.StepAfter;

From dd1d1dae04095718b9b0139c5c1cd9d8025602eb Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 04:12:10 -0400
Subject: [PATCH 039/103] Alerting: Add stored screenshot utilities to the
 channels package. (#49470) (#49664)

Adds three functions:
`withStoredImages` iterates over a list of models.Alerts, extracting a stored image's data from storage, if available, and executing a user-provided function.
`withStoredImage` does this for an image attached to a specific alert.
`openImage` finds and opens an image file on disk.

Moves `store.Image` to `models.Image`
Simplifies `channels.ImageStore` interface and updates notifiers that use it to use the simpler methods.
Updates all pkg/alert/notifier/channels to use withStoredImage routines.

(cherry picked from commit 9e8efaa4599cad3ba272c5a5689b94bb7f6e8b8b)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
---
 pkg/services/ngalert/image/mock.go            |  53 --------
 pkg/services/ngalert/image/service.go         |  14 +--
 pkg/services/ngalert/models/image.go          |  23 ++++
 pkg/services/ngalert/notifier/alertmanager.go |   2 +-
 .../ngalert/notifier/channels/discord.go      | 117 +++++++++---------
 .../ngalert/notifier/channels/email.go        |  38 ++----
 .../ngalert/notifier/channels/factory.go      |   7 +-
 .../ngalert/notifier/channels/googlechat.go   |  29 ++---
 .../ngalert/notifier/channels/opsgenie.go     |  27 ++--
 .../ngalert/notifier/channels/pagerduty.go    |  25 ++--
 .../ngalert/notifier/channels/slack.go        |  81 ++++++------
 .../ngalert/notifier/channels/teams.go        |  22 ++--
 .../ngalert/notifier/channels/utils.go        |  81 ++++++++++--
 .../ngalert/notifier/channels/webhook.go      |  29 ++---
 pkg/services/ngalert/notifier/testing.go      |  16 +--
 pkg/services/ngalert/schedule/compat_test.go  |   3 +-
 .../ngalert/state/manager_private_test.go     |  10 +-
 pkg/services/ngalert/state/state.go           |   3 +-
 pkg/services/ngalert/store/image.go           |  82 ++----------
 pkg/services/ngalert/store/image_test.go      |  13 +-
 20 files changed, 289 insertions(+), 386 deletions(-)
 delete mode 100644 pkg/services/ngalert/image/mock.go
 create mode 100644 pkg/services/ngalert/models/image.go

diff --git a/pkg/services/ngalert/image/mock.go b/pkg/services/ngalert/image/mock.go
deleted file mode 100644
index 1529f966ac4..00000000000
--- a/pkg/services/ngalert/image/mock.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/grafana/grafana/pkg/services/ngalert/image (interfaces: ImageService)
-
-// Package image is a generated GoMock package.
-package image
-
-import (
-	context "context"
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-	data "github.com/grafana/grafana-plugin-sdk-go/data"
-	models "github.com/grafana/grafana/pkg/services/ngalert/models"
-	store "github.com/grafana/grafana/pkg/services/ngalert/store"
-)
-
-// MockImageService is a mock of ImageService interface.
-type MockImageService struct {
-	ctrl     *gomock.Controller
-	recorder *MockImageServiceMockRecorder
-}
-
-// MockImageServiceMockRecorder is the mock recorder for MockImageService.
-type MockImageServiceMockRecorder struct {
-	mock *MockImageService
-}
-
-// NewMockImageService creates a new mock instance.
-func NewMockImageService(ctrl *gomock.Controller) *MockImageService {
-	mock := &MockImageService{ctrl: ctrl}
-	mock.recorder = &MockImageServiceMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockImageService) EXPECT() *MockImageServiceMockRecorder {
-	return m.recorder
-}
-
-// NewImage mocks base method.
-func (m *MockImageService) NewImage(arg0 context.Context, arg1 *models.AlertRule, arg2 data.Labels) (*store.Image, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NewImage", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*store.Image)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NewImage indicates an expected call of NewImage.
-func (mr *MockImageServiceMockRecorder) NewImage(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewImage", reflect.TypeOf((*MockImageService)(nil).NewImage), arg0, arg1, arg2)
-}
diff --git a/pkg/services/ngalert/image/service.go b/pkg/services/ngalert/image/service.go
index 4af73af9a2f..f19501475fc 100644
--- a/pkg/services/ngalert/image/service.go
+++ b/pkg/services/ngalert/image/service.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/imguploader"
 	"github.com/grafana/grafana/pkg/services/dashboards"
-	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/rendering"
 	"github.com/grafana/grafana/pkg/services/screenshot"
@@ -20,7 +20,7 @@ import (
 //go:generate mockgen -destination=mock.go -package=image github.com/grafana/grafana/pkg/services/ngalert/image ImageService
 type ImageService interface {
 	// NewImage returns a new image for the alert instance.
-	NewImage(ctx context.Context, r *ngmodels.AlertRule) (*store.Image, error)
+	NewImage(ctx context.Context, r *models.AlertRule) (*models.Image, error)
 }
 
 var (
@@ -83,7 +83,7 @@ func NewScreenshotImageServiceFromCfg(cfg *setting.Cfg, metrics prometheus.Regis
 // NewImage returns a screenshot of the panel for the alert rule. It returns
 // ErrNoDashboard if the alert rule does not have a dashboard and ErrNoPanel
 // when the alert rule does not have a panel in a dashboard.
-func (s *ScreenshotImageService) NewImage(ctx context.Context, r *ngmodels.AlertRule) (*store.Image, error) {
+func (s *ScreenshotImageService) NewImage(ctx context.Context, r *models.AlertRule) (*models.Image, error) {
 	if r.DashboardUID == nil {
 		return nil, ErrNoDashboard
 	}
@@ -102,7 +102,7 @@ func (s *ScreenshotImageService) NewImage(ctx context.Context, r *ngmodels.Alert
 		return nil, fmt.Errorf("failed to take screenshot: %w", err)
 	}
 
-	v := store.Image{
+	v := models.Image{
 		Path: screenshot.Path,
 		URL:  screenshot.URL,
 	}
@@ -115,12 +115,12 @@ func (s *ScreenshotImageService) NewImage(ctx context.Context, r *ngmodels.Alert
 
 type NotAvailableImageService struct{}
 
-func (s *NotAvailableImageService) NewImage(ctx context.Context, r *ngmodels.AlertRule) (*store.Image, error) {
+func (s *NotAvailableImageService) NewImage(ctx context.Context, r *models.AlertRule) (*models.Image, error) {
 	return nil, screenshot.ErrScreenshotsUnavailable
 }
 
 type NoopImageService struct{}
 
-func (s *NoopImageService) NewImage(ctx context.Context, r *ngmodels.AlertRule) (*store.Image, error) {
-	return &store.Image{}, nil
+func (s *NoopImageService) NewImage(ctx context.Context, r *models.AlertRule) (*models.Image, error) {
+	return &models.Image{}, nil
 }
diff --git a/pkg/services/ngalert/models/image.go b/pkg/services/ngalert/models/image.go
new file mode 100644
index 00000000000..0610f6ca1c5
--- /dev/null
+++ b/pkg/services/ngalert/models/image.go
@@ -0,0 +1,23 @@
+package models
+
+import (
+	"errors"
+	"time"
+)
+
+// ErrImageNotFound is returned when the image does not exist.
+var ErrImageNotFound = errors.New("image not found")
+
+type Image struct {
+	ID        int64     `xorm:"pk autoincr 'id'"`
+	Token     string    `xorm:"token"`
+	Path      string    `xorm:"path"`
+	URL       string    `xorm:"url"`
+	CreatedAt time.Time `xorm:"created_at"`
+	ExpiresAt time.Time `xorm:"expires_at"`
+}
+
+// A XORM interface that defines the used table for this struct.
+func (i *Image) TableName() string {
+	return "alert_image"
+}
diff --git a/pkg/services/ngalert/notifier/alertmanager.go b/pkg/services/ngalert/notifier/alertmanager.go
index 7d1ff55c89b..7243a9ac606 100644
--- a/pkg/services/ngalert/notifier/alertmanager.go
+++ b/pkg/services/ngalert/notifier/alertmanager.go
@@ -88,7 +88,7 @@ type ClusterPeer interface {
 
 type AlertingStore interface {
 	store.AlertingStore
-	channels.ImageStore
+	store.ImageStore
 }
 
 type Alertmanager struct {
diff --git a/pkg/services/ngalert/notifier/channels/discord.go b/pkg/services/ngalert/notifier/channels/discord.go
index c113dfd0a29..874b9354c40 100644
--- a/pkg/services/ngalert/notifier/channels/discord.go
+++ b/pkg/services/ngalert/notifier/channels/discord.go
@@ -19,6 +19,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -196,65 +197,52 @@ func (d DiscordNotifier) SendResolved() bool {
 
 func (d DiscordNotifier) constructAttachments(ctx context.Context, as []*types.Alert, embedQuota int) []discordAttachment {
 	attachments := make([]discordAttachment, 0)
-	for i := range as {
-		if embedQuota == 0 {
-			break
-		}
-		imgToken := getTokenFromAnnotations(as[i].Annotations)
-		if len(imgToken) == 0 {
-			continue
-		}
 
-		timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-		imgURL, err := d.images.GetURL(timeoutCtx, imgToken)
-		cancel()
-		if err != nil {
-			if !errors.Is(err, ErrImagesUnavailable) {
-				// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-				d.log.Warn("failed to retrieve image url from store", "error", err)
-			}
-		}
-
-		if len(imgURL) > 0 {
-			attachments = append(attachments, discordAttachment{
-				url:       imgURL,
-				state:     as[i].Status(),
-				alertName: as[i].Name(),
-			})
-		} else {
-			// Need to upload the file. Tell Discord that we're embedding an attachment.
-			timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-			fp, err := d.images.GetFilepath(timeoutCtx, imgToken)
-			cancel()
-			if err != nil {
-				if !errors.Is(err, ErrImagesUnavailable) {
-					// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-					d.log.Warn("failed to retrieve image filepath from store", "error", err)
-				}
+	_ = withStoredImages(ctx, d.log, d.images,
+		func(index int, image *ngmodels.Image) error {
+			if embedQuota < 1 {
+				// TODO: Could be a sentinel error to stop execution.
+				return nil
 			}
 
-			base := filepath.Base(fp)
-			url := fmt.Sprintf("attachment://%s", base)
-			timeoutCtx, cancel = context.WithTimeout(ctx, ImageStoreTimeout)
-			reader, err := d.images.GetData(timeoutCtx, imgToken)
-			cancel()
-			if err != nil {
-				if !errors.Is(err, ErrImagesUnavailable) {
-					// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
+			if image == nil {
+				return nil
+			}
+
+			if len(image.URL) > 0 {
+				attachments = append(attachments, discordAttachment{
+					url:       image.URL,
+					state:     as[index].Status(),
+					alertName: as[index].Name(),
+				})
+				embedQuota--
+				return nil
+			}
+
+			// If we have a local file, but no public URL, upload the image as an attachment.
+			if len(image.Path) > 0 {
+				base := filepath.Base(image.Path)
+				url := fmt.Sprintf("attachment://%s", base)
+				reader, err := openImage(image.Path)
+				if err != nil && !errors.Is(err, ngmodels.ErrImageNotFound) {
 					d.log.Warn("failed to retrieve image data from store", "error", err)
+					return nil
 				}
-			}
 
-			attachments = append(attachments, discordAttachment{
-				url:       url,
-				name:      base,
-				reader:    reader,
-				state:     as[i].Status(),
-				alertName: as[i].Name(),
-			})
-		}
-		embedQuota++
-	}
+				attachments = append(attachments, discordAttachment{
+					url:       url,
+					name:      base,
+					reader:    reader,
+					state:     as[index].Status(),
+					alertName: as[index].Name(),
+				})
+				embedQuota--
+			}
+			return nil
+		},
+		as...,
+	)
+
 	return attachments
 }
 
@@ -282,21 +270,32 @@ func (d DiscordNotifier) buildRequest(ctx context.Context, url string, body []by
 	if err != nil {
 		return nil, err
 	}
+
 	if _, err := payload.Write(body); err != nil {
 		return nil, err
 	}
+
 	for _, a := range attachments {
-		part, err := w.CreateFormFile("", a.name)
-		if err != nil {
-			return nil, err
-		}
-		if _, err := io.Copy(part, a.reader); err != nil {
-			return nil, err
+		if a.reader != nil { // We have an image to upload.
+			err = func() error {
+				defer func() { _ = a.reader.Close() }()
+				part, err := w.CreateFormFile("", a.name)
+				if err != nil {
+					return err
+				}
+				_, err = io.Copy(part, a.reader)
+				return err
+			}()
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
+
 	if err := w.Close(); err != nil {
 		return nil, fmt.Errorf("failed to close multipart writer: %w", err)
 	}
+
 	cmd.ContentType = w.FormDataContentType()
 	cmd.Body = b.String()
 	return cmd, nil
diff --git a/pkg/services/ngalert/notifier/channels/email.go b/pkg/services/ngalert/notifier/channels/email.go
index 3120c267516..bbbc6de13e0 100644
--- a/pkg/services/ngalert/notifier/channels/email.go
+++ b/pkg/services/ngalert/notifier/channels/email.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -126,38 +127,25 @@ func (en *EmailNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 
 	// TODO: modify the email sender code to support multiple file or image URL
 	// fields. We cannot use images from every alert yet.
-	imgToken := getTokenFromAnnotations(as[0].Annotations)
-	if len(imgToken) != 0 {
-		timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-		imgURL, err := en.images.GetURL(timeoutCtx, imgToken)
-		cancel()
-		if err != nil {
-			if !errors.Is(err, ErrImagesUnavailable) {
-				// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-				en.log.Warn("failed to retrieve image url from store", "error", err)
+	_ = withStoredImage(ctx, en.log, en.images,
+		func(index int, image *ngmodels.Image) error {
+			if image == nil {
+				return nil
 			}
-		} else if len(imgURL) > 0 {
-			cmd.Data["ImageLink"] = imgURL
-		} else { // Try to upload
-			timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-			imgPath, err := en.images.GetFilepath(timeoutCtx, imgToken)
-			cancel()
-			if err != nil {
-				if !errors.Is(err, ErrImagesUnavailable) {
-					// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-					en.log.Warn("failed to retrieve image url from store", "error", err)
-				}
-			} else if len(imgPath) != 0 {
-				file, err := os.Stat(imgPath)
+
+			if len(image.URL) != 0 {
+				cmd.Data["ImageLink"] = image.URL
+			} else if len(image.Path) != 0 {
+				file, err := os.Stat(image.Path)
 				if err == nil {
-					cmd.EmbeddedFiles = []string{imgPath}
+					cmd.EmbeddedFiles = []string{image.Path}
 					cmd.Data["EmbeddedImage"] = file.Name()
 				} else {
 					en.log.Warn("failed to access email notification image attachment data", "error", err)
 				}
 			}
-		}
-	}
+			return nil
+		}, 0, as...)
 
 	if tmplErr != nil {
 		en.log.Warn("failed to template email message", "err", tmplErr.Error())
diff --git a/pkg/services/ngalert/notifier/channels/factory.go b/pkg/services/ngalert/notifier/channels/factory.go
index 35334786d87..0a8d4c6a18b 100644
--- a/pkg/services/ngalert/notifier/channels/factory.go
+++ b/pkg/services/ngalert/notifier/channels/factory.go
@@ -3,9 +3,9 @@ package channels
 import (
 	"context"
 	"errors"
-	"io"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/prometheus/alertmanager/template"
 )
@@ -19,11 +19,8 @@ type FactoryConfig struct {
 	Template *template.Template
 }
 
-// A specialization of store.ImageStore, to avoid an import loop.
 type ImageStore interface {
-	GetURL(ctx context.Context, token string) (string, error)
-	GetFilepath(ctx context.Context, token string) (string, error)
-	GetData(ctx context.Context, token string) (io.ReadCloser, error)
+	GetImage(ctx context.Context, token string) (*models.Image, error)
 }
 
 func NewFactoryConfig(config *NotificationChannelConfig, notificationService notifications.Service,
diff --git a/pkg/services/ngalert/notifier/channels/googlechat.go b/pkg/services/ngalert/notifier/channels/googlechat.go
index 2179221ffcc..5c7ed8ad68d 100644
--- a/pkg/services/ngalert/notifier/channels/googlechat.go
+++ b/pkg/services/ngalert/notifier/channels/googlechat.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -188,40 +189,32 @@ func (gcn *GoogleChatNotifier) buildScreenshotCard(ctx context.Context, alerts [
 		},
 		Sections: []section{},
 	}
-	for _, alert := range alerts {
-		imgToken := getTokenFromAnnotations(alert.Annotations)
-		if len(imgToken) == 0 {
-			continue
-		}
 
-		timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-		imgURL, err := gcn.images.GetURL(timeoutCtx, imgToken)
-		cancel()
-		if err != nil {
-			if !errors.Is(err, ErrImagesUnavailable) {
-				// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-				gcn.log.Warn("failed to retrieve image url from store", "error", err)
+	_ = withStoredImages(ctx, gcn.log, gcn.images,
+		func(index int, image *ngmodels.Image) error {
+			if image == nil || len(image.URL) == 0 {
+				return nil
 			}
-		}
 
-		if len(imgURL) > 0 {
 			section := section{
 				Widgets: []widget{
 					textParagraphWidget{
 						Text: text{
-							Text: fmt.Sprintf("%s: %s", alert.Status(), alert.Name()),
+							Text: fmt.Sprintf("%s: %s", alerts[index].Status(), alerts[index].Name()),
 						},
 					},
 					imageWidget{
 						Image: imageData{
-							ImageURL: imgURL,
+							ImageURL: image.URL,
 						},
 					},
 				},
 			}
 			card.Sections = append(card.Sections, section)
-		}
-	}
+
+			return nil
+		}, alerts...)
+
 	if len(card.Sections) == 0 {
 		return nil
 	}
diff --git a/pkg/services/ngalert/notifier/channels/opsgenie.go b/pkg/services/ngalert/notifier/channels/opsgenie.go
index 2afcedac7d3..0a06501eb9c 100644
--- a/pkg/services/ngalert/notifier/channels/opsgenie.go
+++ b/pkg/services/ngalert/notifier/channels/opsgenie.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/prometheus/alertmanager/notify"
 	"github.com/prometheus/alertmanager/template"
@@ -212,25 +213,15 @@ func (on *OpsgenieNotifier) buildOpsgenieMessage(ctx context.Context, alerts mod
 		}
 
 		images := []string{}
-		for i := range as {
-			imgToken := getTokenFromAnnotations(as[i].Annotations)
-			if len(imgToken) == 0 {
-				continue
-			}
-
-			dbContext, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-			imgURL, err := on.images.GetURL(dbContext, imgToken)
-			cancel()
-
-			if err != nil {
-				if !errors.Is(err, ErrImagesUnavailable) {
-					// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-					on.log.Warn("Error reading screenshot data from ImageStore: %v", err)
+		_ = withStoredImages(ctx, on.log, on.images,
+			func(index int, image *ngmodels.Image) error {
+				if image == nil || len(image.URL) == 0 {
+					return nil
 				}
-			} else if len(imgURL) != 0 {
-				images = append(images, imgURL)
-			}
-		}
+				images = append(images, image.URL)
+				return nil
+			},
+			as...)
 
 		if len(images) != 0 {
 			details.Set("image_urls", images)
diff --git a/pkg/services/ngalert/notifier/channels/pagerduty.go b/pkg/services/ngalert/notifier/channels/pagerduty.go
index 944ce15bca1..65cc96ebc6c 100644
--- a/pkg/services/ngalert/notifier/channels/pagerduty.go
+++ b/pkg/services/ngalert/notifier/channels/pagerduty.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/prometheus/alertmanager/notify"
 	"github.com/prometheus/alertmanager/template"
@@ -186,23 +187,15 @@ func (pn *PagerdutyNotifier) buildPagerdutyMessage(ctx context.Context, alerts m
 		},
 	}
 
-	for i := range as {
-		imgToken := getTokenFromAnnotations(as[i].Annotations)
-		if len(imgToken) == 0 {
-			continue
-		}
-		timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-		imgURL, err := pn.images.GetURL(timeoutCtx, imgToken)
-		cancel()
-		if err != nil {
-			if !errors.Is(err, ErrImagesUnavailable) {
-				// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-				pn.log.Warn("failed to retrieve image url from store", "error", err)
+	_ = withStoredImages(ctx, pn.log, pn.images,
+		func(index int, image *ngmodels.Image) error {
+			if image != nil && len(image.URL) != 0 {
+				msg.Images = append(msg.Images, pagerDutyImage{Src: image.URL})
 			}
-		} else {
-			msg.Images = append(msg.Images, pagerDutyImage{Src: imgURL})
-		}
-	}
+
+			return nil
+		},
+		as...)
 
 	if len(msg.Payload.Summary) > 1024 {
 		// This is the Pagerduty limit.
diff --git a/pkg/services/ngalert/notifier/channels/slack.go b/pkg/services/ngalert/notifier/channels/slack.go
index 9a5e9e67e68..e1132d3c819 100644
--- a/pkg/services/ngalert/notifier/channels/slack.go
+++ b/pkg/services/ngalert/notifier/channels/slack.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/prometheus/alertmanager/config"
@@ -226,34 +227,38 @@ func (sn *SlackNotifier) Notify(ctx context.Context, alerts ...*types.Alert) (bo
 		return false, err
 	}
 
+	var imgData io.ReadCloser
+
 	// Try to upload if we have an image path but no image URL. This uploads the file
 	// immediately after the message. A bit of a hack, but it doesn't require the
 	// user to have an image host set up.
-	// TODO: how many image files should we upload? In what order? Should we
-	// assume the alerts array is already sorted?
 	// TODO: We need a refactoring so we don't do two database reads for the same data.
-	// TODO: Should we process all alerts' annotations? We can only have on image.
-	// TODO: Should we guard out-of-bounds errors here? Callers should prevent that from happening, imo
-	imgToken := getTokenFromAnnotations(alerts[0].Annotations)
-	dbContext, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-	imgData, err := sn.images.GetData(dbContext, imgToken)
-	cancel()
-	if err != nil {
-		if !errors.Is(err, ErrImagesUnavailable) {
-			// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-			sn.log.Warn("Error reading screenshot data from ImageStore: %v", err)
+	if len(msg.Attachments[0].ImageURL) == 0 {
+		_ = withStoredImage(ctx, sn.log, sn.images,
+			func(index int, image *ngmodels.Image) error {
+				if image == nil || len(image.Path) == 0 {
+					return nil
+				}
+
+				imgData, err = openImage(image.Path)
+				if err != nil {
+					imgData = nil
+				}
+
+				return nil
+			},
+			0, alerts...)
+
+		if imgData != nil {
+			defer func() {
+				_ = imgData.Close()
+			}()
+
+			err = sn.slackFileUpload(ctx, imgData, sn.Recipient, sn.Token)
+			if err != nil {
+				sn.log.Warn("Error reading screenshot data from ImageStore: %v", err)
+			}
 		}
-		return true, nil
-	}
-
-	defer func() {
-		// Nothing for us to do.
-		_ = imgData.Close()
-	}()
-
-	err = sn.slackFileUpload(ctx, imgData, sn.Recipient, sn.Token)
-	if err != nil {
-		sn.log.Warn("Error reading screenshot data from ImageStore: %v", err)
 	}
 
 	return true, nil
@@ -319,26 +324,13 @@ var sendSlackRequest = func(request *http.Request, logger log.Logger) error {
 	return nil
 }
 
-func (sn *SlackNotifier) buildSlackMessage(ctx context.Context, as []*types.Alert) (*slackMessage, error) {
-	alerts := types.Alerts(as...)
+func (sn *SlackNotifier) buildSlackMessage(ctx context.Context, alrts []*types.Alert) (*slackMessage, error) {
+	alerts := types.Alerts(alrts...)
 	var tmplErr error
-	tmpl, _ := TmplText(ctx, sn.tmpl, as, sn.log, &tmplErr)
+	tmpl, _ := TmplText(ctx, sn.tmpl, alrts, sn.log, &tmplErr)
 
 	ruleURL := joinUrlPath(sn.tmpl.ExternalURL.String(), "/alerting/list", sn.log)
 
-	// TODO: Should we process all alerts' annotations? We can only have on image.
-	// TODO: Should we guard out-of-bounds errors here? Callers should prevent that from happening, imo
-	imgToken := getTokenFromAnnotations(as[0].Annotations)
-	timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-	imgURL, err := sn.images.GetURL(timeoutCtx, imgToken)
-	cancel()
-	if err != nil {
-		if !errors.Is(err, ErrImagesUnavailable) {
-			// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-			sn.log.Warn("failed to retrieve image url from store", "error", err)
-		}
-	}
-
 	req := &slackMessage{
 		Channel:   tmpl(sn.Recipient),
 		Username:  tmpl(sn.Username),
@@ -353,7 +345,6 @@ func (sn *SlackNotifier) buildSlackMessage(ctx context.Context, as []*types.Aler
 				Fallback:   tmpl(sn.Title),
 				Footer:     "Grafana v" + setting.BuildVersion,
 				FooterIcon: FooterIconURL,
-				ImageURL:   imgURL,
 				Ts:         time.Now().Unix(),
 				TitleLink:  ruleURL,
 				Text:       tmpl(sn.Text),
@@ -361,6 +352,16 @@ func (sn *SlackNotifier) buildSlackMessage(ctx context.Context, as []*types.Aler
 			},
 		},
 	}
+
+	_ = withStoredImage(ctx, sn.log, sn.images,
+		func(index int, image *ngmodels.Image) error {
+			if image != nil {
+				req.Attachments[0].ImageURL = image.URL
+			}
+			return nil
+		},
+		0, alrts...)
+
 	if tmplErr != nil {
 		sn.log.Warn("failed to template Slack message", "err", tmplErr.Error())
 	}
diff --git a/pkg/services/ngalert/notifier/channels/teams.go b/pkg/services/ngalert/notifier/channels/teams.go
index 0b9799f4d91..f08f68c15b4 100644
--- a/pkg/services/ngalert/notifier/channels/teams.go
+++ b/pkg/services/ngalert/notifier/channels/teams.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 )
 
@@ -93,21 +94,14 @@ func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 	ruleURL := joinUrlPath(tn.tmpl.ExternalURL.String(), "/alerting/list", tn.log)
 
 	images := []teamsImage{}
-	for i := range as {
-		imgToken := getTokenFromAnnotations(as[i].Annotations)
-		timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-		imgURL, err := tn.images.GetURL(timeoutCtx, imgToken)
-		cancel()
-		if err != nil {
-			if !errors.Is(err, ErrImagesUnavailable) {
-				// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-				tn.log.Warn("failed to retrieve image url from store", "error", err)
+	_ = withStoredImages(ctx, tn.log, tn.images,
+		func(index int, image *ngmodels.Image) error {
+			if image != nil && len(image.URL) != 0 {
+				images = append(images, teamsImage{Image: image.URL})
 			}
-		}
-		if len(imgURL) > 0 {
-			images = append(images, teamsImage{Image: imgURL})
-		}
-	}
+			return nil
+		},
+		as...)
 
 	// Note: these template calls must remain in this order
 	title := tmpl(tn.Title)
diff --git a/pkg/services/ngalert/notifier/channels/utils.go b/pkg/services/ngalert/notifier/channels/utils.go
index 688d13f6a3c..01c9cae7382 100644
--- a/pkg/services/ngalert/notifier/channels/utils.go
+++ b/pkg/services/ngalert/notifier/channels/utils.go
@@ -10,10 +10,13 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"path"
+	"path/filepath"
 	"time"
 
 	"github.com/prometheus/alertmanager/notify"
+	"github.com/prometheus/alertmanager/types"
 	"github.com/prometheus/common/model"
 
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -38,6 +41,73 @@ var (
 	ErrImagesUnavailable = errors.New("alert screenshots are unavailable")
 )
 
+// For each alert, attempts to load the models.Image for an image token
+// associated with the alert, then calls forEachFunc with the index of the
+// alert and the retrieved image struct. If there is no image token, or the
+// image does not exist, forEachFunc will be called with a nil value for the
+// image. If forEachFunc returns an error, withStoredImages will return
+// immediately. If there is a runtime error retrieving images from the image
+// store, withStoredImages will attempt to continue executing, after logging
+// a warning.
+func withStoredImages(ctx context.Context, l log.Logger, imageStore ImageStore, forEachFunc func(index int, image *models.Image) error, alerts ...*types.Alert) error {
+	for i := range alerts {
+		err := withStoredImage(ctx, l, imageStore, forEachFunc, i, alerts...)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func withStoredImage(ctx context.Context, l log.Logger, imageStore ImageStore, imageFunc func(index int, image *models.Image) error, index int, alerts ...*types.Alert) error {
+	imgToken := getTokenFromAnnotations(alerts[index].Annotations)
+	if len(imgToken) == 0 {
+		err := imageFunc(index, nil)
+		if err != nil {
+			return err
+		}
+	}
+
+	timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
+	img, err := imageStore.GetImage(timeoutCtx, imgToken)
+	cancel()
+
+	if errors.Is(err, models.ErrImageNotFound) || errors.Is(err, ErrImagesUnavailable) {
+		err := imageFunc(index, nil)
+		if err != nil {
+			return err
+		}
+	} else if err != nil {
+		// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
+		l.Warn("failed to retrieve image url from store", "error", err)
+	}
+
+	err = imageFunc(index, img)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// The path argument here comes from reading internal image storage, not user
+// input, so we ignore the security check here.
+//nolint:gosec
+func openImage(path string) (io.ReadCloser, error) {
+	fp := filepath.Clean(path)
+	_, err := os.Stat(fp)
+	if os.IsNotExist(err) || os.IsPermission(err) {
+		return nil, models.ErrImageNotFound
+	}
+
+	f, err := os.Open(fp)
+	if err != nil {
+		return nil, err
+	}
+
+	return f, nil
+}
+
 func getTokenFromAnnotations(annotations model.LabelSet) string {
 	if value, ok := annotations[models.ScreenshotTokenAnnotation]; ok {
 		return string(value)
@@ -47,15 +117,8 @@ func getTokenFromAnnotations(annotations model.LabelSet) string {
 
 type UnavailableImageStore struct{}
 
-func (n *UnavailableImageStore) GetURL(ctx context.Context, token string) (string, error) {
-	return "", ErrImagesUnavailable
-}
-
-func (n *UnavailableImageStore) GetFilepath(ctx context.Context, token string) (string, error) {
-	return "", ErrImagesUnavailable
-}
-
-func (n *UnavailableImageStore) GetData(ctx context.Context, token string) (io.ReadCloser, error) {
+// Get returns the image with the corresponding token, or ErrImageNotFound.
+func (u *UnavailableImageStore) GetImage(ctx context.Context, token string) (*models.Image, error) {
 	return nil, ErrImagesUnavailable
 }
 
diff --git a/pkg/services/ngalert/notifier/channels/webhook.go b/pkg/services/ngalert/notifier/channels/webhook.go
index 864623383a0..b88723277dd 100644
--- a/pkg/services/ngalert/notifier/channels/webhook.go
+++ b/pkg/services/ngalert/notifier/channels/webhook.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/prometheus/alertmanager/notify"
 	"github.com/prometheus/alertmanager/template"
@@ -113,33 +114,19 @@ func (wn *WebhookNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 		return false, err
 	}
 
-	// Get screenshot reference tokens out of data before private annotations are cleared.
-	imgTokens := make([]string, 0, len(as))
-	for i := range as {
-		imgTokens = append(imgTokens, getTokenFromAnnotations(as[i].Annotations))
-	}
-
 	as, numTruncated := truncateAlerts(wn.MaxAlerts, as)
 	var tmplErr error
 	tmpl, data := TmplText(ctx, wn.tmpl, as, wn.log, &tmplErr)
 
 	// Augment our Alert data with ImageURLs if available.
-	for i := range data.Alerts {
-		imgURL := ""
-		if len(imgTokens[i]) != 0 {
-			timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-			imgURL, err = wn.images.GetURL(timeoutCtx, imgTokens[i])
-			cancel()
-			if err != nil {
-				if !errors.Is(err, ErrImagesUnavailable) {
-					// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-					wn.log.Warn("failed to retrieve image url from store", "error", err)
-				}
-			} else if len(imgURL) != 0 {
-				data.Alerts[i].ImageURL = imgURL
+	_ = withStoredImages(ctx, wn.log, wn.images,
+		func(index int, image *ngmodels.Image) error {
+			if image != nil && len(image.URL) != 0 {
+				data.Alerts[index].ImageURL = image.URL
 			}
-		}
-	}
+			return nil
+		},
+		as...)
 
 	msg := &webhookMessage{
 		Version:         "1",
diff --git a/pkg/services/ngalert/notifier/testing.go b/pkg/services/ngalert/notifier/testing.go
index 1cfc41d1aee..a1fc49a03e5 100644
--- a/pkg/services/ngalert/notifier/testing.go
+++ b/pkg/services/ngalert/notifier/testing.go
@@ -5,7 +5,6 @@ import (
 	"crypto/md5"
 	"errors"
 	"fmt"
-	"io"
 	"strings"
 	"sync"
 	"testing"
@@ -19,18 +18,13 @@ type FakeConfigStore struct {
 	configs map[int64]*models.AlertConfiguration
 }
 
-func (f *FakeConfigStore) GetURL(ctx context.Context, token string) (string, error) {
-	return "", store.ErrImageNotFound
+// Saves the image or returns an error.
+func (f *FakeConfigStore) SaveImage(ctx context.Context, img *models.Image) error {
+	return models.ErrImageNotFound
 }
 
-func (f *FakeConfigStore) GetFilepath(ctx context.Context, token string) (string, error) {
-	return "", store.ErrImageNotFound
-}
-
-// Returns an io.ReadCloser that reads out the image data for the provided
-// token, if available. May return ErrImageNotFound.
-func (f *FakeConfigStore) GetData(ctx context.Context, token string) (io.ReadCloser, error) {
-	return nil, store.ErrImageNotFound
+func (f *FakeConfigStore) GetImage(ctx context.Context, token string) (*models.Image, error) {
+	return nil, models.ErrImageNotFound
 }
 
 func NewFakeConfigStore(t *testing.T, configs map[int64]*models.AlertConfiguration) FakeConfigStore {
diff --git a/pkg/services/ngalert/schedule/compat_test.go b/pkg/services/ngalert/schedule/compat_test.go
index 7af2ee8a171..b94d6e07e56 100644
--- a/pkg/services/ngalert/schedule/compat_test.go
+++ b/pkg/services/ngalert/schedule/compat_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngModels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -122,7 +121,7 @@ func Test_stateToPostableAlert(t *testing.T) {
 				t.Run("add __alertScreenshotToken__ if there is an image token", func(t *testing.T) {
 					alertState := randomState(tc.state)
 					alertState.Annotations = randomMapOfStrings()
-					alertState.Image = &store.Image{Token: "test_token"}
+					alertState.Image = &ngModels.Image{Token: "test_token"}
 
 					result := stateToPostableAlert(alertState, appURL)
 
diff --git a/pkg/services/ngalert/state/manager_private_test.go b/pkg/services/ngalert/state/manager_private_test.go
index 00ad1160ac6..45933c2eef4 100644
--- a/pkg/services/ngalert/state/manager_private_test.go
+++ b/pkg/services/ngalert/state/manager_private_test.go
@@ -21,9 +21,9 @@ type CountingImageService struct {
 	Called int
 }
 
-func (c *CountingImageService) NewImage(_ context.Context, _ *ngmodels.AlertRule) (*store.Image, error) {
+func (c *CountingImageService) NewImage(_ context.Context, _ *ngmodels.AlertRule) (*ngmodels.Image, error) {
 	c.Called += 1
-	return &store.Image{
+	return &ngmodels.Image{
 		Token: fmt.Sprint(rand.Int()),
 	}, nil
 }
@@ -40,7 +40,7 @@ func Test_maybeNewImage(t *testing.T) {
 			true,
 			&State{
 				State: eval.Alerting,
-				Image: &store.Image{
+				Image: &ngmodels.Image{
 					Token: "erase me",
 				},
 			},
@@ -60,7 +60,7 @@ func Test_maybeNewImage(t *testing.T) {
 			&State{
 				Resolved: true,
 				State:    eval.Normal,
-				Image: &store.Image{
+				Image: &ngmodels.Image{
 					Token: "abcd",
 				},
 			},
@@ -71,7 +71,7 @@ func Test_maybeNewImage(t *testing.T) {
 			false,
 			&State{
 				State: eval.Alerting,
-				Image: &store.Image{
+				Image: &ngmodels.Image{
 					Token: "already set",
 				},
 			},
diff --git a/pkg/services/ngalert/state/state.go b/pkg/services/ngalert/state/state.go
index 44a1bcb1cbb..7aa8c20a66a 100644
--- a/pkg/services/ngalert/state/state.go
+++ b/pkg/services/ngalert/state/state.go
@@ -12,7 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
 )
 
 type State struct {
@@ -33,7 +32,7 @@ type State struct {
 	Resolved             bool
 	Annotations          map[string]string
 	Labels               data.Labels
-	Image                *store.Image
+	Image                *models.Image
 	Error                error
 }
 
diff --git a/pkg/services/ngalert/store/image.go b/pkg/services/ngalert/store/image.go
index 49a3781ee8c..4d0f94b0ee0 100644
--- a/pkg/services/ngalert/store/image.go
+++ b/pkg/services/ngalert/store/image.go
@@ -2,61 +2,32 @@ package store
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"io"
-	"os"
 	"time"
 
 	"github.com/gofrs/uuid"
 
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
-var (
-	// ErrImageNotFound is returned when the image does not exist.
-	ErrImageNotFound = errors.New("image not found")
-)
-
-type Image struct {
-	ID        int64     `xorm:"pk autoincr 'id'"`
-	Token     string    `xorm:"token"`
-	Path      string    `xorm:"path"`
-	URL       string    `xorm:"url"`
-	CreatedAt time.Time `xorm:"created_at"`
-	ExpiresAt time.Time `xorm:"expires_at"`
-}
-
-// A XORM interface that lets us clean up our SQL session definition.
-func (i *Image) TableName() string {
-	return "alert_image"
-}
-
 type ImageStore interface {
 	// Get returns the image with the token or ErrImageNotFound.
-	GetImage(ctx context.Context, token string) (*Image, error)
+	GetImage(ctx context.Context, token string) (*models.Image, error)
 
 	// Saves the image or returns an error.
-	SaveImage(ctx context.Context, img *Image) error
-
-	GetURL(ctx context.Context, token string) (string, error)
-
-	GetFilepath(ctx context.Context, token string) (string, error)
-
-	// Returns an io.ReadCloser that reads out the image data for the provided
-	// token, if available. May return ErrImageNotFound.
-	GetData(ctx context.Context, token string) (io.ReadCloser, error)
+	SaveImage(ctx context.Context, img *models.Image) error
 }
 
-func (st DBstore) GetImage(ctx context.Context, token string) (*Image, error) {
-	var img Image
+func (st DBstore) GetImage(ctx context.Context, token string) (*models.Image, error) {
+	var img models.Image
 	if err := st.SQLStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
 		exists, err := sess.Where("token = ?", token).Get(&img)
 		if err != nil {
 			return fmt.Errorf("failed to get image: %w", err)
 		}
 		if !exists {
-			return ErrImageNotFound
+			return models.ErrImageNotFound
 		}
 		return nil
 	}); err != nil {
@@ -65,7 +36,7 @@ func (st DBstore) GetImage(ctx context.Context, token string) (*Image, error) {
 	return &img, nil
 }
 
-func (st DBstore) SaveImage(ctx context.Context, img *Image) error {
+func (st DBstore) SaveImage(ctx context.Context, img *models.Image) error {
 	return st.SQLStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
 		// TODO: Is this a good idea? Do we actually want to automatically expire
 		// rows? See issue https://github.com/grafana/grafana/issues/49366
@@ -93,47 +64,10 @@ func (st DBstore) SaveImage(ctx context.Context, img *Image) error {
 	})
 }
 
-func (st *DBstore) GetURL(ctx context.Context, token string) (string, error) {
-	img, err := st.GetImage(ctx, token)
-	if err != nil {
-		return "", err
-	}
-	return img.URL, nil
-}
-
-func (st *DBstore) GetFilepath(ctx context.Context, token string) (string, error) {
-	img, err := st.GetImage(ctx, token)
-	if err != nil {
-		return "", err
-	}
-	return img.Path, nil
-}
-
-func (st *DBstore) GetData(ctx context.Context, token string) (io.ReadCloser, error) {
-	// TODO: Should we support getting data from image.URL? One could configure
-	// the system to upload to S3 while still reading data for notifiers like
-	// Slack that take multipart uploads.
-	img, err := st.GetImage(ctx, token)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(img.Path) == 0 {
-		return nil, ErrImageNotFound
-	}
-
-	f, err := os.Open(img.Path)
-	if err != nil {
-		return nil, err
-	}
-
-	return f, nil
-}
-
 //nolint:unused
 func (st DBstore) DeleteExpiredImages(ctx context.Context) error {
 	return st.SQLStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		n, err := sess.Where("expires_at < ?", TimeNow()).Delete(&Image{})
+		n, err := sess.Where("expires_at < ?", TimeNow()).Delete(&models.Image{})
 		if err != nil {
 			return fmt.Errorf("failed to delete expired images: %w", err)
 		}
diff --git a/pkg/services/ngalert/store/image_test.go b/pkg/services/ngalert/store/image_test.go
index 1669adc2c4e..bd607a9137f 100644
--- a/pkg/services/ngalert/store/image_test.go
+++ b/pkg/services/ngalert/store/image_test.go
@@ -12,12 +12,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/ngalert/tests"
 )
 
-func createTestImg(fakeUrl string, fakePath string) *store.Image {
-	return &store.Image{
+func createTestImg(fakeUrl string, fakePath string) *models.Image {
+	return &models.Image{
 		ID:    0,
 		Token: "",
 		Path:  fakeUrl + "local",
@@ -25,12 +26,12 @@ func createTestImg(fakeUrl string, fakePath string) *store.Image {
 	}
 }
 
-func addID(img *store.Image, id int64) *store.Image {
+func addID(img *models.Image, id int64) *models.Image {
 	img.ID = id
 	return img
 }
 
-func addToken(img *store.Image) *store.Image {
+func addToken(img *models.Image) *models.Image {
 	token, err := uuid.NewV4()
 	if err != nil {
 		panic("wat")
@@ -47,7 +48,7 @@ func TestIntegrationSaveAndGetImage(t *testing.T) {
 	// Here are some images to save.
 	imgs := []struct {
 		name   string
-		img    *store.Image
+		img    *models.Image
 		errors bool
 	}{
 		{
@@ -99,7 +100,7 @@ func TestIntegrationDeleteExpiredImages(t *testing.T) {
 	_, dbstore := tests.SetupTestEnv(t, baseIntervalSeconds)
 
 	// Save two images.
-	imgs := []*store.Image{
+	imgs := []*models.Image{
 		createTestImg("", ""),
 		createTestImg("", ""),
 	}

From 236dabfc1d6dae122a0c2ccdd1e0a971b4bf91ff Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 04:34:50 -0400
Subject: [PATCH 040/103] refactoring: saml (#48114) (#49667)

Co-authored-by: Vardan Torosyan <vardants@gmail.com>
(cherry picked from commit d8d7b3ec9d097a774621b9c28b36ca0c95e96510)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
---
 docs/sources/enterprise/saml/about-saml.md    | 34 ++-----------------
 .../enterprise/saml/set-up-saml-with-okta.md  | 30 ++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/sources/enterprise/saml/about-saml.md b/docs/sources/enterprise/saml/about-saml.md
index c541856d1a0..b42bd19a054 100644
--- a/docs/sources/enterprise/saml/about-saml.md
+++ b/docs/sources/enterprise/saml/about-saml.md
@@ -44,38 +44,8 @@ In terms of initiation, Grafana supports:
 - SP-initiated requests
 - IdP-initiated requests
 
-By default, SP-initiated requests are enabled. For instructions on how to enable IdP-initiated logins, see https://grafana.com/docs/grafana/latest/enterprise/saml/#idp-initiated-single-sign-on-sso.
+By default, SP-initiated requests are enabled. For instructions on how to enable IdP-initiated logins, refer to [IdP-initiated]({{< relref "./configure-saml/#idp-initiated-single-sign-on-sso" >}}) to get more information.
 
 ### Edit SAML options in the Grafana config file
 
-Once you have enabled saml, you can configure Grafana to use it for SAML authentication. Refer to [Configuration]({{< relref "../../administration/configuration.md" >}}) to get more information about how to configure Grafana.
-
-**Edit SAML options in Grafana config file:**
-
-1. In the `[auth.saml]` section in the Grafana configuration file, set [`enabled`]({{< relref ".././enterprise-configuration.md#enabled" >}}) to `true`.
-1. Configure the [certificate and private key]({{< relref "#certificate-and-private-key" >}}).
-1. On the Okta application page where you have been redirected after application created, navigate to the **Sign On** tab and find **Identity Provider metadata** link in the **Settings** section.
-1. Set the [`idp_metadata_url`]({{< relref ".././enterprise-configuration.md#idp-metadata-url" >}}) to the URL obtained from the previous step. The URL should look like `https://<your-org-id>.okta.com/app/<application-id>/sso/saml/metadata`.
-1. Set the following options to the attribute names configured at the **step 10** of the SAML integration setup. You can find this attributes on the **General** tab of the application page (**ATTRIBUTE STATEMENTS** and **GROUP ATTRIBUTE STATEMENTS** in the **SAML Settings** section).
-   - [`assertion_attribute_login`]({{< relref ".././enterprise-configuration.md#assertion-attribute-login" >}})
-   - [`assertion_attribute_email`]({{< relref ".././enterprise-configuration.md#assertion-attribute-email" >}})
-   - [`assertion_attribute_name`]({{< relref ".././enterprise-configuration.md#assertion-attribute-name" >}})
-   - [`assertion_attribute_groups`]({{< relref ".././enterprise-configuration.md#assertion-attribute-groups" >}})
-1. Save the configuration file and and then restart the Grafana server.
-
-When you are finished, the Grafana configuration might look like this example:
-
-```bash
-[server]
-root_url = https://grafana.example.com
-
-[auth.saml]
-enabled = true
-private_key_path = "/path/to/private_key.pem"
-certificate_path = "/path/to/certificate.cert"
-idp_metadata_url = "https://my-org.okta.com/app/my-application/sso/saml/metadata"
-assertion_attribute_name = DisplayName
-assertion_attribute_login = Login
-assertion_attribute_email = Email
-assertion_attribute_groups = Group
-```
+Once you have enabled saml, you can configure Grafana to use it for SAML authentication. Refer to [Configure SAML Authentication]({{< relref "./configure-saml.md#" >}}) to get more information about how to configure Grafana.
diff --git a/docs/sources/enterprise/saml/set-up-saml-with-okta.md b/docs/sources/enterprise/saml/set-up-saml-with-okta.md
index 11e2a727d11..9de28106e78 100644
--- a/docs/sources/enterprise/saml/set-up-saml-with-okta.md
+++ b/docs/sources/enterprise/saml/set-up-saml-with-okta.md
@@ -50,3 +50,33 @@ Grafana supports user authentication through Okta, which is useful when you want
 
 1. Click **Next**.
 1. On the final Feedback tab, fill out the form and then click **Finish**.
+
+**Edit SAML options for Okta in Grafana config file:**
+
+1. In the `[auth.saml]` section in the Grafana configuration file, set [`enabled`]({{< relref ".././enterprise-configuration.md#enabled" >}}) to `true`.
+1. Configure the [certificate and private key]({{< relref "#certificate-and-private-key" >}}).
+1. On the Okta application page where you have been redirected after application created, navigate to the **Sign On** tab and find **Identity Provider metadata** link in the **Settings** section.
+1. Set the [`idp_metadata_url`]({{< relref ".././enterprise-configuration.md#idp-metadata-url" >}}) to the URL obtained from the previous step. The URL should look like `https://<your-org-id>.okta.com/app/<application-id>/sso/saml/metadata`.
+1. Set the following options to the attribute names configured at the **step 10** of the SAML integration setup. You can find this attributes on the **General** tab of the application page (**ATTRIBUTE STATEMENTS** and **GROUP ATTRIBUTE STATEMENTS** in the **SAML Settings** section).
+   - [`assertion_attribute_login`]({{< relref ".././enterprise-configuration.md#assertion-attribute-login" >}})
+   - [`assertion_attribute_email`]({{< relref ".././enterprise-configuration.md#assertion-attribute-email" >}})
+   - [`assertion_attribute_name`]({{< relref ".././enterprise-configuration.md#assertion-attribute-name" >}})
+   - [`assertion_attribute_groups`]({{< relref ".././enterprise-configuration.md#assertion-attribute-groups" >}})
+1. Save the configuration file and and then restart the Grafana server.
+
+When you are finished, the Grafana configuration might look like this example:
+
+```bash
+[server]
+root_url = https://grafana.example.com
+
+[auth.saml]
+enabled = true
+private_key_path = "/path/to/private_key.pem"
+certificate_path = "/path/to/certificate.cert"
+idp_metadata_url = "https://my-org.okta.com/app/my-application/sso/saml/metadata"
+assertion_attribute_name = DisplayName
+assertion_attribute_login = Login
+assertion_attribute_email = Email
+assertion_attribute_groups = Group
+```

From d3433be5857c9d551b6a8c87e9e74a80aec9ff04 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 04:38:22 -0400
Subject: [PATCH 041/103] loki: added two new functions (#49617) (#49666)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 514d1bbbdd944b5f0e6a1bd5f8a7aad078b1edb1)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 public/app/plugins/datasource/loki/syntax.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/public/app/plugins/datasource/loki/syntax.ts b/public/app/plugins/datasource/loki/syntax.ts
index 94a5e54dab4..ad19acff4f7 100644
--- a/public/app/plugins/datasource/loki/syntax.ts
+++ b/public/app/plugins/datasource/loki/syntax.ts
@@ -122,6 +122,18 @@ export const RANGE_VEC_FUNCTIONS = [
     detail: 'max_over_time(range-vector)',
     documentation: 'The maximum of all values in the specified interval. Only available in Loki 2.0+.',
   },
+  {
+    insertText: 'first_over_time',
+    label: 'first_over_time',
+    detail: 'first_over_time(range-vector)',
+    documentation: 'The first of all values in the specified interval. Only available in Loki 2.3+.',
+  },
+  {
+    insertText: 'last_over_time',
+    label: 'last_over_time',
+    detail: 'last_over_time(range-vector)',
+    documentation: 'The last of all values in the specified interval. Only available in Loki 2.3+.',
+  },
   {
     insertText: 'sum_over_time',
     label: 'sum_over_time',

From 4c6cfdcb7db95cafd09d4aca8e9db7d3529d53f9 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 05:43:07 -0400
Subject: [PATCH 042/103] loki: better unpack handling (#49074) (#49674)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b54817033a4e0942f4c3fb82220da49612d8be1a)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 public/app/plugins/datasource/loki/syntax.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/datasource/loki/syntax.ts b/public/app/plugins/datasource/loki/syntax.ts
index ad19acff4f7..e203e0b218f 100644
--- a/public/app/plugins/datasource/loki/syntax.ts
+++ b/public/app/plugins/datasource/loki/syntax.ts
@@ -72,6 +72,13 @@ export const PIPE_PARSERS: CompletionItem[] = [
     insertText: 'pattern',
     documentation: 'Extracting labels from the log line using pattern parser. Only available in Loki 2.3+.',
   },
+  {
+    label: 'unpack',
+    insertText: 'unpack',
+    detail: 'unpack identifier',
+    documentation:
+      'Parses a JSON log line, unpacking all embedded labels in the pack stage. A special property "_entry" will also be used to replace the original log line. Only available in Loki 2.2+.',
+  },
 ];
 
 export const PIPE_OPERATORS: CompletionItem[] = [
@@ -82,13 +89,6 @@ export const PIPE_OPERATORS: CompletionItem[] = [
     documentation:
       'Take labels and use the values as sample data for metric aggregations. Only available in Loki 2.0+.',
   },
-  {
-    label: 'unpack',
-    insertText: 'unpack',
-    detail: 'unpack identifier',
-    documentation:
-      'Parses a JSON log line, unpacking all embedded labels in the pack stage. A special property "_entry" will also be used to replace the original log line. Only available in Loki 2.0+.',
-  },
   {
     label: 'label_format',
     insertText: 'label_format',

From 2630dcaea520ec3e432f064f84fdf98e6daec1f5 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 06:25:18 -0400
Subject: [PATCH 043/103] Chore: Re-enable skipped test (#49484) (#49676)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Re-enable skipped test

(cherry picked from commit a008a01315d106bfca4ae756fd471454f534bd35)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
---
 public/app/features/explore/spec/queryHistory.test.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/app/features/explore/spec/queryHistory.test.tsx b/public/app/features/explore/spec/queryHistory.test.tsx
index 4133ce61da5..f9653aa5752 100644
--- a/public/app/features/explore/spec/queryHistory.test.tsx
+++ b/public/app/features/explore/spec/queryHistory.test.tsx
@@ -124,10 +124,7 @@ describe('Explore: Query History', () => {
     await assertQueryHistory(['{"expr":"query #2"}', '{"expr":"query #1"}']);
   });
 
-  /**
-   * TODO: #47635 check why this test times out
-   */
-  it.skip('updates the state in both Explore panes', async () => {
+  it('updates the state in both Explore panes', async () => {
     const urlParams = {
       left: serializeStateToUrlParam({
         datasource: 'loki',

From 60ddede8355309cbc21a3f3d2b0b856059f26a21 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 06:39:49 -0400
Subject: [PATCH 044/103] Narrow the alert condition picker (#49570) (#49675)

(cherry picked from commit 20a83ba14f6136bbb53d1cae2480eb95a1670022)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
---
 .../components/rule-editor/ConditionField.tsx   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx b/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx
index a3eb1411c58..5ec13955b0e 100644
--- a/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx
@@ -1,9 +1,10 @@
+import { css } from '@emotion/css';
 import { last } from 'lodash';
 import React, { FC, useEffect, useMemo } from 'react';
 import { useFormContext } from 'react-hook-form';
 
-import { SelectableValue } from '@grafana/data';
-import { Alert, Card, Field, InputControl, RadioButtonList } from '@grafana/ui';
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Alert, Card, Field, InputControl, RadioButtonList, useStyles2 } from '@grafana/ui';
 import { ExpressionDatasourceUID } from 'app/features/expressions/ExpressionDatasource';
 
 import { RuleFormValues } from '../../types/rule-form';
@@ -53,8 +54,10 @@ export const ConditionField: FC = () => {
     }
   }, [condition, expressions, options, setValue]);
 
+  const styles = useStyles2(getStyles);
+
   return options.length ? (
-    <Card>
+    <Card className={styles.container}>
       <Card.Heading>Set alert condition</Card.Heading>
       <Card.Meta>Select one of your queries or expressions set above that contains your alert condition.</Card.Meta>
       <Card.Actions>
@@ -75,8 +78,14 @@ export const ConditionField: FC = () => {
       </Card.Actions>
     </Card>
   ) : (
-    <Alert title="No queries or expressions have been configured" severity="warning">
+    <Alert title="No queries or expressions have been configured" severity="warning" className={styles.container}>
       Create at least one query or expression to be alerted on
     </Alert>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css`
+    max-width: ${theme.breakpoints.values.sm}px;
+  `,
+});

From 4e35edcf07d326a2cc45588e00220f7fe1770751 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 06:44:13 -0400
Subject: [PATCH 045/103] Fix wrap_handler() panic during OAuth login (#49671)
 (#49678)

---
 pkg/api/login_oauth.go      | 34 ++++++++++++++++------------------
 pkg/api/login_oauth_test.go |  3 +--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 501c0ad6095..1803c168e95 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -13,7 +13,6 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/login"
@@ -68,7 +67,7 @@ func genPKCECode() (string, string, error) {
 	return string(ascii), pkce, nil
 }
 
-func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
+func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) {
 	loginInfo := models.LoginInfo{
 		AuthModule: "oauth",
 	}
@@ -80,7 +79,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 			HttpStatus:    http.StatusNotFound,
 			PublicMessage: "OAuth not enabled",
 		})
-		return nil
+		return
 	}
 
 	connect, err := hs.SocialService.GetConnector(name)
@@ -89,7 +88,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 			HttpStatus:    http.StatusNotFound,
 			PublicMessage: fmt.Sprintf("No OAuth with name %s configured", name),
 		})
-		return nil
+		return
 	}
 
 	errorParam := ctx.Query("error")
@@ -97,7 +96,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 		errorDesc := ctx.Query("error_description")
 		oauthLogger.Error("failed to login ", "error", errorParam, "errorDesc", errorDesc)
 		hs.handleOAuthLoginErrorWithRedirect(ctx, loginInfo, login.ErrProviderDeniedRequest, "error", errorParam, "errorDesc", errorDesc)
-		return nil
+		return
 	}
 
 	code := ctx.Query("code")
@@ -129,7 +128,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 				HttpStatus:    http.StatusInternalServerError,
 				PublicMessage: "An internal error occurred",
 			})
-			return nil
+			return
 		}
 
 		hashedState := hs.hashStatecode(state, provider.ClientSecret)
@@ -139,7 +138,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 		}
 
 		ctx.Redirect(connect.AuthCodeURL(state, opts...))
-		return nil
+		return
 	}
 
 	cookieState := ctx.GetCookie(OauthStateCookieName)
@@ -152,7 +151,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 			HttpStatus:    http.StatusInternalServerError,
 			PublicMessage: "login.OAuthLogin(missing saved state)",
 		})
-		return nil
+		return
 	}
 
 	queryState := hs.hashStatecode(ctx.Query("state"), provider.ClientSecret)
@@ -162,7 +161,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 			HttpStatus:    http.StatusInternalServerError,
 			PublicMessage: "login.OAuthLogin(state mismatch)",
 		})
-		return nil
+		return
 	}
 
 	oauthClient, err := hs.SocialService.GetOAuthHttpClient(name)
@@ -172,7 +171,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 			HttpStatus:    http.StatusInternalServerError,
 			PublicMessage: "login.OAuthLogin(" + err.Error() + ")",
 		})
-		return nil
+		return
 	}
 
 	oauthCtx := context.WithValue(context.Background(), oauth2.HTTPClient, oauthClient)
@@ -194,7 +193,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 			PublicMessage: "login.OAuthLogin(NewTransportWithCode)",
 			Err:           err,
 		})
-		return nil
+		return
 	}
 	// token.TokenType was defaulting to "bearer", which is out of spec, so we explicitly set to "Bearer"
 	token.TokenType = "Bearer"
@@ -217,7 +216,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 				Err:           err,
 			})
 		}
-		return nil
+		return
 	}
 
 	oauthLogger.Debug("OAuthLogin got user info", "userInfo", userInfo)
@@ -225,26 +224,26 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 	// validate that we got at least an email address
 	if userInfo.Email == "" {
 		hs.handleOAuthLoginErrorWithRedirect(ctx, loginInfo, login.ErrNoEmail)
-		return nil
+		return
 	}
 
 	// validate that the email is allowed to login to grafana
 	if !connect.IsEmailAllowed(userInfo.Email) {
 		hs.handleOAuthLoginErrorWithRedirect(ctx, loginInfo, login.ErrEmailNotAllowed)
-		return nil
+		return
 	}
 
 	loginInfo.ExternalUser = *hs.buildExternalUserInfo(token, userInfo, name)
 	loginInfo.User, err = hs.SyncUser(ctx, &loginInfo.ExternalUser, connect)
 	if err != nil {
 		hs.handleOAuthLoginErrorWithRedirect(ctx, loginInfo, err)
-		return nil
+		return
 	}
 
 	// login
 	if err := hs.loginUserWithUser(loginInfo.User, ctx); err != nil {
 		hs.handleOAuthLoginErrorWithRedirect(ctx, loginInfo, err)
-		return nil
+		return
 	}
 
 	loginInfo.HTTPStatus = http.StatusOK
@@ -255,13 +254,12 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) response.Response {
 		if err := hs.ValidateRedirectTo(redirectTo); err == nil {
 			cookies.DeleteCookie(ctx.Resp, "redirect_to", hs.CookieOptionsFromCfg)
 			ctx.Redirect(redirectTo)
-			return nil
+			return
 		}
 		ctx.Logger.Debug("Ignored invalid redirect_to cookie value", "redirect_to", redirectTo)
 	}
 
 	ctx.Redirect(setting.AppSubUrl + "/")
-	return nil
 }
 
 // buildExternalUserInfo returns a ExternalUserInfo struct from OAuth user profile
diff --git a/pkg/api/login_oauth_test.go b/pkg/api/login_oauth_test.go
index cc0c41f745d..2f67bfdfbcc 100644
--- a/pkg/api/login_oauth_test.go
+++ b/pkg/api/login_oauth_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/hooks"
 	"github.com/grafana/grafana/pkg/services/licensing"
@@ -46,7 +45,7 @@ func setupOAuthTest(t *testing.T, cfg *setting.Cfg) *web.Mux {
 
 	m.UseMiddleware(web.Renderer(viewPath, "[[", "]]"))
 
-	m.Get("/login/:name", routing.Wrap(hs.OAuthLogin))
+	m.Get("/login/:name", hs.OAuthLogin)
 	return m
 }
 

From 3fac10229bd25b02fb1621106343c2f4b5857242 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 07:19:18 -0400
Subject: [PATCH 046/103] Notification history: Enable by default (#49502)
 (#49681)

* remove persistNotifications feature flag

* remove unused imports

(cherry picked from commit 8b509eb6ddd4fef5a4ed1274af18639a70c91c15)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 packages/grafana-data/src/types/featureToggles.gen.ts   | 1 -
 pkg/api/index.go                                        | 8 +++-----
 pkg/services/featuremgmt/registry.go                    | 6 ------
 pkg/services/featuremgmt/toggles_gen.go                 | 4 ----
 public/app/core/reducers/appNotification.ts             | 9 ---------
 public/app/features/notifications/NotificationsPage.tsx | 6 ------
 6 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 2267c7a0115..7fdfab135f2 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -51,7 +51,6 @@ export interface FeatureToggles {
   azureMonitorResourcePickerForMetrics?: boolean;
   explore2Dashboard?: boolean;
   tracing?: boolean;
-  persistNotifications?: boolean;
   commandPalette?: boolean;
   savedItems?: boolean;
   cloudWatchDynamicLabels?: boolean;
diff --git a/pkg/api/index.go b/pkg/api/index.go
index b68169179ef..c2bcd4ff9fe 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -40,11 +40,9 @@ func (hs *HTTPServer) getProfileNode(c *models.ReqContext) *dtos.NavLink {
 		},
 	}
 
-	if hs.Features.IsEnabled(featuremgmt.FlagPersistNotifications) {
-		children = append(children, &dtos.NavLink{
-			Text: "Notification history", Id: "notifications", Url: hs.Cfg.AppSubURL + "/notifications", Icon: "bell",
-		})
-	}
+	children = append(children, &dtos.NavLink{
+		Text: "Notification history", Id: "notifications", Url: hs.Cfg.AppSubURL + "/notifications", Icon: "bell",
+	})
 
 	if setting.AddChangePasswordLink() {
 		children = append(children, &dtos.NavLink{
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index e1339fcf635..1cf0cbd1983 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -199,12 +199,6 @@ var (
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
 		},
-		{
-			Name:         "persistNotifications",
-			Description:  "PoC Notifications page",
-			State:        FeatureStateAlpha,
-			FrontendOnly: true,
-		},
 		{
 			Name:        "commandPalette",
 			Description: "Enable command palette",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 66508a05e7f..c9b410c2b39 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -147,10 +147,6 @@ const (
 	// Adds trace ID to error notifications
 	FlagTracing = "tracing"
 
-	// FlagPersistNotifications
-	// PoC Notifications page
-	FlagPersistNotifications = "persistNotifications"
-
 	// FlagCommandPalette
 	// Enable command palette
 	FlagCommandPalette = "commandPalette"
diff --git a/public/app/core/reducers/appNotification.ts b/public/app/core/reducers/appNotification.ts
index adea058d646..f87c8d05712 100644
--- a/public/app/core/reducers/appNotification.ts
+++ b/public/app/core/reducers/appNotification.ts
@@ -1,6 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { config } from '@grafana/runtime';
 import { AppNotification, AppNotificationSeverity, AppNotificationsState } from 'app/types/';
 
 const MAX_STORED_NOTIFICATIONS = 25;
@@ -88,10 +87,6 @@ function isStoredNotification(obj: any): obj is StoredNotification {
 // (De)serialization
 
 export function deserializeNotifications(): Record<string, StoredNotification> {
-  if (!config.featureToggles?.persistNotifications) {
-    return {};
-  }
-
   const storedNotifsRaw = window.localStorage.getItem(STORAGE_KEY);
   if (!storedNotifsRaw) {
     return {};
@@ -106,10 +101,6 @@ export function deserializeNotifications(): Record<string, StoredNotification> {
 }
 
 function serializeNotifications(notifs: Record<string, StoredNotification>) {
-  if (!config.featureToggles?.persistNotifications) {
-    return;
-  }
-
   const reducedNotifs = Object.values(notifs)
     .filter(isAtLeastWarning)
     .sort((a, b) => b.timestamp - a.timestamp)
diff --git a/public/app/features/notifications/NotificationsPage.tsx b/public/app/features/notifications/NotificationsPage.tsx
index e809b8e49fa..04b6b192a23 100644
--- a/public/app/features/notifications/NotificationsPage.tsx
+++ b/public/app/features/notifications/NotificationsPage.tsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { config } from '@grafana/runtime';
-
 import Page from '../../core/components/Page/Page';
 import { GrafanaRouteComponentProps } from '../../core/navigation/types';
 import { getNavModel } from '../../core/selectors/navModel';
@@ -21,10 +19,6 @@ interface OwnProps extends GrafanaRouteComponentProps {}
 type Props = OwnProps & ConnectedProps<typeof connector>;
 
 export const NotificationsPage = ({ navModel }: Props) => {
-  if (!config.featureToggles.persistNotifications) {
-    return null;
-  }
-
   return (
     <Page navModel={navModel}>
       <Page.Contents>

From 80bf4e2dba8860903d604ad9c9d553e275c84bdb Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 07:34:39 -0400
Subject: [PATCH 047/103] ValueMapping: Add support for regex replacement over
 multiple lines (#49607) (#49683)

(cherry picked from commit e402b3617b1ce6ec4bbe259208ba9f31f5bf4f4f)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 packages/grafana-data/src/text/string.ts         |  2 +-
 .../grafana-data/src/utils/valueMappings.test.ts | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/text/string.ts b/packages/grafana-data/src/text/string.ts
index 4031ea6fdb1..41fb2d0b4c1 100644
--- a/packages/grafana-data/src/text/string.ts
+++ b/packages/grafana-data/src/text/string.ts
@@ -34,7 +34,7 @@ export function stringToJsRegex(str: string): RegExp {
     return new RegExp(`^${str}$`);
   }
 
-  const match = str.match(new RegExp('^/(.*?)/(g?i?m?y?)$'));
+  const match = str.match(new RegExp('^/(.*?)/(g?i?m?y?s?)$'));
 
   if (!match) {
     throw new Error(`'${str}' is not a valid regular expression.`);
diff --git a/packages/grafana-data/src/utils/valueMappings.test.ts b/packages/grafana-data/src/utils/valueMappings.test.ts
index 8acee459ce7..1d656debfef 100644
--- a/packages/grafana-data/src/utils/valueMappings.test.ts
+++ b/packages/grafana-data/src/utils/valueMappings.test.ts
@@ -85,6 +85,16 @@ const testSet2: ValueMapping[] = [
   },
 ];
 
+const testSet3: ValueMapping[] = [
+  {
+    type: MappingType.RegexToText,
+    options: {
+      pattern: '/.*/s',
+      result: { text: 'WOW IT REPLACED EVERYTHING OVER MULTIPLE LINES' },
+    },
+  },
+];
+
 describe('Format value with value mappings', () => {
   it('should return null with no valuemappings', () => {
     const valueMappings: ValueMapping[] = [];
@@ -194,6 +204,12 @@ describe('Format value with regex mappings', () => {
   it('should not replace match when replace text is null', () => {
     expect(getValueMappingResult(testSet2, 'hello my name is')).toEqual({ color: 'red' });
   });
+
+  it('supports replacing over multiple lines', () => {
+    expect(getValueMappingResult(testSet3, 'hello \n my name is')).toEqual({
+      text: 'WOW IT REPLACED EVERYTHING OVER MULTIPLE LINES',
+    });
+  });
 });
 
 describe('isNumeric', () => {

From e3a35bd2ff3a8c69ffa2a6c1c51d2d5cc6d09988 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 07:41:03 -0400
Subject: [PATCH 048/103] Remove migrations from behind configs (#49415)
 (#49684)

---
 pkg/services/sqlstore/migrations/migrations.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index facb4b8225d..52a331415fc 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -76,13 +76,10 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 	accesscontrol.AddMigration(mg)
 	addQueryHistoryMigrations(mg)
 
-	if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil {
-		if mg.Cfg.RBACEnabled {
-			accesscontrol.AddTeamMembershipMigrations(mg)
-			accesscontrol.AddDashboardPermissionsMigrator(mg)
-			accesscontrol.AddAlertingPermissionsMigrator(mg)
-		}
-	}
+	accesscontrol.AddTeamMembershipMigrations(mg)
+	accesscontrol.AddDashboardPermissionsMigrator(mg)
+	accesscontrol.AddAlertingPermissionsMigrator(mg)
+
 	addQueryHistoryStarMigrations(mg)
 
 	if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil {

From 83b73db4014c309c72339efaa552a69139161d16 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 07:56:23 -0400
Subject: [PATCH 049/103] Alerting: Fix swagger specification (#49273) (#49687)

* Alerting: fix specification

* Update merged swagger specification

(cherry picked from commit 7cf321d7bde2e7f3bd3f6295d3ed2c154ad69b2e)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
---
 pkg/services/ngalert/api/tooling/api.json     |   80 +-
 .../ngalert/api/tooling/definitions/api.go    |    3 -
 .../definitions/provisioning_contactpoints.go |   13 +-
 .../definitions/provisioning_mute_timings.go  |   13 +-
 .../definitions/provisioning_policies.go      |    2 +-
 .../definitions/provisioning_templates.go     |   17 +-
 .../ngalert/api/tooling/definitions/shared.go |    4 +
 pkg/services/ngalert/api/tooling/post.json    |  169 +-
 pkg/services/ngalert/api/tooling/spec.json    |  165 +-
 public/api-merged.json                        | 1915 +----------------
 10 files changed, 481 insertions(+), 1900 deletions(-)

diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json
index 8a42f15fce5..dc8dd4dc60b 100644
--- a/pkg/services/ngalert/api/tooling/api.json
+++ b/pkg/services/ngalert/api/tooling/api.json
@@ -1371,6 +1371,21 @@
    },
    "type": "array"
   },
+  "MessageTemplate": {
+   "properties": {
+    "Name": {
+     "type": "string"
+    },
+    "Template": {
+     "type": "string"
+    },
+    "provenance": {
+     "$ref": "#/definitions/Provenance"
+    }
+   },
+   "type": "object",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "MessageTemplateContent": {
    "properties": {
     "Template": {
@@ -1380,6 +1395,13 @@
    "type": "object",
    "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
   },
+  "MessageTemplates": {
+   "items": {
+    "$ref": "#/definitions/MessageTemplate"
+   },
+   "type": "array",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "MonthRange": {
    "properties": {
     "Begin": {
@@ -1417,6 +1439,30 @@
    "type": "object",
    "x-go-package": "github.com/prometheus/alertmanager/config"
   },
+  "MuteTiming": {
+   "properties": {
+    "name": {
+     "type": "string",
+     "x-go-name": "Name"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array",
+     "x-go-name": "TimeIntervals"
+    }
+   },
+   "type": "object",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
+  "MuteTimings": {
+   "items": {
+    "$ref": "#/definitions/MuteTiming"
+   },
+   "type": "array",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "NamespaceConfigResponse": {
    "additionalProperties": {
     "items": {
@@ -1427,6 +1473,10 @@
    "type": "object",
    "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
   },
+  "NotFound": {
+   "type": "object",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "NotifierConfig": {
    "properties": {
     "send_resolved": {
@@ -2890,6 +2940,7 @@
    "x-go-package": "github.com/prometheus/alertmanager/timeinterval"
   },
   "URL": {
+   "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
    "properties": {
     "ForceQuery": {
      "type": "boolean"
@@ -2922,9 +2973,9 @@
      "$ref": "#/definitions/Userinfo"
     }
    },
-   "title": "URL is a custom URL type that allows validation at configuration load time.",
+   "title": "A URL represents a parsed URL (technically, a URI reference).",
    "type": "object",
-   "x-go-package": "github.com/prometheus/common/config"
+   "x-go-package": "net/url"
   },
   "Userinfo": {
    "description": "The Userinfo type is an immutable encapsulation of username and\npassword details for a URL. An existing Userinfo value is guaranteed\nto have a username set (potentially empty, as allowed by RFC 2396),\nand optionally a password.",
@@ -3147,11 +3198,12 @@
    "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "alertGroups": {
-   "description": "AlertGroups alert groups",
    "items": {
     "$ref": "#/definitions/alertGroup"
    },
-   "type": "array"
+   "type": "array",
+   "x-go-name": "AlertGroups",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "alertStatus": {
    "description": "AlertStatus alert status",
@@ -3333,14 +3385,14 @@
    "type": "object"
   },
   "gettableAlerts": {
+   "description": "GettableAlerts gettable alerts",
    "items": {
     "$ref": "#/definitions/gettableAlert"
    },
-   "type": "array",
-   "x-go-name": "GettableAlerts",
-   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+   "type": "array"
   },
   "gettableSilence": {
+   "description": "GettableSilence gettable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3392,16 +3444,15 @@
     "status",
     "updatedAt"
    ],
-   "type": "object",
-   "x-go-name": "GettableSilence",
-   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+   "type": "object"
   },
   "gettableSilences": {
-   "description": "GettableSilences gettable silences",
    "items": {
     "$ref": "#/definitions/gettableSilence"
    },
-   "type": "array"
+   "type": "array",
+   "x-go-name": "GettableSilences",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "labelSet": {
    "additionalProperties": {
@@ -3530,7 +3581,6 @@
    "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "postableSilence": {
-   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3570,7 +3620,9 @@
     "matchers",
     "startsAt"
    ],
-   "type": "object"
+   "type": "object",
+   "x-go-name": "PostableSilence",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "receiver": {
    "properties": {
diff --git a/pkg/services/ngalert/api/tooling/definitions/api.go b/pkg/services/ngalert/api/tooling/definitions/api.go
index 014d6fadb45..c865234b92d 100644
--- a/pkg/services/ngalert/api/tooling/definitions/api.go
+++ b/pkg/services/ngalert/api/tooling/definitions/api.go
@@ -29,9 +29,6 @@ type ValidationError struct {
 	Msg string `json:"msg"`
 }
 
-// swagger:model
-type Ack struct{}
-
 type Backend int
 
 const (
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go
index 32c42932a79..804a32b089b 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go
@@ -23,7 +23,7 @@ import (
 //     - application/json
 //
 //     Responses:
-//       202: Accepted
+//       202: Ack
 //       400: ValidationError
 
 // swagger:route PUT /api/provisioning/contact-points/{ID} provisioning RoutePutContactpoint
@@ -34,7 +34,7 @@ import (
 //     - application/json
 //
 //     Responses:
-//       202: Accepted
+//       202: Ack
 //       400: ValidationError
 
 // swagger:route DELETE /api/provisioning/contact-points/{ID} provisioning RouteDeleteContactpoints
@@ -45,9 +45,16 @@ import (
 //     - application/json
 //
 //     Responses:
-//       202: Accepted
+//       202: Ack
 //       400: ValidationError
 
+// swagger:parameters RoutePutContactpoint RouteDeleteContactpoints
+type ContactPointUIDReference struct {
+	// ContactPointUID should be the contact point UID identifier
+	// in:path
+	ID string
+}
+
 // swagger:parameters RoutePostContactpoints RoutePutContactpoint
 type ContactPointPayload struct {
 	// in:body
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
index fd937890ced..c5720206e82 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
@@ -7,7 +7,7 @@ import prometheus "github.com/prometheus/alertmanager/config"
 // Get all the mute timings.
 //
 //     Responses:
-//       200: []MuteTiming
+//       200: MuteTimings
 //       400: ValidationError
 
 // swagger:route GET /api/provisioning/mute-timings/{name} provisioning RouteGetMuteTiming
@@ -18,6 +18,17 @@ import prometheus "github.com/prometheus/alertmanager/config"
 //       200: MuteTiming
 //       400: ValidationError
 
+// swagger:model
 type MuteTiming struct {
 	prometheus.MuteTimeInterval
 }
+
+// swagger:model
+type MuteTimings []MuteTiming
+
+// swagger:parameters RouteGetTemplate RouteGetMuteTiming
+type RouteGetMuteTimingParam struct {
+	// Template Name
+	// in:path
+	Name string `json:"name"`
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
index e9df6997a9e..da0b2246395 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
@@ -16,7 +16,7 @@ package definitions
 //     - application/json
 //
 //     Responses:
-//       202: Accepted
+//       202: Ack
 //       400: ValidationError
 
 // swagger:parameters RoutePutPolicyTree
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
index f4aee44bbe6..8ec4210721f 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
@@ -14,7 +14,7 @@ import (
 // Get all message templates.
 //
 //     Responses:
-//       200: []MessageTemplate
+//       200: MessageTemplate
 //       400: ValidationError
 
 // swagger:route GET /api/provisioning/templates/{name} provisioning RouteGetTemplate
@@ -33,7 +33,7 @@ import (
 //     - application/json
 //
 //     Responses:
-//       202: Accepted
+//       202: Ack
 //       400: ValidationError
 
 // swagger:route DELETE /api/provisioning/templates/{name} provisioning RouteDeleteTemplate
@@ -41,14 +41,25 @@ import (
 // Delete a template.
 //
 //     Responses:
-//       204: Accepted
+//       204: Ack
 
+// swagger:parameters RouteGetTemplate RoutePutTemplate RouteDeleteTemplate
+type RouteGetTemplateParam struct {
+	// Template Name
+	// in:path
+	Name string `json:"name"`
+}
+
+// swagger:model
 type MessageTemplate struct {
 	Name       string
 	Template   string
 	Provenance models.Provenance `json:"provenance,omitempty"`
 }
 
+// swagger:model
+type MessageTemplates []MessageTemplate
+
 type MessageTemplateContent struct {
 	Template string
 }
diff --git a/pkg/services/ngalert/api/tooling/definitions/shared.go b/pkg/services/ngalert/api/tooling/definitions/shared.go
index 4e90032c4e7..1b2677311d3 100644
--- a/pkg/services/ngalert/api/tooling/definitions/shared.go
+++ b/pkg/services/ngalert/api/tooling/definitions/shared.go
@@ -1,3 +1,7 @@
 package definitions
 
+// swagger:model
 type NotFound struct{}
+
+// swagger:model
+type Ack struct{}
diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json
index 784f2b19055..a3c445e9374 100644
--- a/pkg/services/ngalert/api/tooling/post.json
+++ b/pkg/services/ngalert/api/tooling/post.json
@@ -1371,6 +1371,21 @@
    },
    "type": "array"
   },
+  "MessageTemplate": {
+   "properties": {
+    "Name": {
+     "type": "string"
+    },
+    "Template": {
+     "type": "string"
+    },
+    "provenance": {
+     "$ref": "#/definitions/Provenance"
+    }
+   },
+   "type": "object",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "MessageTemplateContent": {
    "properties": {
     "Template": {
@@ -1380,6 +1395,13 @@
    "type": "object",
    "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
   },
+  "MessageTemplates": {
+   "items": {
+    "$ref": "#/definitions/MessageTemplate"
+   },
+   "type": "array",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "MonthRange": {
    "properties": {
     "Begin": {
@@ -1417,6 +1439,30 @@
    "type": "object",
    "x-go-package": "github.com/prometheus/alertmanager/config"
   },
+  "MuteTiming": {
+   "properties": {
+    "name": {
+     "type": "string",
+     "x-go-name": "Name"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array",
+     "x-go-name": "TimeIntervals"
+    }
+   },
+   "type": "object",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
+  "MuteTimings": {
+   "items": {
+    "$ref": "#/definitions/MuteTiming"
+   },
+   "type": "array",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "NamespaceConfigResponse": {
    "additionalProperties": {
     "items": {
@@ -1427,6 +1473,10 @@
    "type": "object",
    "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
   },
+  "NotFound": {
+   "type": "object",
+   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+  },
   "NotifierConfig": {
    "properties": {
     "send_resolved": {
@@ -3121,6 +3171,7 @@
    "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "alertGroup": {
+   "description": "AlertGroup alert group",
    "properties": {
     "alerts": {
      "description": "alerts",
@@ -3142,9 +3193,7 @@
     "labels",
     "receiver"
    ],
-   "type": "object",
-   "x-go-name": "AlertGroup",
-   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+   "type": "object"
   },
   "alertGroups": {
    "description": "AlertGroups alert groups",
@@ -3529,7 +3578,6 @@
    "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "postableSilence": {
-   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3569,7 +3617,9 @@
     "matchers",
     "startsAt"
    ],
-   "type": "object"
+   "type": "object",
+   "x-go-name": "PostableSilence",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "receiver": {
    "properties": {
@@ -4841,7 +4891,10 @@
     ],
     "responses": {
      "202": {
-      "$ref": "#/responses/Accepted"
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -4862,9 +4915,21 @@
      "application/json"
     ],
     "operationId": "RouteDeleteContactpoints",
+    "parameters": [
+     {
+      "description": "ContactPointUID should be the contact point UID identifier",
+      "in": "path",
+      "name": "ID",
+      "required": true,
+      "type": "string"
+     }
+    ],
     "responses": {
      "202": {
-      "$ref": "#/responses/Accepted"
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -4884,6 +4949,13 @@
     ],
     "operationId": "RoutePutContactpoint",
     "parameters": [
+     {
+      "description": "ContactPointUID should be the contact point UID identifier",
+      "in": "path",
+      "name": "ID",
+      "required": true,
+      "type": "string"
+     },
      {
       "in": "body",
       "name": "Body",
@@ -4894,7 +4966,10 @@
     ],
     "responses": {
      "202": {
-      "$ref": "#/responses/Accepted"
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -4914,7 +4989,10 @@
     "operationId": "RouteGetMuteTimings",
     "responses": {
      "200": {
-      "$ref": "#/responses/MuteTiming"
+      "description": "MuteTimings",
+      "schema": {
+       "$ref": "#/definitions/MuteTimings"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -4932,9 +5010,22 @@
   "/api/provisioning/mute-timings/{name}": {
    "get": {
     "operationId": "RouteGetMuteTiming",
+    "parameters": [
+     {
+      "description": "Template Name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string",
+      "x-go-name": "Name"
+     }
+    ],
     "responses": {
      "200": {
-      "$ref": "#/responses/MuteTiming"
+      "description": "MuteTiming",
+      "schema": {
+       "$ref": "#/definitions/MuteTiming"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -4987,7 +5078,10 @@
     ],
     "responses": {
      "202": {
-      "$ref": "#/responses/Accepted"
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -5007,7 +5101,10 @@
     "operationId": "RouteGetTemplates",
     "responses": {
      "200": {
-      "$ref": "#/responses/MessageTemplate"
+      "description": "MessageTemplate",
+      "schema": {
+       "$ref": "#/definitions/MessageTemplate"
+      }
      },
      "400": {
       "description": "ValidationError",
@@ -5025,9 +5122,22 @@
   "/api/provisioning/templates/{name}": {
    "delete": {
     "operationId": "RouteDeleteTemplate",
+    "parameters": [
+     {
+      "description": "Template Name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string",
+      "x-go-name": "Name"
+     }
+    ],
     "responses": {
      "204": {
-      "$ref": "#/responses/Accepted"
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
      }
     },
     "summary": "Delete a template.",
@@ -5037,12 +5147,28 @@
    },
    "get": {
     "operationId": "RouteGetTemplate",
+    "parameters": [
+     {
+      "description": "Template Name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string",
+      "x-go-name": "Name"
+     }
+    ],
     "responses": {
      "200": {
-      "$ref": "#/responses/MessageTemplate"
+      "description": "MessageTemplate",
+      "schema": {
+       "$ref": "#/definitions/MessageTemplate"
+      }
      },
      "404": {
-      "$ref": "#/responses/NotFound"
+      "description": "NotFound",
+      "schema": {
+       "$ref": "#/definitions/NotFound"
+      }
      }
     },
     "summary": "Get a message template.",
@@ -5056,6 +5182,14 @@
     ],
     "operationId": "RoutePutTemplate",
     "parameters": [
+     {
+      "description": "Template Name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string",
+      "x-go-name": "Name"
+     },
      {
       "in": "body",
       "name": "Body",
@@ -5066,7 +5200,10 @@
     ],
     "responses": {
      "202": {
-      "$ref": "#/responses/Accepted"
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
      },
      "400": {
       "description": "ValidationError",
diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json
index 3baaec8446c..d10fd315e2e 100644
--- a/pkg/services/ngalert/api/tooling/spec.json
+++ b/pkg/services/ngalert/api/tooling/spec.json
@@ -1164,7 +1164,10 @@
         ],
         "responses": {
           "202": {
-            "$ref": "#/responses/Accepted"
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1186,6 +1189,13 @@
         "summary": "Update an existing contact point.",
         "operationId": "RoutePutContactpoint",
         "parameters": [
+          {
+            "type": "string",
+            "description": "ContactPointUID should be the contact point UID identifier",
+            "name": "ID",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "Body",
             "in": "body",
@@ -1196,7 +1206,10 @@
         ],
         "responses": {
           "202": {
-            "$ref": "#/responses/Accepted"
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1215,9 +1228,21 @@
         ],
         "summary": "Delete a contact point.",
         "operationId": "RouteDeleteContactpoints",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "ContactPointUID should be the contact point UID identifier",
+            "name": "ID",
+            "in": "path",
+            "required": true
+          }
+        ],
         "responses": {
           "202": {
-            "$ref": "#/responses/Accepted"
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1237,7 +1262,10 @@
         "operationId": "RouteGetMuteTimings",
         "responses": {
           "200": {
-            "$ref": "#/responses/MuteTiming"
+            "description": "MuteTimings",
+            "schema": {
+              "$ref": "#/definitions/MuteTimings"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1255,9 +1283,22 @@
         ],
         "summary": "Get a mute timing.",
         "operationId": "RouteGetMuteTiming",
+        "parameters": [
+          {
+            "type": "string",
+            "x-go-name": "Name",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/responses/MuteTiming"
+            "description": "MuteTiming",
+            "schema": {
+              "$ref": "#/definitions/MuteTiming"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1310,7 +1351,10 @@
         ],
         "responses": {
           "202": {
-            "$ref": "#/responses/Accepted"
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1330,7 +1374,10 @@
         "operationId": "RouteGetTemplates",
         "responses": {
           "200": {
-            "$ref": "#/responses/MessageTemplate"
+            "description": "MessageTemplate",
+            "schema": {
+              "$ref": "#/definitions/MessageTemplate"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1348,12 +1395,28 @@
         ],
         "summary": "Get a message template.",
         "operationId": "RouteGetTemplate",
+        "parameters": [
+          {
+            "type": "string",
+            "x-go-name": "Name",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/responses/MessageTemplate"
+            "description": "MessageTemplate",
+            "schema": {
+              "$ref": "#/definitions/MessageTemplate"
+            }
           },
           "404": {
-            "$ref": "#/responses/NotFound"
+            "description": "NotFound",
+            "schema": {
+              "$ref": "#/definitions/NotFound"
+            }
           }
         }
       },
@@ -1367,6 +1430,14 @@
         "summary": "Updates an existing template.",
         "operationId": "RoutePutTemplate",
         "parameters": [
+          {
+            "type": "string",
+            "x-go-name": "Name",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "Body",
             "in": "body",
@@ -1377,7 +1448,10 @@
         ],
         "responses": {
           "202": {
-            "$ref": "#/responses/Accepted"
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           },
           "400": {
             "description": "ValidationError",
@@ -1393,9 +1467,22 @@
         ],
         "summary": "Delete a template.",
         "operationId": "RouteDeleteTemplate",
+        "parameters": [
+          {
+            "type": "string",
+            "x-go-name": "Name",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
         "responses": {
           "204": {
-            "$ref": "#/responses/Accepted"
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           }
         }
       }
@@ -3389,6 +3476,21 @@
       },
       "$ref": "#/definitions/Matchers"
     },
+    "MessageTemplate": {
+      "type": "object",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Template": {
+          "type": "string"
+        },
+        "provenance": {
+          "$ref": "#/definitions/Provenance"
+        }
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "MessageTemplateContent": {
       "type": "object",
       "properties": {
@@ -3398,6 +3500,13 @@
       },
       "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
     },
+    "MessageTemplates": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/MessageTemplate"
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "MonthRange": {
       "type": "object",
       "title": "A MonthRange is an inclusive range between [1, 12] where 1 = January.",
@@ -3435,6 +3544,30 @@
       },
       "x-go-package": "github.com/prometheus/alertmanager/config"
     },
+    "MuteTiming": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "x-go-name": "Name"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          },
+          "x-go-name": "TimeIntervals"
+        }
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
+    "MuteTimings": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/MuteTiming"
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "NamespaceConfigResponse": {
       "type": "object",
       "additionalProperties": {
@@ -3445,6 +3578,10 @@
       },
       "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
     },
+    "NotFound": {
+      "type": "object",
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "NotifierConfig": {
       "type": "object",
       "title": "NotifierConfig contains base options common across all notifier configurations.",
@@ -5139,6 +5276,7 @@
       "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
     },
     "alertGroup": {
+      "description": "AlertGroup alert group",
       "type": "object",
       "required": [
         "alerts",
@@ -5161,8 +5299,6 @@
           "$ref": "#/definitions/receiver"
         }
       },
-      "x-go-name": "AlertGroup",
-      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models",
       "$ref": "#/definitions/alertGroup"
     },
     "alertGroups": {
@@ -5553,7 +5689,6 @@
       "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
     },
     "postableSilence": {
-      "description": "PostableSilence postable silence",
       "type": "object",
       "required": [
         "comment",
@@ -5594,6 +5729,8 @@
           "x-go-name": "StartsAt"
         }
       },
+      "x-go-name": "PostableSilence",
+      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models",
       "$ref": "#/definitions/postableSilence"
     },
     "receiver": {
diff --git a/public/api-merged.json b/public/api-merged.json
index 5f9b1aaf466..5fdc053a4d9 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -1793,944 +1793,6 @@
         }
       }
     },
-    "/alertmanager/grafana/api/v2/alerts": {
-      "get": {
-        "description": "get alertmanager alerts",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetGrafanaAMAlerts",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Active",
-            "description": "Show active alerts",
-            "name": "active",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Silenced",
-            "description": "Show silenced alerts",
-            "name": "silenced",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Inhibited",
-            "description": "Show inhibited alerts",
-            "name": "inhibited",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "x-go-name": "Matchers",
-            "description": "A list of matchers to filter alerts by",
-            "name": "filter",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "x-go-name": "Receivers",
-            "description": "A regex matching receivers to filter alerts by",
-            "name": "receiver",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "gettableAlerts",
-            "schema": {
-              "$ref": "#/definitions/gettableAlerts"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "create alertmanager alerts",
-        "tags": ["alertmanager"],
-        "operationId": "RoutePostGrafanaAMAlerts",
-        "parameters": [
-          {
-            "name": "PostableAlerts",
-            "in": "body",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/postableAlert"
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/grafana/api/v2/alerts/groups": {
-      "get": {
-        "description": "get alertmanager alerts",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetGrafanaAMAlertGroups",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Active",
-            "description": "Show active alerts",
-            "name": "active",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Silenced",
-            "description": "Show silenced alerts",
-            "name": "silenced",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Inhibited",
-            "description": "Show inhibited alerts",
-            "name": "inhibited",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "x-go-name": "Matchers",
-            "description": "A list of matchers to filter alerts by",
-            "name": "filter",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "x-go-name": "Receivers",
-            "description": "A regex matching receivers to filter alerts by",
-            "name": "receiver",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "alertGroups",
-            "schema": {
-              "$ref": "#/definitions/alertGroups"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/grafana/api/v2/silence/{SilenceId}": {
-      "get": {
-        "description": "get silence",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetGrafanaSilence",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "SilenceId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "gettableSilence",
-            "schema": {
-              "$ref": "#/definitions/gettableSilence"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "delete silence",
-        "tags": ["alertmanager"],
-        "operationId": "RouteDeleteGrafanaSilence",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "SilenceId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/grafana/api/v2/silences": {
-      "get": {
-        "description": "get silences",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetGrafanaSilences",
-        "parameters": [
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "x-go-name": "Filter",
-            "name": "filter",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "gettableSilences",
-            "schema": {
-              "$ref": "#/definitions/gettableSilences"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "create silence",
-        "tags": ["alertmanager"],
-        "operationId": "RouteCreateGrafanaSilence",
-        "parameters": [
-          {
-            "name": "Silence",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/postableSilence"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "gettableSilence",
-            "schema": {
-              "$ref": "#/definitions/gettableSilence"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/grafana/api/v2/status": {
-      "get": {
-        "description": "get alertmanager status and configuration",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetGrafanaAMStatus",
-        "responses": {
-          "200": {
-            "description": "GettableStatus",
-            "schema": {
-              "$ref": "#/definitions/GettableStatus"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/grafana/config/api/v1/alerts": {
-      "get": {
-        "description": "gets an Alerting config",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetGrafanaAlertingConfig",
-        "responses": {
-          "200": {
-            "description": "GettableUserConfig",
-            "schema": {
-              "$ref": "#/definitions/GettableUserConfig"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "sets an Alerting config",
-        "tags": ["alertmanager"],
-        "operationId": "RoutePostGrafanaAlertingConfig",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/PostableUserConfig"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "deletes the Alerting config for a tenant",
-        "tags": ["alertmanager"],
-        "operationId": "RouteDeleteGrafanaAlertingConfig",
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/grafana/config/api/v1/receivers/test": {
-      "post": {
-        "tags": ["alertmanager"],
-        "summary": "Test Grafana managed receivers without saving them.",
-        "operationId": "RoutePostTestGrafanaReceivers",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/TestReceiversConfigBodyParams"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "207": {
-            "description": "MultiStatus",
-            "schema": {
-              "$ref": "#/definitions/MultiStatus"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          },
-          "403": {
-            "description": "PermissionDenied",
-            "schema": {
-              "$ref": "#/definitions/PermissionDenied"
-            }
-          },
-          "404": {
-            "description": "AlertManagerNotFound",
-            "schema": {
-              "$ref": "#/definitions/AlertManagerNotFound"
-            }
-          },
-          "408": {
-            "description": "Failure",
-            "schema": {
-              "$ref": "#/definitions/Failure"
-            }
-          },
-          "409": {
-            "description": "AlertManagerNotReady",
-            "schema": {
-              "$ref": "#/definitions/AlertManagerNotReady"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/api/v2/alerts": {
-      "get": {
-        "description": "get alertmanager alerts",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetAMAlerts",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Active",
-            "description": "Show active alerts",
-            "name": "active",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Silenced",
-            "description": "Show silenced alerts",
-            "name": "silenced",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Inhibited",
-            "description": "Show inhibited alerts",
-            "name": "inhibited",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "x-go-name": "Matchers",
-            "description": "A list of matchers to filter alerts by",
-            "name": "filter",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "x-go-name": "Receivers",
-            "description": "A regex matching receivers to filter alerts by",
-            "name": "receiver",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "gettableAlerts",
-            "schema": {
-              "$ref": "#/definitions/gettableAlerts"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "create alertmanager alerts",
-        "tags": ["alertmanager"],
-        "operationId": "RoutePostAMAlerts",
-        "parameters": [
-          {
-            "name": "PostableAlerts",
-            "in": "body",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/postableAlert"
-              }
-            }
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/api/v2/alerts/groups": {
-      "get": {
-        "description": "get alertmanager alerts",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetAMAlertGroups",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Active",
-            "description": "Show active alerts",
-            "name": "active",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Silenced",
-            "description": "Show silenced alerts",
-            "name": "silenced",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "default": true,
-            "x-go-name": "Inhibited",
-            "description": "Show inhibited alerts",
-            "name": "inhibited",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "x-go-name": "Matchers",
-            "description": "A list of matchers to filter alerts by",
-            "name": "filter",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "x-go-name": "Receivers",
-            "description": "A regex matching receivers to filter alerts by",
-            "name": "receiver",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "alertGroups",
-            "schema": {
-              "$ref": "#/definitions/alertGroups"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}": {
-      "get": {
-        "description": "get silence",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetSilence",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "SilenceId",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "gettableSilence",
-            "schema": {
-              "$ref": "#/definitions/gettableSilence"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "delete silence",
-        "tags": ["alertmanager"],
-        "operationId": "RouteDeleteSilence",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "SilenceId",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/api/v2/silences": {
-      "get": {
-        "description": "get silences",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetSilences",
-        "parameters": [
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "x-go-name": "Filter",
-            "name": "filter",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "gettableSilences",
-            "schema": {
-              "$ref": "#/definitions/gettableSilences"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "create silence",
-        "tags": ["alertmanager"],
-        "operationId": "RouteCreateSilence",
-        "parameters": [
-          {
-            "name": "Silence",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/postableSilence"
-            }
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "gettableSilence",
-            "schema": {
-              "$ref": "#/definitions/gettableSilence"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/api/v2/status": {
-      "get": {
-        "description": "get alertmanager status and configuration",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetAMStatus",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "GettableStatus",
-            "schema": {
-              "$ref": "#/definitions/GettableStatus"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/config/api/v1/alerts": {
-      "get": {
-        "description": "gets an Alerting config",
-        "tags": ["alertmanager"],
-        "operationId": "RouteGetAlertingConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "GettableUserConfig",
-            "schema": {
-              "$ref": "#/definitions/GettableUserConfig"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "sets an Alerting config",
-        "tags": ["alertmanager"],
-        "operationId": "RoutePostAlertingConfig",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/PostableUserConfig"
-            }
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "deletes the Alerting config for a tenant",
-        "tags": ["alertmanager"],
-        "operationId": "RouteDeleteAlertingConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/alertmanager/{DatasourceUID}/config/api/v1/receivers/test": {
-      "post": {
-        "tags": ["alertmanager"],
-        "summary": "Test Grafana managed receivers without saving them.",
-        "operationId": "RoutePostTestReceivers",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/TestReceiversConfigBodyParams"
-            }
-          },
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "207": {
-            "description": "MultiStatus",
-            "schema": {
-              "$ref": "#/definitions/MultiStatus"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          },
-          "403": {
-            "description": "PermissionDenied",
-            "schema": {
-              "$ref": "#/definitions/PermissionDenied"
-            }
-          },
-          "404": {
-            "description": "AlertManagerNotFound",
-            "schema": {
-              "$ref": "#/definitions/AlertManagerNotFound"
-            }
-          },
-          "408": {
-            "description": "Failure",
-            "schema": {
-              "$ref": "#/definitions/Failure"
-            }
-          },
-          "409": {
-            "description": "AlertManagerNotReady",
-            "schema": {
-              "$ref": "#/definitions/AlertManagerNotReady"
-            }
-          }
-        }
-      }
-    },
     "/alerts": {
       "get": {
         "tags": ["legacy_alerts"],
@@ -6918,361 +5980,6 @@
         }
       }
     },
-    "/prometheus/grafana/api/v1/alerts": {
-      "get": {
-        "description": "gets the current alerts",
-        "tags": ["prometheus"],
-        "operationId": "RouteGetGrafanaAlertStatuses",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": false,
-            "x-go-name": "IncludeInternalLabels",
-            "description": "Include Grafana specific labels as part of the response.",
-            "name": "includeInternalLabels",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "AlertResponse",
-            "schema": {
-              "$ref": "#/definitions/AlertResponse"
-            }
-          }
-        }
-      }
-    },
-    "/prometheus/grafana/api/v1/rules": {
-      "get": {
-        "description": "gets the evaluation statuses of all rules",
-        "tags": ["prometheus"],
-        "operationId": "RouteGetGrafanaRuleStatuses",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": false,
-            "x-go-name": "IncludeInternalLabels",
-            "description": "Include Grafana specific labels as part of the response.",
-            "name": "includeInternalLabels",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "Filter the list of rules to those that belong to the specified dashboard UID.",
-            "name": "DashboardUID",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Filter the list of rules to those that belong to the specified panel ID. Dashboard UID must be specified.",
-            "name": "PanelID",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "RuleResponse",
-            "schema": {
-              "$ref": "#/definitions/RuleResponse"
-            }
-          }
-        }
-      }
-    },
-    "/prometheus/{DatasourceUID}/api/v1/alerts": {
-      "get": {
-        "description": "gets the current alerts",
-        "tags": ["prometheus"],
-        "operationId": "RouteGetAlertStatuses",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "AlertResponse",
-            "schema": {
-              "$ref": "#/definitions/AlertResponse"
-            }
-          }
-        }
-      }
-    },
-    "/prometheus/{DatasourceUID}/api/v1/rules": {
-      "get": {
-        "description": "gets the evaluation statuses of all rules",
-        "tags": ["prometheus"],
-        "operationId": "RouteGetRuleStatuses",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "RuleResponse",
-            "schema": {
-              "$ref": "#/definitions/RuleResponse"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/contact-points": {
-      "get": {
-        "tags": ["provisioning"],
-        "summary": "Get all the contact points.",
-        "operationId": "RouteGetContactpoints",
-        "responses": {
-          "200": {
-            "description": "Route",
-            "schema": {
-              "$ref": "#/definitions/Route"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "post": {
-        "consumes": ["application/json"],
-        "tags": ["provisioning"],
-        "summary": "Create a contact point.",
-        "operationId": "RoutePostContactpoints",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/EmbeddedContactPoint"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "$ref": "#/responses/Accepted"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/contact-points/{ID}": {
-      "put": {
-        "consumes": ["application/json"],
-        "tags": ["provisioning"],
-        "summary": "Update an existing contact point.",
-        "operationId": "RoutePutContactpoint",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/EmbeddedContactPoint"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "$ref": "#/responses/Accepted"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "consumes": ["application/json"],
-        "tags": ["provisioning"],
-        "summary": "Delete a contact point.",
-        "operationId": "RouteDeleteContactpoints",
-        "responses": {
-          "202": {
-            "$ref": "#/responses/Accepted"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/mute-timings": {
-      "get": {
-        "tags": ["provisioning"],
-        "summary": "Get all the mute timings.",
-        "operationId": "RouteGetMuteTimings",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/MuteTiming"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/mute-timings/{name}": {
-      "get": {
-        "tags": ["provisioning"],
-        "summary": "Get a mute timing.",
-        "operationId": "RouteGetMuteTiming",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/MuteTiming"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/policies": {
-      "get": {
-        "tags": ["provisioning"],
-        "summary": "Get the notification policy tree.",
-        "operationId": "RouteGetPolicyTree",
-        "responses": {
-          "200": {
-            "description": "Route",
-            "schema": {
-              "$ref": "#/definitions/Route"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "put": {
-        "consumes": ["application/json"],
-        "tags": ["provisioning"],
-        "summary": "Sets the notification policy tree.",
-        "operationId": "RoutePutPolicyTree",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/Route"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "$ref": "#/responses/Accepted"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/templates": {
-      "get": {
-        "tags": ["provisioning"],
-        "summary": "Get all message templates.",
-        "operationId": "RouteGetTemplates",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/MessageTemplate"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/templates/{name}": {
-      "get": {
-        "tags": ["provisioning"],
-        "summary": "Get a message template.",
-        "operationId": "RouteGetTemplate",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/MessageTemplate"
-          },
-          "404": {
-            "$ref": "#/responses/NotFound"
-          }
-        }
-      },
-      "put": {
-        "consumes": ["application/json"],
-        "tags": ["provisioning"],
-        "summary": "Updates an existing template.",
-        "operationId": "RoutePutTemplate",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/MessageTemplateContent"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "$ref": "#/responses/Accepted"
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": ["provisioning"],
-        "summary": "Delete a template.",
-        "operationId": "RouteDeleteTemplate",
-        "responses": {
-          "204": {
-            "$ref": "#/responses/Accepted"
-          }
-        }
-      }
-    },
     "/recording-rules": {
       "get": {
         "tags": ["recording_rules", "enterprise"],
@@ -7885,368 +6592,6 @@
         }
       }
     },
-    "/ruler/grafana/api/v1/rules": {
-      "get": {
-        "description": "List rule groups",
-        "produces": ["application/json"],
-        "tags": ["ruler"],
-        "operationId": "RouteGetGrafanaRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "DashboardUID",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "PanelID",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "NamespaceConfigResponse",
-            "schema": {
-              "$ref": "#/definitions/NamespaceConfigResponse"
-            }
-          }
-        }
-      }
-    },
-    "/ruler/grafana/api/v1/rules/{Namespace}": {
-      "get": {
-        "description": "Get rule groups by namespace",
-        "produces": ["application/json"],
-        "tags": ["ruler"],
-        "operationId": "RouteGetNamespaceGrafanaRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "NamespaceConfigResponse",
-            "schema": {
-              "$ref": "#/definitions/NamespaceConfigResponse"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "Creates or updates a rule group",
-        "consumes": ["application/json", "application/yaml"],
-        "tags": ["ruler"],
-        "operationId": "RoutePostNameGrafanaRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/PostableRuleGroupConfig"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "Delete namespace",
-        "tags": ["ruler"],
-        "operationId": "RouteDeleteNamespaceGrafanaRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      }
-    },
-    "/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}": {
-      "get": {
-        "description": "Get rule group",
-        "produces": ["application/json"],
-        "tags": ["ruler"],
-        "operationId": "RouteGetGrafanaRuleGroupConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Groupname",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "RuleGroupConfigResponse",
-            "schema": {
-              "$ref": "#/definitions/RuleGroupConfigResponse"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "Delete rule group",
-        "tags": ["ruler"],
-        "operationId": "RouteDeleteGrafanaRuleGroupConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Groupname",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      }
-    },
-    "/ruler/{DatasourceUID}/api/v1/rules": {
-      "get": {
-        "description": "List rule groups",
-        "produces": ["application/json"],
-        "tags": ["ruler"],
-        "operationId": "RouteGetRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "DashboardUID",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "PanelID",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "NamespaceConfigResponse",
-            "schema": {
-              "$ref": "#/definitions/NamespaceConfigResponse"
-            }
-          }
-        }
-      }
-    },
-    "/ruler/{DatasourceUID}/api/v1/rules/{Namespace}": {
-      "get": {
-        "description": "Get rule groups by namespace",
-        "produces": ["application/json"],
-        "tags": ["ruler"],
-        "operationId": "RouteGetNamespaceRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "NamespaceConfigResponse",
-            "schema": {
-              "$ref": "#/definitions/NamespaceConfigResponse"
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "Creates or updates a rule group",
-        "consumes": ["application/json", "application/yaml"],
-        "tags": ["ruler"],
-        "operationId": "RoutePostNameRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/PostableRuleGroupConfig"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "Delete namespace",
-        "tags": ["ruler"],
-        "operationId": "RouteDeleteNamespaceRulesConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      }
-    },
-    "/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}": {
-      "get": {
-        "description": "Get rule group",
-        "produces": ["application/json"],
-        "tags": ["ruler"],
-        "operationId": "RouteGetRulegGroupConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Groupname",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "RuleGroupConfigResponse",
-            "schema": {
-              "$ref": "#/definitions/RuleGroupConfigResponse"
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "Delete rule group",
-        "tags": ["ruler"],
-        "operationId": "RouteDeleteRuleGroupConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Namespace",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "Groupname",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      }
-    },
     "/saml/acs": {
       "post": {
         "tags": ["saml", "enterprise"],
@@ -9863,184 +8208,6 @@
           }
         }
       }
-    },
-    "/v1/eval": {
-      "post": {
-        "description": "Test rule",
-        "consumes": ["application/json"],
-        "produces": ["application/json"],
-        "tags": ["testing"],
-        "operationId": "RouteEvalQueries",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/EvalQueriesPayload"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "EvalQueriesResponse",
-            "schema": {
-              "$ref": "#/definitions/EvalQueriesResponse"
-            }
-          }
-        }
-      }
-    },
-    "/v1/ngalert/admin_config": {
-      "get": {
-        "produces": ["application/json"],
-        "tags": ["configuration"],
-        "summary": "Get the NGalert configuration of the user's organization, returns 404 if no configuration is present.",
-        "operationId": "RouteGetNGalertConfig",
-        "responses": {
-          "200": {
-            "description": "GettableNGalertConfig",
-            "schema": {
-              "$ref": "#/definitions/GettableNGalertConfig"
-            }
-          },
-          "404": {
-            "description": "Failure",
-            "schema": {
-              "$ref": "#/definitions/Failure"
-            }
-          },
-          "500": {
-            "description": "Failure",
-            "schema": {
-              "$ref": "#/definitions/Failure"
-            }
-          }
-        }
-      },
-      "post": {
-        "consumes": ["application/json"],
-        "tags": ["configuration"],
-        "summary": "Creates or updates the NGalert configuration of the user's organization. If no value is sent for alertmanagersChoice, it defaults to \"all\".",
-        "operationId": "RoutePostNGalertConfig",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/PostableNGalertConfig"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "consumes": ["application/json"],
-        "tags": ["configuration"],
-        "summary": "Deletes the NGalert configuration of the user's organization.",
-        "operationId": "RouteDeleteNGalertConfig",
-        "responses": {
-          "200": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          },
-          "500": {
-            "description": "Failure",
-            "schema": {
-              "$ref": "#/definitions/Failure"
-            }
-          }
-        }
-      }
-    },
-    "/v1/ngalert/alertmanagers": {
-      "get": {
-        "produces": ["application/json"],
-        "tags": ["configuration"],
-        "summary": "Get the discovered and dropped Alertmanagers of the user's organization based on the specified configuration.",
-        "operationId": "RouteGetAlertmanagers",
-        "responses": {
-          "200": {
-            "description": "GettableAlertmanagers",
-            "schema": {
-              "$ref": "#/definitions/GettableAlertmanagers"
-            }
-          }
-        }
-      }
-    },
-    "/v1/rule/test/grafana": {
-      "post": {
-        "description": "Test a rule against Grafana ruler",
-        "consumes": ["application/json"],
-        "produces": ["application/json"],
-        "tags": ["testing"],
-        "operationId": "RouteTestRuleGrafanaConfig",
-        "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/TestRulePayload"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "TestRuleResponse",
-            "schema": {
-              "$ref": "#/definitions/TestRuleResponse"
-            }
-          }
-        }
-      }
-    },
-    "/v1/rule/test/{DatasourceUID}": {
-      "post": {
-        "description": "Test a rule against external data source ruler",
-        "consumes": ["application/json"],
-        "produces": ["application/json"],
-        "tags": ["testing"],
-        "operationId": "RouteTestRuleConfig",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "DatasoureUID should be the datasource UID identifier",
-            "name": "DatasourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/TestRulePayload"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "TestRuleResponse",
-            "schema": {
-              "$ref": "#/definitions/TestRuleResponse"
-            }
-          }
-        }
-      }
     }
   },
   "definitions": {
@@ -13240,6 +11407,13 @@
         "alertmanager_config": {
           "$ref": "#/definitions/GettableApiAlertingConfig"
         },
+        "template_file_provenances": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/Provenance"
+          },
+          "x-go-name": "TemplateFileProvenances"
+        },
         "template_files": {
           "type": "object",
           "additionalProperties": {
@@ -14056,6 +12230,21 @@
         "$ref": "#/definitions/Matcher"
       }
     },
+    "MessageTemplate": {
+      "type": "object",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Template": {
+          "type": "string"
+        },
+        "provenance": {
+          "$ref": "#/definitions/Provenance"
+        }
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "MessageTemplateContent": {
       "type": "object",
       "properties": {
@@ -14065,6 +12254,13 @@
       },
       "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
     },
+    "MessageTemplates": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/MessageTemplate"
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "Metadata": {
       "description": "Metadata contains user accesses for a given resource\nEx: map[string]bool{\"create\":true, \"delete\": true}",
       "type": "object",
@@ -14153,6 +12349,30 @@
       },
       "x-go-package": "github.com/prometheus/alertmanager/config"
     },
+    "MuteTiming": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "x-go-name": "Name"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          },
+          "x-go-name": "TimeIntervals"
+        }
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
+    "MuteTimings": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/MuteTiming"
+      },
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "NamespaceConfigResponse": {
       "type": "object",
       "additionalProperties": {
@@ -14217,6 +12437,10 @@
       },
       "x-go-package": "github.com/grafana/grafana/pkg/api/dtos"
     },
+    "NotFound": {
+      "type": "object",
+      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+    },
     "NotificationTestCommand": {
       "type": "object",
       "properties": {
@@ -16910,8 +15134,9 @@
       "x-go-package": "github.com/grafana/grafana/pkg/api/dtos"
     },
     "URL": {
+      "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
       "type": "object",
-      "title": "URL is a custom URL type that allows validation at configuration load time.",
+      "title": "A URL represents a parsed URL (technically, a URI reference).",
       "properties": {
         "ForceQuery": {
           "type": "boolean"
@@ -16944,7 +15169,7 @@
           "$ref": "#/definitions/Userinfo"
         }
       },
-      "x-go-package": "github.com/prometheus/common/config"
+      "x-go-package": "net/url"
     },
     "UpdateAlertNotificationCommand": {
       "type": "object",
@@ -18020,14 +16245,14 @@
       }
     },
     "gettableAlerts": {
+      "description": "GettableAlerts gettable alerts",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableAlert"
-      },
-      "x-go-name": "GettableAlerts",
-      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+      }
     },
     "gettableSilence": {
+      "description": "GettableSilence gettable silence",
       "type": "object",
       "required": ["comment", "createdBy", "endsAt", "matchers", "startsAt", "id", "status", "updatedAt"],
       "properties": {
@@ -18070,9 +16295,7 @@
           "format": "date-time",
           "x-go-name": "UpdatedAt"
         }
-      },
-      "x-go-name": "GettableSilence",
-      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+      }
     },
     "gettableSilences": {
       "type": "array",
@@ -18200,7 +16423,6 @@
       "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
     },
     "postableSilence": {
-      "description": "PostableSilence postable silence",
       "type": "object",
       "required": ["comment", "createdBy", "endsAt", "matchers", "startsAt"],
       "properties": {
@@ -18234,10 +16456,11 @@
           "format": "date-time",
           "x-go-name": "StartsAt"
         }
-      }
+      },
+      "x-go-name": "PostableSilence",
+      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
     },
     "receiver": {
-      "description": "Receiver receiver",
       "type": "object",
       "required": ["name"],
       "properties": {
@@ -18246,7 +16469,9 @@
           "type": "string",
           "x-go-name": "Name"
         }
-      }
+      },
+      "x-go-name": "Receiver",
+      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
     },
     "silence": {
       "description": "Silence silence",

From db1c49a95b092f72cd0b627c8eca488806f5626d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 08:43:41 -0400
Subject: [PATCH 050/103] Build: Enable long term caching for frontend assets
 (#47625) (#49691)

* build(webpack): move CopyUniconsPlugin into own file

* chore(webpack): delete unused blobUrl and compile loaders

* build(webpack): prefer contenthash over fullhash for longer caching

* build(webpack): set optimization.moduleIds named only in dev

* build(webpack): introduce HTMLWebpackCSSChunks so templates can access theme css by name

* feat: inject css files with contenthash in html templates

* revert(error-template): remove ContentDeliveryURL from CSS href

* refactor(index-template): update grafanaBootData.themePaths

* chore(webpack): add typescript annotations for CopyUniconsPlugin

(cherry picked from commit 78bef7a26a799209b5307d6bde8e25fcb4fbde7d)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
---
 public/views/error-template.html              |   6 +-
 public/views/index-template.html              |  14 +--
 scripts/webpack/loaders/blobUrl.js            |   8 --
 scripts/webpack/loaders/compile.js            | 100 ------------------
 scripts/webpack/plugins/CopyUniconsPlugin.js  |  39 +++++++
 .../webpack/plugins/HTMLWebpackCSSChunks.js   |  42 ++++++++
 scripts/webpack/webpack.common.js             |  37 +------
 scripts/webpack/webpack.dev.js                |   7 +-
 scripts/webpack/webpack.hot.js                |   5 +-
 scripts/webpack/webpack.prod.js               |   4 +-
 10 files changed, 108 insertions(+), 154 deletions(-)
 delete mode 100644 scripts/webpack/loaders/blobUrl.js
 delete mode 100644 scripts/webpack/loaders/compile.js
 create mode 100644 scripts/webpack/plugins/CopyUniconsPlugin.js
 create mode 100644 scripts/webpack/plugins/HTMLWebpackCSSChunks.js

diff --git a/public/views/error-template.html b/public/views/error-template.html
index 0f785120ce1..28e828a1554 100644
--- a/public/views/error-template.html
+++ b/public/views/error-template.html
@@ -10,7 +10,11 @@
 
     <base href="[[.AppSubUrl]]/" />
 
-    <link rel="stylesheet" href="public/build/grafana.[[ .Theme ]].<%= compilation.hash %>.css" />
+    [[ if eq .Theme "light" ]]
+    <link rel="stylesheet" href="public/build/<%= htmlWebpackPlugin.files.cssChunks.light %>" />
+    [[ else ]]
+    <link rel="stylesheet" href="public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>" />
+    [[ end ]]
 
     <link rel="icon" type="image/png" href="public/img/fav32.png" />
     <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28" />
diff --git a/public/views/index-template.html b/public/views/index-template.html
index 2923b1918f9..955a1b4fc4e 100644
--- a/public/views/index-template.html
+++ b/public/views/index-template.html
@@ -20,10 +20,12 @@
     <link rel="icon" type="image/png" href="[[.FavIcon]]" />
     <link rel="apple-touch-icon" sizes="180x180" href="[[.AppleTouchIcon]]" />
     <link rel="mask-icon" href="[[.ContentDeliveryURL]]public/img/grafana_mask_icon.svg" color="#F05A28" />
-    <link
-      rel="stylesheet"
-      href="[[.ContentDeliveryURL]]public/build/grafana.[[ .Theme ]].<%= compilation.hash %>.css"
-    />
+
+    [[ if eq .Theme "light" ]]
+    <link rel="stylesheet" href="[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.light %>" />
+    [[ else ]]
+    <link rel="stylesheet" href="[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>" />
+    [[ end ]]
 
     <script nonce="[[.Nonce]]">
       performance.mark('frontend_boot_css_time_seconds');
@@ -251,8 +253,8 @@
         settings: [[.Settings]],
         navTree: [[.NavTree]],
         themePaths: {
-          light: '[[.ContentDeliveryURL]]public/build/grafana.light.<%= compilation.hash %>.css',
-          dark: '[[.ContentDeliveryURL]]public/build/grafana.dark.<%= compilation.hash %>.css'
+          light: '[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.light %>',
+          dark: '[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>'
         }
       };
 
diff --git a/scripts/webpack/loaders/blobUrl.js b/scripts/webpack/loaders/blobUrl.js
deleted file mode 100644
index dd8fce3d1f6..00000000000
--- a/scripts/webpack/loaders/blobUrl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const loaderUtils = require('loader-utils');
-
-module.exports = function blobUrl(source) {
-  const { type } = loaderUtils.getOptions(this) || {};
-  return `module.exports = URL.createObjectURL(new Blob([${JSON.stringify(source)}]${
-    type ? `, { type: ${JSON.stringify(type)} }` : ''
-  }));`;
-};
diff --git a/scripts/webpack/loaders/compile.js b/scripts/webpack/loaders/compile.js
deleted file mode 100644
index 29f9ffe81fc..00000000000
--- a/scripts/webpack/loaders/compile.js
+++ /dev/null
@@ -1,100 +0,0 @@
-const loaderUtils = require('loader-utils');
-const ExternalsPlugin = require('webpack/lib/ExternalsPlugin');
-const LoaderTargetPlugin = require('webpack/lib/LoaderTargetPlugin');
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
-const NodeTargetPlugin = require('webpack/lib/node/NodeTargetPlugin');
-const WebWorkerTemplatePlugin = require('webpack/lib/webworker/WebWorkerTemplatePlugin');
-
-const COMPILATION_METADATA = Symbol('COMPILATION_METADATA');
-
-module.exports.COMPILATION_METADATA = COMPILATION_METADATA;
-
-module.exports.pitch = function pitch(remainingRequest) {
-  const { target, plugins = [], output, emit } = loaderUtils.getOptions(this) || {};
-
-  if (target !== 'worker') {
-    throw new Error(`Unsupported compile target: ${JSON.stringify(target)}`);
-  }
-
-  this.cacheable(false);
-
-  const { filename, options = {} } = getOutputFilename(output, { target });
-
-  // eslint-disable-next-line no-underscore-dangle
-  const currentCompilation = this._compilation;
-
-  const outputFilename = loaderUtils.interpolateName(this, filename, {
-    context: options.context || currentCompilation.options.context,
-    regExp: options.regExp,
-  });
-
-  const outputOptions = {
-    filename: outputFilename,
-    chunkFilename: `${outputFilename}.[id]`,
-    namedChunkFilename: null,
-  };
-
-  const compilerOptions = currentCompilation.compiler.options;
-  const childCompiler = currentCompilation.createChildCompiler('worker', outputOptions, [
-    // https://github.com/webpack/webpack/blob/master/lib/WebpackOptionsApply.js
-    new WebWorkerTemplatePlugin(outputOptions),
-    new LoaderTargetPlugin('webworker'),
-    ...(this.target === 'web' || this.target === 'webworker' ? [] : [new NodeTargetPlugin()]),
-
-    // https://github.com/webpack-contrib/worker-loader/issues/95#issuecomment-352856617
-    ...(compilerOptions.externals ? [new ExternalsPlugin(compilerOptions.externals)] : []),
-
-    ...plugins,
-
-    new SingleEntryPlugin(this.context, `!!${remainingRequest}`, 'main'),
-  ]);
-
-  const subCache = `subcache ${__dirname} ${remainingRequest}`;
-
-  childCompiler.plugin('compilation', (compilation) => {
-    if (!compilation.cache) {
-      return;
-    }
-    if (!(subCache in compilation.cache)) {
-      Object.assign(compilation.cache, { [subCache]: {} });
-    }
-    Object.assign(compilation, { cache: compilation.cache[subCache] });
-  });
-
-  const callback = this.async();
-
-  childCompiler.runAsChild((error, entries, compilation) => {
-    if (error) {
-      return callback(error);
-    }
-    if (entries.length === 0) {
-      return callback(null, null);
-    }
-    const mainFilename = entries[0].files[0];
-    if (emit === false) {
-      delete currentCompilation.assets[mainFilename];
-    }
-    callback(null, compilation.assets[mainFilename].source(), null, {
-      [COMPILATION_METADATA]: entries[0].files,
-    });
-  });
-};
-
-function getOutputFilename(options, { target }) {
-  if (!options) {
-    return { filename: `[fullhash].${target}.js`, options: undefined };
-  }
-  if (typeof options === 'string') {
-    return { filename: options, options: undefined };
-  }
-  if (typeof options === 'object') {
-    return {
-      filename: options.filename,
-      options: {
-        context: options.context,
-        regExp: options.regExp,
-      },
-    };
-  }
-  throw new Error(`Invalid compile output options: ${options}`);
-}
diff --git a/scripts/webpack/plugins/CopyUniconsPlugin.js b/scripts/webpack/plugins/CopyUniconsPlugin.js
new file mode 100644
index 00000000000..0e5fafcf04c
--- /dev/null
+++ b/scripts/webpack/plugins/CopyUniconsPlugin.js
@@ -0,0 +1,39 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+class CopyUniconsPlugin {
+  /**
+   * @param {import('webpack').Compiler} compiler
+   */
+  apply(compiler) {
+    compiler.hooks.afterEnvironment.tap(
+      'CopyUniconsPlugin',
+      /**
+       * @param {import('webpack').Compilation} compilation
+       */
+      () => {
+        let destDir = path.resolve(__dirname, '../../../public/img/icons/unicons');
+
+        if (!fs.pathExistsSync(destDir)) {
+          let srcDir = path.join(
+            path.dirname(require.resolve('iconscout-unicons-tarball/package.json')),
+            'unicons/svg/line'
+          );
+          fs.copySync(srcDir, destDir);
+        }
+
+        let solidDestDir = path.resolve(__dirname, '../../../public/img/icons/solid');
+
+        if (!fs.pathExistsSync(solidDestDir)) {
+          let srcDir = path.join(
+            path.dirname(require.resolve('iconscout-unicons-tarball/package.json')),
+            'unicons/svg/solid'
+          );
+          fs.copySync(srcDir, solidDestDir);
+        }
+      }
+    );
+  }
+}
+
+module.exports = CopyUniconsPlugin;
diff --git a/scripts/webpack/plugins/HTMLWebpackCSSChunks.js b/scripts/webpack/plugins/HTMLWebpackCSSChunks.js
new file mode 100644
index 00000000000..434d350f718
--- /dev/null
+++ b/scripts/webpack/plugins/HTMLWebpackCSSChunks.js
@@ -0,0 +1,42 @@
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+
+/*
+ * This plugin returns the css associated with entrypoints. Those chunks can be found
+ * in `htmlWebpackPlugin.files.cssChunks`.
+ * The HTML Webpack plugin removed the chunks object in v5 in favour of an array however if we want
+ * to do anything smart with hashing (e.g. [contenthash]) we need a map of { themeName: chunkNameWithHash }.
+ */
+class HTMLWebpackCSSChunks {
+  /**
+   * @param {import('webpack').Compiler} compiler
+   */
+  apply(compiler) {
+    compiler.hooks.compilation.tap(
+      'HTMLWebpackCSSChunks',
+      /**
+       * @param {import('webpack').Compilation} compilation
+       */
+      (compilation) => {
+        HtmlWebpackPlugin.getHooks(compilation).beforeAssetTagGeneration.tapAsync(
+          'HTMLWebpackCSSChunks',
+          (data, cb) => {
+            data.assets.cssChunks = {};
+
+            for (const entryPoint of compilation.entrypoints.values()) {
+              for (const chunk of entryPoint.chunks) {
+                const cssFile = [...chunk.files].find((file) => file.endsWith('.css'));
+                if (cssFile !== undefined) {
+                  data.assets.cssChunks[chunk.name] = cssFile;
+                }
+              }
+            }
+
+            cb(null, data);
+          }
+        );
+      }
+    );
+  }
+}
+
+module.exports = HTMLWebpackCSSChunks;
diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js
index d8d00d6cc52..0f1f07a0853 100644
--- a/scripts/webpack/webpack.common.js
+++ b/scripts/webpack/webpack.common.js
@@ -1,36 +1,10 @@
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const fs = require('fs-extra');
 const path = require('path');
 const webpack = require('webpack');
 
+const CopyUniconsPlugin = require('./plugins/CopyUniconsPlugin');
 const CorsWorkerPlugin = require('./plugins/CorsWorkerPlugin');
 
-class CopyUniconsPlugin {
-  apply(compiler) {
-    compiler.hooks.afterEnvironment.tap('CopyUniconsPlugin', () => {
-      let destDir = path.resolve(__dirname, '../../public/img/icons/unicons');
-
-      if (!fs.pathExistsSync(destDir)) {
-        let srcDir = path.join(
-          path.dirname(require.resolve('iconscout-unicons-tarball/package.json')),
-          'unicons/svg/line'
-        );
-        fs.copySync(srcDir, destDir);
-      }
-
-      let solidDestDir = path.resolve(__dirname, '../../public/img/icons/solid');
-
-      if (!fs.pathExistsSync(solidDestDir)) {
-        let srcDir = path.join(
-          path.dirname(require.resolve('iconscout-unicons-tarball/package.json')),
-          'unicons/svg/solid'
-        );
-        fs.copySync(srcDir, solidDestDir);
-      }
-    });
-  }
-}
-
 module.exports = {
   target: 'web',
   entry: {
@@ -39,16 +13,14 @@ module.exports = {
   output: {
     clean: true,
     path: path.resolve(__dirname, '../../public/build'),
-    filename: '[name].[fullhash].js',
+    filename: '[name].[contenthash].js',
     // Keep publicPath relative for host.com/grafana/ deployments
     publicPath: 'public/build/',
   },
   resolve: {
     extensions: ['.ts', '.tsx', '.es6', '.js', '.json', '.svg'],
     alias: {
-      // storybook v6 bump caused the app to bundle multiple versions of react breaking hooks
-      // make sure to resolve only from the project: https://github.com/facebook/react/issues/13991#issuecomment-435587809
-      // some of data source pluginis use global Prism object to add the language definition
+      // some of data source plugins use global Prism object to add the language definition
       // we want to have same Prism object in core and in grafana/ui
       prismjs: require.resolve('prismjs'),
     },
@@ -134,13 +106,12 @@ module.exports = {
       {
         test: /\.(svg|ico|jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/,
         loader: 'file-loader',
-        options: { name: 'static/img/[name].[hash:8].[ext]' },
+        options: { name: 'static/img/[name].[contenthash:8].[ext]' },
       },
     ],
   },
   // https://webpack.js.org/plugins/split-chunks-plugin/#split-chunks-example-3
   optimization: {
-    moduleIds: 'named',
     runtimeChunk: 'single',
     splitChunks: {
       chunks: 'all',
diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js
index dddb04ae409..0eb477af2e3 100644
--- a/scripts/webpack/webpack.dev.js
+++ b/scripts/webpack/webpack.dev.js
@@ -8,6 +8,7 @@ const path = require('path');
 const { DefinePlugin } = require('webpack');
 const { merge } = require('webpack-merge');
 
+const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
 const common = require('./webpack.common.js');
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
@@ -51,11 +52,11 @@ module.exports = (env = {}) =>
     // https://webpack.js.org/guides/build-performance/#output-without-path-info
     output: {
       pathinfo: false,
-      filename: '[name].js',
     },
 
     // https://webpack.js.org/guides/build-performance/#avoid-extra-optimization-steps
     optimization: {
+      moduleIds: 'named',
       runtimeChunk: true,
       removeAvailableModules: false,
       removeEmptyChunks: false,
@@ -91,7 +92,7 @@ module.exports = (env = {}) =>
         extensions: ['.ts', '.tsx'],
       }),
       new MiniCssExtractPlugin({
-        filename: 'grafana.[name].[fullhash].css',
+        filename: 'grafana.[name].[contenthash].css',
       }),
       new HtmlWebpackPlugin({
         filename: path.resolve(__dirname, '../../public/views/error.html'),
@@ -103,11 +104,11 @@ module.exports = (env = {}) =>
       new HtmlWebpackPlugin({
         filename: path.resolve(__dirname, '../../public/views/index.html'),
         template: path.resolve(__dirname, '../../public/views/index-template.html'),
-        hash: true,
         inject: false,
         chunksSortMode: 'none',
         excludeChunks: ['dark', 'light'],
       }),
+      new HTMLWebpackCSSChunks(),
       new DefinePlugin({
         'process.env': {
           NODE_ENV: JSON.stringify('development'),
diff --git a/scripts/webpack/webpack.hot.js b/scripts/webpack/webpack.hot.js
index 41933f42758..9c049c4755a 100644
--- a/scripts/webpack/webpack.hot.js
+++ b/scripts/webpack/webpack.hot.js
@@ -7,6 +7,7 @@ const path = require('path');
 const { DefinePlugin } = require('webpack');
 const { merge } = require('webpack-merge');
 
+const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
 const common = require('./webpack.common.js');
 
 module.exports = merge(common, {
@@ -77,16 +78,16 @@ module.exports = merge(common, {
 
   plugins: [
     new MiniCssExtractPlugin({
-      filename: 'grafana.[name].[fullhash].css',
+      filename: 'grafana.[name].[contenthash].css',
     }),
     new HtmlWebpackPlugin({
       filename: path.resolve(__dirname, '../../public/views/index.html'),
       template: path.resolve(__dirname, '../../public/views/index-template.html'),
-      hash: true,
       inject: false,
       chunksSortMode: 'none',
       excludeChunks: ['dark', 'light'],
     }),
+    new HTMLWebpackCSSChunks(),
     new ReactRefreshWebpackPlugin(),
     new DefinePlugin({
       'process.env': {
diff --git a/scripts/webpack/webpack.prod.js b/scripts/webpack/webpack.prod.js
index ec9c1ac5759..310029024b6 100644
--- a/scripts/webpack/webpack.prod.js
+++ b/scripts/webpack/webpack.prod.js
@@ -7,6 +7,7 @@ const path = require('path');
 const TerserPlugin = require('terser-webpack-plugin');
 const { merge } = require('webpack-merge');
 
+const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
 const common = require('./webpack.common.js');
 
 module.exports = (env = {}) =>
@@ -63,7 +64,7 @@ module.exports = (env = {}) =>
 
     plugins: [
       new MiniCssExtractPlugin({
-        filename: 'grafana.[name].[fullhash].css',
+        filename: 'grafana.[name].[contenthash].css',
       }),
       new HtmlWebpackPlugin({
         filename: path.resolve(__dirname, '../../public/views/error.html'),
@@ -79,6 +80,7 @@ module.exports = (env = {}) =>
         excludeChunks: ['manifest', 'dark', 'light'],
         chunksSortMode: 'none',
       }),
+      new HTMLWebpackCSSChunks(),
       function () {
         this.hooks.done.tap('Done', function (stats) {
           if (stats.compilation.errors && stats.compilation.errors.length) {

From a4948e1018cedbbe0b074e1d00eb7d1f92a3b6ee Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 08:52:51 -0400
Subject: [PATCH 051/103] fix: only "swallow" the json() parsing error if the
 response is empty (#47493) (#49692)

(cherry picked from commit 84b7efb393a8320c335a545e2a89f7ab0c8bda4c)

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
---
 public/app/core/utils/fetch.test.ts | 25 ++++++++++++++++++++++++-
 public/app/core/utils/fetch.ts      | 10 ++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/public/app/core/utils/fetch.test.ts b/public/app/core/utils/fetch.test.ts
index 9d46e039aa3..b510ea90bf4 100644
--- a/public/app/core/utils/fetch.test.ts
+++ b/public/app/core/utils/fetch.test.ts
@@ -135,7 +135,12 @@ describe('parseCredentials', () => {
 });
 
 describe('parseResponseBody', () => {
-  const rsp = {} as unknown as Response;
+  let rsp: Response;
+
+  beforeEach(() => {
+    rsp = new Response();
+  });
+
   it('parses json', async () => {
     const value = { hello: 'world' };
     const body = await parseResponseBody(
@@ -148,6 +153,24 @@ describe('parseResponseBody', () => {
     expect(body).toEqual(value);
   });
 
+  it('returns an empty object {} when the response is empty but is declared as JSON type', async () => {
+    rsp.headers.set('Content-Length', '0');
+    jest.spyOn(console, 'warn').mockImplementation();
+
+    const json = jest.fn();
+    const body = await parseResponseBody(
+      {
+        ...rsp,
+        json,
+      },
+      'json'
+    );
+
+    expect(body).toEqual({});
+    expect(json).not.toHaveBeenCalled();
+    expect(console.warn).toHaveBeenCalledTimes(1);
+  });
+
   it('parses text', async () => {
     const value = 'RAW TEXT';
     const body = await parseResponseBody(
diff --git a/public/app/core/utils/fetch.ts b/public/app/core/utils/fetch.ts
index c4b00d2034e..c057dda9111 100644
--- a/public/app/core/utils/fetch.ts
+++ b/public/app/core/utils/fetch.ts
@@ -106,13 +106,15 @@ export async function parseResponseBody<T>(
         return response.blob() as any;
 
       case 'json':
-        try {
-          return await response.json();
-        } catch (err) {
-          console.warn(`${response.url} returned an invalid JSON -`, err);
+        // An empty string is not a valid JSON.
+        // Sometimes (unfortunately) our APIs declare their Content-Type as JSON, however they return an empty body.
+        if (response.headers.get('Content-Length') === '0') {
+          console.warn(`${response.url} returned an invalid JSON`);
           return {} as unknown as T;
         }
 
+        return await response.json();
+
       case 'text':
         return response.text() as any;
     }

From 1c67b35d6b56f5390d8e365470750632fe04d2d3 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 08:57:55 -0400
Subject: [PATCH 052/103] Preferences: Fix updating of preferences for Navbar
 and Query History (#49677) (#49694)

* Preferences: Fix PUT for Navbar and Query History

* Update linting

* Fix linting

* Use models defined in preference package in preferences

* Remove white space

* Revert "Use models defined in preference package in preferences"

This reverts commit 6f7aa9f8d35a7aad505fa3bad7e2ddeaddb4c527.

(cherry picked from commit e25a49ff49ca0207f557ed1b508125c0a96b938b)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---
 pkg/api/dtos/prefs.go  | 9 ++++-----
 pkg/api/preferences.go | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/api/dtos/prefs.go b/pkg/api/dtos/prefs.go
index 18dc1f9ca94..134f48fba11 100644
--- a/pkg/api/dtos/prefs.go
+++ b/pkg/api/dtos/prefs.go
@@ -1,7 +1,6 @@
 package dtos
 
 import (
-	"github.com/grafana/grafana/pkg/models"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 )
 
@@ -24,10 +23,10 @@ type UpdatePrefsCmd struct {
 	HomeDashboardID  int64   `json:"homeDashboardId"`
 	HomeDashboardUID *string `json:"homeDashboardUID,omitempty"`
 	// Enum: utc,browser
-	Timezone     string                         `json:"timezone"`
-	WeekStart    string                         `json:"weekStart"`
-	Navbar       *models.NavbarPreference       `json:"navbar,omitempty"`
-	QueryHistory *models.QueryHistoryPreference `json:"queryHistory,omitempty"`
+	Timezone     string                       `json:"timezone"`
+	WeekStart    string                       `json:"weekStart"`
+	Navbar       *pref.NavbarPreference       `json:"navbar,omitempty"`
+	QueryHistory *pref.QueryHistoryPreference `json:"queryHistory,omitempty"`
 }
 
 // swagger:model
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
index 483de3408af..47d54b58117 100644
--- a/pkg/api/preferences.go
+++ b/pkg/api/preferences.go
@@ -120,6 +120,8 @@ func (hs *HTTPServer) updatePreferencesFor(ctx context.Context, orgID, userID, t
 		Timezone:        dtoCmd.Timezone,
 		WeekStart:       dtoCmd.WeekStart,
 		HomeDashboardID: dtoCmd.HomeDashboardID,
+		QueryHistory:    dtoCmd.QueryHistory,
+		Navbar:          dtoCmd.Navbar,
 	}
 
 	if err := hs.preferenceService.Save(ctx, &saveCmd); err != nil {

From 073f747679df9110acb6c05c9bbe7024d3b107d3 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 09:21:37 -0400
Subject: [PATCH 053/103] Loki code editor: do not run query on blur in explore
 mode (#49241) (#49696)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* loki code editor: do not run query on blur in explore mode

* loki: code editor: better change tracking

* fixed comment

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
(cherry picked from commit 386181cf4565ae558fab9fa5a6033680e4daa1c8)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 .../components/LokiQueryCodeEditor.tsx        | 22 +++++++++++++++++--
 .../components/LokiQueryEditorSelector.tsx    |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
index 1354458a7ac..2ea26ae1f60 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
@@ -1,16 +1,33 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { CoreApp, GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
 import { testIds } from '../../components/LokiQueryEditor';
 import { LokiQueryField } from '../../components/LokiQueryField';
 import { LokiQueryEditorProps } from '../../components/types';
 
-export function LokiQueryCodeEditor({ query, datasource, range, onRunQuery, onChange, data }: LokiQueryEditorProps) {
+export function LokiQueryCodeEditor({
+  query,
+  datasource,
+  range,
+  onRunQuery,
+  onChange,
+  data,
+  app,
+}: LokiQueryEditorProps) {
   const styles = useStyles2(getStyles);
 
+  // the inner QueryField works like this when a blur event happens:
+  // - if it has an onBlur prop, it calls it
+  // - else it calls onRunQuery (some extra conditions apply)
+  //
+  // we want it to not do anything when a blur event happens in explore mode,
+  // so we set an empty-function in such case. otherwise we set `undefined`,
+  // which will cause it to run the query when blur happens.
+  const onBlur = app === CoreApp.Explore ? () => undefined : undefined;
+
   return (
     <div className={styles.wrapper}>
       <LokiQueryField
@@ -19,6 +36,7 @@ export function LokiQueryCodeEditor({ query, datasource, range, onRunQuery, onCh
         range={range}
         onRunQuery={onRunQuery}
         onChange={onChange}
+        onBlur={onBlur}
         history={[]}
         data={data}
         data-testid={testIds.editor}
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
index fbb5f1d4f82..3d264ea554d 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
@@ -111,7 +111,7 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
       </EditorHeader>
       <Space v={0.5} />
       <EditorRows>
-        {editorMode === QueryEditorMode.Code && <LokiQueryCodeEditor {...props} />}
+        {editorMode === QueryEditorMode.Code && <LokiQueryCodeEditor {...props} onChange={onChangeInternal} />}
         {editorMode === QueryEditorMode.Builder && (
           <LokiQueryBuilderContainer
             datasource={props.datasource}

From 9f9f8c3a23333cd0346df1b973c9920d6d4d3b7c Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Thu, 26 May 2022 14:31:33 +0100
Subject: [PATCH 054/103] Variables: Fixes issue with data source variables not
 being correctly used in panel queries (#49323) (#49697)

---
 public/app/features/query/state/PanelQueryRunner.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index f7ceea18895..dcd7ef65c2a 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -236,9 +236,11 @@ export class PanelQueryRunner {
     try {
       const ds = await getDataSource(datasource, request.scopedVars);
 
-      // Attach the data source name to each query
+      // Attach the data source to each query
       request.targets = request.targets.map((query) => {
-        if (!query.datasource) {
+        // When using a data source variable, the panel might have the incorrect datasource
+        // stored, so when running the query make sure it is done with the correct one
+        if (!query.datasource || (query.datasource.uid !== ds.uid && !ds.meta.mixed)) {
           query.datasource = ds.getRef();
         }
         return query;

From 7e99d6dc46f9c71406a9facc5a910f5e8515160e Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Thu, 26 May 2022 14:31:46 +0100
Subject: [PATCH 055/103] TimeRange: Fixes issue when zooming out on a
 timerange with timespan 0 (#49622) (#49695)

---
 public/app/core/utils/timePicker.test.ts | 20 ++++++++++++++++++++
 public/app/core/utils/timePicker.ts      |  6 ++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/public/app/core/utils/timePicker.test.ts b/public/app/core/utils/timePicker.test.ts
index aeca99657ec..3fe23e6e841 100644
--- a/public/app/core/utils/timePicker.test.ts
+++ b/public/app/core/utils/timePicker.test.ts
@@ -73,6 +73,26 @@ describe('getZoomedTimeRange', () => {
 
       const result = getZoomedTimeRange(range, 2);
 
+      expect(result).toEqual(expectedRange);
+    });
+  });
+  describe('when called with a timespan of 0', () => {
+    it('then it should return a timespan of 30s', () => {
+      const range = {
+        from: toUtc('2019-01-01 10:00:00'),
+        to: toUtc('2019-01-01 10:00:00'),
+        raw: {
+          from: 'now',
+          to: 'now',
+        },
+      };
+      const expectedRange: AbsoluteTimeRange = {
+        from: toUtc('2019-01-01 09:59:45').valueOf(),
+        to: toUtc('2019-01-01 10:00:15').valueOf(),
+      };
+
+      const result = getZoomedTimeRange(range, 2);
+
       expect(result).toEqual(expectedRange);
     });
   });
diff --git a/public/app/core/utils/timePicker.ts b/public/app/core/utils/timePicker.ts
index 7b6c01c59c7..08dd76c2531 100644
--- a/public/app/core/utils/timePicker.ts
+++ b/public/app/core/utils/timePicker.ts
@@ -30,9 +30,11 @@ export const getShiftedTimeRange = (direction: number, origRange: TimeRange): Ab
 export const getZoomedTimeRange = (range: TimeRange, factor: number): AbsoluteTimeRange => {
   const timespan = range.to.valueOf() - range.from.valueOf();
   const center = range.to.valueOf() - timespan / 2;
+  // If the timepsan is 0, zooming out would do nothing, so we force a zoom out to 30s
+  const newTimespan = timespan === 0 ? 30000 : timespan * factor;
 
-  const to = center + (timespan * factor) / 2;
-  const from = center - (timespan * factor) / 2;
+  const to = center + newTimespan / 2;
+  const from = center - newTimespan / 2;
 
   return { from, to };
 };

From 05cd2af454f0830a7c3586860a59e420560ff869 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 09:43:55 -0400
Subject: [PATCH 056/103] Chore: Remove usage of deprecated getColorForTheme
 function (#49519) (#49700)

(cherry picked from commit 308ceebdd1820bf7a98155949d0af0371b34f9e8)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 packages/grafana-data/src/field/scale.test.ts    |  5 ++---
 .../src/utils/namedColorsPalette.test.ts         |  6 ++----
 .../grafana-data/src/utils/namedColorsPalette.ts | 16 ----------------
 .../grafana-ui/src/components/Badge/Badge.tsx    |  4 ++--
 .../grafana-ui/src/components/Gauge/utils.ts     |  9 +++++----
 .../src/components/Graph/utils.test.ts           |  3 +--
 .../src/components/VizLegend/VizLegend.story.tsx |  4 ++--
 public/app/plugins/panel/graph/data_processor.ts | 13 ++-----------
 public/app/plugins/panel/graph/module.ts         |  4 ++--
 .../app/plugins/panel/graph/threshold_manager.ts |  9 ++++-----
 .../plugins/panel/graph/time_region_manager.ts   | 10 +++++-----
 public/app/plugins/panel/heatmap/color_legend.ts |  4 ++--
 public/app/plugins/panel/heatmap/rendering.ts    |  3 +--
 public/app/plugins/panel/nodeGraph/Legend.tsx    |  6 +++---
 public/app/plugins/panel/table-old/renderer.ts   |  5 ++---
 15 files changed, 35 insertions(+), 66 deletions(-)

diff --git a/packages/grafana-data/src/field/scale.test.ts b/packages/grafana-data/src/field/scale.test.ts
index 9cfd9dbb1ce..c09a8249c2e 100644
--- a/packages/grafana-data/src/field/scale.test.ts
+++ b/packages/grafana-data/src/field/scale.test.ts
@@ -1,6 +1,5 @@
 import { createTheme } from '../themes';
 import { ThresholdsMode, Field, FieldType, FieldColorModeId } from '../types';
-import { getColorForTheme } from '../utils';
 import { ArrayVector } from '../vector/ArrayVector';
 
 import { getScaleCalculator } from './scale';
@@ -41,12 +40,12 @@ describe('getScaleCalculator', () => {
     const calc = getScaleCalculator(field, theme);
     expect(calc(true as any)).toEqual({
       percent: 1,
-      color: getColorForTheme('green', theme.v1),
+      color: theme.v1.visualization.getColorByName('green'),
       threshold: undefined,
     });
     expect(calc(false as any)).toEqual({
       percent: 0,
-      color: getColorForTheme('red', theme.v1),
+      color: theme.v1.visualization.getColorByName('red'),
       threshold: undefined,
     });
   });
diff --git a/packages/grafana-data/src/utils/namedColorsPalette.test.ts b/packages/grafana-data/src/utils/namedColorsPalette.test.ts
index debb0630409..cc8f367cbf7 100644
--- a/packages/grafana-data/src/utils/namedColorsPalette.test.ts
+++ b/packages/grafana-data/src/utils/namedColorsPalette.test.ts
@@ -1,17 +1,15 @@
 import { createTheme } from '../themes';
 
-import { getColorForTheme } from './namedColorsPalette';
-
 describe('colors', () => {
   const theme = createTheme();
 
   describe('getColorFromHexRgbOrName', () => {
     it('returns black for unknown color', () => {
-      expect(getColorForTheme('aruba-sunshine', theme.v1)).toBe('aruba-sunshine');
+      expect(theme.v1.visualization.getColorByName('aruba-sunshine')).toBe('aruba-sunshine');
     });
 
     it('returns dark hex variant for known color if theme not specified', () => {
-      expect(getColorForTheme('semi-dark-blue', theme.v1)).toBe('#3274D9');
+      expect(theme.v1.visualization.getColorByName('semi-dark-blue')).toBe('#3274D9');
     });
   });
 });
diff --git a/packages/grafana-data/src/utils/namedColorsPalette.ts b/packages/grafana-data/src/utils/namedColorsPalette.ts
index 4d2424c1721..6d798ec96af 100644
--- a/packages/grafana-data/src/utils/namedColorsPalette.ts
+++ b/packages/grafana-data/src/utils/namedColorsPalette.ts
@@ -1,19 +1,3 @@
-import { GrafanaTheme, GrafanaThemeType } from '../types/theme';
-
-/**
- * @deprecated use theme.visualization.getColorByName
- */
-export function getColorForTheme(color: string, theme: GrafanaTheme): string {
-  return theme.visualization.getColorByName(color);
-}
-
-/**
- * @deprecated use getColorForTheme
- */
-export function getColorFromHexRgbOrName(color: string, type?: GrafanaThemeType): string {
-  return 'gray';
-}
-
 export const classicColors = [
   '#7EB26D', // 0: pale green
   '#EAB839', // 1: mustard
diff --git a/packages/grafana-ui/src/components/Badge/Badge.tsx b/packages/grafana-ui/src/components/Badge/Badge.tsx
index aa81bdfed1b..9cd0c78fe48 100644
--- a/packages/grafana-ui/src/components/Badge/Badge.tsx
+++ b/packages/grafana-ui/src/components/Badge/Badge.tsx
@@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { HTMLAttributes } from 'react';
 import tinycolor from 'tinycolor2';
 
-import { getColorForTheme, GrafanaTheme } from '@grafana/data';
+import { GrafanaTheme } from '@grafana/data';
 
 import { useTheme } from '../../themes/ThemeContext';
 import { stylesFactory } from '../../themes/stylesFactory';
@@ -44,7 +44,7 @@ export const Badge = React.memo<BadgeProps>(({ icon, color, text, tooltip, class
 Badge.displayName = 'Badge';
 
 const getStyles = stylesFactory((theme: GrafanaTheme, color: BadgeColor) => {
-  let sourceColor = getColorForTheme(color, theme);
+  let sourceColor = theme.visualization.getColorByName(color);
   let borderColor = '';
   let bgColor = '';
   let textColor = '';
diff --git a/packages/grafana-ui/src/components/Gauge/utils.ts b/packages/grafana-ui/src/components/Gauge/utils.ts
index 84750c5274e..87b0c95112f 100644
--- a/packages/grafana-ui/src/components/Gauge/utils.ts
+++ b/packages/grafana-ui/src/components/Gauge/utils.ts
@@ -6,7 +6,6 @@ import {
   GAUGE_DEFAULT_MAXIMUM,
   GAUGE_DEFAULT_MINIMUM,
   getActiveThreshold,
-  getColorForTheme,
   GrafanaTheme,
   Threshold,
   ThresholdsConfig,
@@ -65,7 +64,9 @@ export function getFormattedThresholds(
 
   const first = getActiveThreshold(min, steps);
   const last = getActiveThreshold(max, steps);
-  const formatted: Threshold[] = [{ value: +min.toFixed(decimals), color: getColorForTheme(first.color, theme) }];
+  const formatted: Threshold[] = [
+    { value: +min.toFixed(decimals), color: theme.visualization.getColorByName(first.color) },
+  ];
   let skip = true;
   for (let i = 0; i < steps.length; i++) {
     const step = steps[i];
@@ -76,11 +77,11 @@ export function getFormattedThresholds(
       continue;
     }
     const prev = steps[i - 1];
-    formatted.push({ value: step.value, color: getColorForTheme(prev!.color, theme) });
+    formatted.push({ value: step.value, color: theme.visualization.getColorByName(prev.color) });
     if (step === last) {
       break;
     }
   }
-  formatted.push({ value: +max.toFixed(decimals), color: getColorForTheme(last.color, theme) });
+  formatted.push({ value: +max.toFixed(decimals), color: theme.visualization.getColorByName(last.color) });
   return formatted;
 }
diff --git a/packages/grafana-ui/src/components/Graph/utils.test.ts b/packages/grafana-ui/src/components/Graph/utils.test.ts
index 742cd90acb6..f68ed2e4b3f 100644
--- a/packages/grafana-ui/src/components/Graph/utils.test.ts
+++ b/packages/grafana-ui/src/components/Graph/utils.test.ts
@@ -4,7 +4,6 @@ import {
   FieldCache,
   FieldColorModeId,
   Field,
-  getColorForTheme,
   applyFieldOverrides,
   createTheme,
   DataFrame,
@@ -88,7 +87,7 @@ const cSeries = passThroughFieldOverrides(
 )[0];
 
 function getFixedThemedColor(field: Field): string {
-  return getColorForTheme(field.config.color!.fixedColor!, getTheme());
+  return getTheme().visualization.getColorByName(field.config.color!.fixedColor!);
 }
 
 describe('Graph utils', () => {
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx
index d5db02e57a5..636c73400dd 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx
@@ -1,7 +1,7 @@
 import { Story, Meta } from '@storybook/react';
 import React, { FC, useEffect, useState } from 'react';
 
-import { DisplayValue, getColorForTheme, GrafanaTheme } from '@grafana/data';
+import { DisplayValue, GrafanaTheme } from '@grafana/data';
 import { LegendDisplayMode, LegendPlacement } from '@grafana/schema';
 import { useTheme, VizLegend } from '@grafana/ui';
 
@@ -154,7 +154,7 @@ function generateLegendItems(
 ): VizLegendItem[] {
   const alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
   const colors = ['green', 'blue', 'red', 'purple', 'orange', 'dark-green', 'yellow', 'light-blue'].map((c) =>
-    getColorForTheme(c, theme)
+    theme.visualization.getColorByName(c)
   );
 
   return [...new Array(numberOfSeries)].map((item, i) => {
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 51d5e068f62..b0db3635b80 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -1,15 +1,6 @@
 import { find } from 'lodash';
 
-import {
-  DataFrame,
-  dateTime,
-  Field,
-  FieldType,
-  getColorForTheme,
-  getFieldDisplayName,
-  getTimeField,
-  TimeRange,
-} from '@grafana/data';
+import { DataFrame, dateTime, Field, FieldType, getFieldDisplayName, getTimeField, TimeRange } from '@grafana/data';
 import { colors } from '@grafana/ui';
 import { applyNullInsertThreshold } from '@grafana/ui/src/components/GraphNG/nullInsertThreshold';
 import config from 'app/core/config';
@@ -89,7 +80,7 @@ export class DataProcessor {
     const series = new TimeSeries({
       datapoints: datapoints || [],
       alias: alias,
-      color: getColorForTheme(color, config.theme),
+      color: config.theme.visualization.getColorByName(color),
       unit: field.config ? field.config.unit : undefined,
       dataFrameIndex,
       fieldIndex,
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 4d04007096a..7c2d7ade2e9 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -8,7 +8,7 @@ import './event_editor';
 import { auto } from 'angular';
 import { defaults, find, without } from 'lodash';
 
-import { DataFrame, FieldConfigProperty, getColorForTheme, PanelEvents, PanelPlugin } from '@grafana/data';
+import { DataFrame, FieldConfigProperty, PanelEvents, PanelPlugin } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { MetricsPanelCtrl } from 'app/angular/panel/metrics_panel_ctrl';
 import config from 'app/core/config';
@@ -297,7 +297,7 @@ export class GraphCtrl extends MetricsPanelCtrl {
   }
 
   onColorChange = (series: any, color: string) => {
-    series.setColor(getColorForTheme(color, config.theme));
+    series.setColor(config.theme.visualization.getColorByName(color));
     this.panel.aliasColors[series.alias] = color;
     this.render();
   };
diff --git a/public/app/plugins/panel/graph/threshold_manager.ts b/public/app/plugins/panel/graph/threshold_manager.ts
index 533ef94392b..599976a8bfb 100644
--- a/public/app/plugins/panel/graph/threshold_manager.ts
+++ b/public/app/plugins/panel/graph/threshold_manager.ts
@@ -2,7 +2,6 @@ import 'vendor/flot/jquery.flot';
 import $ from 'jquery';
 import { isNumber } from 'lodash';
 
-import { getColorForTheme } from '@grafana/data';
 import { PanelCtrl } from 'app/angular/panel/panel_ctrl';
 import { config } from 'app/core/config';
 import { CoreEvents } from 'app/types';
@@ -235,12 +234,12 @@ export class ThresholdManager {
         if (threshold.yaxis === 'right' && this.hasSecondYAxis) {
           options.grid.markings.push({
             y2axis: { from: threshold.value, to: limit },
-            color: getColorForTheme(fillColor, config.theme),
+            color: config.theme.visualization.getColorByName(fillColor),
           });
         } else {
           options.grid.markings.push({
             yaxis: { from: threshold.value, to: limit },
-            color: getColorForTheme(fillColor, config.theme),
+            color: config.theme.visualization.getColorByName(fillColor),
           });
         }
       }
@@ -248,12 +247,12 @@ export class ThresholdManager {
         if (threshold.yaxis === 'right' && this.hasSecondYAxis) {
           options.grid.markings.push({
             y2axis: { from: threshold.value, to: threshold.value },
-            color: getColorForTheme(lineColor, config.theme),
+            color: config.theme.visualization.getColorByName(lineColor),
           });
         } else {
           options.grid.markings.push({
             yaxis: { from: threshold.value, to: threshold.value },
-            color: getColorForTheme(lineColor, config.theme),
+            color: config.theme.visualization.getColorByName(lineColor),
           });
         }
       }
diff --git a/public/app/plugins/panel/graph/time_region_manager.ts b/public/app/plugins/panel/graph/time_region_manager.ts
index cd83a083871..8c5272e52cd 100644
--- a/public/app/plugins/panel/graph/time_region_manager.ts
+++ b/public/app/plugins/panel/graph/time_region_manager.ts
@@ -1,7 +1,7 @@
 import 'vendor/flot/jquery.flot';
 import { map } from 'lodash';
 
-import { getColorForTheme, dateTime, DateTime, AbsoluteTimeRange, GrafanaTheme } from '@grafana/data';
+import { dateTime, DateTime, AbsoluteTimeRange, GrafanaTheme } from '@grafana/data';
 import { config } from 'app/core/config';
 
 type TimeRegionColorDefinition = {
@@ -51,8 +51,8 @@ function getColor(timeRegion: any, theme: GrafanaTheme): TimeRegionColorDefiniti
 
   if (timeRegion.colorMode === 'custom') {
     return {
-      fill: timeRegion.fill && timeRegion.fillColor ? getColorForTheme(timeRegion.fillColor, theme) : null,
-      line: timeRegion.line && timeRegion.lineColor ? getColorForTheme(timeRegion.lineColor, theme) : null,
+      fill: timeRegion.fill && timeRegion.fillColor ? theme.visualization.getColorByName(timeRegion.fillColor) : null,
+      line: timeRegion.line && timeRegion.lineColor ? theme.visualization.getColorByName(timeRegion.lineColor) : null,
     };
   }
 
@@ -63,8 +63,8 @@ function getColor(timeRegion: any, theme: GrafanaTheme): TimeRegionColorDefiniti
   }
 
   return {
-    fill: timeRegion.fill ? getColorForTheme(colorMode.color.fill, theme) : null,
-    line: timeRegion.fill ? getColorForTheme(colorMode.color.line, theme) : null,
+    fill: timeRegion.fill ? theme.visualization.getColorByName(colorMode.color.fill) : null,
+    line: timeRegion.fill ? theme.visualization.getColorByName(colorMode.color.line) : null,
   };
 }
 
diff --git a/public/app/plugins/panel/heatmap/color_legend.ts b/public/app/plugins/panel/heatmap/color_legend.ts
index d6eb9892d21..71df88abe40 100644
--- a/public/app/plugins/panel/heatmap/color_legend.ts
+++ b/public/app/plugins/panel/heatmap/color_legend.ts
@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 import $ from 'jquery';
 import { find, isEmpty, isNil, sortBy, uniq } from 'lodash';
 
-import { PanelEvents, getColorForTheme } from '@grafana/data';
+import { PanelEvents } from '@grafana/data';
 import coreModule from 'app/angular/core_module';
 import { config } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
@@ -273,7 +273,7 @@ function drawSimpleOpacityLegend(elem: JQuery, options: { colorScale: string; ex
         .attr('width', rangeStep)
         .attr('height', legendHeight)
         .attr('stroke-width', 0)
-        .attr('fill', getColorForTheme(options.cardColor, config.theme))
+        .attr('fill', config.theme.visualization.getColorByName(options.cardColor))
         .style('opacity', (d) => legendOpacityScale(d));
     }
   }
diff --git a/public/app/plugins/panel/heatmap/rendering.ts b/public/app/plugins/panel/heatmap/rendering.ts
index a397249286c..906224b24e2 100644
--- a/public/app/plugins/panel/heatmap/rendering.ts
+++ b/public/app/plugins/panel/heatmap/rendering.ts
@@ -5,7 +5,6 @@ import { find, isEmpty, isNaN, isNil, isString, map, max, min, toNumber } from '
 import {
   dateTimeFormat,
   formattedValueToString,
-  getColorForTheme,
   getValueFormat,
   LegacyGraphHoverClearEvent,
   LegacyGraphHoverEvent,
@@ -660,7 +659,7 @@ export class HeatmapRenderer {
 
   getCardColor(d: { count: any }) {
     if (this.panel.color.mode === 'opacity') {
-      return getColorForTheme(this.panel.color.cardColor, config.theme);
+      return config.theme.visualization.getColorByName(this.panel.color.cardColor);
     } else {
       return this.colorScale(d.count);
     }
diff --git a/public/app/plugins/panel/nodeGraph/Legend.tsx b/public/app/plugins/panel/nodeGraph/Legend.tsx
index f2f7184b16e..350eaf6b62f 100644
--- a/public/app/plugins/panel/nodeGraph/Legend.tsx
+++ b/public/app/plugins/panel/nodeGraph/Legend.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import { identity } from 'lodash';
 import React, { useCallback } from 'react';
 
-import { Field, FieldColorModeId, getColorForTheme, GrafanaTheme } from '@grafana/data';
+import { Field, FieldColorModeId, GrafanaTheme } from '@grafana/data';
 import { LegendDisplayMode } from '@grafana/schema';
 import { Icon, useStyles, useTheme, VizLegend, VizLegendItem, VizLegendListItem } from '@grafana/ui';
 
@@ -97,14 +97,14 @@ function getColorLegendItems(nodes: NodeDatum[], theme: GrafanaTheme): Array<Viz
       data: { field: f },
     };
     if (f.config.color?.mode === FieldColorModeId.Fixed && f.config.color?.fixedColor) {
-      item.color = getColorForTheme(f.config.color?.fixedColor || '', theme);
+      item.color = theme.visualization.getColorByName(f.config.color?.fixedColor || '');
     } else if (f.config.color?.mode) {
       item.gradient = f.config.color?.mode;
     }
 
     if (!(item.color || item.gradient)) {
       // Defaults to gray color
-      item.color = getColorForTheme('', theme);
+      item.color = theme.visualization.getColorByName('');
     }
 
     return item;
diff --git a/public/app/plugins/panel/table-old/renderer.ts b/public/app/plugins/panel/table-old/renderer.ts
index 550ad34adc9..e79a7439b94 100644
--- a/public/app/plugins/panel/table-old/renderer.ts
+++ b/public/app/plugins/panel/table-old/renderer.ts
@@ -12,7 +12,6 @@ import {
   TimeZone,
   dateTimeFormatISO,
   dateTimeFormat,
-  getColorForTheme,
   GrafanaTheme,
 } from '@grafana/data';
 import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
@@ -77,10 +76,10 @@ export class TableRenderer {
     }
     for (let i = style.thresholds.length; i > 0; i--) {
       if (value >= style.thresholds[i - 1]) {
-        return getColorForTheme(style.colors[i], this.theme);
+        return this.theme.visualization.getColorByName(style.colors[i]);
       }
     }
-    return getColorForTheme(first(style.colors), this.theme);
+    return this.theme.visualization.getColorByName(first(style.colors));
   }
 
   defaultCellFormatter(v: any, style: ColumnStyle) {

From bdfc7f2a3787d374aa697b4202322e250a41763b Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 09:50:23 -0400
Subject: [PATCH 057/103] =?UTF-8?q?Docs:=20Fix=20duplicate=20text=20in=20W?=
 =?UTF-8?q?hat=E2=80=99s=20new=20in=20Grafana=20v9.0=20(#49699)=20(#49702)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 668625aaebde9b58de12bcb38e68481b5ecbc788)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
---
 docs/sources/whatsnew/whats-new-in-v9-0.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index abe9118b8ef..b8de9fb3149 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -205,12 +205,7 @@ In the InfluxDB data source, browser access mode was deprecated in grafana 8.0.0
 
 The rename by regex transformation has been improved to allow global patterns of the form `/<stringToReplace>/g`. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behavior as before by wrapping the match string in forward slashes (/), for example, (._) would become /(._)/. ([Github Issue #48179](https://github.com/grafana/grafana/pull/48179))
 
-## ## A note on Grafana Enterprise licensing
-
-The Rename by regex transformation has been improved to allow global patterns of the form /<stringToReplace>/g. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behavior as before by wrapping the match string in forward slashes (/), e.g. (._) becomes /(._)/
-Github Issue #48179
-
-## Deprecation Notices
+## A note on Grafana Enterprise licensing
 
 When we release Grafana 9.0 on June 14th, Grafana will no longer enforce viewers and editor-admins differently. That means that regardless of whether your Grafana Enterprise license is tiered or combined, instead of seeing this on the Stats & Licensing page:
 

From 86565913035285c6876cfa990a06b56c69b3f7e3 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 09:54:12 -0400
Subject: [PATCH 058/103] Docs: Document Prometheus NaN breaking change
 (#49688) (#49703)

---
 docs/sources/whatsnew/whats-new-in-v9-0.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index b8de9fb3149..b14ab428565 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -197,6 +197,10 @@ Support for Elasticsearch versions that are after their end of life ( based on h
 
 In the Elasticsearch data source, browser access mode was deprecated in grafana 7.4.0 and removed in 9.0.0. If you used this mode, please switch to server access mode on the data source configuration page.
 
+### Prometheus: NaN values representation changed in numeric data
+
+In the Prometheus data source, when grafana receives numeric data from Prometheus, it may contain NaN (not a number) values. For consistency and performance reasons we changed how we represent such values in Grafana. In previous versions, the behavior was different between alerting queries and other queries (like dashboard queries or explore queries). Alerting queries kept NaN values unchanged, but other queries converted these values to “null”. Starting with grafana 9.0.0, we will always keep NaN values unchanged for all queries.
+
 <!-- ### InfluxDB: Support for browser access mode removed (should this stay??)
 
 In the InfluxDB data source, browser access mode was deprecated in grafana 8.0.0 and we are removing this feature in 9.0.0. If you are using this mode, you need to [switch to server access mode]({{< relref "../datasources/influxdb/_index.md##influxql-classic-influxdb-query" >}}) on the data source configuration page or you can do this via provisioning. -->

From 0b05659c6912d712277264c5378aab5d0d1f6ac0 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 10:28:55 -0400
Subject: [PATCH 059/103] Chore: Remove deprecated TextDisplayOptions export
 (#49705) (#49710)

(cherry picked from commit c6ac9410b266dff9342524ec14967fda780aadba)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 packages/grafana-data/src/index.ts                    |  3 ---
 packages/grafana-data/src/schema.ts                   | 11 -----------
 .../grafana-ui/src/components/BarGauge/BarGauge.tsx   |  6 +++---
 .../grafana-ui/src/components/BigValue/BigValue.tsx   |  5 +++--
 packages/grafana-ui/src/components/Gauge/Gauge.tsx    |  4 ++--
 5 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 packages/grafana-data/src/schema.ts

diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index 2cefae622b7..c05d6d0e32d 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -26,6 +26,3 @@ export { PanelPlugin, SetFieldConfigOptionsArgs, StandardOptionConfig } from './
 export { createFieldConfigRegistry } from './panel/registryFactories';
 export { QueryRunner, QueryRunnerOptions } from './types/queryRunner';
 export { GroupingToMatrixTransformerOptions } from './transformations/transformers/groupingToMatrix';
-
-// Moved to `@grafana/schema`, in Grafana 9, this will be removed
-export * from './schema';
diff --git a/packages/grafana-data/src/schema.ts b/packages/grafana-data/src/schema.ts
deleted file mode 100644
index abd505098f3..00000000000
--- a/packages/grafana-data/src/schema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Moved to `@grafana/schema`, in Grafana 9, this will be removed
-//---------------------------------------------------------------
-// grafana/grafana/packages/grafana-schema$ grep export src/schema/*.ts
-/**
- * @deprecated Moved to `@grafana/schema` package and will be removed in Grafana 9
- * @public
- */
-export {
-  // Styles that changed
-  VizTextDisplayOptions as TextDisplayOptions, // rename
-} from '@grafana/schema';
diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
index 6155bacad5a..4971d4f2323 100644
--- a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
+++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
@@ -14,12 +14,12 @@ import {
   GAUGE_DEFAULT_MAXIMUM,
   GAUGE_DEFAULT_MINIMUM,
   getFieldColorMode,
-  TextDisplayOptions,
   ThresholdsMode,
   TimeSeriesValue,
   VizOrientation,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable2 } from '../../types';
 import { calculateFontSize, measureText } from '../../utils/measureText';
@@ -39,7 +39,7 @@ export interface Props extends Themeable2 {
   display?: DisplayProcessor;
   value: DisplayValue;
   orientation: VizOrientation;
-  text?: TextDisplayOptions;
+  text?: VizTextDisplayOptions;
   itemSpacing?: number;
   lcdCellWidth?: number;
   displayMode: BarGaugeDisplayMode;
@@ -609,7 +609,7 @@ function getValueStyles(
   width: number,
   height: number,
   orientation: VizOrientation,
-  text?: TextDisplayOptions
+  text?: VizTextDisplayOptions
 ): CSSProperties {
   const styles: CSSProperties = {
     color,
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.tsx
index 789bd7fd93a..da3088dab94 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.tsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 
-import { DisplayValue, DisplayValueAlignmentFactors, FieldSparkline, TextDisplayOptions } from '@grafana/data';
+import { DisplayValue, DisplayValueAlignmentFactors, FieldSparkline } from '@grafana/data';
+import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable2 } from '../../types';
 import { FormattedValueDisplay } from '../FormattedValueDisplay/FormattedValueDisplay';
@@ -57,7 +58,7 @@ export interface Props extends Themeable2 {
   /** Factors that should influence the positioning of the text  */
   alignmentFactors?: DisplayValueAlignmentFactors;
   /** Explicit font size control */
-  text?: TextDisplayOptions;
+  text?: VizTextDisplayOptions;
   /** Specify which text should be visible in the BigValue */
   textMode?: BigValueTextMode;
   /** If true disables the tooltip */
diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
index 709cd81ea09..906ca0d7f7f 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
@@ -8,8 +8,8 @@ import {
   ThresholdsMode,
   GAUGE_DEFAULT_MAXIMUM,
   GAUGE_DEFAULT_MINIMUM,
-  TextDisplayOptions,
 } from '@grafana/data';
+import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable } from '../../types';
 import { calculateFontSize } from '../../utils/measureText';
@@ -23,7 +23,7 @@ export interface Props extends Themeable {
   showThresholdLabels: boolean;
   width: number;
   value: DisplayValue;
-  text?: TextDisplayOptions;
+  text?: VizTextDisplayOptions;
   onClick?: React.MouseEventHandler<HTMLElement>;
   className?: string;
 }

From 94274ac0ec2845cc5a7f0181f9e63d6f6dd07265 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 10:43:52 -0400
Subject: [PATCH 060/103] Query History: Add feature tracking for query history
 (#49685) (#49711)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add feature tracking for query history

* Fix unit tests

* Update event names

(cherry picked from commit e0adb41e80b9e9deb90f4d1511eda21eed0ad170)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
---
 .../RichHistory/RichHistoryCard.test.tsx      |  5 +++
 .../explore/RichHistory/RichHistoryCard.tsx   | 32 ++++++++++++++-----
 .../RichHistory/RichHistoryContainer.test.tsx |  1 +
 .../RichHistory/RichHistoryContainer.tsx      |  4 +++
 .../explore/spec/queryHistory.test.tsx        | 23 +++++++++++++
 5 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
index 83b73403dc8..7a450f373a0 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
@@ -18,6 +18,11 @@ const mockDS = mockDataSource({
   type: DataSourceType.Alertmanager,
 });
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
 jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
   return {
     getDataSourceSrv: () => ({
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index 850c46f9ee8..df3efab5bde 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { GrafanaTheme, DataSourceApi, DataQuery } from '@grafana/data';
-import { getDataSourceSrv } from '@grafana/runtime';
+import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import { stylesFactory, useTheme, TextArea, Button, IconButton } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
 import appEvents from 'app/core/app_events';
@@ -176,12 +176,17 @@ export function RichHistoryCard(props: Props) {
 
   const onRunQuery = async () => {
     const queriesToRun = query.queries;
-    if (query.datasourceName !== datasourceInstance?.name) {
+    const differentDataSource = query.datasourceName !== datasourceInstance?.name;
+    if (differentDataSource) {
       await changeDatasource(exploreId, query.datasourceName, { importQueries: true });
       setQueries(exploreId, queriesToRun);
     } else {
       setQueries(exploreId, queriesToRun);
     }
+    reportInteraction('grafana_explore_query_history_run', {
+      queryHistoryEnabled: config.queryHistoryEnabled,
+      differentDataSource,
+    });
   };
 
   const onCopyQuery = () => {
@@ -196,6 +201,14 @@ export function RichHistoryCard(props: Props) {
   };
 
   const onDeleteQuery = () => {
+    const performDelete = (queryId: string) => {
+      deleteHistoryItem(queryId);
+      dispatch(notifyApp(createSuccessNotification('Query deleted')));
+      reportInteraction('grafana_explore_query_history_deleted', {
+        queryHistoryEnabled: config.queryHistoryEnabled,
+      });
+    };
+
     // For starred queries, we want confirmation. For non-starred, we don't.
     if (query.starred) {
       appEvents.publish(
@@ -204,20 +217,20 @@ export function RichHistoryCard(props: Props) {
           text: 'Are you sure you want to permanently delete your starred query?',
           yesText: 'Delete',
           icon: 'trash-alt',
-          onConfirm: () => {
-            deleteHistoryItem(query.id);
-            dispatch(notifyApp(createSuccessNotification('Query deleted')));
-          },
+          onConfirm: () => performDelete(query.id),
         })
       );
     } else {
-      deleteHistoryItem(query.id);
-      dispatch(notifyApp(createSuccessNotification('Query deleted')));
+      performDelete(query.id);
     }
   };
 
   const onStarrQuery = () => {
     starHistoryItem(query.id, !query.starred);
+    reportInteraction('grafana_explore_query_history_starred', {
+      queryHistoryEnabled: config.queryHistoryEnabled,
+      newValue: !query.starred,
+    });
   };
 
   const toggleActiveUpdateComment = () => setActiveUpdateComment(!activeUpdateComment);
@@ -225,6 +238,9 @@ export function RichHistoryCard(props: Props) {
   const onUpdateComment = () => {
     commentHistoryItem(query.id, comment);
     setActiveUpdateComment(false);
+    reportInteraction('grafana_explore_query_history_commented', {
+      queryHistoryEnabled: config.queryHistoryEnabled,
+    });
   };
 
   const onCancelUpdateComment = () => {
diff --git a/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx b/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
index dfe279eca66..84d1aca02a9 100644
--- a/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
@@ -17,6 +17,7 @@ jest.mock('@grafana/runtime', () => ({
       getList: () => [],
     };
   },
+  reportInteraction: jest.fn(),
 }));
 
 const setup = (propOverrides?: Partial<Props>) => {
diff --git a/public/app/features/explore/RichHistory/RichHistoryContainer.tsx b/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
index 099cea64304..72fb7c125f1 100644
--- a/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
@@ -2,6 +2,7 @@
 import React, { useEffect, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
+import { config, reportInteraction } from '@grafana/runtime';
 import { useTheme2 } from '@grafana/ui';
 // Types
 import { ExploreItemState, StoreState } from 'app/types';
@@ -86,6 +87,9 @@ export function RichHistoryContainer(props: Props) {
 
   useEffect(() => {
     initRichHistory();
+    reportInteraction('grafana_explore_query_history_opened', {
+      queryHistoryEnabled: config.queryHistoryEnabled,
+    });
   }, [initRichHistory]);
 
   if (!richHistorySettings) {
diff --git a/public/app/features/explore/spec/queryHistory.test.tsx b/public/app/features/explore/spec/queryHistory.test.tsx
index f9653aa5752..b2c28ebdf99 100644
--- a/public/app/features/explore/spec/queryHistory.test.tsx
+++ b/public/app/features/explore/spec/queryHistory.test.tsx
@@ -40,9 +40,13 @@ import {
 const fetchMock = jest.fn();
 const postMock = jest.fn();
 const getMock = jest.fn();
+const reportInteractionMock = jest.fn();
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => ({ fetch: fetchMock, post: postMock, get: getMock }),
+  reportInteraction: (...args: object[]) => {
+    reportInteractionMock(...args);
+  },
 }));
 
 jest.mock('app/core/services/PreferencesService', () => ({
@@ -78,6 +82,7 @@ describe('Explore: Query History', () => {
     fetchMock.mockClear();
     postMock.mockClear();
     getMock.mockClear();
+    reportInteractionMock.mockClear();
     tearDown();
   });
 
@@ -103,6 +108,11 @@ describe('Explore: Query History', () => {
     // previously added query is in query history
     await openQueryHistory();
     await assertQueryHistoryExists(RAW_QUERY);
+
+    expect(reportInteractionMock).toBeCalledTimes(2);
+    expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_opened', {
+      queryHistoryEnabled: false,
+    });
   });
 
   it('adds recently added query if the query history panel is already open', async () => {
@@ -153,10 +163,17 @@ describe('Explore: Query History', () => {
     starQueryHistory(1, ExploreId.left);
     await assertQueryHistoryIsStarred([false, true], ExploreId.left);
     await assertQueryHistoryIsStarred([false, true], ExploreId.right);
+    expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_starred', {
+      queryHistoryEnabled: false,
+      newValue: true,
+    });
 
     deleteQueryHistory(0, ExploreId.left);
     await assertQueryHistory(['{"expr":"query #1"}'], ExploreId.left);
     await assertQueryHistory(['{"expr":"query #1"}'], ExploreId.right);
+    expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_deleted', {
+      queryHistoryEnabled: false,
+    });
   });
 
   it('updates query history settings', async () => {
@@ -192,6 +209,9 @@ describe('Explore: Query History', () => {
 
       await openQueryHistory();
       expect(postMock).not.toBeCalledWith('/api/query-history/migrate', { queries: [] });
+      expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_opened', {
+        queryHistoryEnabled: false,
+      });
     });
 
     it('migrates query history from local storage', async () => {
@@ -219,6 +239,9 @@ describe('Explore: Query History', () => {
           url: expect.stringMatching('/api/query-history/migrate'),
         })
       );
+      expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_opened', {
+        queryHistoryEnabled: true,
+      });
     });
   });
 

From 243a6cfb6c72881d406977ec42aa924de732faac Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Thu, 26 May 2022 16:55:05 +0200
Subject: [PATCH 061/103] Toolkit: Bump dependencies (#47826) (#49714)

* chore(typescript): remove sanitize_url.d.ts in favour of npm package types

* chore(toolkit): bump all webpack related deps inline with grafana core

* refactor(toolkit): prefer webpack types and use from imports for bundling

* feat(toolkit): bundle plugins using webpack 5 and babel

* chore(toolkit): but all eslint deps inline with grafana core

* refactor(toolkit): rewrite linting step to use new eslint node api

* chore(toolkit): bump jest dependencies inline with grafana core

* refactor(toolkit): update jest config for jest 27

* fix(toolkit): resolve toolkit if using yarn berry

* docs(toolkit): update instructions for developing with yarn berry

* chore(toolkit): remove yarnlink code as won't work with yarn berry

* chore(toolkit): bump remaining dependencies

* chore(toolkit): remove unused core.start task

* feat(toolkit): use browserlist when building plugins

* chore(toolkit): add browserslist dependency

* refactor(toolkit): resolve style loaders, update postcss options for webpack5

* chore(toolkit): put back grafana/data and grafana/ui

* docs(toolkit): improve instructions for developing toolkit locally

* chore(toolkit): clean up webpack debug and warnings

* chore(input-datasource): remove pnpwebpack plugin and update browserslist to solve failing build

* chore(renovatebot): remove toolkit package.json from ignorePaths

* revert(renovate): put back toolkit package.json in ignorePaths

* feat(toolkit): introduce babel plugins

* refactor(toolkit): remove runtime automatic from preset-react for earlier versions of react

* refactor(toolkit): add missing fallbacks to webpack config

* fix(toolkit): remove spaces from copy webpack glob so files are copied

* refactor(toolkit): fix up babel typescript support and copy browserlist on build

* chore(yarn): refresh lock file

* revert(toolkit): remove browsers list so plugins compile to ES5

* revert(toolkit): remove copying .browserslistrc

(cherry picked from commit f4353bbbc46b036f06c25cc92a5a702a11b3d7d2)
---
 packages/grafana-data/tsconfig.json           |    8 +-
 packages/grafana-toolkit/README.md            |   24 +-
 packages/grafana-toolkit/package.json         |  134 +-
 packages/grafana-toolkit/src/cli/index.ts     |   17 -
 .../src/cli/tasks/core.start.ts               |   44 -
 .../src/cli/tasks/plugin.build.ts             |   28 +-
 .../src/cli/tasks/plugin.dev.ts               |   28 -
 .../src/cli/tasks/plugin/bundle.ts            |   18 +-
 .../src/config/eslint.plugin.js               |    2 -
 .../src/config/jest.plugin.config.ts          |    7 +-
 .../src/config/webpack.plugin.config.ts       |  127 +-
 .../src/config/webpack/loaders.ts             |   28 +-
 packages/grafana-toolkit/tsconfig.json        |    2 +-
 packages/grafana-ui/.storybook/tsconfig.json  |    7 +-
 .../internal/input-datasource/package.json    |    7 +-
 .../input-datasource/webpack.config.js        |   15 -
 public/app/types/sanitize-url.d.ts            |    3 -
 yarn.lock                                     | 5713 ++++-------------
 18 files changed, 1552 insertions(+), 4660 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/core.start.ts
 delete mode 100644 plugins-bundled/internal/input-datasource/webpack.config.js
 delete mode 100644 public/app/types/sanitize-url.d.ts

diff --git a/packages/grafana-data/tsconfig.json b/packages/grafana-data/tsconfig.json
index d56edaaf559..22c856eb4aa 100644
--- a/packages/grafana-data/tsconfig.json
+++ b/packages/grafana-data/tsconfig.json
@@ -9,11 +9,5 @@
   },
   "exclude": ["dist", "node_modules"],
   "extends": "@grafana/tsconfig",
-  "include": [
-    "src/**/*.ts*",
-    "typings/jest",
-    "../../public/app/types/jquery/*.ts",
-    "../../public/app/types/*.d.ts",
-    "../../public/app/types/sanitize-url.d.ts"
-  ]
+  "include": ["src/**/*.ts*", "typings/jest", "../../public/app/types/jquery/*.ts", "../../public/app/types/*.d.ts"]
 }
diff --git a/packages/grafana-toolkit/README.md b/packages/grafana-toolkit/README.md
index 67f653a11a5..324fafede0e 100644
--- a/packages/grafana-toolkit/README.md
+++ b/packages/grafana-toolkit/README.md
@@ -328,10 +328,30 @@ You can contribute to grafana-toolkit by helping develop it or by debugging it.
 
 Typically plugins should be developed using the `@grafana/toolkit` installed from npm. However, when working on the toolkit, you might want to use the local version. Follow the steps below to develop with a local version:
 
+#### Prerequisites
+
+For the following to work make sure to have a plugin that uses yarn berry and yarn PnP to test changes against. Feel free to clone the panel plugin [here](https://github.com/jackw/plugin-yarn-berry) if need be.
+
 1. Clone [Grafana repository](https://github.com/grafana/grafana).
 2. Navigate to the directory you have cloned Grafana repo to and then run `yarn install --immutable`.
-3. Navigate to `<GRAFANA_DIR>/packages/grafana-toolkit` and then run `yarn link`.
-4. Navigate to the directory where your plugin code is and then run `npx grafana-toolkit plugin:dev --yarnlink`. This adds all dependencies required by grafana-toolkit to your project, as well as link your local grafana-toolkit version to be used by the plugin.
+3. Open `packages/grafana-toolkit/package.json`, delete any mention of `@grafana/data` and `@grafana/ui`. Then add the following:
+
+```
+  "devDependencies": {
+    "@grafana/data": "workspace:*",
+    "@grafana/ui": "workspace:*"
+  },
+  "peerDependencies": {
+    "@grafana/data": "*",
+    "@grafana/ui": "*"
+  }
+```
+
+**DO NOT commit this `package.json` code change. It is required to resolve these `@grafana` packages from the plugin for development purposes only.**
+
+4. Run `yarn` in the grafana repo.
+5. Navigate to the directory where your plugin code is and then run `yarn link <GRAFANA_DIR>/packages/grafana-toolkit`. This uses yarn berry's `portal` protocol to "link" the grafana-toolkit package and resolve it's dependencies into your plugin code allowing you to develop toolkit and test changes against plugin code.
+6. Make the required changes to Grafana toolkit.
 
 ### Debug grafana-toolkit
 
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 622fee2cc0a..1dd3e2824aa 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -26,82 +26,92 @@
   },
   "main": "src/index.ts",
   "dependencies": {
-    "@babel/core": "7.13.14",
-    "@babel/preset-env": "7.13.12",
+    "@babel/core": "^7.17.8",
+    "@babel/plugin-proposal-class-properties": "7.16.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.16.7",
+    "@babel/plugin-proposal-object-rest-spread": "7.17.3",
+    "@babel/plugin-proposal-optional-chaining": "7.16.7",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-transform-react-constant-elements": "7.17.6",
+    "@babel/plugin-transform-runtime": "7.17.0",
+    "@babel/plugin-transform-typescript": "7.16.8",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-react": "^7.16.7",
+    "@babel/preset-typescript": "^7.16.7",
     "@grafana/data": "9.0.0-beta.1",
-    "@grafana/eslint-config": "2.5.2",
+    "@grafana/eslint-config": "^3.0.0",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@grafana/ui": "9.0.0-beta.1",
-    "@jest/core": "26.6.3",
-    "@rushstack/eslint-patch": "1.0.6",
+    "@jest/core": "27.5.1",
     "@types/command-exists": "^1.2.0",
-    "@types/eslint": "7.28.0",
+    "@types/eslint": "8.4.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.0.0",
-    "@types/jest": "27.0.2",
-    "@types/lodash": "4.14.149",
-    "@types/node": "^16.0.0",
-    "@types/prettier": "^2.4.0",
-    "@types/react-dev-utils": "^9.0.4",
-    "@types/rimraf": "^3.0.0",
-    "@types/semver": "^7.0.0",
-    "@types/tmp": "^0.1.0",
-    "@types/webpack": "4.41.7",
-    "@typescript-eslint/eslint-plugin": "4.28.0",
-    "@typescript-eslint/parser": "4.28.0",
-    "axios": "0.26.1",
-    "babel-jest": "26.6.3",
-    "babel-loader": "8.2.2",
+    "@types/inquirer": "^8.2.1",
+    "@types/jest": "27.4.1",
+    "@types/lodash": "4.14.181",
+    "@types/node": "16.11.26",
+    "@types/prettier": "2.6.0",
+    "@types/react-dev-utils": "9.0.10",
+    "@types/rimraf": "3.0.2",
+    "@types/semver": "7.3.9",
+    "@types/tmp": "0.2.3",
+    "@typescript-eslint/eslint-plugin": "5.16.0",
+    "@typescript-eslint/parser": "5.16.0",
+    "axios": "^0.26.1",
+    "babel-jest": "27.5.1",
+    "babel-loader": "^8.2.4",
     "babel-plugin-angularjs-annotate": "0.10.0",
-    "chalk": "^4.0.0",
-    "command-exists": "^1.2.8",
-    "commander": "^8.0.0",
-    "concurrently": "6.3.0",
-    "copy-webpack-plugin": "5.1.2",
-    "css-loader": "3.4.2",
-    "eslint": "7.28.0",
+    "chalk": "^4.1.2",
+    "command-exists": "^1.2.9",
+    "commander": "^9.2.0",
+    "copy-webpack-plugin": "^9.0.1",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^3.4.1",
+    "eslint": "8.11.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-jsdoc": "38.0.6",
+    "eslint-plugin-react": "7.29.4",
+    "eslint-plugin-react-hooks": "4.3.0",
     "execa": "^5.1.1",
-    "file-loader": "6.2.0",
-    "fork-ts-checker-webpack-plugin": "6.4.0",
+    "file-loader": "^6.2.0",
+    "fork-ts-checker-webpack-plugin": "^7.2.1",
     "fs-extra": "^10.0.0",
-    "globby": "^10.0.1",
-    "html-loader": "0.5.5",
-    "html-webpack-plugin": "^3.2.0",
-    "inquirer": "^8.0.0",
-    "jest": "26.6.3",
-    "jest-canvas-mock": "2.3.0",
+    "globby": "^11.0.4",
+    "html-loader": "^3.1.0",
+    "html-webpack-plugin": "^5.5.0",
+    "inquirer": "^8.2.2",
+    "jest": "27.5.1",
+    "jest-canvas-mock": "2.3.1",
     "jest-coverage-badges": "^1.1.2",
-    "jest-environment-jsdom-fifteen": "^1.0.2",
-    "jest-junit": "^13.0.0",
-    "less": "^3.11.1",
-    "less-loader": "^5.0.0",
-    "lodash": "4.17.21",
+    "jest-junit": "13.1.0",
+    "less": "^4.1.2",
+    "less-loader": "^10.2.0",
+    "lodash": "^4.17.21",
     "md5-file": "^5.0.0",
-    "mini-css-extract-plugin": "^0.7.0",
-    "optimize-css-assets-webpack-plugin": "6.0.1",
-    "ora": "^4.0.3",
-    "pixelmatch": "^5.1.0",
+    "mini-css-extract-plugin": "^2.6.0",
+    "ora": "^5.4.1",
+    "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
-    "postcss-flexbugs-fixes": "4.2.0",
-    "postcss-loader": "3.0.0",
-    "postcss-preset-env": "6.7.0",
+    "postcss": "^8.4.12",
+    "postcss-flexbugs-fixes": "^5.0.2",
+    "postcss-loader": "^6.2.1",
+    "postcss-preset-env": "7.4.3",
     "prettier": "2.6.0",
     "react-dev-utils": "^12.0.0",
-    "replace-in-file": "^4.1.0",
-    "replace-in-file-webpack-plugin": "^1.0.6",
-    "rimraf": "^3.0.0",
-    "sass": "1.27.0",
-    "sass-loader": "8.0.2",
-    "semver": "^7.1.3",
-    "simple-git": "^3.5.0",
-    "style-loader": "1.1.3",
-    "terser-webpack-plugin": "2.3.7",
-    "ts-jest": "26.4.4",
-    "ts-loader": "6.2.1",
-    "ts-node": "9.0.0",
+    "replace-in-file-webpack-plugin": "1.0.6",
+    "rimraf": "3.0.2",
+    "sass": "^1.49.9",
+    "sass-loader": "^12.6.0",
+    "semver": "^7.3.7",
+    "simple-git": "^3.6.0",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.1",
+    "ts-jest": "27.1.3",
+    "ts-loader": "^9.2.8",
+    "ts-node": "^9.1.0",
     "tslib": "2.4.0",
     "typescript": "4.6.4",
-    "url-loader": "^2.0.1",
-    "webpack": "4.41.5"
+    "url-loader": "^4.1.1",
+    "webpack": "^5.72.0"
   }
 }
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index 8dc814cf0fb..3f5943740f0 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -1,4 +1,3 @@
-// @ts-ignore
 import chalk from 'chalk';
 import { program } from 'commander';
 
@@ -6,7 +5,6 @@ import { changelogTask } from './tasks/changelog';
 import { cherryPickTask } from './tasks/cherrypick';
 import { closeMilestoneTask } from './tasks/closeMilestone';
 import { componentCreateTask } from './tasks/component.create';
-import { startTask } from './tasks/core.start';
 import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
 import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
@@ -26,19 +24,6 @@ import { execTask } from './utils/execTask';
 export const run = (includeInternalScripts = false) => {
   if (includeInternalScripts) {
     program.option('-d, --depreciate <scripts>', 'Inform about npm script deprecation', (v) => v.split(','));
-    program
-      .command('core:start')
-      .option('-h, --hot', 'Run front-end with HRM enabled')
-      .option('-T, --noTsCheck', 'Run bundler without TS type checking')
-      .option('-t, --watchTheme', 'Watch for theme changes and regenerate variables.scss files')
-      .description('Starts Grafana front-end in development mode with watch enabled')
-      .action(async (cmd) => {
-        await execTask(startTask)({
-          watchThemes: cmd.watchTheme,
-          noTsCheck: cmd.noTsCheck,
-          hot: cmd.hot,
-        });
-      });
 
     program
       .command('package:build')
@@ -165,12 +150,10 @@ export const run = (includeInternalScripts = false) => {
   program
     .command('plugin:dev')
     .option('-w, --watch', 'Run plugin development mode with watch enabled')
-    .option('--yarnlink', 'symlink this project to the local grafana/toolkit')
     .description('Starts plugin dev mode')
     .action(async (cmd) => {
       await execTask(pluginDevTask)({
         watch: !!cmd.watch,
-        yarnlink: !!cmd.yarnlink,
         silent: true,
       });
     });
diff --git a/packages/grafana-toolkit/src/cli/tasks/core.start.ts b/packages/grafana-toolkit/src/cli/tasks/core.start.ts
deleted file mode 100644
index 0d7e372f05f..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/core.start.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-//@ts-ignore
-import concurrently from 'concurrently';
-
-import { Task, TaskRunner } from './task';
-
-interface StartTaskOptions {
-  watchThemes: boolean;
-  noTsCheck: boolean;
-  hot: boolean;
-}
-
-const startTaskRunner: TaskRunner<StartTaskOptions> = async ({ watchThemes, noTsCheck, hot }) => {
-  const noTsCheckArg = noTsCheck ? 1 : 0;
-  const jobs = [
-    watchThemes && {
-      command: 'nodemon -e ts -w ./packages/grafana-ui/src/themes -x yarn run themes:generate',
-      name: 'SASS variables generator',
-    },
-    hot
-      ? {
-          command: 'webpack serve --progress --color --config scripts/webpack/webpack.hot.js',
-          name: 'Dev server',
-        }
-      : {
-          command: `webpack --progress --color --watch --env noTsCheck=${noTsCheckArg} --config scripts/webpack/webpack.dev.js`,
-          name: 'Webpack',
-        },
-  ];
-
-  try {
-    await concurrently(
-      jobs.filter((job) => !!job),
-      {
-        killOthers: ['failure', 'failure'],
-        raw: true,
-      }
-    );
-  } catch (e) {
-    console.error(e);
-    process.exit(1);
-  }
-};
-
-export const startTask = new Task<StartTaskOptions>('Core startTask', startTaskRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
index 6fc22e1de95..beacb204b58 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
@@ -1,4 +1,4 @@
-import { CLIEngine } from 'eslint';
+import { ESLint } from 'eslint';
 import execa from 'execa';
 import { constants as fsConstants, promises as fs } from 'fs';
 import globby from 'globby';
@@ -76,8 +76,6 @@ export const versions = async () => {
 // @ts-ignore
 const typecheckPlugin = () => useSpinner('Typechecking', () => execa('tsc', ['--noEmit']));
 
-const getTypescriptSources = () => globby(resolvePath(process.cwd(), 'src/**/*.+(ts|tsx)'));
-
 // @ts-ignore
 const getStylesSources = () => globby(resolvePath(process.cwd(), 'src/**/*.+(scss|css)'));
 
@@ -106,24 +104,34 @@ export const lintPlugin = ({ fix }: Fixable = {}) =>
       }
     );
 
-    const cli = new CLIEngine({
-      configFile,
+    const eslint = new ESLint({
+      extensions: ['.ts', '.tsx'],
+      overrideConfigFile: configFile,
       fix,
       useEslintrc: false,
     });
 
-    const report = cli.executeOnFiles(await getTypescriptSources());
+    const results = await eslint.lintFiles(resolvePath(process.cwd(), 'src'));
 
     if (fix) {
-      CLIEngine.outputFixes(report);
+      await ESLint.outputFixes(results);
     }
 
-    const { errorCount, results, warningCount } = report;
-    const formatter = cli.getFormatter();
+    const { errorCount, warningCount } = results.reduce<Record<string, number>>(
+      (acc, value) => {
+        acc.errorCount += value.errorCount;
+        acc.warningCount += value.warningCount;
+        return acc;
+      },
+      { errorCount: 0, warningCount: 0 }
+    );
+
+    const formatter = await eslint.loadFormatter('stylish');
+    const resultText = formatter.format(results);
 
     if (errorCount > 0 || warningCount > 0) {
       console.log('\n');
-      console.log(formatter(results));
+      console.log(resultText);
       console.log('\n');
     }
 
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts
index 1b9a15b4136..78f363aa827 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts
@@ -1,6 +1,3 @@
-import execa = require('execa');
-import path = require('path');
-
 import { useSpinner } from '../utils/useSpinner';
 
 import { lintPlugin } from './plugin.build';
@@ -10,32 +7,7 @@ import { Task, TaskRunner } from './task';
 const bundlePlugin = (options: PluginBundleOptions) =>
   useSpinner('Bundling plugin in dev mode', () => bundleFn(options));
 
-const yarnlink = () =>
-  useSpinner('Linking local toolkit', async () => {
-    try {
-      // Make sure we are not using package.json defined toolkit
-      await execa('yarn', ['remove', '@grafana/toolkit']);
-    } catch (e: any) {
-      console.log('\n', e.message, '\n');
-    }
-    await execa('yarn', ['link', '@grafana/toolkit']);
-
-    // Add all the same dependencies as toolkit
-    const args: string[] = ['add'];
-    const packages = require(path.resolve(__dirname, '../../../package.json'));
-    for (const [key, value] of Object.entries(packages.dependencies)) {
-      args.push(`${key}@${value}`);
-    }
-    await execa('yarn', args);
-
-    console.log('Added dependencies required by local @grafana/toolkit.  Do not checkin this package.json!');
-  });
-
 const pluginDevRunner: TaskRunner<PluginBundleOptions> = async (options) => {
-  if (options.yarnlink) {
-    return yarnlink();
-  }
-
   if (options.watch) {
     await bundleFn(options);
   } else {
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts
index 345392ad632..7d8b433403c 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts
@@ -1,17 +1,15 @@
-import clearConsole = require('react-dev-utils/clearConsole');
-import formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-import webpack = require('webpack');
+import clearConsole from 'react-dev-utils/clearConsole';
+import formatWebpackMessages from 'react-dev-utils/formatWebpackMessages';
+import webpack from 'webpack';
 
 import { loadWebpackConfig } from '../../../config/webpack.plugin.config';
 
 export interface PluginBundleOptions {
   watch: boolean;
   production?: boolean;
-  yarnlink?: boolean;
   preserveConsole?: boolean;
 }
 
-// export const bundlePlugin = ({ watch, production }: PluginBundleOptions) => useSpinner('Bundle plugin', async () => {
 export const bundlePlugin = async ({ watch, production, preserveConsole }: PluginBundleOptions) => {
   const compiler = webpack(
     await loadWebpackConfig({
@@ -32,9 +30,9 @@ export const bundlePlugin = async ({ watch, production, preserveConsole }: Plugi
         console.log('Compiling...');
       });
 
-      compiler.hooks.done.tap('done', (stats: webpack.Stats) => {
+      compiler.hooks.done.tap('done', (stats) => {
         clearConsole();
-        const json: any = stats.toJson(); // different @types/webpack between react-dev-utils and grafana-toolkit
+        const json = stats.toJson();
         const output = formatWebpackMessages(json);
 
         if (!output.errors.length && !output.warnings.length) {
@@ -57,13 +55,13 @@ export const bundlePlugin = async ({ watch, production, preserveConsole }: Plugi
         }
       });
     } else {
-      compiler.run((err: Error, stats: webpack.Stats) => {
+      compiler.run((err, stats) => {
         if (err) {
           reject(err);
           return;
         }
 
-        if (stats.hasErrors()) {
+        if (stats?.hasErrors()) {
           stats.compilation.errors.forEach((e) => {
             console.log(e.message);
           });
@@ -72,7 +70,7 @@ export const bundlePlugin = async ({ watch, production, preserveConsole }: Plugi
           return;
         }
 
-        console.log('\n', stats.toString({ colors: true }), '\n');
+        console.log('\n', stats?.toString({ colors: true }), '\n');
         resolve();
       });
     }
diff --git a/packages/grafana-toolkit/src/config/eslint.plugin.js b/packages/grafana-toolkit/src/config/eslint.plugin.js
index 35cd51a762d..8881050af33 100644
--- a/packages/grafana-toolkit/src/config/eslint.plugin.js
+++ b/packages/grafana-toolkit/src/config/eslint.plugin.js
@@ -1,5 +1,3 @@
-require('@rushstack/eslint-patch/modern-module-resolution');
-
 module.exports = {
   extends: ['@grafana/eslint-config'],
   rules: {
diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.ts b/packages/grafana-toolkit/src/config/jest.plugin.config.ts
index 647dc976526..8cb608c54d4 100644
--- a/packages/grafana-toolkit/src/config/jest.plugin.config.ts
+++ b/packages/grafana-toolkit/src/config/jest.plugin.config.ts
@@ -76,14 +76,14 @@ export const jestConfig = (baseDir: string = process.cwd()) => {
         },
       ],
     ],
-    testEnvironment: require.resolve('jest-environment-jsdom-fifteen'),
+    testEnvironment: 'jsdom',
     testMatch: [
       '<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}',
       '<rootDir>/src/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
       '<rootDir>/spec/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
     ],
     transform: {
-      '^.+\\.js$': 'babel-jest',
+      '^.+\\.jsx?$': require.resolve('babel-jest'),
       '^.+\\.tsx?$': require.resolve('ts-jest'),
     },
     transformIgnorePatterns: [
@@ -105,7 +105,8 @@ export const jestConfig = (baseDir: string = process.cwd()) => {
 export const loadJestPluginConfig = (baseDir: string = process.cwd()) => {
   const cfgpath = path.resolve(baseDir, 'jest.config.js');
   if (!fs.existsSync(cfgpath)) {
-    const src = path.resolve(baseDir, 'node_modules/@grafana/toolkit/src/config/jest.plugin.config.local.js');
+    const toolkitDir = path.dirname(require.resolve(`@grafana/toolkit/package.json`));
+    const src = path.join(toolkitDir, 'src/config/jest.plugin.config.local.js');
     fs.copyFileSync(src, cfgpath);
     console.log('Using standard jest plugin config', src);
   }
diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts
index 09f57379e9b..5a67061b598 100644
--- a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts
+++ b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts
@@ -3,11 +3,11 @@ import * as webpack from 'webpack';
 import { getStyleLoaders, getStylesheetEntries, getFileLoaders } from './webpack/loaders';
 
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const fs = require('fs');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const path = require('path');
 const ReplaceInFileWebpackPlugin = require('replace-in-file-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
@@ -94,25 +94,20 @@ const getCommonPlugins = (options: WebpackConfigurationOptions) => {
       // both options are optional
       filename: 'styles/[name].css',
     }),
-    new webpack.optimize.OccurrenceOrderPlugin(true),
-    new CopyWebpackPlugin(
-      [
+    new CopyWebpackPlugin({
+      patterns: [
         // If src/README.md exists use it; otherwise the root README
-        { from: hasREADME ? 'README.md' : '../README.md', to: '.', force: true, prority: 1 },
-        { from: 'plugin.json', to: '.' },
-        { from: '**/README.md', to: '[path]README.md', priority: 0 },
-        { from: '../LICENSE', to: '.' },
-        { from: '../CHANGELOG.md', to: '.', force: true },
-        { from: '**/*.json', to: '.' },
-        { from: '**/*.svg', to: '.' },
-        { from: '**/*.png', to: '.' },
-        { from: '**/*.html', to: '.' },
-        { from: 'img/**/*', to: '.' },
-        { from: 'libs/**/*', to: '.' },
-        { from: 'static/**/*', to: '.' },
+        { from: hasREADME ? 'README.md' : '../README.md', to: '.', force: true, priority: 1, noErrorOnMissing: true },
+        { from: 'plugin.json', to: '.', noErrorOnMissing: true },
+        { from: '**/README.md', to: '[path]README.md', priority: 0, noErrorOnMissing: true },
+        { from: '../LICENSE', to: '.', noErrorOnMissing: true },
+        { from: '../CHANGELOG.md', to: '.', force: true, noErrorOnMissing: true },
+        { from: '**/*.{json,svg,png,html}', to: '.', noErrorOnMissing: true },
+        { from: 'img/**/*', to: '.', noErrorOnMissing: true },
+        { from: 'libs/**/*', to: '.', noErrorOnMissing: true },
+        { from: 'static/**/*', to: '.', noErrorOnMissing: true },
       ],
-      { logLevel: options.watch ? 'silent' : 'warn' }
-    ),
+    }),
 
     new ReplaceInFileWebpackPlugin([
       {
@@ -146,9 +141,11 @@ const getBaseWebpackConfig: WebpackConfigurationGetter = async (options) => {
   if (options.production) {
     const compressOptions = { drop_console: !options.preserveConsole, drop_debugger: true };
     optimization.minimizer = [
-      new TerserPlugin({ sourceMap: true, terserOptions: { compress: compressOptions } }),
-      new OptimizeCssAssetsPlugin(),
+      new TerserPlugin({ terserOptions: { compress: compressOptions } }),
+      new CssMinimizerPlugin(),
     ];
+    optimization.chunkIds = 'total-size';
+    optimization.moduleIds = 'size';
   } else if (options.watch) {
     plugins.push(new HtmlWebpackPlugin());
   }
@@ -156,11 +153,6 @@ const getBaseWebpackConfig: WebpackConfigurationGetter = async (options) => {
   return {
     mode: options.production ? 'production' : 'development',
     target: 'web',
-    node: {
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty',
-    },
     context: path.join(process.cwd(), 'src'),
     devtool: 'source-map',
     entry: await getEntries(),
@@ -194,14 +186,12 @@ const getBaseWebpackConfig: WebpackConfigurationGetter = async (options) => {
       '@grafana/ui',
       '@grafana/runtime',
       '@grafana/data',
-      // @ts-ignore
-      (context, request, callback) => {
+      ({ request }, callback) => {
         const prefix = 'grafana/';
-        if (request.indexOf(prefix) === 0) {
-          return callback(null, request.slice(prefix.length));
+        if (request?.indexOf(prefix) === 0) {
+          return callback(undefined, request.slice(prefix.length));
         }
 
-        // @ts-ignore
         callback();
       },
     ],
@@ -209,43 +199,56 @@ const getBaseWebpackConfig: WebpackConfigurationGetter = async (options) => {
     resolve: {
       extensions: ['.ts', '.tsx', '.js'],
       modules: [path.resolve(process.cwd(), 'src'), 'node_modules'],
+      fallback: {
+        buffer: false,
+        fs: false,
+        stream: false,
+        http: false,
+        https: false,
+        string_decoder: false,
+        os: false,
+        timers: false,
+      },
     },
     module: {
       rules: [
         {
-          test: /\.tsx?$/,
-          loaders: [
-            {
-              loader: require.resolve('babel-loader'),
-              options: {
-                presets: [[require.resolve('@babel/preset-env'), { modules: false }]],
-                plugins: [require.resolve('babel-plugin-angularjs-annotate')],
-                sourceMaps: true,
-              },
+          test: /\.[tj]sx?$/,
+          use: {
+            loader: require.resolve('babel-loader'),
+            options: {
+              cacheDirectory: true,
+              cacheCompression: false,
+              presets: [
+                [require.resolve('@babel/preset-env'), { modules: false }],
+                [
+                  require.resolve('@babel/preset-typescript'),
+                  {
+                    allowNamespaces: true,
+                    allowDeclareFields: true,
+                  },
+                ],
+                [require.resolve('@babel/preset-react')],
+              ],
+              plugins: [
+                [
+                  require.resolve('@babel/plugin-transform-typescript'),
+                  {
+                    allowNamespaces: true,
+                    allowDeclareFields: true,
+                  },
+                ],
+                require.resolve('@babel/plugin-proposal-class-properties'),
+                [require.resolve('@babel/plugin-proposal-object-rest-spread'), { loose: true }],
+                require.resolve('@babel/plugin-transform-react-constant-elements'),
+                require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
+                require.resolve('@babel/plugin-proposal-optional-chaining'),
+                require.resolve('@babel/plugin-syntax-dynamic-import'),
+                require.resolve('babel-plugin-angularjs-annotate'),
+              ],
             },
-            {
-              loader: require.resolve('ts-loader'),
-              options: {
-                onlyCompileBundledFiles: true,
-                transpileOnly: true,
-              },
-            },
-          ],
-          exclude: /(node_modules)/,
-        },
-        {
-          test: /\.jsx?$/,
-          loaders: [
-            {
-              loader: require.resolve('babel-loader'),
-              options: {
-                presets: [['@babel/preset-env', { modules: false }]],
-                plugins: ['angularjs-annotate'],
-                sourceMaps: true,
-              },
-            },
-          ],
-          exclude: /(node_modules)/,
+          },
+          exclude: /node_modules/,
         },
         ...getStyleLoaders(),
         {
diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.ts b/packages/grafana-toolkit/src/config/webpack/loaders.ts
index fc4a386df45..3bad34d293f 100644
--- a/packages/grafana-toolkit/src/config/webpack/loaders.ts
+++ b/packages/grafana-toolkit/src/config/webpack/loaders.ts
@@ -76,21 +76,23 @@ export const getStyleLoaders = () => {
 
   const cssLoaders = [
     {
-      loader: 'css-loader',
+      loader: require.resolve('css-loader'),
       options: {
         importLoaders: 1,
         sourceMap: true,
       },
     },
     {
-      loader: 'postcss-loader',
+      loader: require.resolve('postcss-loader'),
       options: {
-        plugins: () => [
-          require('postcss-flexbugs-fixes'),
-          require('postcss-preset-env')({
-            autoprefixer: { flexbox: 'no-2009', grid: true },
-          }),
-        ],
+        postcssOptions: {
+          plugins: () => [
+            require('postcss-flexbugs-fixes'),
+            require('postcss-preset-env')({
+              autoprefixer: { flexbox: 'no-2009', grid: true },
+            }),
+          ],
+        },
       },
     },
   ];
@@ -103,27 +105,27 @@ export const getStyleLoaders = () => {
     },
     {
       test: /(dark|light)\.scss$/,
-      use: [extractionLoader, ...cssLoaders, 'sass-loader'],
+      use: [extractionLoader, ...cssLoaders, require.resolve('sass-loader')],
     },
     {
       test: /\.css$/,
-      use: ['style-loader', ...cssLoaders, 'sass-loader'],
+      use: ['style-loader', ...cssLoaders, require.resolve('sass-loader')],
       exclude: [`${styleDir}light.css`, `${styleDir}dark.css`],
     },
     {
       test: /\.s[ac]ss$/,
-      use: ['style-loader', ...cssLoaders, 'sass-loader'],
+      use: ['style-loader', ...cssLoaders, require.resolve('sass-loader')],
       exclude: [`${styleDir}light.scss`, `${styleDir}dark.scss`],
     },
     {
       test: /\.less$/,
       use: [
         {
-          loader: 'style-loader',
+          loader: require.resolve('style-loader'),
         },
         ...cssLoaders,
         {
-          loader: 'less-loader',
+          loader: require.resolve('less-loader'),
           options: {
             javascriptEnabled: true,
           },
diff --git a/packages/grafana-toolkit/tsconfig.json b/packages/grafana-toolkit/tsconfig.json
index 864c187d763..cbfacdd8a00 100644
--- a/packages/grafana-toolkit/tsconfig.json
+++ b/packages/grafana-toolkit/tsconfig.json
@@ -11,5 +11,5 @@
   },
   "exclude": ["dist", "node_modules"],
   "extends": "@grafana/tsconfig",
-  "include": ["src/**/*.ts", "../../public/app/types/jquery/*.ts", "../../public/app/types/sanitize-url.d.ts"]
+  "include": ["src/**/*.ts", "../../public/app/types/jquery/*.ts"]
 }
diff --git a/packages/grafana-ui/.storybook/tsconfig.json b/packages/grafana-ui/.storybook/tsconfig.json
index 7a8f86da20c..bdf5280e75d 100644
--- a/packages/grafana-ui/.storybook/tsconfig.json
+++ b/packages/grafana-ui/.storybook/tsconfig.json
@@ -6,10 +6,5 @@
   },
   "exclude": ["../dist", "../node_modules"],
   "extends": "../tsconfig.json",
-  "include": [
-    "../src/**/*.ts",
-    "../src/**/*.tsx",
-    "../../../public/app/types/sanitize-url.d.ts",
-    "../../../public/app/types/svg.d.ts"
-  ]
+  "include": ["../src/**/*.ts", "../src/**/*.tsx", "../../../public/app/types/svg.d.ts"]
 }
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 1ff6c2427c8..9e6c4ce8eeb 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -15,17 +15,14 @@
   },
   "author": "Grafana Labs",
   "devDependencies": {
+    "@grafana/toolkit": "9.0.0-beta.1",
     "@types/jest": "26.0.15",
     "@types/lodash": "4.14.149",
     "@types/react": "17.0.30",
-    "lodash": "4.17.21",
-    "pnp-webpack-plugin": "^1.7.0",
-    "ts-loader": "8.0.11",
-    "webpack": "5.58.1"
+    "lodash": "4.17.21"
   },
   "dependencies": {
     "@grafana/data": "9.0.0-beta.1",
-    "@grafana/toolkit": "9.0.0-beta.1",
     "@grafana/ui": "9.0.0-beta.1",
     "jquery": "3.5.1",
     "react": "17.0.1",
diff --git a/plugins-bundled/internal/input-datasource/webpack.config.js b/plugins-bundled/internal/input-datasource/webpack.config.js
deleted file mode 100644
index 50dfc450d1b..00000000000
--- a/plugins-bundled/internal/input-datasource/webpack.config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const { merge } = require('lodash');
-const PnpWebpackPlugin = require('pnp-webpack-plugin');
-
-module.exports = {
-  getWebpackConfig: (baseConfig) => {
-    return merge(baseConfig, {
-      resolve: {
-        plugins: [PnpWebpackPlugin],
-      },
-      resolveLoader: {
-        plugins: [PnpWebpackPlugin.moduleLoader(module)],
-      },
-    });
-  },
-};
diff --git a/public/app/types/sanitize-url.d.ts b/public/app/types/sanitize-url.d.ts
deleted file mode 100644
index 9f6af49c606..00000000000
--- a/public/app/types/sanitize-url.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module '@braintree/sanitize-url' {
-  function sanitizeUrl(url: string): string;
-}
diff --git a/yarn.lock b/yarn.lock
index 1a813b8fd16..274511cbb51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50,7 +50,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.13.0, @babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.13.12, @babel/compat-data@npm:^7.15.0":
+"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.15.0":
   version: 7.15.0
   resolution: "@babel/compat-data@npm:7.15.0"
   checksum: 65088d87b14966dcdba397c799f312beb1e7a4dac178e7daa922a17ee9b65d8cfd9f35ff8352ccb6e20bb9a169df1171263ef5fd5967aa25d544ea3f62681993
@@ -109,29 +109,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.13.14":
-  version: 7.13.14
-  resolution: "@babel/core@npm:7.13.14"
-  dependencies:
-    "@babel/code-frame": ^7.12.13
-    "@babel/generator": ^7.13.9
-    "@babel/helper-compilation-targets": ^7.13.13
-    "@babel/helper-module-transforms": ^7.13.14
-    "@babel/helpers": ^7.13.10
-    "@babel/parser": ^7.13.13
-    "@babel/template": ^7.12.13
-    "@babel/traverse": ^7.13.13
-    "@babel/types": ^7.13.14
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.1.2
-    semver: ^6.3.0
-    source-map: ^0.5.0
-  checksum: 3c08166ab8497da44644f1a35ce0e75d0cfe1307ff8bb3b75be4d83a204eb2e565b4c305f47225b187374ec4e8972b109a7c70eb5b07471afe074bf33451c21e
-  languageName: node
-  linkType: hard
-
 "@babel/core@npm:7.17.8":
   version: 7.17.8
   resolution: "@babel/core@npm:7.17.8"
@@ -201,6 +178,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:^7.17.8":
+  version: 7.17.9
+  resolution: "@babel/core@npm:7.17.9"
+  dependencies:
+    "@ampproject/remapping": ^2.1.0
+    "@babel/code-frame": ^7.16.7
+    "@babel/generator": ^7.17.9
+    "@babel/helper-compilation-targets": ^7.17.7
+    "@babel/helper-module-transforms": ^7.17.7
+    "@babel/helpers": ^7.17.9
+    "@babel/parser": ^7.17.9
+    "@babel/template": ^7.16.7
+    "@babel/traverse": ^7.17.9
+    "@babel/types": ^7.17.0
+    convert-source-map: ^1.7.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.1
+    semver: ^6.3.0
+  checksum: 2d301e4561a170bb584a735ec412de8fdc40b2052e12380d4a5e36781be5af1fd2a60552e7f0764b0a491a242f20105265bd2a10ff57b30c2842684f02dbb5a2
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.7.2":
   version: 7.16.0
   resolution: "@babel/core@npm:7.16.0"
@@ -269,7 +269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.13.9, @babel/generator@npm:^7.15.4, @babel/generator@npm:^7.15.8, @babel/generator@npm:^7.4.0":
+"@babel/generator@npm:^7.15.4, @babel/generator@npm:^7.15.8":
   version: 7.15.8
   resolution: "@babel/generator@npm:7.15.8"
   dependencies:
@@ -324,7 +324,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.14.5, @babel/helper-annotate-as-pure@npm:^7.15.4":
+"@babel/generator@npm:^7.17.9":
+  version: 7.17.9
+  resolution: "@babel/generator@npm:7.17.9"
+  dependencies:
+    "@babel/types": ^7.17.0
+    jsesc: ^2.5.1
+    source-map: ^0.5.0
+  checksum: afbdd4afbf731ba0a17e7e2d9a2291e6461259af887f88f1178f63514a86e9c18cec462ae8f9cd6df9ba15a18296f47b0e151202bb4f834f7338ac0c07ec8dc8
+  languageName: node
+  linkType: hard
+
+"@babel/helper-annotate-as-pure@npm:^7.14.5":
   version: 7.15.4
   resolution: "@babel/helper-annotate-as-pure@npm:7.15.4"
   dependencies:
@@ -342,16 +353,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.14.5":
-  version: 7.15.4
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.15.4"
-  dependencies:
-    "@babel/helper-explode-assignable-expression": ^7.15.4
-    "@babel/types": ^7.15.4
-  checksum: 0753698e94ae5852e19c4865c3265061643f3ba617360eddf913c4d15b18400e9c47a8a6abed08a83d8b65301394f21d43e21702a79bf90d3f2e566f027cb745
-  languageName: node
-  linkType: hard
-
 "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.7"
@@ -362,7 +363,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.13.10, @babel/helper-compilation-targets@npm:^7.13.13, @babel/helper-compilation-targets@npm:^7.15.4":
+"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.15.4":
   version: 7.15.4
   resolution: "@babel/helper-compilation-targets@npm:7.15.4"
   dependencies:
@@ -432,22 +433,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.14.5":
-  version: 7.15.4
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.15.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.15.4
-    "@babel/helper-function-name": ^7.15.4
-    "@babel/helper-member-expression-to-functions": ^7.15.4
-    "@babel/helper-optimise-call-expression": ^7.15.4
-    "@babel/helper-replace-supers": ^7.15.4
-    "@babel/helper-split-export-declaration": ^7.15.4
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 42fa8550125cd26ec5ff62f8d5383924b896a35326a31acced93a166661d1a1446199e5d2c8dc3685d70482127dc57cc6c22c5ffccadb58e72bfedf906fba817
-  languageName: node
-  linkType: hard
-
 "@babel/helper-create-class-features-plugin@npm:^7.16.10":
   version: 7.17.1
   resolution: "@babel/helper-create-class-features-plugin@npm:7.17.1"
@@ -641,15 +626,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-explode-assignable-expression@npm:^7.15.4":
-  version: 7.15.4
-  resolution: "@babel/helper-explode-assignable-expression@npm:7.15.4"
-  dependencies:
-    "@babel/types": ^7.15.4
-  checksum: a302fa05ba3eec575044711b9050c1e4db9b6409e59f30b7ae6733bd9bab9ccb81ffaee01276e98c334f4dc0084c4071c6749f8195d0f2555054b55d7320360a
-  languageName: node
-  linkType: hard
-
 "@babel/helper-explode-assignable-expression@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/helper-explode-assignable-expression@npm:7.16.7"
@@ -659,7 +635,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.0.0, @babel/helper-function-name@npm:^7.14.5, @babel/helper-function-name@npm:^7.15.4":
+"@babel/helper-function-name@npm:^7.0.0, @babel/helper-function-name@npm:^7.15.4":
   version: 7.15.4
   resolution: "@babel/helper-function-name@npm:7.15.4"
   dependencies:
@@ -783,7 +759,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.14.5, @babel/helper-module-imports@npm:^7.15.4":
+"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.15.4":
   version: 7.15.4
   resolution: "@babel/helper-module-imports@npm:7.15.4"
   dependencies:
@@ -826,7 +802,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.13.14, @babel/helper-module-transforms@npm:^7.14.5, @babel/helper-module-transforms@npm:^7.15.4, @babel/helper-module-transforms@npm:^7.15.8":
+"@babel/helper-module-transforms@npm:^7.15.8":
   version: 7.15.8
   resolution: "@babel/helper-module-transforms@npm:7.15.8"
   dependencies:
@@ -936,17 +912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.14.5, @babel/helper-remap-async-to-generator@npm:^7.15.4":
-  version: 7.15.4
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.15.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.15.4
-    "@babel/helper-wrap-function": ^7.15.4
-    "@babel/types": ^7.15.4
-  checksum: 80918caa96fcb679a89887f7997fd1428d77810e3fa11de0c7475594a09c7b96adee872b84202f8301ee707dec43575c6d92799f07959d595d2da1940388d8aa
-  languageName: node
-  linkType: hard
-
 "@babel/helper-remap-async-to-generator@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/helper-remap-async-to-generator@npm:7.16.8"
@@ -958,7 +923,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.0.0, @babel/helper-replace-supers@npm:^7.14.5, @babel/helper-replace-supers@npm:^7.15.4":
+"@babel/helper-replace-supers@npm:^7.0.0, @babel/helper-replace-supers@npm:^7.15.4":
   version: 7.15.4
   resolution: "@babel/helper-replace-supers@npm:7.15.4"
   dependencies:
@@ -1019,15 +984,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.14.5, @babel/helper-skip-transparent-expression-wrappers@npm:^7.15.4":
-  version: 7.15.4
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.15.4"
-  dependencies:
-    "@babel/types": ^7.15.4
-  checksum: ebec4ea6fc93fd39e610f7b274cb63e420fffee1cbe5002e41bdf9d39ce6121d541163124730fb22b242d0f58d3be447b339ec6b323feeda687a978cafabfeaa
-  languageName: node
-  linkType: hard
-
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.16.0":
   version: 7.16.0
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.16.0"
@@ -1078,7 +1034,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.12.17, @babel/helper-validator-option@npm:^7.14.5":
+"@babel/helper-validator-option@npm:^7.14.5":
   version: 7.14.5
   resolution: "@babel/helper-validator-option@npm:7.14.5"
   checksum: 1b25c34a5cb3d8602280f33b9ab687d2a77895e3616458d0f70ddc450ada9b05e342c44f322bc741d51b252e84cff6ec44ae93d622a3354828579a643556b523
@@ -1092,18 +1048,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.15.4":
-  version: 7.15.4
-  resolution: "@babel/helper-wrap-function@npm:7.15.4"
-  dependencies:
-    "@babel/helper-function-name": ^7.15.4
-    "@babel/template": ^7.15.4
-    "@babel/traverse": ^7.15.4
-    "@babel/types": ^7.15.4
-  checksum: 66422c8abd69ac3b9be44de62fe9e460ae8faa2b692757eeed920523633a1921b29af8867eb5f0832b1f029c489cf01c703ae51fa2dc078ea636abcc52e092bc
-  languageName: node
-  linkType: hard
-
 "@babel/helper-wrap-function@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/helper-wrap-function@npm:7.16.8"
@@ -1127,7 +1071,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.13.10, @babel/helpers@npm:^7.15.4":
+"@babel/helpers@npm:^7.15.4":
   version: 7.15.4
   resolution: "@babel/helpers@npm:7.15.4"
   dependencies:
@@ -1171,6 +1115,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helpers@npm:^7.17.9":
+  version: 7.17.9
+  resolution: "@babel/helpers@npm:7.17.9"
+  dependencies:
+    "@babel/template": ^7.16.7
+    "@babel/traverse": ^7.17.9
+    "@babel/types": ^7.17.0
+  checksum: 3c6db861e4c82fff2de3efb4ad12e32658c50c29920597cd0979390659b202e5849acd9542e0e2453167a52ccc30156ee4455d64d0e330f020d991d7551566f8
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.14.5":
   version: 7.14.5
   resolution: "@babel/highlight@npm:7.14.5"
@@ -1204,7 +1159,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.13.13, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.15.4, @babel/parser@npm:^7.15.8, @babel/parser@npm:^7.4.3":
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.15.4, @babel/parser@npm:^7.15.8":
   version: 7.15.8
   resolution: "@babel/parser@npm:7.15.8"
   bin:
@@ -1276,6 +1231,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.17.9":
+  version: 7.17.9
+  resolution: "@babel/parser@npm:7.17.9"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: ea59c985ebfae7c0299c8ea63ed34903202f51665db8d59c55b4366e20270b74d7367a2c211fdd2db20f25750df89adcc85ab6c8692061c6459a88efb79f43e6
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.16.7"
@@ -1287,19 +1251,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.13.12":
-  version: 7.15.4
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.15.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.15.4
-    "@babel/plugin-proposal-optional-chaining": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: 6c4f264951a51b22ae52e97ed8ba272c1b7a068a0b4a3472c24998a9ce0c3174c3157457a7c886664cc5c77f7693b779d07b1def2545a6cfdf66ee5ff2064423
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.16.7"
@@ -1313,19 +1264,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-async-generator-functions@npm:^7.13.8":
-  version: 7.15.8
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.15.8"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-remap-async-to-generator": ^7.15.4
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d3b9840a69de3b9f336540000bd785ade25800f893821e0986b647eed92bd820bc2486563d48d6a76de66b62d0adb598dea4fcf5f248420707b5a3d2b7212b36
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-async-generator-functions@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.8"
@@ -1339,19 +1277,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-properties@npm:7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.17.12"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.17.12
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 884df6a4617a18cdc2a630096b2a10954bcc94757c893bb01abd6702fdc73343ca5c611f4884c4634e0608f5e86c3093ea6b973ce00bf21b248ba54de92c837d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.12.1, @babel/plugin-proposal-class-properties@npm:^7.16.7":
+"@babel/plugin-proposal-class-properties@npm:7.16.7, @babel/plugin-proposal-class-properties@npm:^7.12.1, @babel/plugin-proposal-class-properties@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-class-properties@npm:7.16.7"
   dependencies:
@@ -1363,15 +1289,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-properties@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.14.5"
+"@babel/plugin-proposal-class-properties@npm:7.17.12":
+  version: 7.17.12
+  resolution: "@babel/plugin-proposal-class-properties@npm:7.17.12"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-create-class-features-plugin": ^7.17.12
+    "@babel/helper-plugin-utils": ^7.17.12
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: fe2aa0a44f8ea121e10c856d6fb4fca418dc42451258ef6ed29321ca740080fba420ebd3d6700d0456c34c2ab2044f9ce4308498321f52a93184ff5adb015aae
+  checksum: 884df6a4617a18cdc2a630096b2a10954bcc94757c893bb01abd6702fdc73343ca5c611f4884c4634e0608f5e86c3093ea6b973ce00bf21b248ba54de92c837d
   languageName: node
   linkType: hard
 
@@ -1416,18 +1342,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-dynamic-import@npm:^7.13.8":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 47be4b5f8824f8690b47d99a34d52de0e6c19d0b99f26c1f9a2e4cc49e05082bcef7248c610bb3830ae84cec928713c7774f4929fca4fa72df570df7a76a9d2b
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-dynamic-import@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-dynamic-import@npm:7.16.7"
@@ -1452,18 +1366,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-export-namespace-from@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b3f4e0cc196f7ad9132816bb350124e8932bc047ab946e431f85bae9649b0de384c54261a60c050a2b8220703408fc089f90349ad008ed69a70944a6f3048d0e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-export-namespace-from@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.16.7"
@@ -1476,18 +1378,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-json-strings@npm:^7.13.8":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 51dafe70237860569c9c27dc6a0db83e149bf7babb0fcafa9dbcd55a960b443f7b5bb695956c6e116e46b3dbd2a6777ead62bcad843aff8c1916c1be56e2f504
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-json-strings@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-json-strings@npm:7.16.7"
@@ -1500,18 +1390,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.13.8":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 08b6dbc991c4824b0d8bfabf46c8254fce02d2df04627b8849cf15a4b6de75629c10c7c83d1e6834cdcebfc98b16264ce2dd32aa9c0fae900ed2af807d5ac42b
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-logical-assignment-operators@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.16.7"
@@ -1524,19 +1402,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7881d8005d0d4e17a94f3bfbfa4a0d8af016d2f62ed90912fabb8c5f8f0cc0a15fd412f09c230984c40b5c893086987d403c73198ef388ffcb3726ff72efc009
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.12.1, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.7":
+"@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.7, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.12.1, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.7"
   dependencies:
@@ -1548,27 +1414,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.14.5"
+"@babel/plugin-proposal-nullish-coalescing-operator@npm:7.17.12":
+  version: 7.17.12
+  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.17.12"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-plugin-utils": ^7.17.12
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 033d9483c2feb74928fbb83a73948eb1179c8852d2ae507fbfc37752d2dbf702c9ad0daaf1eaa029f81b12b7e2470061b4f611db88b7293f0e9a71eba288a430
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-numeric-separator@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 22093297ec9aed3938b39f4efa1b518252fe7b0835902c3066f0ae6a864ac253b986a4a21a6092aa068d0702d7b09bed74e56cf39f2da8b4f3f43e0747bffb62
+  checksum: 7881d8005d0d4e17a94f3bfbfa4a0d8af016d2f62ed90912fabb8c5f8f0cc0a15fd412f09c230984c40b5c893086987d403c73198ef388ffcb3726ff72efc009
   languageName: node
   linkType: hard
 
@@ -1612,21 +1466,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-object-rest-spread@npm:^7.13.8":
-  version: 7.15.6
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.15.6"
-  dependencies:
-    "@babel/compat-data": ^7.15.0
-    "@babel/helper-compilation-targets": ^7.15.4
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.15.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fef884b9e2e235c449f317b4fb0f90c23bdfbfec160c3ed105a3bbf2a85a6e449883953f8229ba132ad65090ff38094fca8475225ad462d1bd87f1392f3f60ed
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-object-rest-spread@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.16.7"
@@ -1642,18 +1481,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-catch-binding@npm:^7.13.8":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f9c1b2b34fef1bde85feeb0b438131f526056161e10b6fb91c74a5828ad39d2a20521b5c3cefc7367a7e5fc792b7c7e607bf278d7999b5d89824c34af3174eae
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-optional-catch-binding@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.16.7"
@@ -1666,6 +1493,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-proposal-optional-chaining@npm:7.16.7, @babel/plugin-proposal-optional-chaining@npm:^7.12.7, @babel/plugin-proposal-optional-chaining@npm:^7.16.7":
+  version: 7.16.7
+  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.7"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.16.7
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
+    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e4a6c1ac7e6817b92a673ea52ab0b7dc1fb39d29fb0820cd414e10ae2cd132bd186b4238dcca881a29fc38fe9d38ed24fc111ba22ca20086481682d343f4f130
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-proposal-optional-chaining@npm:7.17.12":
   version: 7.17.12
   resolution: "@babel/plugin-proposal-optional-chaining@npm:7.17.12"
@@ -1679,32 +1519,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-chaining@npm:^7.12.7, @babel/plugin-proposal-optional-chaining@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e4a6c1ac7e6817b92a673ea52ab0b7dc1fb39d29fb0820cd414e10ae2cd132bd186b4238dcca881a29fc38fe9d38ed24fc111ba22ca20086481682d343f4f130
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.13.12, @babel/plugin-proposal-optional-chaining@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9e39e20d162bea2241b4c24ea8a339f872a04954a5155c606bf2437edaa1a15b8a517daee4b2b09cfd42d826b93c57f080aa9fbb13c60a8f3a7a72963badf2df
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-private-methods@npm:^7.12.1, @babel/plugin-proposal-private-methods@npm:^7.16.11":
   version: 7.16.11
   resolution: "@babel/plugin-proposal-private-methods@npm:7.16.11"
@@ -1717,18 +1531,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-private-methods@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.14.5"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: badacc1d68c8cf92a7ba973e3c283bc3aebf586a6573b6d18a96461ce18039d4cdc0135edac1b810df8d92cfca628115d98a0ad83ed8f15bf15eaff21539bf32
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-private-property-in-object@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.7"
@@ -1743,18 +1545,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.12.13, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.14.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 58bd3277a972a33d101d29ab4f52e964b6e8ec218eb84f764b4ea67bf8ed362909760812d3f7451ee5e54dc273bd81bc5a00cd2c13e8fb64a47ec117cb69d51b
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-unicode-property-regex@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.16.7"
@@ -1767,6 +1557,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-proposal-unicode-property-regex@npm:^7.4.4":
+  version: 7.14.5
+  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.14.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.14.5
+    "@babel/helper-plugin-utils": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 58bd3277a972a33d101d29ab4f52e964b6e8ec218eb84f764b4ea67bf8ed362909760812d3f7451ee5e54dc273bd81bc5a00cd2c13e8fb64a47ec117cb69d51b
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-syntax-async-generators@npm:^7.8.4":
   version: 7.8.4
   resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
@@ -2020,7 +1822,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-top-level-await@npm:^7.12.13, @babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3":
+"@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3":
   version: 7.14.5
   resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
   dependencies:
@@ -2075,30 +1877,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 126196ea0107e97f711c0d48d8d1e01a30f5a5e127628f7367658b4c5832182c4e28914294408374690c5bfbb4ad4fe6560068d8bf370cafe8d4fe23599aaa95
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.14.5"
-  dependencies:
-    "@babel/helper-module-imports": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-remap-async-to-generator": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4c47016c5f65adaa5836054fcc99402f1d295aedd7ebd44e6df128a90977952f2a8abdf3b3d0aa5a9e1186184da538452c4d9a3b1482376759c6962627201da5
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-async-to-generator@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.8"
@@ -2112,17 +1890,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9994d9f107308b21be043de115fe1d06956807d93a3039ddab54333d1fbb39ad50cc5f9eccaedf5317f4699230e923662254974f3a974c4f000e986837bc020a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-block-scoped-functions@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.7"
@@ -2145,17 +1912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.12.13":
-  version: 7.15.3
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.15.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ee28f51711b5f6569a9bb86be5b2a5456f3e6e22e68488ee77f8082fae5563f45c858dc8323e0e51085d880db1be73e28dc5d108c8a855c831fb29310a01b549
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-classes@npm:^7.12.1, @babel/plugin-transform-classes@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-classes@npm:7.16.7"
@@ -2174,34 +1930,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.13.0":
-  version: 7.15.4
-  resolution: "@babel/plugin-transform-classes@npm:7.15.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.15.4
-    "@babel/helper-function-name": ^7.15.4
-    "@babel/helper-optimise-call-expression": ^7.15.4
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-replace-supers": ^7.15.4
-    "@babel/helper-split-export-declaration": ^7.15.4
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c795bb3f49eff5a5a7357650fb233e6a84089278d8b917ef46c566dd112de660240e7ffca6ba274d7596034806b9655974082cf99746ea492f3be98613d5fc01
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 87bd4c46255359ab8d53d0e9b5aa5e1ef218c1447874bd8c2eff759d3a2b5fe6b3ec55046babe0087f7e3890f6167524c729737e912080ea1c9758a559765130
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-computed-properties@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-computed-properties@npm:7.16.7"
@@ -2224,17 +1952,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.13.0":
-  version: 7.14.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.14.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0b0cf8ed9fb92c53e3888c17402c4f1e8f329f05a759829b559df883b19b442d3950b7f319df419d0cff122ea76fc8b3b55779fdbb9e394e5f058419a8d5ba14
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-destructuring@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-destructuring@npm:7.16.7"
@@ -2257,18 +1974,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.12.13, @babel/plugin-transform-dotall-regex@npm:^7.4.4":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.14.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4da3dac9580823c1fe8aaedf6109d3a26d17ad7ef7d1b278ddbcd7c148e02c465cf49250794529a34bac0bda6b53db558ae08d185a96b76efaaa17a5da3911df
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-dotall-regex@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.7"
@@ -2281,14 +1986,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.12.13":
+"@babel/plugin-transform-dotall-regex@npm:^7.4.4":
   version: 7.14.5
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.14.5"
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.14.5"
   dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.14.5
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c6c951d2f7ed528a8103d08293d4aaf95efa38c697e7b2b27b7e6c9780280484373e2f7ef8d77daf17dffdc86748fbf75e776e0542b1c7b17e29308bc31ebd8c
+  checksum: 4da3dac9580823c1fe8aaedf6109d3a26d17ad7ef7d1b278ddbcd7c148e02c465cf49250794529a34bac0bda6b53db558ae08d185a96b76efaaa17a5da3911df
   languageName: node
   linkType: hard
 
@@ -2303,18 +2009,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.14.5"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7588a582d0bc5c80fda7f1c631354a35a9a7d284dd80ccaf2bbfd086a39a9d6461718dc7dd45a3ca59228593270a7c6a907a9cbe7ddc349d80c7342af0263c5c
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-exponentiation-operator@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.7"
@@ -2350,29 +2044,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.13.0":
-  version: 7.15.4
-  resolution: "@babel/plugin-transform-for-of@npm:7.15.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 908307b89d05bfb464a4a33033f68fdfedf6302a0203d45c2a34abc3a5bacf23767284892b21b52d0cbeb7e10330a1d5d81990000fef1592adbb3556fd96d1d0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-function-name@npm:7.14.5"
-  dependencies:
-    "@babel/helper-function-name": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3db2fa1bcd21b76a91ce78db8ebca047fdadbf198f816e2621e531a751a0d40976cf2a25262dee9352fd0c53bff5b25fddefadebdbb4ba3da6d89b849ab075b6
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-function-name@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-function-name@npm:7.16.7"
@@ -2386,17 +2057,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-literals@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2341cfaaf8ac7199c578407ea4de41205d3d74c5a48899aa96c41b08c09d18c46d9018fdc6a2f69f0bccc2662223afc47b60130ae4ff36a79351fface71a61f3
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-literals@npm:7.16.7"
@@ -2408,17 +2068,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a94ff910e8d0e28effd58c64f2d15c9772ea4c209644f116fd81dc5c93ce232304f42ef14d5ec2baf095c824786698fcf6c1d4c91952dc3762350f4ec0eb1f17
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-member-expression-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.7"
@@ -2430,19 +2079,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.14.5"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 963d9ebb11b282d5c5f462e3e1ad6991e60fb4d190b5a7aa0d9937e0fa83d89cf5f94268f0b0b343576f2cee0cf545bcaf40da40eb8b9dca5c79840fd86a65ed
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-amd@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-modules-amd@npm:7.16.7"
@@ -2456,20 +2092,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.13.8":
-  version: 7.15.4
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.15.4"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.15.4
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-simple-access": ^7.15.4
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4782b0dad09a9a593be94c7d71fc134ba190e04125a0bf7127dfb5f23413438467b50d92f5d91faa2d377cecccfaf9cdd61156a033fc772816772fdddd82e0ad
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-commonjs@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.16.8"
@@ -2498,21 +2120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.13.8":
-  version: 7.15.4
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.15.4"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.15.4
-    "@babel/helper-module-transforms": ^7.15.4
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-validator-identifier": ^7.14.9
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c5ba905680781237a8e86ae6434a9ca33e49deb8e7c3ac28d7b8079bc51c39b557aeecb06e97dc519912815fc99cbd75eaa23bfaa5428ee36aef2dfeae617c29
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-systemjs@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-modules-systemjs@npm:7.16.7"
@@ -2543,18 +2150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.14.5"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 455ff383bed47e104d4b2b32f11bc5a44a25c797fad26b5eab9b8a81856f9945350b45ad28b9b20b0bbf324832c7a826c9c3d6f865e85c26a1771663132e4145
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-umd@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-modules-umd@npm:7.16.7"
@@ -2567,17 +2162,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.12.13":
-  version: 7.14.9
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.14.9"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 81dda376c0af4c07ae252703481e8bd16d49045bd624697ff6b6635326f3f20fca9c574a2f0036bf7f4aa8c36baa9d926912538de486a189a3515bec7f72e16a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.16.8":
   version: 7.16.8
   resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.8"
@@ -2600,17 +2184,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-new-target@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5b806c86926cd0b03fa2f22cf21a6d6a86e5831b80e8a1e898877acd3a03fd07078e45da33b671200ec98a5c7ac9be2f3592cd88933e262feffba248ca7ca4e7
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-new-target@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-new-target@npm:7.16.7"
@@ -2622,18 +2195,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-object-super@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-replace-supers": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 88477a8b27e76042ffbff1345088422f5b3135346d69f264e71d90b3749a3d73d5a579c97a33cd11c61c5d499a655911c7cd97dbe68edb36e090dfd5f154d777
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-object-super@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-object-super@npm:7.16.7"
@@ -2657,28 +2218,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.13.0, @babel/plugin-transform-parameters@npm:^7.15.4":
-  version: 7.15.4
-  resolution: "@babel/plugin-transform-parameters@npm:7.15.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0d8bf881156669a2a6fa279e80fa2f1f47ec6404a72be87adb3e8fa40e72d26f2413ce942208dd1b0f6deb47332d8d2fd81b5e5d6f744779c7d9b13f85b608a5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-property-literals@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 426e7b13a048220314e35bd4e6732640293c616173ef05ceca3a2bfadd043199e35ec693f1604f77178c3a88bea241b6d7ce92d8fc837faeb37117ad7866350f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-property-literals@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-property-literals@npm:7.16.7"
@@ -2701,6 +2240,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-react-constant-elements@npm:7.17.6":
+  version: 7.17.6
+  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.17.6"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.16.7
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 4c111328511c4dcb8d1d7970d7cccff463c0c34dfe3380f5bb80b692fa191b441fa8c6ef4229c5140dc0b8c69cc3f9aeb6dc05455c4367be93e784658ce11cc5
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-react-display-name@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-react-display-name@npm:7.16.7"
@@ -2780,17 +2330,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-regenerator@npm:7.14.5"
-  dependencies:
-    regenerator-transform: ^0.14.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f606bc04da7d0cfd651914cb144e85a0ea6fe20ee453ed21d002747cc47b09c853bc97166c32dc47e959581b772d9883f7d96d1c8e795c81ed21dbbb300e3aa7
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-regenerator@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-regenerator@npm:7.16.7"
@@ -2813,17 +2352,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8a40d7b48e1b4a549272d603e7b28ead70213e12353d65edd07156b7169d7933cee8b79987b54f374f3c41b835d941aca4b13b8aa23a922c94113af2131ca686
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-reserved-words@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-reserved-words@npm:7.16.7"
@@ -2862,17 +2390,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 60cdd17e347a6a0973c8ea5c08ae4b3f8e59ce0e188453c4bda045d2a5c34495af8e0e9393631aa9f3fd51282455b9c5d6ba07e262576171dbe2b4094bdaf8ad
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-spread@npm:^7.12.1, @babel/plugin-transform-spread@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-spread@npm:7.16.7"
@@ -2885,29 +2402,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.13.0":
-  version: 7.15.8
-  resolution: "@babel/plugin-transform-spread@npm:7.15.8"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.15.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fbffa4f2a6dd630ab5f22d1e66e77a0043d83b16ef97418fb389584d4c29c218096da7def69fc3b3e8e9092db8de236b5e15ebe5467d0a28bf59eda1318ad41d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-sticky-regex@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6d77e0641c4c72203d592d54fdb11770de22a34d659d3335e4c537e95b930d03142b11f1d41d103da3de063c628a0f34bdd4c6534b591bc59d9ce67fafb836dc
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-sticky-regex@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.7"
@@ -2930,28 +2424,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.13.0":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-template-literals@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 56d273470c16e83bac1bfab5057a64f23191b51460a009b522b3b29806d7a9f64cbd94323836ceb997c4f331b85564f952eb5566c7bd140d0b278f0191a31985
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1e71ec00ea8b64522b8677c030f334cc5b3833a5b7269a152a2ba7a6b36f0e0a4333a61072e69113e4062e71554d4751ef2e3ddd5e81994978123323f266981c
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-typeof-symbol@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.7"
@@ -2963,6 +2435,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-typescript@npm:7.16.8":
+  version: 7.16.8
+  resolution: "@babel/plugin-transform-typescript@npm:7.16.8"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.16.7
+    "@babel/helper-plugin-utils": ^7.16.7
+    "@babel/plugin-syntax-typescript": ^7.16.7
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a76d0afcbd550208cf2e7cdedb4f2d3ca3fa287640a4858a5ee0a28270b784d7d20d5a51b5997dc84514e066a5ebef9e0a0f74ed9fffae09e73984786dd08036
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-typescript@npm:7.17.12, @babel/plugin-transform-typescript@npm:^7.17.12":
   version: 7.17.12
   resolution: "@babel/plugin-transform-typescript@npm:7.17.12"
@@ -2989,17 +2474,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2a6979c5b886d9c7d9d3887374d75384542fe05a71eb7738b2cde659386089a930d37d1a34ffb4b87def98fbed3526d78b7cd5dd9bffde4d406b368faba81b7d
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-unicode-escapes@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-unicode-escapes@npm:7.16.7"
@@ -3011,18 +2485,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.12.13":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.14.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1b7a4c0dc6b07390f991e7cac8409f7a1ae74495d94b9e1fb5a716d5362a349a35717cfad883074e3f80e16bb630bbd1986a3436f739f6b01c30a96ef3f9ea9a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-unicode-regex@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.7"
@@ -3035,85 +2497,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.13.12":
-  version: 7.13.12
-  resolution: "@babel/preset-env@npm:7.13.12"
-  dependencies:
-    "@babel/compat-data": ^7.13.12
-    "@babel/helper-compilation-targets": ^7.13.10
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/helper-validator-option": ^7.12.17
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.13.12
-    "@babel/plugin-proposal-async-generator-functions": ^7.13.8
-    "@babel/plugin-proposal-class-properties": ^7.13.0
-    "@babel/plugin-proposal-dynamic-import": ^7.13.8
-    "@babel/plugin-proposal-export-namespace-from": ^7.12.13
-    "@babel/plugin-proposal-json-strings": ^7.13.8
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.13.8
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.13.8
-    "@babel/plugin-proposal-numeric-separator": ^7.12.13
-    "@babel/plugin-proposal-object-rest-spread": ^7.13.8
-    "@babel/plugin-proposal-optional-catch-binding": ^7.13.8
-    "@babel/plugin-proposal-optional-chaining": ^7.13.12
-    "@babel/plugin-proposal-private-methods": ^7.13.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.12.13
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-class-properties": ^7.12.13
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-top-level-await": ^7.12.13
-    "@babel/plugin-transform-arrow-functions": ^7.13.0
-    "@babel/plugin-transform-async-to-generator": ^7.13.0
-    "@babel/plugin-transform-block-scoped-functions": ^7.12.13
-    "@babel/plugin-transform-block-scoping": ^7.12.13
-    "@babel/plugin-transform-classes": ^7.13.0
-    "@babel/plugin-transform-computed-properties": ^7.13.0
-    "@babel/plugin-transform-destructuring": ^7.13.0
-    "@babel/plugin-transform-dotall-regex": ^7.12.13
-    "@babel/plugin-transform-duplicate-keys": ^7.12.13
-    "@babel/plugin-transform-exponentiation-operator": ^7.12.13
-    "@babel/plugin-transform-for-of": ^7.13.0
-    "@babel/plugin-transform-function-name": ^7.12.13
-    "@babel/plugin-transform-literals": ^7.12.13
-    "@babel/plugin-transform-member-expression-literals": ^7.12.13
-    "@babel/plugin-transform-modules-amd": ^7.13.0
-    "@babel/plugin-transform-modules-commonjs": ^7.13.8
-    "@babel/plugin-transform-modules-systemjs": ^7.13.8
-    "@babel/plugin-transform-modules-umd": ^7.13.0
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.12.13
-    "@babel/plugin-transform-new-target": ^7.12.13
-    "@babel/plugin-transform-object-super": ^7.12.13
-    "@babel/plugin-transform-parameters": ^7.13.0
-    "@babel/plugin-transform-property-literals": ^7.12.13
-    "@babel/plugin-transform-regenerator": ^7.12.13
-    "@babel/plugin-transform-reserved-words": ^7.12.13
-    "@babel/plugin-transform-shorthand-properties": ^7.12.13
-    "@babel/plugin-transform-spread": ^7.13.0
-    "@babel/plugin-transform-sticky-regex": ^7.12.13
-    "@babel/plugin-transform-template-literals": ^7.13.0
-    "@babel/plugin-transform-typeof-symbol": ^7.12.13
-    "@babel/plugin-transform-unicode-escapes": ^7.12.13
-    "@babel/plugin-transform-unicode-regex": ^7.12.13
-    "@babel/preset-modules": ^0.1.4
-    "@babel/types": ^7.13.12
-    babel-plugin-polyfill-corejs2: ^0.1.4
-    babel-plugin-polyfill-corejs3: ^0.1.3
-    babel-plugin-polyfill-regenerator: ^0.1.2
-    core-js-compat: ^3.9.0
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e2215aca1207b7891e9b4055a565aa74a28b1715c154d6a41868515420cb9cac2f75e83cba22b9f781e33ee368a478f414b84f716c4f769c643b89fc72728d03
-  languageName: node
-  linkType: hard
-
 "@babel/preset-env@npm:7.17.10":
   version: 7.17.10
   resolution: "@babel/preset-env@npm:7.17.10"
@@ -3198,7 +2581,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:^7.12.11":
+"@babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:^7.16.11":
   version: 7.16.11
   resolution: "@babel/preset-env@npm:7.16.11"
   dependencies:
@@ -3295,7 +2678,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-modules@npm:^0.1.4, @babel/preset-modules@npm:^0.1.5":
+"@babel/preset-modules@npm:^0.1.5":
   version: 0.1.5
   resolution: "@babel/preset-modules@npm:0.1.5"
   dependencies:
@@ -3326,7 +2709,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-react@npm:^7.12.10":
+"@babel/preset-react@npm:^7.12.10, @babel/preset-react@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/preset-react@npm:7.16.7"
   dependencies:
@@ -3355,7 +2738,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:^7.12.7":
+"@babel/preset-typescript@npm:^7.12.7, @babel/preset-typescript@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/preset-typescript@npm:7.16.7"
   dependencies:
@@ -3401,17 +2784,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.12.13, @babel/template@npm:^7.15.4, @babel/template@npm:^7.3.3, @babel/template@npm:^7.4.0":
-  version: 7.15.4
-  resolution: "@babel/template@npm:7.15.4"
-  dependencies:
-    "@babel/code-frame": ^7.14.5
-    "@babel/parser": ^7.15.4
-    "@babel/types": ^7.15.4
-  checksum: 58ca51fdd40bbaaddf2e46513dd05d5823f214cb2877b3f353abf5541a033a1b6570c29c2c80e60f2b55966326e40bebbf53666b261646ccf410b3d984af42ce
-  languageName: node
-  linkType: hard
-
 "@babel/template@npm:^7.12.7, @babel/template@npm:^7.16.7":
   version: 7.16.7
   resolution: "@babel/template@npm:7.16.7"
@@ -3423,6 +2795,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.15.4, @babel/template@npm:^7.3.3":
+  version: 7.15.4
+  resolution: "@babel/template@npm:7.15.4"
+  dependencies:
+    "@babel/code-frame": ^7.14.5
+    "@babel/parser": ^7.15.4
+    "@babel/types": ^7.15.4
+  checksum: 58ca51fdd40bbaaddf2e46513dd05d5823f214cb2877b3f353abf5541a033a1b6570c29c2c80e60f2b55966326e40bebbf53666b261646ccf410b3d984af42ce
+  languageName: node
+  linkType: hard
+
 "@babel/template@npm:^7.16.0":
   version: 7.16.0
   resolution: "@babel/template@npm:7.16.0"
@@ -3434,23 +2817,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.13.13, @babel/traverse@npm:^7.15.4, @babel/traverse@npm:^7.4.3":
-  version: 7.15.4
-  resolution: "@babel/traverse@npm:7.15.4"
-  dependencies:
-    "@babel/code-frame": ^7.14.5
-    "@babel/generator": ^7.15.4
-    "@babel/helper-function-name": ^7.15.4
-    "@babel/helper-hoist-variables": ^7.15.4
-    "@babel/helper-split-export-declaration": ^7.15.4
-    "@babel/parser": ^7.15.4
-    "@babel/types": ^7.15.4
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: 831506a92c8ed76dc60504de37663bf5a553d7b1b009a94defc082cddb6c380c5487a1aa9438bcd7b9891a2a72758a63e4f878154aa70699d09b388b1445d774
-  languageName: node
-  linkType: hard
-
 "@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.17.0, @babel/traverse@npm:^7.17.3":
   version: 7.17.3
   resolution: "@babel/traverse@npm:7.17.3"
@@ -3469,6 +2835,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.15.4":
+  version: 7.15.4
+  resolution: "@babel/traverse@npm:7.15.4"
+  dependencies:
+    "@babel/code-frame": ^7.14.5
+    "@babel/generator": ^7.15.4
+    "@babel/helper-function-name": ^7.15.4
+    "@babel/helper-hoist-variables": ^7.15.4
+    "@babel/helper-split-export-declaration": ^7.15.4
+    "@babel/parser": ^7.15.4
+    "@babel/types": ^7.15.4
+    debug: ^4.1.0
+    globals: ^11.1.0
+  checksum: 831506a92c8ed76dc60504de37663bf5a553d7b1b009a94defc082cddb6c380c5487a1aa9438bcd7b9891a2a72758a63e4f878154aa70699d09b388b1445d774
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.7.2":
   version: 7.16.3
   resolution: "@babel/traverse@npm:7.16.3"
@@ -3540,7 +2923,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.13.12, @babel/types@npm:^7.13.14, @babel/types@npm:^7.15.4, @babel/types@npm:^7.15.6, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+"@babel/traverse@npm:^7.17.9":
+  version: 7.17.9
+  resolution: "@babel/traverse@npm:7.17.9"
+  dependencies:
+    "@babel/code-frame": ^7.16.7
+    "@babel/generator": ^7.17.9
+    "@babel/helper-environment-visitor": ^7.16.7
+    "@babel/helper-function-name": ^7.17.9
+    "@babel/helper-hoist-variables": ^7.16.7
+    "@babel/helper-split-export-declaration": ^7.16.7
+    "@babel/parser": ^7.17.9
+    "@babel/types": ^7.17.0
+    debug: ^4.1.0
+    globals: ^11.1.0
+  checksum: d907c71d1617589cc0cddc9837cb27bcb9b8f2117c379e13e72653745abe01da24e8c072bd0c91b9db33323ddb1086722756fbc50b487b2608733baf9dd6fd2c
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.15.4, @babel/types@npm:^7.15.6, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
   version: 7.15.6
   resolution: "@babel/types@npm:7.15.6"
   dependencies:
@@ -3772,10 +3173,94 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/convert-colors@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@csstools/convert-colors@npm:1.4.0"
-  checksum: 26069eeb845a506934c821c203feb97f5de634c5fbeb9978505a2271d6cfdb0ce400240fca9620a4ef2e68953928ea25aab92ea8454e0edf5cd074066d9ad57b
+"@csstools/postcss-color-function@npm:^1.0.3":
+  version: 1.1.0
+  resolution: "@csstools/postcss-color-function@npm:1.1.0"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": ^1.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 1378858848067fce67b5b7d1daeb3082bddeacddc588cea0fd85e5d7a0bb5cd4f43fea9b96fced2bc1c45171f8900d1f5ebfe13f574c360164c79e055868befb
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-font-format-keywords@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-font-format-keywords@npm:1.0.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.3
+  checksum: 4f41dccc46b51568b0517420d150ca105c31a2652f028f070e7457213f4e950420385d72ee869d75f592811da3a03cb46d11935d51f29b73d9ab24c10b3140e5
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-hwb-function@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-hwb-function@npm:1.0.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.3
+  checksum: 7d91ae87d40ece32d57f0fc0c777ff9256bb85c609e2c5e812dc9d9ea98688ea959c3d94b296f69135e99822db361ac447cb7f398a2daeebcc0203d0ee5961c9
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-ic-unit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-ic-unit@npm:1.0.0"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": ^1.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.3
+  checksum: d194b13a66027558d2d0dd3be3b795167b5e751bb3a3e62928c77ef1c524f0d672a7658852f07e589abbb64e827096eac00d9b6d7ec79e21006fd4f6f0b3ce87
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-is-pseudo-class@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "@csstools/postcss-is-pseudo-class@npm:2.0.2"
+  dependencies:
+    postcss-selector-parser: ^6.0.10
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 7118ae8f0fd72d43a7ba770103d8a2fd57fcd7f26972e2285c803fc1a48debd8ff07695132f1e5743a111b71b62d83083a6788c4150b37cf6ea5a550cf10e789
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-normalize-display-values@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-normalize-display-values@npm:1.0.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.3
+  checksum: 5751a171f3ccd5d411bf1945e306b7a3191a82a52743b65c9f04ec4beffc0e087c32f024929fb51e46388bd197545699e279d87a53acfbc40dd5594e862b24af
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-oklab-function@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "@csstools/postcss-oklab-function@npm:1.1.0"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": ^1.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: d59616e6acc0466ce87626c50b519a26391ac643d135c0316a4bfca27396c922b67a57cbe6adda3864123f8b9c1b48a0427e499a357887f5c0f3a0aa00b1b71b
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-progressive-custom-properties@npm:^1.1.0, @csstools/postcss-progressive-custom-properties@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:1.3.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.3
+  checksum: e281845fde5b8a80d06ec20147bd74e96a9351bebbec5e5c3a6fb37ea30a597ff84172601786a8a270662f58f708b4a3bf8d822d6318023def9773d2f6589962
   languageName: node
   linkType: hard
 
@@ -4197,6 +3682,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@es-joy/jsdoccomment@npm:~0.22.1":
+  version: 0.22.2
+  resolution: "@es-joy/jsdoccomment@npm:0.22.2"
+  dependencies:
+    comment-parser: 1.3.1
+    esquery: ^1.4.0
+    jsdoc-type-pratt-parser: ~2.2.5
+  checksum: 21c9f5b49ac5dce8086c759dba84f2d8e7dcf4f24b55bc1a110390c6b1d8ad0dde48ce5757662a00c7066ca50cea8e3d52f533504f7c0c3a839574db3e40bee5
+  languageName: node
+  linkType: hard
+
 "@es-joy/jsdoccomment@npm:~0.30.0":
   version: 0.30.0
   resolution: "@es-joy/jsdoccomment@npm:0.30.0"
@@ -4225,6 +3721,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/eslintrc@npm:^1.2.1":
+  version: 1.3.0
+  resolution: "@eslint/eslintrc@npm:1.3.0"
+  dependencies:
+    ajv: ^6.12.4
+    debug: ^4.3.2
+    espree: ^9.3.2
+    globals: ^13.15.0
+    ignore: ^5.2.0
+    import-fresh: ^3.2.1
+    js-yaml: ^4.1.0
+    minimatch: ^3.1.2
+    strip-json-comments: ^3.1.1
+  checksum: a1e734ad31a8b5328dce9f479f185fd4fc83dd7f06c538e1fa457fd8226b89602a55cc6458cd52b29573b01cdfaf42331be8cfc1fec732570086b591f4ed6515
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^1.2.3":
   version: 1.2.3
   resolution: "@eslint/eslintrc@npm:1.2.3"
@@ -4310,14 +3823,11 @@ __metadata:
     "@types/react": 17.0.30
     jquery: 3.5.1
     lodash: 4.17.21
-    pnp-webpack-plugin: ^1.7.0
     react: 17.0.1
     react-dom: 17.0.1
     react-hook-form: 7.5.3
     react-router-dom: ^5.2.0
-    ts-loader: 8.0.11
     tslib: 2.4.0
-    webpack: 5.58.1
   languageName: unknown
   linkType: soft
 
@@ -4464,25 +3974,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/eslint-config@npm:2.5.2":
-  version: 2.5.2
-  resolution: "@grafana/eslint-config@npm:2.5.2"
-  dependencies:
-    "@typescript-eslint/eslint-plugin": 5.10.0
-    "@typescript-eslint/parser": 5.10.0
-    eslint: 7.28.0
-    eslint-config-prettier: 8.3.0
-    eslint-plugin-jsdoc: 37.7.0
-    eslint-plugin-prettier: 4.0.0
-    eslint-plugin-react: 7.28.0
-    eslint-plugin-react-hooks: 4.3.0
-    prettier: 2.5.1
-    typescript: 4.4.4
-  checksum: 47b641ce48175d5f0801174a07dc72bb3adc4e2bb2d85383361372b129a9ade0ead838faf4012e0af51ffaac63b0d24229977f05aeb36df5a172aa42cda519db
-  languageName: node
-  linkType: hard
-
-"@grafana/eslint-config@npm:3.0.0":
+"@grafana/eslint-config@npm:3.0.0, @grafana/eslint-config@npm:^3.0.0":
   version: 3.0.0
   resolution: "@grafana/eslint-config@npm:3.0.0"
   dependencies:
@@ -4617,83 +4109,93 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
   dependencies:
-    "@babel/core": 7.13.14
-    "@babel/preset-env": 7.13.12
+    "@babel/core": ^7.17.8
+    "@babel/plugin-proposal-class-properties": 7.16.7
+    "@babel/plugin-proposal-nullish-coalescing-operator": 7.16.7
+    "@babel/plugin-proposal-object-rest-spread": 7.17.3
+    "@babel/plugin-proposal-optional-chaining": 7.16.7
+    "@babel/plugin-syntax-dynamic-import": 7.8.3
+    "@babel/plugin-transform-react-constant-elements": 7.17.6
+    "@babel/plugin-transform-runtime": 7.17.0
+    "@babel/plugin-transform-typescript": 7.16.8
+    "@babel/preset-env": ^7.16.11
+    "@babel/preset-react": ^7.16.7
+    "@babel/preset-typescript": ^7.16.7
     "@grafana/data": 9.0.0-beta.1
-    "@grafana/eslint-config": 2.5.2
+    "@grafana/eslint-config": ^3.0.0
     "@grafana/tsconfig": ^1.2.0-rc1
     "@grafana/ui": 9.0.0-beta.1
-    "@jest/core": 26.6.3
-    "@rushstack/eslint-patch": 1.0.6
+    "@jest/core": 27.5.1
     "@types/command-exists": ^1.2.0
-    "@types/eslint": 7.28.0
+    "@types/eslint": 8.4.1
     "@types/fs-extra": ^9.0.13
-    "@types/inquirer": ^8.0.0
-    "@types/jest": 27.0.2
-    "@types/lodash": 4.14.149
-    "@types/node": ^16.0.0
-    "@types/prettier": ^2.4.0
-    "@types/react-dev-utils": ^9.0.4
-    "@types/rimraf": ^3.0.0
-    "@types/semver": ^7.0.0
-    "@types/tmp": ^0.1.0
-    "@types/webpack": 4.41.7
-    "@typescript-eslint/eslint-plugin": 4.28.0
-    "@typescript-eslint/parser": 4.28.0
-    axios: 0.26.1
-    babel-jest: 26.6.3
-    babel-loader: 8.2.2
+    "@types/inquirer": ^8.2.1
+    "@types/jest": 27.4.1
+    "@types/lodash": 4.14.181
+    "@types/node": 16.11.26
+    "@types/prettier": 2.6.0
+    "@types/react-dev-utils": 9.0.10
+    "@types/rimraf": 3.0.2
+    "@types/semver": 7.3.9
+    "@types/tmp": 0.2.3
+    "@typescript-eslint/eslint-plugin": 5.16.0
+    "@typescript-eslint/parser": 5.16.0
+    axios: ^0.26.1
+    babel-jest: 27.5.1
+    babel-loader: ^8.2.4
     babel-plugin-angularjs-annotate: 0.10.0
-    chalk: ^4.0.0
-    command-exists: ^1.2.8
-    commander: ^8.0.0
-    concurrently: 6.3.0
-    copy-webpack-plugin: 5.1.2
-    css-loader: 3.4.2
-    eslint: 7.28.0
+    chalk: ^4.1.2
+    command-exists: ^1.2.9
+    commander: ^9.2.0
+    copy-webpack-plugin: ^9.0.1
+    css-loader: ^6.7.1
+    css-minimizer-webpack-plugin: ^3.4.1
+    eslint: 8.11.0
+    eslint-config-prettier: 8.5.0
+    eslint-plugin-jsdoc: 38.0.6
+    eslint-plugin-react: 7.29.4
+    eslint-plugin-react-hooks: 4.3.0
     execa: ^5.1.1
-    file-loader: 6.2.0
-    fork-ts-checker-webpack-plugin: 6.4.0
+    file-loader: ^6.2.0
+    fork-ts-checker-webpack-plugin: ^7.2.1
     fs-extra: ^10.0.0
-    globby: ^10.0.1
-    html-loader: 0.5.5
-    html-webpack-plugin: ^3.2.0
-    inquirer: ^8.0.0
-    jest: 26.6.3
-    jest-canvas-mock: 2.3.0
+    globby: ^11.0.4
+    html-loader: ^3.1.0
+    html-webpack-plugin: ^5.5.0
+    inquirer: ^8.2.2
+    jest: 27.5.1
+    jest-canvas-mock: 2.3.1
     jest-coverage-badges: ^1.1.2
-    jest-environment-jsdom-fifteen: ^1.0.2
-    jest-junit: ^13.0.0
-    less: ^3.11.1
-    less-loader: ^5.0.0
-    lodash: 4.17.21
+    jest-junit: 13.1.0
+    less: ^4.1.2
+    less-loader: ^10.2.0
+    lodash: ^4.17.21
     md5-file: ^5.0.0
-    mini-css-extract-plugin: ^0.7.0
-    optimize-css-assets-webpack-plugin: 6.0.1
-    ora: ^4.0.3
-    pixelmatch: ^5.1.0
+    mini-css-extract-plugin: ^2.6.0
+    ora: ^5.4.1
+    pixelmatch: ^5.2.1
     pngjs: ^6.0.0
-    postcss-flexbugs-fixes: 4.2.0
-    postcss-loader: 3.0.0
-    postcss-preset-env: 6.7.0
+    postcss: ^8.4.12
+    postcss-flexbugs-fixes: ^5.0.2
+    postcss-loader: ^6.2.1
+    postcss-preset-env: 7.4.3
     prettier: 2.6.0
     react-dev-utils: ^12.0.0
-    replace-in-file: ^4.1.0
-    replace-in-file-webpack-plugin: ^1.0.6
-    rimraf: ^3.0.0
-    sass: 1.27.0
-    sass-loader: 8.0.2
-    semver: ^7.1.3
-    simple-git: ^3.5.0
-    style-loader: 1.1.3
-    terser-webpack-plugin: 2.3.7
-    ts-jest: 26.4.4
-    ts-loader: 6.2.1
-    ts-node: 9.0.0
+    replace-in-file-webpack-plugin: 1.0.6
+    rimraf: 3.0.2
+    sass: ^1.49.9
+    sass-loader: ^12.6.0
+    semver: ^7.3.7
+    simple-git: ^3.6.0
+    style-loader: ^3.3.1
+    terser-webpack-plugin: ^5.3.1
+    ts-jest: 27.1.3
+    ts-loader: ^9.2.8
+    ts-node: ^9.1.0
     tslib: 2.4.0
     typescript: 4.6.4
-    url-loader: ^2.0.1
-    webpack: 4.41.5
+    url-loader: ^4.1.1
+    webpack: ^5.72.0
   bin:
     grafana-toolkit: ./bin/grafana-toolkit.js
   languageName: unknown
@@ -4995,31 +4497,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@jest/console@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "@jest/console@npm:24.9.0"
-  dependencies:
-    "@jest/source-map": ^24.9.0
-    chalk: ^2.0.1
-    slash: ^2.0.0
-  checksum: ee6468c4aeeb8752126e92e20b0ffbf32abda731e9b7865b63b60bd569c3536e9c901efcec4d81c506a7c6fea2a970ace8262190961aba31dedbfeaa3459d78b
-  languageName: node
-  linkType: hard
-
-"@jest/console@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/console@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    chalk: ^4.0.0
-    jest-message-util: ^26.6.2
-    jest-util: ^26.6.2
-    slash: ^3.0.0
-  checksum: 69a9ca6ba357d7634fd537e3b87c64369865ffb59f57fe6661223088bd62273d0c1d660fefce3625a427f42a37d32590f6b291e1295ea6d6b7cb31ddae36a737
-  languageName: node
-  linkType: hard
-
 "@jest/console@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/console@npm:27.5.1"
@@ -5034,43 +4511,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/core@npm:26.6.3, @jest/core@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "@jest/core@npm:26.6.3"
-  dependencies:
-    "@jest/console": ^26.6.2
-    "@jest/reporters": ^26.6.2
-    "@jest/test-result": ^26.6.2
-    "@jest/transform": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    ansi-escapes: ^4.2.1
-    chalk: ^4.0.0
-    exit: ^0.1.2
-    graceful-fs: ^4.2.4
-    jest-changed-files: ^26.6.2
-    jest-config: ^26.6.3
-    jest-haste-map: ^26.6.2
-    jest-message-util: ^26.6.2
-    jest-regex-util: ^26.0.0
-    jest-resolve: ^26.6.2
-    jest-resolve-dependencies: ^26.6.3
-    jest-runner: ^26.6.3
-    jest-runtime: ^26.6.3
-    jest-snapshot: ^26.6.2
-    jest-util: ^26.6.2
-    jest-validate: ^26.6.2
-    jest-watcher: ^26.6.2
-    micromatch: ^4.0.2
-    p-each-series: ^2.1.0
-    rimraf: ^3.0.0
-    slash: ^3.0.0
-    strip-ansi: ^6.0.0
-  checksum: f52b26ffe9b923ed67b3ff30e170b3a434d4263990f78d96cd43acbd0aa8ad36aecad2f1822f376da3a80228714fd6b7f7acd51744133cfcd2780ba0e3da537b
-  languageName: node
-  linkType: hard
-
-"@jest/core@npm:^27.5.1":
+"@jest/core@npm:27.5.1, @jest/core@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/core@npm:27.5.1"
   dependencies:
@@ -5111,30 +4552,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^24.3.0":
-  version: 24.9.0
-  resolution: "@jest/environment@npm:24.9.0"
-  dependencies:
-    "@jest/fake-timers": ^24.9.0
-    "@jest/transform": ^24.9.0
-    "@jest/types": ^24.9.0
-    jest-mock: ^24.9.0
-  checksum: 6a663c05713ad0cd1dc7c5bf715a3e5e655e73ee02497ab0a9dea4fe0855226504535c504d265c054c8b4bafb1216dff0e7e0e3b4ed064bda4c3d6efe74fe369
-  languageName: node
-  linkType: hard
-
-"@jest/environment@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/environment@npm:26.6.2"
-  dependencies:
-    "@jest/fake-timers": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    jest-mock: ^26.6.2
-  checksum: 7748081b2a758161785aff161780b05084dccaff908c8ed82c04f7da5d5e5439e77b5eb667306d5c4e1422653c7a67ed2955f26704f48c65c404195e1e21780a
-  languageName: node
-  linkType: hard
-
 "@jest/environment@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/environment@npm:27.5.1"
@@ -5147,31 +4564,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^24.3.0, @jest/fake-timers@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "@jest/fake-timers@npm:24.9.0"
-  dependencies:
-    "@jest/types": ^24.9.0
-    jest-message-util: ^24.9.0
-    jest-mock: ^24.9.0
-  checksum: d49ab33e28b070d5be75659ed89d4b79e74012c8c28ecf51cf9b89732ba5b2a57129787dd144949c048a0460ed62f1e32079a4b10d896c75bde024699d7a2c5c
-  languageName: node
-  linkType: hard
-
-"@jest/fake-timers@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/fake-timers@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    "@sinonjs/fake-timers": ^6.0.1
-    "@types/node": "*"
-    jest-message-util: ^26.6.2
-    jest-mock: ^26.6.2
-    jest-util: ^26.6.2
-  checksum: c732658fac4014a424e6629495296c3b2e8697787518df34c74539ec139625e7141ad792b8a4d3c8392b47954ad01be9846b7c57cc8c631490969e7cafa84e6a
-  languageName: node
-  linkType: hard
-
 "@jest/fake-timers@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/fake-timers@npm:27.5.1"
@@ -5186,17 +4578,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/globals@npm:26.6.2"
-  dependencies:
-    "@jest/environment": ^26.6.2
-    "@jest/types": ^26.6.2
-    expect: ^26.6.2
-  checksum: 49b28d0cc7e99898eeaf23e6899e3c9ee25a2a4831caa3eb930ec1722de2e92a0e8a6a6f649438fdd20ff0c0d5e522dd78cb719466a57f011a88d60419b903c5
-  languageName: node
-  linkType: hard
-
 "@jest/globals@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/globals@npm:27.5.1"
@@ -5208,42 +4589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/reporters@npm:26.6.2"
-  dependencies:
-    "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^26.6.2
-    "@jest/test-result": ^26.6.2
-    "@jest/transform": ^26.6.2
-    "@jest/types": ^26.6.2
-    chalk: ^4.0.0
-    collect-v8-coverage: ^1.0.0
-    exit: ^0.1.2
-    glob: ^7.1.2
-    graceful-fs: ^4.2.4
-    istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-instrument: ^4.0.3
-    istanbul-lib-report: ^3.0.0
-    istanbul-lib-source-maps: ^4.0.0
-    istanbul-reports: ^3.0.2
-    jest-haste-map: ^26.6.2
-    jest-resolve: ^26.6.2
-    jest-util: ^26.6.2
-    jest-worker: ^26.6.2
-    node-notifier: ^8.0.0
-    slash: ^3.0.0
-    source-map: ^0.6.0
-    string-length: ^4.0.1
-    terminal-link: ^2.0.0
-    v8-to-istanbul: ^7.0.0
-  dependenciesMeta:
-    node-notifier:
-      optional: true
-  checksum: 53c7a697c562becb7682a9a6248ea553013bf7048c08ddce5bf9fb53b975fc9f799ca163f7494e0be6c4d3cf181c8bc392976268da52b7de8ce4470b971ed84e
-  languageName: node
-  linkType: hard
-
 "@jest/reporters@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/reporters@npm:27.5.1"
@@ -5282,28 +4627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/source-map@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "@jest/source-map@npm:24.9.0"
-  dependencies:
-    callsites: ^3.0.0
-    graceful-fs: ^4.1.15
-    source-map: ^0.6.0
-  checksum: 00479faf6854d5d183b94465db1a0876980ced72bf26cb6a2fe8c04977dc2692e6529faa6b64269492d1d9cab51feebaac9d453d1e6bb1306fc15777143b72af
-  languageName: node
-  linkType: hard
-
-"@jest/source-map@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/source-map@npm:26.6.2"
-  dependencies:
-    callsites: ^3.0.0
-    graceful-fs: ^4.2.4
-    source-map: ^0.6.0
-  checksum: b171cef442738887dda85527ab78229996db5946c6435ddb56d442c2851889ba493729a9de73100f1a31b9a31a91207b55bc75656ae7df9843d65078b925385e
-  languageName: node
-  linkType: hard
-
 "@jest/source-map@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/source-map@npm:27.5.1"
@@ -5315,29 +4638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "@jest/test-result@npm:24.9.0"
-  dependencies:
-    "@jest/console": ^24.9.0
-    "@jest/types": ^24.9.0
-    "@types/istanbul-lib-coverage": ^2.0.0
-  checksum: 7145c7baa289798881160b3cfa5b2466b2636238a52b77cf46e5468ffe2881fb8fb8d4966155a8d508b26a8d29a302a9eb9037de1a371e5dc9bb6e94837c0ae7
-  languageName: node
-  linkType: hard
-
-"@jest/test-result@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/test-result@npm:26.6.2"
-  dependencies:
-    "@jest/console": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/istanbul-lib-coverage": ^2.0.0
-    collect-v8-coverage: ^1.0.0
-  checksum: dcb6175825231e9377e43546aed4edd6acc22f1788d5f099bbba36bb55b9115a92f760e88426c076bcdeff5a50d8f697327a920db0cd1fb339781fc3713fa8c7
-  languageName: node
-  linkType: hard
-
 "@jest/test-result@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/test-result@npm:27.5.1"
@@ -5350,19 +4650,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "@jest/test-sequencer@npm:26.6.3"
-  dependencies:
-    "@jest/test-result": ^26.6.2
-    graceful-fs: ^4.2.4
-    jest-haste-map: ^26.6.2
-    jest-runner: ^26.6.3
-    jest-runtime: ^26.6.3
-  checksum: a3450b3d7057f74da1828bb7b3658f228a7c049dc4082c5c49b8bafbd8f69d102a8a99007b7ed5d43464712f7823f53fe3564fda17787f178c219cccf329a461
-  languageName: node
-  linkType: hard
-
 "@jest/test-sequencer@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/test-sequencer@npm:27.5.1"
@@ -5375,30 +4662,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "@jest/transform@npm:24.9.0"
-  dependencies:
-    "@babel/core": ^7.1.0
-    "@jest/types": ^24.9.0
-    babel-plugin-istanbul: ^5.1.0
-    chalk: ^2.0.1
-    convert-source-map: ^1.4.0
-    fast-json-stable-stringify: ^2.0.0
-    graceful-fs: ^4.1.15
-    jest-haste-map: ^24.9.0
-    jest-regex-util: ^24.9.0
-    jest-util: ^24.9.0
-    micromatch: ^3.1.10
-    pirates: ^4.0.1
-    realpath-native: ^1.1.0
-    slash: ^2.0.0
-    source-map: ^0.6.1
-    write-file-atomic: 2.4.1
-  checksum: 0153bcd6a9b464c85ee8b67c360f745ab8e41b1b363220f1f12ed644a667dceb6666366017f7f849a8f6cde960020b638b8557eae852af0537520b0903881fbd
-  languageName: node
-  linkType: hard
-
 "@jest/transform@npm:^26.6.2":
   version: 26.6.2
   resolution: "@jest/transform@npm:26.6.2"
@@ -5445,17 +4708,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^24.3.0, @jest/types@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "@jest/types@npm:24.9.0"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^1.1.1
-    "@types/yargs": ^13.0.0
-  checksum: 603698f774cf22f9d16a0e0fac9e10e7db21052aebfa33db154c8a5940e0eb1fa9c079a8c91681041ad3aeee2adfa950608dd0c663130316ba034b8bca7b301c
-  languageName: node
-  linkType: hard
-
 "@jest/types@npm:^26.6.2":
   version: 26.6.2
   resolution: "@jest/types@npm:26.6.2"
@@ -7768,13 +7020,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rushstack/eslint-patch@npm:1.0.6":
-  version: 1.0.6
-  resolution: "@rushstack/eslint-patch@npm:1.0.6"
-  checksum: fbecc15d7e95186622514d86f566082f1f6d04c30d93830bffe154fd699780f32120bbbce2efb919658696af01c58f0e02e580941ede8eee8cc9b007637b639c
-  languageName: node
-  linkType: hard
-
 "@rushstack/node-core-library@npm:3.45.5":
   version: 3.45.5
   resolution: "@rushstack/node-core-library@npm:3.45.5"
@@ -7954,15 +7199,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinonjs/fake-timers@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "@sinonjs/fake-timers@npm:6.0.1"
-  dependencies:
-    "@sinonjs/commons": ^1.7.0
-  checksum: 8e331aa1412d905ecc8efd63550f58a6f77dcb510f878172004e53be63eb82650623618763001a918fc5e21257b86c45041e4e97c454ed6a2d187de084abbd11
-  languageName: node
-  linkType: hard
-
 "@sinonjs/fake-timers@npm:^8.0.1":
   version: 8.1.0
   resolution: "@sinonjs/fake-timers@npm:8.1.0"
@@ -9621,13 +8857,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/anymatch@npm:*":
-  version: 1.3.1
-  resolution: "@types/anymatch@npm:1.3.1"
-  checksum: 1eeb16286102a98eda415e1ade6fb980ff0a001fc21e777af8932001ebbd324d0d2fbbd5ef51c828346ff71847ba00af3f73d1dfea434efb9b72467b8cf0343a
-  languageName: node
-  linkType: hard
-
 "@types/argparse@npm:1.0.38":
   version: 1.0.38
   resolution: "@types/argparse@npm:1.0.38"
@@ -9642,7 +8871,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.7":
+"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14":
   version: 7.1.16
   resolution: "@types/babel__core@npm:7.1.16"
   dependencies:
@@ -10165,16 +9394,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint-scope@npm:^3.7.0":
-  version: 3.7.1
-  resolution: "@types/eslint-scope@npm:3.7.1"
-  dependencies:
-    "@types/eslint": "*"
-    "@types/estree": "*"
-  checksum: 4271c9adad19ad8a1d23062d9020468a51c7f81594b12b8e68f7d460c09e14d57cae3e82b077c402766369c0c17e2de72da72c405fa465d18a46c0b14ce92530
-  languageName: node
-  linkType: hard
-
 "@types/eslint-scope@npm:^3.7.3":
   version: 3.7.3
   resolution: "@types/eslint-scope@npm:3.7.3"
@@ -10195,13 +9414,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:7.28.0":
-  version: 7.28.0
-  resolution: "@types/eslint@npm:7.28.0"
+"@types/eslint@npm:8.4.1":
+  version: 8.4.1
+  resolution: "@types/eslint@npm:8.4.1"
   dependencies:
     "@types/estree": "*"
     "@types/json-schema": "*"
-  checksum: 75ac2577d2a2e35bae66f56d2d1c871d5e836b2721cf14bd3df450c9d584eba48fa3b1013fba710245bf4795f16e1df0ed315e543e3199c4815ee4782537d0ae
+  checksum: b5790997ee9d3820d16350192d41849b0e2448c9e93650acac672ddf502e35c0a5a25547172a9eec840a96687cd94ba1cee672cbd86640f8f4ff1b65960d2ab9
   languageName: node
   linkType: hard
 
@@ -10215,7 +9434,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^0.0.50":
+"@types/estree@npm:*":
   version: 0.0.50
   resolution: "@types/estree@npm:0.0.50"
   checksum: 9a2b6a4a8c117f34d08fbda5e8f69b1dfb109f7d149b60b00fd7a9fb6ac545c078bc590aa4ec2f0a256d680cf72c88b3b28b60c326ee38a7bc8ee1ee95624922
@@ -10415,13 +9634,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/inquirer@npm:^8.0.0":
-  version: 8.1.3
-  resolution: "@types/inquirer@npm:8.1.3"
+"@types/inquirer@npm:^8.2.1":
+  version: 8.2.1
+  resolution: "@types/inquirer@npm:8.2.1"
   dependencies:
     "@types/through": "*"
     rxjs: ^7.2.0
-  checksum: b2f9914d1380e60a9a6d890abdd24078db63069a4bd974e77a00c5660bf5cab33a60fba6f02b56f1b2e6418e287e4697361b12cb85704b13e76f1a23c934d203
+  checksum: 5362d0b1cbec3887c9d5a671a0b19c58cf54066456c8967dd7ee799dfcc242cc8cd8959440c0f2fe7768becaf721b45fd30c222e6b9bcca378f45c68af43bab5
   languageName: node
   linkType: hard
 
@@ -10455,16 +9674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/istanbul-reports@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "@types/istanbul-reports@npm:1.1.2"
-  dependencies:
-    "@types/istanbul-lib-coverage": "*"
-    "@types/istanbul-lib-report": "*"
-  checksum: 00866e815d1e68d0a590d691506937b79d8d65ad8eab5ed34dbfee66136c7c0f4ea65327d32046d5fe469f22abea2b294987591dc66365ebc3991f7e413b2d78
-  languageName: node
-  linkType: hard
-
 "@types/istanbul-reports@npm:^3.0.0":
   version: 3.0.1
   resolution: "@types/istanbul-reports@npm:3.0.1"
@@ -10474,7 +9683,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:*, @types/jest@npm:27.0.2":
+"@types/jest@npm:*":
   version: 27.0.2
   resolution: "@types/jest@npm:27.0.2"
   dependencies:
@@ -10494,16 +9703,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:26.x":
-  version: 26.0.24
-  resolution: "@types/jest@npm:26.0.24"
-  dependencies:
-    jest-diff: ^26.0.0
-    pretty-format: ^26.0.0
-  checksum: ae39675412f08d884926254e9b12bfd2b5a4e4d204c94d3148cb942174a474930d0c60540133c968f22241d4712b7940c96cbc883096eb326a4d5b206fb78bd0
-  languageName: node
-  linkType: hard
-
 "@types/jest@npm:27.4.1":
   version: 27.4.1
   resolution: "@types/jest@npm:27.4.1"
@@ -10537,7 +9736,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
   version: 7.0.9
   resolution: "@types/json-schema@npm:7.0.9"
   checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705
@@ -10583,6 +9782,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash@npm:4.14.181":
+  version: 4.14.181
+  resolution: "@types/lodash@npm:4.14.181"
+  checksum: 0d1863d8383fd2f8bb42e9e3fc1d6255bb88ff034d6df848941063698944313dae944fc1270315613e3d303fae7c7a9a86085ad3235ed6204c56c4b0b3699aa9
+  languageName: node
+  linkType: hard
+
 "@types/lodash@npm:4.14.182":
   version: 4.14.182
   resolution: "@types/lodash@npm:4.14.182"
@@ -10674,7 +9880,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^16.0.0":
+"@types/node@npm:*, @types/node@npm:>=13.7.0":
   version: 16.11.6
   resolution: "@types/node@npm:16.11.6"
   checksum: 6e19634766ff589d3d2f361c2196b671f8f133cdadc5ad347a621c360d8994b6c4fbccfb2ad9c60c588c593831a96497c9c6b77d2b7e91be723384b94f6368e7
@@ -10688,6 +9894,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:16.11.26":
+  version: 16.11.26
+  resolution: "@types/node@npm:16.11.26"
+  checksum: 57757caaba3f0d95de82198cb276a1002c49b710108c932a1d02d7c91ff2fa57cfe2dd19fde60853b6dd90b0964b3cf35557981d2628e20aed6a909057aedfe6
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:16.11.36":
   version: 16.11.36
   resolution: "@types/node@npm:16.11.36"
@@ -10760,10 +9973,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2.0.0, @types/prettier@npm:^2.4.0":
-  version: 2.4.1
-  resolution: "@types/prettier@npm:2.4.1"
-  checksum: df330c2d6fe7c282839b0f17701e069a9c6c96d2ff54704e933a1b3c1b98844d963a7cb00c5629d173604892ceee802312bbaeb8a97f5da21e13db8f653b519e
+"@types/prettier@npm:2.6.0":
+  version: 2.6.0
+  resolution: "@types/prettier@npm:2.6.0"
+  checksum: 946f1f82ce6f31664e023a5d65931c31b7d677b454f528f67dce851d72e7fcfe713076f4251b16c3646eecf1545f5f5b909b4962966341ed9ddf5b80113b3674
   languageName: node
   linkType: hard
 
@@ -10854,16 +10067,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dev-utils@npm:^9.0.4":
-  version: 9.0.8
-  resolution: "@types/react-dev-utils@npm:9.0.8"
+"@types/react-dev-utils@npm:9.0.10":
+  version: 9.0.10
+  resolution: "@types/react-dev-utils@npm:9.0.10"
   dependencies:
     "@types/eslint": "*"
     "@types/express": "*"
     "@types/html-webpack-plugin": "*"
     "@types/webpack": ^4
-    "@types/webpack-dev-server": ^3
-  checksum: d7b6cdc89a37111416962348a893ea179d93ff2fac4963ef0c90f22c6f7f95e9de592c0237ef1bc20639b5beaf3f769ee771582172fd3da6984e5e526f6ce790
+    "@types/webpack-dev-server": 3
+  checksum: b8aecccc7c0aa3d644f832f72b6e5c378c232c8b72c5671f5e39f37364fb46d362b6877ca728f4a136e0af2b341485fad2ed10b1394efa42568284cbb9c61b61
   languageName: node
   linkType: hard
 
@@ -11142,7 +10355,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/rimraf@npm:^3.0.0":
+"@types/rimraf@npm:3.0.2":
   version: 3.0.2
   resolution: "@types/rimraf@npm:3.0.2"
   dependencies:
@@ -11159,7 +10372,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:7.3.9, @types/semver@npm:^7.0.0":
+"@types/semver@npm:7.3.9":
   version: 7.3.9
   resolution: "@types/semver@npm:7.3.9"
   checksum: 60bfcfdfa7f937be2c6f4b37ddb6714fb0f27b05fe4cbdfdd596a97d35ed95d13ee410efdd88e72a66449d0384220bf20055ab7d6b5df10de4990fbd20e5cbe0
@@ -11243,13 +10456,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/stack-utils@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@types/stack-utils@npm:1.0.1"
-  checksum: 9dc052b575acfeca3f165fb19d87b7b2989d54ed7d64a7eeb0b7587bc5795ef1f2c2b1511a44dcf0831ef35b8ce3486f97fcbfdd50c01f68aa297de31502c9d9
-  languageName: node
-  linkType: hard
-
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.1
   resolution: "@types/stack-utils@npm:2.0.1"
@@ -11264,15 +10470,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/tapable@npm:*":
-  version: 2.2.2
-  resolution: "@types/tapable@npm:2.2.2"
-  dependencies:
-    tapable: ^2.2.0
-  checksum: 879954a0cdc40b50728421d62108d7037d260ad8c0cf922ab1baa417249c46d82749dab954a1f49fdb292b483b19956f2ec36fc3305114e45874efb55d782a2e
-  languageName: node
-  linkType: hard
-
 "@types/tapable@npm:^1, @types/tapable@npm:^1.0.5":
   version: 1.0.8
   resolution: "@types/tapable@npm:1.0.8"
@@ -11323,10 +10520,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/tmp@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@types/tmp@npm:0.1.0"
-  checksum: 14f894120775e639e27dab3f7c1ab2186911e8f61e2b7a12c9600374ddcbc26dd966544879055feea863bb68a28cb738ae5b3556a564b104177af6a1942a6d97
+"@types/tmp@npm:0.2.3":
+  version: 0.2.3
+  resolution: "@types/tmp@npm:0.2.3"
+  checksum: 0ca45e99b3b3c6959d5c4f4555f73c8007db540cfb0fbbb9373217f9ab85e67eef75193f51a1d6564b0ee6c6f5ffa259d1034d7f7530a5b7ce80acb94cfc4daa
   languageName: node
   linkType: hard
 
@@ -11360,7 +10557,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack-dev-server@npm:^3":
+"@types/webpack-dev-server@npm:3":
   version: 3.11.6
   resolution: "@types/webpack-dev-server@npm:3.11.6"
   dependencies:
@@ -11391,20 +10588,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack@npm:4.41.7":
-  version: 4.41.7
-  resolution: "@types/webpack@npm:4.41.7"
-  dependencies:
-    "@types/anymatch": "*"
-    "@types/node": "*"
-    "@types/tapable": "*"
-    "@types/uglify-js": "*"
-    "@types/webpack-sources": "*"
-    source-map: ^0.6.0
-  checksum: 1112a357095f82896ad48608bed7ec800ef32cf08cb6fcb98ea579eec735c2e223f7d8b8d3aedc2e36981d6bedb8a258a028310adcc0067d923a7f56677387fc
-  languageName: node
-  linkType: hard
-
 "@types/webpack@npm:^4":
   version: 4.41.31
   resolution: "@types/webpack@npm:4.41.31"
@@ -11449,15 +10632,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:^13.0.0":
-  version: 13.0.12
-  resolution: "@types/yargs@npm:13.0.12"
-  dependencies:
-    "@types/yargs-parser": "*"
-  checksum: 4eb34d8c071892299646e5a3fb02a643f5a5ea8da8f4d1817001882ebbcfa4fbda235b8978732f8eb55fa16433296e2087907fe69678a69125f0dca627a91426
-  languageName: node
-  linkType: hard
-
 "@types/yargs@npm:^15.0.0":
   version: 15.0.14
   resolution: "@types/yargs@npm:15.0.14"
@@ -11485,27 +10659,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:4.28.0"
-  dependencies:
-    "@typescript-eslint/experimental-utils": 4.28.0
-    "@typescript-eslint/scope-manager": 4.28.0
-    debug: ^4.3.1
-    functional-red-black-tree: ^1.0.1
-    regexpp: ^3.1.0
-    semver: ^7.3.5
-    tsutils: ^3.21.0
-  peerDependencies:
-    "@typescript-eslint/parser": ^4.0.0
-    eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: fb52430e3a219e45c014c8a8407ccd2830da45e6fc134d0138b99faf45e580d3ad9a3405cad98726183779d94640366c532e4519783a2a99fe072dc73705b8ad
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/eslint-plugin@npm:5.10.0":
   version: 5.10.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.10.0"
@@ -11529,6 +10682,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/eslint-plugin@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.16.0"
+  dependencies:
+    "@typescript-eslint/scope-manager": 5.16.0
+    "@typescript-eslint/type-utils": 5.16.0
+    "@typescript-eslint/utils": 5.16.0
+    debug: ^4.3.2
+    functional-red-black-tree: ^1.0.1
+    ignore: ^5.1.8
+    regexpp: ^3.2.0
+    semver: ^7.3.5
+    tsutils: ^3.21.0
+  peerDependencies:
+    "@typescript-eslint/parser": ^5.0.0
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 4007cc1599503424037300e7401fb969ca441b122ef8a8f2fc8d70f84d656fdf7ab7b0d00e506a3aaf702871616c3756da17eb1508ff315dfb25170f2d28a904
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/eslint-plugin@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.25.0"
@@ -11552,39 +10728,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/experimental-utils@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/experimental-utils@npm:4.28.0"
-  dependencies:
-    "@types/json-schema": ^7.0.7
-    "@typescript-eslint/scope-manager": 4.28.0
-    "@typescript-eslint/types": 4.28.0
-    "@typescript-eslint/typescript-estree": 4.28.0
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: "*"
-  checksum: 29bcee0d581ad20043532b6b1fa0c2e844ab35a99aa67478fbb68b7be5889dc8aee1f52b72c3a51d8f4cf57e1f0ac664d92738b3eb5aea9aa8a8c72aa30a74b7
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/parser@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/parser@npm:4.28.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": 4.28.0
-    "@typescript-eslint/types": 4.28.0
-    "@typescript-eslint/typescript-estree": 4.28.0
-    debug: ^4.3.1
-  peerDependencies:
-    eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 08c167db5c36776a638afe52130e0bf20bfc94598da3f178171cfafb72703fc508b17667b4584cd6bea4c8c6d6922af8f7a45e9a7d6419f83fe2f6c893845d96
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/parser@npm:5.10.0":
   version: 5.10.0
   resolution: "@typescript-eslint/parser@npm:5.10.0"
@@ -11602,6 +10745,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/parser@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/parser@npm:5.16.0"
+  dependencies:
+    "@typescript-eslint/scope-manager": 5.16.0
+    "@typescript-eslint/types": 5.16.0
+    "@typescript-eslint/typescript-estree": 5.16.0
+    debug: ^4.3.2
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 40006578e9ac451c80dc4b4b7e29af97b53fb9e9ea660d6ca17fb98b5c9858c648f9b17523c9de9b9b9e4155af17b65435e6163f02c4a2dfacf48274f45cba21
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/parser@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/parser@npm:5.25.0"
@@ -11619,16 +10779,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/scope-manager@npm:4.28.0"
-  dependencies:
-    "@typescript-eslint/types": 4.28.0
-    "@typescript-eslint/visitor-keys": 4.28.0
-  checksum: cdab7ef35e18cf2c9a25a4e588cb464bd7e6a3e3f9a7dceaa567fa04202b68901b5c9dc108c3ff7b92215c373274c9d105b8061ae97d2600039345c53d33a4ae
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:5.10.0":
   version: 5.10.0
   resolution: "@typescript-eslint/scope-manager@npm:5.10.0"
@@ -11649,6 +10799,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.16.0"
+  dependencies:
+    "@typescript-eslint/types": 5.16.0
+    "@typescript-eslint/visitor-keys": 5.16.0
+  checksum: 008a6607d3e6ebcc59a9b28cddcc25703f39a88e27a96c69a6d988acc50a1ea7dbf50963c165ffa5b85a101209a0da3a7ec6832633a162ca4ecc78c0e54acd9f
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/scope-manager@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/scope-manager@npm:5.25.0"
@@ -11675,6 +10835,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/type-utils@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/type-utils@npm:5.16.0"
+  dependencies:
+    "@typescript-eslint/utils": 5.16.0
+    debug: ^4.3.2
+    tsutils: ^3.21.0
+  peerDependencies:
+    eslint: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 86d9f1dff6a096c8465453b8c7d0cc667b87a769f19073bfa9bbd36f8baa772c0384ec396b1132052383846bbbcf0d051345ed7d373260c1b506ed27100b383d
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/type-utils@npm:5.25.0"
@@ -11691,13 +10867,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/types@npm:4.28.0"
-  checksum: 5d167f32e93f5854e78315a3a59beaf45bf9fdc5dc6a01d02c22152c08c8871022b5c41281c5355f44be1f9d36f9d24a67087a5c0dcfeea25477eb5918b5c410
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:5.10.0":
   version: 5.10.0
   resolution: "@typescript-eslint/types@npm:5.10.0"
@@ -11712,6 +10881,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/types@npm:5.16.0"
+  checksum: 0450125741c3eef9581da0b75b4a987a633d77009cfb03507c3db29885b790ee80e3c0efc4f9a0dd3376ba758b49c7829722676153472616a57bb04bce5cc4fa
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/types@npm:5.25.0"
@@ -11719,24 +10895,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/typescript-estree@npm:4.28.0"
-  dependencies:
-    "@typescript-eslint/types": 4.28.0
-    "@typescript-eslint/visitor-keys": 4.28.0
-    debug: ^4.3.1
-    globby: ^11.0.3
-    is-glob: ^4.0.1
-    semver: ^7.3.5
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 680ec9a48cc702eba81a1a9101d6635fac10977c930cdb79a94c975b611c0276cc30e13f41630faeb28446cdcc0afb50bd389042629b35a6dd51b6d6774e0973
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:5.10.0":
   version: 5.10.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.10.0"
@@ -11773,6 +10931,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.16.0"
+  dependencies:
+    "@typescript-eslint/types": 5.16.0
+    "@typescript-eslint/visitor-keys": 5.16.0
+    debug: ^4.3.2
+    globby: ^11.0.4
+    is-glob: ^4.0.3
+    semver: ^7.3.5
+    tsutils: ^3.21.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 930ead4655712c3bd40885fb6b2074cd3c10fb03da864dd7a7dd2e43abfd330bb07e505f0aec8b4846178bff8befbb017f9f3370c67e9c717e4cb8d3df6e16ef
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.25.0"
@@ -11807,6 +10983,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/utils@npm:5.16.0"
+  dependencies:
+    "@types/json-schema": ^7.0.9
+    "@typescript-eslint/scope-manager": 5.16.0
+    "@typescript-eslint/types": 5.16.0
+    "@typescript-eslint/typescript-estree": 5.16.0
+    eslint-scope: ^5.1.1
+    eslint-utils: ^3.0.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 46749091a204d7cf80d81b04704e23a86903a142a7e35cc5068a821c147c3bf098a7eff99af2b0e2ea7310013ca90300db9bab33ae5e3b5f773ed1d2961a5ed4
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/utils@npm:5.25.0"
@@ -11839,16 +11031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:4.28.0":
-  version: 4.28.0
-  resolution: "@typescript-eslint/visitor-keys@npm:4.28.0"
-  dependencies:
-    "@typescript-eslint/types": 4.28.0
-    eslint-visitor-keys: ^2.0.0
-  checksum: a2f5cec756946d924e3a4f5e89d600da82d500690575620513eb700e9ab65226f62910a16ed3a2e1e9c46d7171ee6c5f23ff82e222dcd65e4b6e14f712534d71
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:5.10.0":
   version: 5.10.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.10.0"
@@ -11869,6 +11051,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:5.16.0":
+  version: 5.16.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.16.0"
+  dependencies:
+    "@typescript-eslint/types": 5.16.0
+    eslint-visitor-keys: ^3.0.0
+  checksum: b587bf3b0da95bb58ff877b75fefcee6472222de1e3ec76aa4b94cae66078b62a372c7d0343374a16aab15cdcbae3f9e019624028b35827f68ef6559389f7fd0
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.25.0"
@@ -12014,17 +11206,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ast@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/ast@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/helper-module-context": 1.8.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.8.5
-    "@webassemblyjs/wast-parser": 1.8.5
-  checksum: eee2593fd09ea888ed5ed8919e681a479f9d997061f97264020c8d4b0be11ab3c4e8646463afd021c8c40f1d92023cad1a09559ccdef6e24fdb4290e021a368b
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/ast@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/ast@npm:1.9.0"
@@ -12043,13 +11224,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/floating-point-hex-parser@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.8.5"
-  checksum: 68a1ff458355fb6b1553c8f7e2df6d76623bf5ef895f3fc30de620b88d1e68224643c8daf517d19b75d4e10a7f663c038b9912970edcae6f5a4fdb85b630bfc3
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/floating-point-hex-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0"
@@ -12064,13 +11238,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-api-error@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-api-error@npm:1.8.5"
-  checksum: 83e3c62a67f94cc36b2b8c4785aa92c15fc5d95a0e22c4b6c39dace583dd9c47c88bc4dea032a959b511d33db26eeb8de9b7be6f5d343f89ebdbd17c11520827
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-api-error@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-api-error@npm:1.9.0"
@@ -12085,13 +11252,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-buffer@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-buffer@npm:1.8.5"
-  checksum: 5eeb48b135d5ca013c8876228a3a2ccfba98d87dfe12fcf6921e0acf7a272070f369e4e4e8a7f34f2cf22e8faaade24a39a9bcfba76498f103f051384b0f55b3
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-buffer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
@@ -12099,15 +11259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-code-frame@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-code-frame@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/wast-printer": 1.8.5
-  checksum: 80ca0fdc18c39ba1fe3f139f657f62159b7269ca153f10c5b984f5140a83e3fb8c18565f4443afbce144622b9eb8d16034beb52efc91b69e1e107e15b9f5a6c6
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-code-frame@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0"
@@ -12117,13 +11268,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-fsm@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-fsm@npm:1.8.5"
-  checksum: 5026861c39518cf7f8fa6a88ccad8e251d906130a9ccfe2a49da5eb5321bfdf0861f31e5269f76687259f96cc8143f09a9df73a3836c44cb5445bdc01f77fd91
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-fsm@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-fsm@npm:1.9.0"
@@ -12131,16 +11275,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-module-context@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-module-context@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    mamacro: ^0.0.3
-  checksum: 519ff898993e9331b21bf22dbb85c91378f5c227e7075a4cd580c8e51dfd1372847c722b2e49564d2609b54e10283d68cad6d243b8a95d7833f60c6eb33a5259
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-module-context@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-module-context@npm:1.9.0"
@@ -12168,13 +11302,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-bytecode@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.8.5"
-  checksum: ac560cafe93e5ef07d892cea8ed5f1cb2b7cb8777a335fa92d99068eef650fbc37077e2ac8861bcaed337ac613db477741603554d9784373d41acaeffefd2c01
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0"
@@ -12194,18 +11321,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/helper-buffer": 1.8.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.8.5
-    "@webassemblyjs/wasm-gen": 1.8.5
-  checksum: f8af22bf904d43d2700708bcb61ebfe1241cb57a4ef3e1400327c072d43b34bf5a04c39493a5d7691cca0590cec0cb0935cad7111764593cdb0840e637edac9d
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/helper-wasm-section@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0"
@@ -12227,15 +11342,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ieee754@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/ieee754@npm:1.8.5"
-  dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 20230eb79e4bdf812f49ae73ca145a0a8d0fa1ec8a6353b5a36e57c1955ecc7245f277bfb1bf839e041fff7f300948d938b0672bae9d5764519ed0b6a6aa1bdb
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/ieee754@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/ieee754@npm:1.9.0"
@@ -12254,15 +11360,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/leb128@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/leb128@npm:1.8.5"
-  dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: c41603eba2d4052bf14e9213bfa80534dcbafacc782bd8faef80394cf2a93a4aece465416a5132aff2ec8339381003689850b72899828c236313e3653fb47214
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/leb128@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/leb128@npm:1.9.0"
@@ -12279,13 +11376,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/utf8@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/utf8@npm:1.8.5"
-  checksum: 6aac4440996a160f268762a3dad1ef4a02f4d06fe3a7a0189556adbbbc34ed9ec54a2eadc2adb0aea2ba3430e9dbe20ab461df4f224eed73c9066904b17013e4
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/utf8@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/utf8@npm:1.9.0"
@@ -12309,22 +11399,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-edit@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/wasm-edit@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/helper-buffer": 1.8.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.8.5
-    "@webassemblyjs/helper-wasm-section": 1.8.5
-    "@webassemblyjs/wasm-gen": 1.8.5
-    "@webassemblyjs/wasm-opt": 1.8.5
-    "@webassemblyjs/wasm-parser": 1.8.5
-    "@webassemblyjs/wast-printer": 1.8.5
-  checksum: 7298a60bd4914a7d13bceebce4a130f412056eb40a9d9a27d102bf173a0b369cb0d4be3303abcd08c9482695afe79080e896ace4f2ecabbb0247e2f1829fd4ca
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-edit@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-edit@npm:1.9.0"
@@ -12354,19 +11428,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/wasm-gen@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.8.5
-    "@webassemblyjs/ieee754": 1.8.5
-    "@webassemblyjs/leb128": 1.8.5
-    "@webassemblyjs/utf8": 1.8.5
-  checksum: d861e0233aff09e4841624f6554e32fc3056c232a2b3a9cf92bfcc3f9f34f850e240b6dec70977ae55afd5e5cea3e8d260292cccb1803dc26da4fdcee72b4637
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-gen@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-gen@npm:1.9.0"
@@ -12392,18 +11453,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/wasm-opt@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/helper-buffer": 1.8.5
-    "@webassemblyjs/wasm-gen": 1.8.5
-    "@webassemblyjs/wasm-parser": 1.8.5
-  checksum: 44b18c328b919ba4510d58b4dfe6244edac8c21cd2b6cf7167ad58feb0ddc61217c98521b2f0ffc0e388a0b5469b060a6908e8cc7753ab72945204b4a87dd31b
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-opt@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-opt@npm:1.9.0"
@@ -12430,20 +11479,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/wasm-parser@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/helper-api-error": 1.8.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.8.5
-    "@webassemblyjs/ieee754": 1.8.5
-    "@webassemblyjs/leb128": 1.8.5
-    "@webassemblyjs/utf8": 1.8.5
-  checksum: ea80e9ba6d8f8ba7c3177eda500a41226b5a0373b92a32e8ce81b4562fd4bec37a67ff1a833a378a811307cf1ec4f54f44207c6bbc82fb45709a6cb60d86458f
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wasm-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-parser@npm:1.9.0"
@@ -12458,20 +11493,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-parser@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/wast-parser@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/floating-point-hex-parser": 1.8.5
-    "@webassemblyjs/helper-api-error": 1.8.5
-    "@webassemblyjs/helper-code-frame": 1.8.5
-    "@webassemblyjs/helper-fsm": 1.8.5
-    "@xtuc/long": 4.2.2
-  checksum: ec0b28f0c558950024521808c1e12b4597023b0ef914aed0eb9078bcb4daaa34555a46efe35406b8edb899b008782b1a43d96c6485c45e98ce9745fe17196817
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wast-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wast-parser@npm:1.9.0"
@@ -12496,17 +11517,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@webassemblyjs/wast-printer@npm:1.8.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/wast-parser": 1.8.5
-    "@xtuc/long": 4.2.2
-  checksum: 7c53f5f694b9820cef5e58653a85f5e9b0eba4e59013a2e0fcf3562d7e70501b0202d73ebadbd14b5845ecf958e3639bdde5a197a4245dded722f2015ec45e2a
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/wast-printer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wast-printer@npm:1.9.0"
@@ -12650,7 +11660,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.0, abab@npm:^2.0.3, abab@npm:^2.0.5":
+"abab@npm:^2.0.3, abab@npm:^2.0.5":
   version: 2.0.5
   resolution: "abab@npm:2.0.5"
   checksum: 0ec951b46d5418c2c2f923021ec193eaebdb4e802ffd5506286781b454be722a13a8430f98085cd3e204918401d9130ec6cc8f5ae19be315b3a0e857d83196e1
@@ -12691,16 +11701,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-globals@npm:^4.3.2":
-  version: 4.3.4
-  resolution: "acorn-globals@npm:4.3.4"
-  dependencies:
-    acorn: ^6.0.1
-    acorn-walk: ^6.0.1
-  checksum: c31bfde102d8a104835e9591c31dd037ec771449f9c86a6b1d2ac3c7c336694f828cfabba7687525b094f896a854affbf1afe6e1b12c0d998be6bab5d49c9663
-  languageName: node
-  linkType: hard
-
 "acorn-globals@npm:^6.0.0":
   version: 6.0.0
   resolution: "acorn-globals@npm:6.0.0"
@@ -12729,13 +11729,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^6.0.1":
-  version: 6.2.0
-  resolution: "acorn-walk@npm:6.2.0"
-  checksum: ea241a5d96338f1e8030aafae72a91ff0ec4360e2775e44a2fdb2eb618b07fc309e000a5126056631ac7f00fe8bd9bbd23fcb6d018eee4ba11086eb36c1b2e61
-  languageName: node
-  linkType: hard
-
 "acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
@@ -12759,7 +11752,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^6.0.1, acorn@npm:^6.2.1, acorn@npm:^6.4.1":
+"acorn@npm:^6.4.1":
   version: 6.4.2
   resolution: "acorn@npm:6.4.2"
   bin:
@@ -12768,7 +11761,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.4.0, acorn@npm:^7.4.1":
+"acorn@npm:^7.1.1, acorn@npm:^7.4.0, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
   bin:
@@ -12968,13 +11961,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 5a32d0b3c0944e65d22ff3ae2f88d7a4f8d88a78a703033caeae33f2944915e053d283d02f630dc94823edc7757148ecdcf39fd687a5117bda5c10133a03a7d8
-  languageName: node
-  linkType: hard
-
 "angular-bindonce@npm:0.3.1":
   version: 0.3.1
   resolution: "angular-bindonce@npm:0.3.1"
@@ -13254,13 +12240,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-equal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-equal@npm:1.0.0"
-  checksum: 3f68045806357db9b2fa1ad583e42a659de030633118a0cd35ee4975cb20db3b9a3d36bbec9b5afe70011cf989eefd215c12fe0ce08c498f770859ca6e70688a
-  languageName: node
-  linkType: hard
-
 "array-filter@npm:^1.0.0":
   version: 1.0.0
   resolution: "array-filter@npm:1.0.0"
@@ -13309,7 +12288,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-union@npm:^1.0.1, array-union@npm:^1.0.2":
+"array-union@npm:^1.0.2":
   version: 1.0.2
   resolution: "array-union@npm:1.0.2"
   dependencies:
@@ -13484,13 +12463,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ast-types@npm:0.9.6":
-  version: 0.9.6
-  resolution: "ast-types@npm:0.9.6"
-  checksum: 6b75831c192963453eaeaedaa9db41823cd964bfb9c40ad8da6e978393dd66611f8cc4f778ecabce6a4a9b44a04c83b2571d98fcb561b87596d7b2ea796447db
-  languageName: node
-  linkType: hard
-
 "ast-types@npm:^0.14.2":
   version: 0.14.2
   resolution: "ast-types@npm:0.14.2"
@@ -13578,7 +12550,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^9.6.1, autoprefixer@npm:^9.8.6":
+"autoprefixer@npm:^10.4.4":
+  version: 10.4.4
+  resolution: "autoprefixer@npm:10.4.4"
+  dependencies:
+    browserslist: ^4.20.3
+    caniuse-lite: ^1.0.30001335
+    fraction.js: ^4.2.0
+    normalize-range: ^0.1.2
+    picocolors: ^1.0.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.1.0
+  bin:
+    autoprefixer: bin/autoprefixer
+  checksum: bd42e23d71af0228b6b0b27d0d0b33c95e67562e55eb4ca0e221cf795a06482c90d565d6544a5f4090d8e303b09b200845fa2bcaaa707d1e8777974250dffe1f
+  languageName: node
+  linkType: hard
+
+"autoprefixer@npm:^9.8.6":
   version: 9.8.8
   resolution: "autoprefixer@npm:9.8.8"
   dependencies:
@@ -13623,15 +12613,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:0.26.1":
-  version: 0.26.1
-  resolution: "axios@npm:0.26.1"
-  dependencies:
-    follow-redirects: ^1.14.8
-  checksum: d9eb58ff4bc0b36a04783fc9ff760e9245c829a5a1052ee7ca6013410d427036b1d10d04e7380c02f3508c5eaf3485b1ae67bd2adbfec3683704745c8d7a6e1a
-  languageName: node
-  linkType: hard
-
 "axios@npm:0.27.2":
   version: 0.27.2
   resolution: "axios@npm:0.27.2"
@@ -13651,21 +12632,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:26.6.3, babel-jest@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "babel-jest@npm:26.6.3"
+"axios@npm:^0.26.1":
+  version: 0.26.1
+  resolution: "axios@npm:0.26.1"
   dependencies:
-    "@jest/transform": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/babel__core": ^7.1.7
-    babel-plugin-istanbul: ^6.0.0
-    babel-preset-jest: ^26.6.2
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.4
-    slash: ^3.0.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 5917233f0d381e719e195b69b81e46da90293432d10288d79f8f59b8f3f9ac030e14701f3d9f90893fb739481df1d132446f1b983d841e65e2623775db100897
+    follow-redirects: ^1.14.8
+  checksum: d9eb58ff4bc0b36a04783fc9ff760e9245c829a5a1052ee7ca6013410d427036b1d10d04e7380c02f3508c5eaf3485b1ae67bd2adbfec3683704745c8d7a6e1a
   languageName: node
   linkType: hard
 
@@ -13687,21 +12659,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:8.2.2":
-  version: 8.2.2
-  resolution: "babel-loader@npm:8.2.2"
-  dependencies:
-    find-cache-dir: ^3.3.1
-    loader-utils: ^1.4.0
-    make-dir: ^3.1.0
-    schema-utils: ^2.6.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-    webpack: ">=2"
-  checksum: df5092ef9886bb49aacb7c58ac40ed0681ced031c8d91e49d680cedace2aa1703390a31fbe7c0e409f739836e911c5c991119133d90d9289f681c0a8ff2447a1
-  languageName: node
-  linkType: hard
-
 "babel-loader@npm:8.2.5":
   version: 8.2.5
   resolution: "babel-loader@npm:8.2.5"
@@ -13732,6 +12689,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-loader@npm:^8.2.4":
+  version: 8.2.4
+  resolution: "babel-loader@npm:8.2.4"
+  dependencies:
+    find-cache-dir: ^3.3.1
+    loader-utils: ^2.0.0
+    make-dir: ^3.1.0
+    schema-utils: ^2.6.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+    webpack: ">=2"
+  checksum: 4968251fc4af4279c8e44adba523ed4ad18942f04b37061298e81640d09a570f66e6d53948e39a7d3c3d24ca2b025f0a07c606fadd8e3fbffa8912fd789fd4f0
+  languageName: node
+  linkType: hard
+
 "babel-plugin-add-react-displayname@npm:^0.0.5":
   version: 0.0.5
   resolution: "babel-plugin-add-react-displayname@npm:0.0.5"
@@ -13798,18 +12770,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-istanbul@npm:^5.1.0":
-  version: 5.2.0
-  resolution: "babel-plugin-istanbul@npm:5.2.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    find-up: ^3.0.0
-    istanbul-lib-instrument: ^3.3.0
-    test-exclude: ^5.2.3
-  checksum: 46e31a53d1c08a4b738c988871e94dd83e534b3d49248c45c9e63d04d221aa787d8c4f32576e1fade26dbab7cabeae665cbf5eb067aaef74500048dfef365c80
-  languageName: node
-  linkType: hard
-
 "babel-plugin-istanbul@npm:^6.0.0, babel-plugin-istanbul@npm:^6.1.1":
   version: 6.1.1
   resolution: "babel-plugin-istanbul@npm:6.1.1"
@@ -13823,18 +12783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "babel-plugin-jest-hoist@npm:26.6.2"
-  dependencies:
-    "@babel/template": ^7.3.3
-    "@babel/types": ^7.3.3
-    "@types/babel__core": ^7.0.0
-    "@types/babel__traverse": ^7.0.6
-  checksum: abe3732fdf20f96e91cbf788a54d776b30bd7a6054cb002a744d7071c656813e26e77a780dc2a6f6b197472897e220836cd907bda3fadb9d0481126bfd6c3783
-  languageName: node
-  linkType: hard
-
 "babel-plugin-jest-hoist@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-plugin-jest-hoist@npm:27.5.1"
@@ -13878,19 +12826,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.1.4":
-  version: 0.1.10
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.1.10"
-  dependencies:
-    "@babel/compat-data": ^7.13.0
-    "@babel/helper-define-polyfill-provider": ^0.1.5
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d4bf9a68fb6b70a52c74ed9a262a8cfdb3d4fa86e70ef07172884589d50547efb730d4ff7a798d0bc22a589ed8b92d60f58aece5d44cf2febc22949daf60fb36
-  languageName: node
-  linkType: hard
-
 "babel-plugin-polyfill-corejs2@npm:^0.3.0":
   version: 0.3.0
   resolution: "babel-plugin-polyfill-corejs2@npm:0.3.0"
@@ -13904,7 +12839,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.1.0, babel-plugin-polyfill-corejs3@npm:^0.1.3":
+"babel-plugin-polyfill-corejs3@npm:^0.1.0":
   version: 0.1.7
   resolution: "babel-plugin-polyfill-corejs3@npm:0.1.7"
   dependencies:
@@ -13928,17 +12863,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.1.2":
-  version: 0.1.6
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.1.6"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.1.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 05d9222c33c248e6402589dfa1e007389605376d47d5c51224a3f4a0371a38e41039584968d6e061916dd221943d4f11f317fb187460fca87e446ee8bf73cfc8
-  languageName: node
-  linkType: hard
-
 "babel-plugin-polyfill-regenerator@npm:^0.3.0":
   version: 0.3.0
   resolution: "babel-plugin-polyfill-regenerator@npm:0.3.0"
@@ -13990,18 +12914,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "babel-preset-jest@npm:26.6.2"
-  dependencies:
-    babel-plugin-jest-hoist: ^26.6.2
-    babel-preset-current-node-syntax: ^1.0.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 1d9bef3a7ac6751a09d29ceb84be8b1998abd210fafa12223689c744db4f2a63ab90cba7986a71f3154d9aceda9dbeca563178731d21cbaf793b4096ed3a4d01
-  languageName: node
-  linkType: hard
-
 "babel-preset-jest@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-preset-jest@npm:27.5.1"
@@ -14133,13 +13045,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"big.js@npm:^3.1.3":
-  version: 3.2.0
-  resolution: "big.js@npm:3.2.0"
-  checksum: 299449e40555625a308f01d74378677036b2ec98b30aaa89794b3afbd4eaa104b7456a989affadfd7f630dc14b3f1df250de9bddc4a6fc664e60727887bb33e7
-  languageName: node
-  linkType: hard
-
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
@@ -14447,7 +13352,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.17.5, browserslist@npm:^4.6.4":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.6, browserslist@npm:^4.17.5":
   version: 4.17.5
   resolution: "browserslist@npm:4.17.5"
   dependencies:
@@ -14532,7 +13437,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-from@npm:1.x, buffer-from@npm:^1.0.0":
+"buffer-from@npm:^1.0.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
   checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
@@ -14645,7 +13550,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^12.0.2, cacache@npm:^12.0.3":
+"cacache@npm:^12.0.2":
   version: 12.0.4
   resolution: "cacache@npm:12.0.4"
   dependencies:
@@ -14668,32 +13573,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^13.0.1":
-  version: 13.0.1
-  resolution: "cacache@npm:13.0.1"
-  dependencies:
-    chownr: ^1.1.2
-    figgy-pudding: ^3.5.1
-    fs-minipass: ^2.0.0
-    glob: ^7.1.4
-    graceful-fs: ^4.2.2
-    infer-owner: ^1.0.4
-    lru-cache: ^5.1.1
-    minipass: ^3.0.0
-    minipass-collect: ^1.0.2
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.2
-    mkdirp: ^0.5.1
-    move-concurrently: ^1.0.1
-    p-map: ^3.0.0
-    promise-inflight: ^1.0.1
-    rimraf: ^2.7.1
-    ssri: ^7.0.0
-    unique-filename: ^1.1.1
-  checksum: 733e65de5a0db3f1c181aa780f60ff121b5efd9b7c0851e1e1f213df768a790882d4d5af987fb0cfa70c5c6c4834e0474a291ac8872d227056f7ea12c1447092
-  languageName: node
-  linkType: hard
-
 "cacache@npm:^15.0.5, cacache@npm:^15.2.0":
   version: 15.3.0
   resolution: "cacache@npm:15.3.0"
@@ -14790,24 +13669,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caller-callsite@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "caller-callsite@npm:2.0.0"
-  dependencies:
-    callsites: ^2.0.0
-  checksum: b685e9d126d9247b320cfdfeb3bc8da0c4be28d8fb98c471a96bc51aab3130099898a2fe3bf0308f0fe048d64c37d6d09f563958b9afce1a1e5e63d879c128a2
-  languageName: node
-  linkType: hard
-
-"caller-path@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "caller-path@npm:2.0.0"
-  dependencies:
-    caller-callsite: ^2.0.0
-  checksum: 3e12ccd0c71ec10a057aac69e3ec175b721ca858c640df021ef0d25999e22f7c1d864934b596b7d47038e9b56b7ec315add042abbd15caac882998b50102fb12
-  languageName: node
-  linkType: hard
-
 "callsite@npm:^1.0.0":
   version: 1.0.0
   resolution: "callsite@npm:1.0.0"
@@ -14815,13 +13676,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"callsites@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "callsites@npm:2.0.0"
-  checksum: be2f67b247df913732b7dec1ec0bbfcdbaea263e5a95968b19ec7965affae9496b970e3024317e6d4baa8e28dc6ba0cec03f46fdddc2fdcc51396600e53c2623
-  languageName: node
-  linkType: hard
-
 "callsites@npm:^3.0.0":
   version: 3.1.0
   resolution: "callsites@npm:3.1.0"
@@ -14829,16 +13683,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camel-case@npm:3.0.x":
-  version: 3.0.0
-  resolution: "camel-case@npm:3.0.0"
-  dependencies:
-    no-case: ^2.2.0
-    upper-case: ^1.1.1
-  checksum: 4190ed6ab8acf4f3f6e1a78ad4d0f3f15ce717b6bfa1b5686d58e4bcd29960f6e312dd746b5fa259c6d452f1413caef25aee2e10c9b9a580ac83e516533a961a
-  languageName: node
-  linkType: hard
-
 "camel-case@npm:^4.1.1, camel-case@npm:^4.1.2":
   version: 4.1.2
   resolution: "camel-case@npm:4.1.2"
@@ -14867,7 +13711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase@npm:^5.0.0, camelcase@npm:^5.3.1":
+"camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
   checksum: e6effce26b9404e3c0f301498184f243811c30dfe6d0b9051863bd8e4034d09c8c2923794f280d6827e5aa055f6c434115ff97864a16a963366fb35fd673024b
@@ -14900,7 +13744,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001271, caniuse-lite@npm:^1.0.30001286, caniuse-lite@npm:^1.0.30001317":
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001271, caniuse-lite@npm:^1.0.30001286, caniuse-lite@npm:^1.0.30001317":
   version: 1.0.30001332
   resolution: "caniuse-lite@npm:1.0.30001332"
   checksum: e54182ea42ab3d2ff1440f9a6480292f7ab23c00c188df7ad65586312e4da567e8bedd5cb5fb8f0ff4193dc027a54e17e0b3c0b6db5d5a3fb61c7726ff9c45b3
@@ -14960,7 +13804,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.3.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.3.2, chalk@npm:^2.4.1":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -15113,7 +13957,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:>=2.0.0 <4.0.0, chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2":
+"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2":
   version: 3.5.2
   resolution: "chokidar@npm:3.5.2"
   dependencies:
@@ -15155,7 +13999,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chownr@npm:^1.1.1, chownr@npm:^1.1.2, chownr@npm:^1.1.4":
+"chownr@npm:^1.1.1, chownr@npm:^1.1.4":
   version: 1.1.4
   resolution: "chownr@npm:1.1.4"
   checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
@@ -15212,13 +14056,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cjs-module-lexer@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "cjs-module-lexer@npm:0.6.0"
-  checksum: 445b039607efd74561d7db8d0867031c8b6a69f25e83fdd861b0fa1fbc11f12de057ba1db80637f3c9016774354092af5325eebb90505d65ccc5389cae09d1fd
-  languageName: node
-  linkType: hard
-
 "cjs-module-lexer@npm:^1.0.0":
   version: 1.2.2
   resolution: "cjs-module-lexer@npm:1.2.2"
@@ -15245,7 +14082,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clean-css@npm:4.2.x, clean-css@npm:^4.2.3":
+"clean-css@npm:^4.2.3":
   version: 4.2.4
   resolution: "clean-css@npm:4.2.4"
   dependencies:
@@ -15286,7 +14123,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-spinners@npm:^2.2.0, cli-spinners@npm:^2.5.0":
+"cli-spinners@npm:^2.5.0":
   version: 2.6.1
   resolution: "cli-spinners@npm:2.6.1"
   checksum: 423409baaa7a58e5104b46ca1745fbfc5888bbd0b0c5a626e052ae1387060839c8efd512fb127e25769b3dc9562db1dc1b5add6e0b93b7ef64f477feb6416a45
@@ -15342,17 +14179,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cliui@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "cliui@npm:6.0.0"
-  dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.0
-    wrap-ansi: ^6.2.0
-  checksum: 4fcfd26d292c9f00238117f39fc797608292ae36bac2168cfee4c85923817d0607fe21b3329a8621e01aedf512c99b7eaa60e363a671ffd378df6649fb48ae42
-  languageName: node
-  linkType: hard
-
 "cliui@npm:^7.0.2":
   version: 7.0.4
   resolution: "cliui@npm:7.0.4"
@@ -15400,13 +14226,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clone@npm:^2.1.1":
-  version: 2.1.2
-  resolution: "clone@npm:2.1.2"
-  checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
-  languageName: node
-  linkType: hard
-
 "clsx@npm:^1.1.1":
   version: 1.1.1
   resolution: "clsx@npm:1.1.1"
@@ -15591,7 +14410,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"command-exists@npm:^1.2.8":
+"command-exists@npm:^1.2.9":
   version: 1.2.9
   resolution: "command-exists@npm:1.2.9"
   checksum: 729ae3d88a2058c93c58840f30341b7f82688a573019535d198b57a4d8cb0135ced0ad7f52b591e5b28a90feb2c675080ce916e56254a0f7c15cb2395277cac3
@@ -15605,7 +14424,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:*, commander@npm:8.3.0, commander@npm:^8.0.0, commander@npm:^8.1.0, commander@npm:^8.3.0":
+"commander@npm:*, commander@npm:8.3.0, commander@npm:^8.1.0, commander@npm:^8.3.0":
   version: 8.3.0
   resolution: "commander@npm:8.3.0"
   checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
@@ -15626,13 +14445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:2.17.x":
-  version: 2.17.1
-  resolution: "commander@npm:2.17.1"
-  checksum: 22e7ed5b422079a13a496e5eb8f73f36c15b5809d46f738e168e20f9ad485c12951bdc2cb366a36eb5f4927dae4f17b355b8adb96a5b9093f5fa4c439e8b9419
-  languageName: node
-  linkType: hard
-
 "commander@npm:^4.1.1":
   version: 4.1.1
   resolution: "commander@npm:4.1.1"
@@ -15661,10 +14473,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:~2.19.0":
-  version: 2.19.0
-  resolution: "commander@npm:2.19.0"
-  checksum: d52ffb0b31528784005356f879591b5a4875d3e88806c115fb30a8de0994d2fa9ca3f72a3cb880cdaf1bfb9df185f928cfcbbc656fa831f9c6109a209569ef6d
+"commander@npm:^9.2.0":
+  version: 9.2.0
+  resolution: "commander@npm:9.2.0"
+  checksum: 7c82e4cd969712aa6d7c055b8351807a7230f9f31ef7ec7881e11a1147511de85adf5d6ccfd200240a118eecf693b220caf6865b8efbcea558a70d35aa9ed711
   languageName: node
   linkType: hard
 
@@ -15805,24 +14617,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"concurrently@npm:6.3.0":
-  version: 6.3.0
-  resolution: "concurrently@npm:6.3.0"
-  dependencies:
-    chalk: ^4.1.0
-    date-fns: ^2.16.1
-    lodash: ^4.17.21
-    rxjs: ^6.6.3
-    spawn-command: ^0.0.2-1
-    supports-color: ^8.1.0
-    tree-kill: ^1.2.2
-    yargs: ^16.2.0
-  bin:
-    concurrently: bin/concurrently.js
-  checksum: fb68236899259a3b0c05d27db608ee9150f11fc785552c14937e5e1421c9448d03704cdc2acb5f842a91c465d50005b4229f348eb9594d84cbef54e5a93ffde7
-  languageName: node
-  linkType: hard
-
 "config-chain@npm:^1.1.12":
   version: 1.1.13
   resolution: "config-chain@npm:1.1.13"
@@ -16071,28 +14865,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-webpack-plugin@npm:5.1.2":
-  version: 5.1.2
-  resolution: "copy-webpack-plugin@npm:5.1.2"
-  dependencies:
-    cacache: ^12.0.3
-    find-cache-dir: ^2.1.0
-    glob-parent: ^3.1.0
-    globby: ^7.1.1
-    is-glob: ^4.0.1
-    loader-utils: ^1.2.3
-    minimatch: ^3.0.4
-    normalize-path: ^3.0.0
-    p-limit: ^2.2.1
-    schema-utils: ^1.0.0
-    serialize-javascript: ^4.0.0
-    webpack-log: ^2.0.0
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: e398884dee1891311bc1661ba980ef8e6cc6aaf807dd49f782cb37aa66b0c53ef844360c5a0406373eda0ab444b2d6d8743b35a1f7634577ae34619dd19e231e
-  languageName: node
-  linkType: hard
-
 "copy-webpack-plugin@npm:9.0.1":
   version: 9.0.1
   resolution: "copy-webpack-plugin@npm:9.0.1"
@@ -16110,6 +14882,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"copy-webpack-plugin@npm:^9.0.1":
+  version: 9.1.0
+  resolution: "copy-webpack-plugin@npm:9.1.0"
+  dependencies:
+    fast-glob: ^3.2.7
+    glob-parent: ^6.0.1
+    globby: ^11.0.3
+    normalize-path: ^3.0.0
+    schema-utils: ^3.1.1
+    serialize-javascript: ^6.0.0
+  peerDependencies:
+    webpack: ^5.1.0
+  checksum: 06cb4fb6fc99a95ccfd3169115ee57f64953e5b4075900fc8faab98b7e7d3fcd6915b125fdb98c919cfd55e581a8444f5c6b9dbb342cbd60b154d8fb3f79f2b9
+  languageName: node
+  linkType: hard
+
 "core-js-compat@npm:^3.20.2, core-js-compat@npm:^3.21.0":
   version: 3.21.0
   resolution: "core-js-compat@npm:3.21.0"
@@ -16130,7 +14918,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.8.1, core-js-compat@npm:^3.9.0":
+"core-js-compat@npm:^3.8.1":
   version: 3.19.0
   resolution: "core-js-compat@npm:3.19.0"
   dependencies:
@@ -16196,18 +14984,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^5.0.0":
-  version: 5.2.1
-  resolution: "cosmiconfig@npm:5.2.1"
-  dependencies:
-    import-fresh: ^2.0.0
-    is-directory: ^0.3.1
-    js-yaml: ^3.13.1
-    parse-json: ^4.0.0
-  checksum: 8b6f1d3c8a5ffdf663a952f17af0761adf210b7a5933d0fe8988f3ca3a1f0e1e5cbbb74d5b419c15933dd2fdcaec31dbc5cc85cb8259a822342b93b529eff89c
-  languageName: node
-  linkType: hard
-
 "cosmiconfig@npm:^6.0.0":
   version: 6.0.0
   resolution: "cosmiconfig@npm:6.0.0"
@@ -16379,14 +15155,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-blank-pseudo@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "css-blank-pseudo@npm:0.1.4"
+"css-blank-pseudo@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "css-blank-pseudo@npm:3.0.3"
   dependencies:
-    postcss: ^7.0.5
+    postcss-selector-parser: ^6.0.9
+  peerDependencies:
+    postcss: ^8.4
   bin:
-    css-blank-pseudo: cli.js
-  checksum: f995a6ca5dbb867af4b30c3dc872a8f0b27ad120442c34796eef7f9c4dcf014249522aaa0a2da3c101c4afa5d7d376436bb978ae1b2c02deddec283fad30c998
+    css-blank-pseudo: dist/cli.cjs
+  checksum: 9be0a13885a99d8ba9e1f45ea66e801d4da75b58c1c3c516a40772fa3a93ef9952b15dcac0418acbb6c89daaae0572819647701b8e553a02972826e33d4cd67f
   languageName: node
   linkType: hard
 
@@ -16399,24 +15177,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-color-names@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "css-color-names@npm:1.0.1"
-  checksum: 7a3cdeb9e3311dc508c2f59872ba40b4c0af70304e942d638956fc4103afc3d62784c17aa8703ab42180653e0079734919a6c436143f12c8baf63035bb8d187d
-  languageName: node
-  linkType: hard
-
-"css-declaration-sorter@npm:^6.0.3":
-  version: 6.1.3
-  resolution: "css-declaration-sorter@npm:6.1.3"
-  dependencies:
-    timsort: ^0.3.0
-  peerDependencies:
-    postcss: ^8.0.9
-  checksum: 6fdacdce48e1351a8fd73472b7dfaae573ce7d4f5bba8385afc9c765d01055920b851d288228ecb0d535d163b22f8d7941e095b9da995956cd3309e41d1bffa2
-  languageName: node
-  linkType: hard
-
 "css-declaration-sorter@npm:^6.2.2":
   version: 6.2.2
   resolution: "css-declaration-sorter@npm:6.2.2"
@@ -16433,15 +15193,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^0.10.0":
-  version: 0.10.0
-  resolution: "css-has-pseudo@npm:0.10.0"
+"css-has-pseudo@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "css-has-pseudo@npm:3.0.4"
   dependencies:
-    postcss: ^7.0.6
-    postcss-selector-parser: ^5.0.0-rc.4
+    postcss-selector-parser: ^6.0.9
+  peerDependencies:
+    postcss: ^8.4
   bin:
-    css-has-pseudo: cli.js
-  checksum: 88d891ba18f821e8a94d821ecdd723c606019462664c7d86e7d8731622bd26f9d55582e494bcc2a62f9399cc7b89049ddc8a9d1e8f1bf1a133c2427739d2d334
+    css-has-pseudo: dist/cli.cjs
+  checksum: 8f165d68f6621891d9fa1d874794916a52ed8847dfbec591523ad68774650cc1eae062ba08f59514666e04aeba27be72c9b211892f3a187c5ba6e287bd4260e7
   languageName: node
   linkType: hard
 
@@ -16455,29 +15216,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-loader@npm:3.4.2":
-  version: 3.4.2
-  resolution: "css-loader@npm:3.4.2"
-  dependencies:
-    camelcase: ^5.3.1
-    cssesc: ^3.0.0
-    icss-utils: ^4.1.1
-    loader-utils: ^1.2.3
-    normalize-path: ^3.0.0
-    postcss: ^7.0.23
-    postcss-modules-extract-imports: ^2.0.0
-    postcss-modules-local-by-default: ^3.0.2
-    postcss-modules-scope: ^2.1.1
-    postcss-modules-values: ^3.0.0
-    postcss-value-parser: ^4.0.2
-    schema-utils: ^2.6.0
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: dbd80f052b41ea7c33d96a2fbeabca82773f7e3567300c636ffb079ffcf8ba111b02f315346942334ed27ffc137323c9a4ac1e446eaed5837abbdd3fdd371a0c
-  languageName: node
-  linkType: hard
-
-"css-loader@npm:6.7.1":
+"css-loader@npm:6.7.1, css-loader@npm:^6.7.1":
   version: 6.7.1
   resolution: "css-loader@npm:6.7.1"
   dependencies:
@@ -16563,14 +15302,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-prefers-color-scheme@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "css-prefers-color-scheme@npm:3.1.1"
+"css-minimizer-webpack-plugin@npm:^3.4.1":
+  version: 3.4.1
+  resolution: "css-minimizer-webpack-plugin@npm:3.4.1"
   dependencies:
-    postcss: ^7.0.5
+    cssnano: ^5.0.6
+    jest-worker: ^27.0.2
+    postcss: ^8.3.5
+    schema-utils: ^4.0.0
+    serialize-javascript: ^6.0.0
+    source-map: ^0.6.1
+  peerDependencies:
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    "@parcel/css":
+      optional: true
+    clean-css:
+      optional: true
+    csso:
+      optional: true
+    esbuild:
+      optional: true
+  checksum: 065c6c1eadb7c99267db5d04d6f3909e9968b73c4cb79ab9e4502a5fbf1a3d564cfe6f8e0bff8e4ab00d4ed233e9c3c76a4ebe0ee89150b3d9ecb064ddf1e5e9
+  languageName: node
+  linkType: hard
+
+"css-prefers-color-scheme@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "css-prefers-color-scheme@npm:6.0.3"
+  peerDependencies:
+    postcss: ^8.4
   bin:
-    css-prefers-color-scheme: cli.js
-  checksum: ba69a86b006818ffe3548bcbeb5e4e8139b8b6cf45815a3b3dddd12cd9acf3d8ac3b94e63fe0abd34e0683cf43ed8c2344e3bd472bbf02a6eb40c7bbf565d587
+    css-prefers-color-scheme: dist/cli.cjs
+  checksum: 3a2b02f0454adda68861cdcaf6a0d11f462eadf165301cba61c5ec7c5f229ac261c5baa54c377d9b811ec5f21b30d72a02bc032cdad2415b3a566f08a0c47b3a
   languageName: node
   linkType: hard
 
@@ -16651,19 +15415,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "cssdb@npm:4.4.0"
-  checksum: 521dd2135da1ab93612a4161eb1024cfc7b155a35d95f9867d328cc88ad57fdd959aa88ea8f4e6cea3a82bca91b76570dc1abb18bfd902c6889973956a03e497
-  languageName: node
-  linkType: hard
-
-"cssesc@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "cssesc@npm:2.0.0"
-  bin:
-    cssesc: bin/cssesc
-  checksum: 5e50886c2aca3f492fe808dbd146d30eb1c6f31fbe6093979a8376e39d171d989279199f6f3f1a42464109e082e0e42bc33eeff9467fb69bf346f5ba5853c3c6
+"cssdb@npm:^6.5.0":
+  version: 6.5.0
+  resolution: "cssdb@npm:6.5.0"
+  checksum: badd8cfc6d827cf08c8442ccbf733af1cd79b1df751c7f7d9a22207d235e928a612751c1025485f4bd5c77d420e0ed2d35c6184a4c5d195671b2e4d56f255b64
   languageName: node
   linkType: hard
 
@@ -16690,45 +15445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^5.1.6":
-  version: 5.1.6
-  resolution: "cssnano-preset-default@npm:5.1.6"
-  dependencies:
-    css-declaration-sorter: ^6.0.3
-    cssnano-utils: ^2.0.1
-    postcss-calc: ^8.0.0
-    postcss-colormin: ^5.2.1
-    postcss-convert-values: ^5.0.2
-    postcss-discard-comments: ^5.0.1
-    postcss-discard-duplicates: ^5.0.1
-    postcss-discard-empty: ^5.0.1
-    postcss-discard-overridden: ^5.0.1
-    postcss-merge-longhand: ^5.0.3
-    postcss-merge-rules: ^5.0.2
-    postcss-minify-font-values: ^5.0.1
-    postcss-minify-gradients: ^5.0.3
-    postcss-minify-params: ^5.0.1
-    postcss-minify-selectors: ^5.1.0
-    postcss-normalize-charset: ^5.0.1
-    postcss-normalize-display-values: ^5.0.1
-    postcss-normalize-positions: ^5.0.1
-    postcss-normalize-repeat-style: ^5.0.1
-    postcss-normalize-string: ^5.0.1
-    postcss-normalize-timing-functions: ^5.0.1
-    postcss-normalize-unicode: ^5.0.1
-    postcss-normalize-url: ^5.0.2
-    postcss-normalize-whitespace: ^5.0.1
-    postcss-ordered-values: ^5.0.2
-    postcss-reduce-initial: ^5.0.1
-    postcss-reduce-transforms: ^5.0.1
-    postcss-svgo: ^5.0.3
-    postcss-unique-selectors: ^5.0.1
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: e8826ce075648a3ef3865595c9aa189c39a8a672e941d400596bedfd9df4d176a5d462caf21a8bf711bebcfa10b12cfe1d283190423825ba6ee3664fc6eec341
-  languageName: node
-  linkType: hard
-
 "cssnano-preset-default@npm:^5.2.8":
   version: 5.2.8
   resolution: "cssnano-preset-default@npm:5.2.8"
@@ -16768,15 +15484,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "cssnano-utils@npm:2.0.1"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: e27f7648fdb999667ba607fd8d56e28d4dbf4bf458c625fc84f460f70fa0fcd491991f309ca27cc0609a24fb3af49b3d0b9b205921e0edd7de57ca27048652e3
-  languageName: node
-  linkType: hard
-
 "cssnano-utils@npm:^3.1.0":
   version: 3.1.0
   resolution: "cssnano-utils@npm:3.1.0"
@@ -16786,17 +15493,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano@npm:^5.0.2":
-  version: 5.0.10
-  resolution: "cssnano@npm:5.0.10"
+"cssnano@npm:^5.0.6":
+  version: 5.0.8
+  resolution: "cssnano@npm:5.0.8"
   dependencies:
-    cssnano-preset-default: ^5.1.6
-    is-resolvable: ^1.1.0
+    cssnano-preset-default: ^5.2.8
     lilconfig: ^2.0.3
     yaml: ^1.10.2
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 65fa38069925b9ac5b97b05e04c1ad4c9ede580f402e58bef4a15eae14d8cdb8c834b76091b6d4319c1986025221f29ce57b89ae32f63a13f66625df44e12db9
+  checksum: 18d6496accecf8aa428ed8ef27fbc41cd1c2cad26e64b335711fafd23b2d03d5854023d3fbfda7da9718e416ae94d6b38357df20a6289e1db1c422421d819684
   languageName: node
   linkType: hard
 
@@ -16822,7 +15528,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssom@npm:^0.4.1, cssom@npm:^0.4.4":
+"cssom@npm:^0.4.4":
   version: 0.4.4
   resolution: "cssom@npm:0.4.4"
   checksum: e3bc1076e7ee4213d4fef05e7ae03bfa83dc05f32611d8edc341f4ecc3d9647b89c8245474c7dd2cdcdb797a27c462e99da7ad00a34399694559f763478ff53f
@@ -16836,7 +15542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^2.0.0, cssstyle@npm:^2.3.0":
+"cssstyle@npm:^2.3.0":
   version: 2.3.0
   resolution: "cssstyle@npm:2.3.0"
   dependencies:
@@ -17388,17 +16094,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "data-urls@npm:1.1.0"
-  dependencies:
-    abab: ^2.0.0
-    whatwg-mimetype: ^2.2.0
-    whatwg-url: ^7.0.0
-  checksum: dc4bd9621df0dff336d7c4c0517c792488ef3cf11cd37e72ab80f3a7f0a0aa14bad677ac97cf22c87c6eb9518e58b98590e1c8c756b56240940f0e470c81612e
-  languageName: node
-  linkType: hard
-
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -17499,7 +16194,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^3.0.0, debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.7":
+"debug@npm:^3.0.0, debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.6, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -17870,7 +16565,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dir-glob@npm:^2.0.0, dir-glob@npm:^2.2.2":
+"dir-glob@npm:^2.2.2":
   version: 2.2.2
   resolution: "dir-glob@npm:2.2.2"
   dependencies:
@@ -18037,15 +16732,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domexception@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "domexception@npm:1.0.1"
-  dependencies:
-    webidl-conversions: ^4.0.2
-  checksum: f564a9c0915dcb83ceefea49df14aaed106b1468fbe505119e8bcb0b77e242534f3aba861978537c0fc9dc6f35b176d0ffc77b3e342820fb27a8f215e7ae4d52
-  languageName: node
-  linkType: hard
-
 "domexception@npm:^2.0.1":
   version: 2.0.1
   resolution: "domexception@npm:2.0.1"
@@ -18241,13 +16927,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emittery@npm:^0.7.1":
-  version: 0.7.2
-  resolution: "emittery@npm:0.7.2"
-  checksum: 908cd933d48a9bcb58ddf39e9a7d4ba1e049de392ccbef010102539a636e03cea2b28218331b7ede41de8165d9ed7f148851c5112ebd2e943117c0f61eff5f10
-  languageName: node
-  linkType: hard
-
 "emittery@npm:^0.8.1":
   version: 0.8.1
   resolution: "emittery@npm:0.8.1"
@@ -18269,13 +16948,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emojis-list@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "emojis-list@npm:2.1.0"
-  checksum: fb61fa6356dfcc9fbe6db8e334c29da365a34d3d82a915cb59621883d3023d804fd5edad5acd42b8eec016936e81d3b38e2faf921b32e073758374253afe1272
-  languageName: node
-  linkType: hard
-
 "emojis-list@npm:^3.0.0":
   version: 3.0.0
   resolution: "emojis-list@npm:3.0.0"
@@ -18370,7 +17042,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^4.0.0, enhanced-resolve@npm:^4.1.0, enhanced-resolve@npm:^4.5.0":
+"enhanced-resolve@npm:^4.0.0, enhanced-resolve@npm:^4.5.0":
   version: 4.5.0
   resolution: "enhanced-resolve@npm:4.5.0"
   dependencies:
@@ -18381,7 +17053,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.8.3":
+"enhanced-resolve@npm:^5.0.0":
   version: 5.8.3
   resolution: "enhanced-resolve@npm:5.8.3"
   dependencies:
@@ -18691,16 +17363,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-templates@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "es6-templates@npm:0.2.3"
-  dependencies:
-    recast: ~0.11.12
-    through: ~2.3.6
-  checksum: 37261e42e26b2627dc2e3c3a6244445b79a61e5de4ba8b17f1e692ae5f40bff1d2aa0d9e314fd8207036b14126f7dfc39ef54b10fd0a19eba6e8a53d6840d036
-  languageName: node
-  linkType: hard
-
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
@@ -18743,25 +17405,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^1.11.1":
-  version: 1.14.3
-  resolution: "escodegen@npm:1.14.3"
-  dependencies:
-    esprima: ^4.0.1
-    estraverse: ^4.2.0
-    esutils: ^2.0.2
-    optionator: ^0.8.1
-    source-map: ~0.6.1
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0
-  languageName: node
-  linkType: hard
-
 "escodegen@npm:^2.0.0":
   version: 2.0.0
   resolution: "escodegen@npm:2.0.0"
@@ -18881,6 +17524,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-jsdoc@npm:38.0.6":
+  version: 38.0.6
+  resolution: "eslint-plugin-jsdoc@npm:38.0.6"
+  dependencies:
+    "@es-joy/jsdoccomment": ~0.22.1
+    comment-parser: 1.3.1
+    debug: ^4.3.4
+    escape-string-regexp: ^4.0.0
+    esquery: ^1.4.0
+    regextras: ^0.8.0
+    semver: ^7.3.5
+    spdx-expression-parse: ^3.0.1
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: 81c49a1949bf7d26d6ac30bb8b6277ce3dfc5e875325ac25798df1e3c0abfe254432e3747031f5eb97beedff60303570bd2c92a6b05c8435269510758d3ddfc2
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-jsdoc@npm:39.3.0":
   version: 39.3.0
   resolution: "eslint-plugin-jsdoc@npm:39.3.0"
@@ -18909,21 +17570,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:4.0.0":
-  version: 4.0.0
-  resolution: "eslint-plugin-prettier@npm:4.0.0"
-  dependencies:
-    prettier-linter-helpers: ^1.0.0
-  peerDependencies:
-    eslint: ">=7.28.0"
-    prettier: ">=2.0.0"
-  peerDependenciesMeta:
-    eslint-config-prettier:
-      optional: true
-  checksum: 03d69177a3c21fa2229c7e427ce604429f0b20ab7f411e2e824912f572a207c7f5a41fd1f0a95b9b8afe121e291c1b1f1dc1d44c7aad4b0837487f9c19f5210d
-  languageName: node
-  linkType: hard
-
 "eslint-plugin-react-hooks@npm:4.3.0":
   version: 4.3.0
   resolution: "eslint-plugin-react-hooks@npm:4.3.0"
@@ -19124,6 +17770,51 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint@npm:8.11.0":
+  version: 8.11.0
+  resolution: "eslint@npm:8.11.0"
+  dependencies:
+    "@eslint/eslintrc": ^1.2.1
+    "@humanwhocodes/config-array": ^0.9.2
+    ajv: ^6.10.0
+    chalk: ^4.0.0
+    cross-spawn: ^7.0.2
+    debug: ^4.3.2
+    doctrine: ^3.0.0
+    escape-string-regexp: ^4.0.0
+    eslint-scope: ^7.1.1
+    eslint-utils: ^3.0.0
+    eslint-visitor-keys: ^3.3.0
+    espree: ^9.3.1
+    esquery: ^1.4.0
+    esutils: ^2.0.2
+    fast-deep-equal: ^3.1.3
+    file-entry-cache: ^6.0.1
+    functional-red-black-tree: ^1.0.1
+    glob-parent: ^6.0.1
+    globals: ^13.6.0
+    ignore: ^5.2.0
+    import-fresh: ^3.0.0
+    imurmurhash: ^0.1.4
+    is-glob: ^4.0.0
+    js-yaml: ^4.1.0
+    json-stable-stringify-without-jsonify: ^1.0.1
+    levn: ^0.4.1
+    lodash.merge: ^4.6.2
+    minimatch: ^3.0.4
+    natural-compare: ^1.4.0
+    optionator: ^0.9.1
+    regexpp: ^3.2.0
+    strip-ansi: ^6.0.1
+    strip-json-comments: ^3.1.0
+    text-table: ^0.2.0
+    v8-compile-cache: ^2.0.3
+  bin:
+    eslint: bin/eslint.js
+  checksum: a06a2ea37002d6c0a4f462fe31b4411185dc3da7857fafb896eb392ba95a1289cc3538056474b2f44f08012f265bede01a39d46df4ac39ebc6d7be90e2c8f9fa
+  languageName: node
+  linkType: hard
+
 "eslint@npm:8.15.0":
   version: 8.15.0
   resolution: "eslint@npm:8.15.0"
@@ -19180,7 +17871,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"espree@npm:^9.3.2":
+"espree@npm:^9.3.1, espree@npm:^9.3.2":
   version: 9.3.2
   resolution: "espree@npm:9.3.2"
   dependencies:
@@ -19201,16 +17892,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esprima@npm:~3.1.0":
-  version: 3.1.3
-  resolution: "esprima@npm:3.1.3"
-  bin:
-    esparse: ./bin/esparse.js
-    esvalidate: ./bin/esvalidate.js
-  checksum: 2771c059aa61f2b2fe9d898f11c737c45c26eae6052908f1e2b8bd91c6a440607420f2679cbfd6cbb79f2fa502b37a3053048d287bcd30ea582d46c969fcf67e
-  languageName: node
-  linkType: hard
-
 "espurify@npm:^1.6.0":
   version: 1.8.1
   resolution: "espurify@npm:1.8.1"
@@ -19339,7 +18020,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:4.1.0, execa@npm:^4.0.0":
+"execa@npm:4.1.0":
   version: 4.1.0
   resolution: "execa@npm:4.1.0"
   dependencies:
@@ -19435,20 +18116,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expect@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "expect@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    ansi-styles: ^4.0.0
-    jest-get-type: ^26.3.0
-    jest-matcher-utils: ^26.6.2
-    jest-message-util: ^26.6.2
-    jest-regex-util: ^26.0.0
-  checksum: 79a9b888c5c6d37d11f2cb76def6cf1dc8ff098d38662ee20c9f2ee0da67e9a93435f2327854b2e7554732153870621843e7f83e8cefb1250447ee2bc39883a4
-  languageName: node
-  linkType: hard
-
 "expect@npm:^27.5.1":
   version: 27.5.1
   resolution: "expect@npm:27.5.1"
@@ -19646,13 +18313,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-diff@npm:^1.1.2":
-  version: 1.2.0
-  resolution: "fast-diff@npm:1.2.0"
-  checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
-  languageName: node
-  linkType: hard
-
 "fast-equals@npm:^2.0.3":
   version: 2.0.4
   resolution: "fast-equals@npm:2.0.4"
@@ -19687,7 +18347,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9":
+"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9":
   version: 3.2.11
   resolution: "fast-glob@npm:3.2.11"
   dependencies:
@@ -19756,13 +18416,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fastparse@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "fastparse@npm:1.1.2"
-  checksum: c4d199809dc4e8acafeb786be49481cc9144de296e2d54df4540ccfd868d0df73afc649aba70a748925eb32bbc4208b723d6288adf92382275031a8c7e10c0aa
-  languageName: node
-  linkType: hard
-
 "fastq@npm:^1.6.0":
   version: 1.13.0
   resolution: "fastq@npm:1.13.0"
@@ -20022,13 +18675,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flatten@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "flatten@npm:1.0.3"
-  checksum: 5c57379816f1692aaa79fbc6390e0a0644e5e8442c5783ed57c6d315468eddbc53a659eaa03c9bb1e771b0f4a9bd8dd8a2620286bf21fd6538a7857321fdfb20
-  languageName: node
-  linkType: hard
-
 "flush-write-stream@npm:^1.0.0":
   version: 1.1.1
   resolution: "flush-write-stream@npm:1.1.1"
@@ -20079,15 +18725,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"for-each@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "for-each@npm:0.3.3"
-  dependencies:
-    is-callable: ^1.1.3
-  checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28
-  languageName: node
-  linkType: hard
-
 "for-in@npm:^1.0.2":
   version: 1.0.2
   resolution: "for-in@npm:1.0.2"
@@ -20119,37 +18756,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fork-ts-checker-webpack-plugin@npm:6.4.0":
-  version: 6.4.0
-  resolution: "fork-ts-checker-webpack-plugin@npm:6.4.0"
-  dependencies:
-    "@babel/code-frame": ^7.8.3
-    "@types/json-schema": ^7.0.5
-    chalk: ^4.1.0
-    chokidar: ^3.4.2
-    cosmiconfig: ^6.0.0
-    deepmerge: ^4.2.2
-    fs-extra: ^9.0.0
-    glob: ^7.1.6
-    memfs: ^3.1.2
-    minimatch: ^3.0.4
-    schema-utils: 2.7.0
-    semver: ^7.3.2
-    tapable: ^1.0.0
-  peerDependencies:
-    eslint: ">= 6"
-    typescript: ">= 2.7"
-    vue-template-compiler: "*"
-    webpack: ">= 4"
-  peerDependenciesMeta:
-    eslint:
-      optional: true
-    vue-template-compiler:
-      optional: true
-  checksum: feba541453d4bdeaa743388541e125204789369920909f0152b11cfd1801a75fb2f6c708eae0174c9810ab4334fa21dea761037629440a647046581e7df62b8c
-  languageName: node
-  linkType: hard
-
 "fork-ts-checker-webpack-plugin@npm:7.2.11":
   version: 7.2.11
   resolution: "fork-ts-checker-webpack-plugin@npm:7.2.11"
@@ -20222,6 +18828,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fork-ts-checker-webpack-plugin@npm:^7.2.1":
+  version: 7.2.6
+  resolution: "fork-ts-checker-webpack-plugin@npm:7.2.6"
+  dependencies:
+    "@babel/code-frame": ^7.16.7
+    chalk: ^4.1.2
+    chokidar: ^3.5.3
+    cosmiconfig: ^7.0.1
+    deepmerge: ^4.2.2
+    fs-extra: ^10.0.0
+    memfs: ^3.4.1
+    minimatch: ^3.0.4
+    schema-utils: ^3.1.1
+    semver: ^7.3.5
+    tapable: ^2.2.1
+  peerDependencies:
+    typescript: ">3.6.0"
+    vue-template-compiler: "*"
+    webpack: ^5.11.0
+  peerDependenciesMeta:
+    vue-template-compiler:
+      optional: true
+  checksum: d74e8b22e3e4d5159061d93f519d7eb795bafac4b9a993b72eed952a714144d89c8a706414b231a89c69cabf29e00e1fb26d7060e3b5577c08cabb5a3d5a7697
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^3.0.0":
   version: 3.0.1
   resolution: "form-data@npm:3.0.1"
@@ -20581,7 +19213,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
+"get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
   checksum: b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9
@@ -20917,6 +19549,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globals@npm:^13.15.0":
+  version: 13.15.0
+  resolution: "globals@npm:13.15.0"
+  dependencies:
+    type-fest: ^0.20.2
+  checksum: 383ade0873b2ab29ce6d143466c203ed960491575bc97406395e5c8434026fb02472ab2dfff5bc16689b8460269b18fda1047975295cd0183904385c51258bae
+  languageName: node
+  linkType: hard
+
 "globals@npm:^13.6.0":
   version: 13.12.0
   resolution: "globals@npm:13.12.0"
@@ -20960,22 +19601,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^10.0.1":
-  version: 10.0.2
-  resolution: "globby@npm:10.0.2"
-  dependencies:
-    "@types/glob": ^7.1.1
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.0.3
-    glob: ^7.1.3
-    ignore: ^5.1.1
-    merge2: ^1.2.3
-    slash: ^3.0.0
-  checksum: 167cd067f2cdc030db2ec43232a1e835fa06217577d545709dbf29fd21631b30ff8258705172069c855dc4d5766c3b2690834e35b936fbff01ad0329fb95a26f
-  languageName: node
-  linkType: hard
-
 "globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.0.4":
   version: 11.0.4
   resolution: "globby@npm:11.0.4"
@@ -21004,20 +19629,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "globby@npm:7.1.1"
-  dependencies:
-    array-union: ^1.0.1
-    dir-glob: ^2.0.0
-    glob: ^7.1.2
-    ignore: ^3.3.5
-    pify: ^3.0.0
-    slash: ^1.0.0
-  checksum: f0eba08a08ae7c98149a4411661c0bf08c4717d81e6f355cf624fb01880b249737eb8e951bf86124cb3af8ea1c793c0a9d363ed5cdec99bb2c6b68f8a323025f
-  languageName: node
-  linkType: hard
-
 "globby@npm:^9.2.0":
   version: 9.2.0
   resolution: "globby@npm:9.2.0"
@@ -21681,7 +20292,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"he@npm:1.2.0, he@npm:1.2.x, he@npm:^1.2.0":
+"he@npm:1.2.0, he@npm:^1.2.0":
   version: 1.2.0
   resolution: "he@npm:1.2.0"
   bin:
@@ -21794,15 +20405,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-encoding-sniffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "html-encoding-sniffer@npm:1.0.2"
-  dependencies:
-    whatwg-encoding: ^1.0.1
-  checksum: b874df6750451b7642fbe8e998c6bdd2911b0f42ad2927814b717bf1f4b082b0904b6178a1bfbc40117bf5799777993b0825e7713ca0fca49844e5aec03aa0e2
-  languageName: node
-  linkType: hard
-
 "html-encoding-sniffer@npm:^2.0.1":
   version: 2.0.1
   resolution: "html-encoding-sniffer@npm:2.0.1"
@@ -21835,20 +20437,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-loader@npm:0.5.5":
-  version: 0.5.5
-  resolution: "html-loader@npm:0.5.5"
-  dependencies:
-    es6-templates: ^0.2.3
-    fastparse: ^1.1.1
-    html-minifier: ^3.5.8
-    loader-utils: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: 33ec6046ad4f604288513dc4008619fac9550d047a0bb87bed4f04e2b13b2c83241eed912dab2a8a235382b082199b4c70a44c6ac7ed43a39fdb63db2de91596
-  languageName: node
-  linkType: hard
-
-"html-loader@npm:3.1.0":
+"html-loader@npm:3.1.0, html-loader@npm:^3.1.0":
   version: 3.1.0
   resolution: "html-loader@npm:3.1.0"
   dependencies:
@@ -21894,23 +20483,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-minifier@npm:^3.2.3, html-minifier@npm:^3.5.8":
-  version: 3.5.21
-  resolution: "html-minifier@npm:3.5.21"
-  dependencies:
-    camel-case: 3.0.x
-    clean-css: 4.2.x
-    commander: 2.17.x
-    he: 1.2.x
-    param-case: 2.1.x
-    relateurl: 0.2.x
-    uglify-js: 3.4.x
-  bin:
-    html-minifier: ./cli.js
-  checksum: 66a86841a8b919a11a13d9b80176845cfbc5dda6e88efea2cf312ecc07427d9eab4aca70537357583e5e66ee1e62da14e035792eea000f8f3a9ca1856b2fb2b2
-  languageName: node
-  linkType: hard
-
 "html-tags@npm:^3.1.0":
   version: 3.1.0
   resolution: "html-tags@npm:3.1.0"
@@ -21932,7 +20504,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:5.5.0, html-webpack-plugin@npm:^5.0.0":
+"html-webpack-plugin@npm:5.5.0, html-webpack-plugin@npm:^5.0.0, html-webpack-plugin@npm:^5.5.0":
   version: 5.5.0
   resolution: "html-webpack-plugin@npm:5.5.0"
   dependencies:
@@ -21947,23 +20519,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "html-webpack-plugin@npm:3.2.0"
-  dependencies:
-    html-minifier: ^3.2.3
-    loader-utils: ^0.2.16
-    lodash: ^4.17.3
-    pretty-error: ^2.0.2
-    tapable: ^1.0.0
-    toposort: ^1.0.0
-    util.promisify: 1.0.0
-  peerDependencies:
-    webpack: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0
-  checksum: e769e69a975997e35e080ff6305c98411cc358fe025f257600ed0f0536dc9560d204450baeb2855d2575ed68d3242f05d56e3a8d576e0ff87f04785ea95dabe8
-  languageName: node
-  linkType: hard
-
 "html-webpack-plugin@npm:^4.0.0":
   version: 4.5.2
   resolution: "html-webpack-plugin@npm:4.5.2"
@@ -22228,7 +20783,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24, iconv-lite@npm:^0.4.8":
+"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24, iconv-lite@npm:^0.4.4, iconv-lite@npm:^0.4.8":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -22294,13 +20849,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^3.3.5":
-  version: 3.3.10
-  resolution: "ignore@npm:3.3.10"
-  checksum: 23e8cc776e367b56615ab21b78decf973a35dfca5522b39d9b47643d8168473b0d1f18dd1321a1bab466a12ea11a2411903f3b21644f4d5461ee0711ec8678bd
-  languageName: node
-  linkType: hard
-
 "ignore@npm:^4.0.3, ignore@npm:^4.0.6":
   version: 4.0.6
   resolution: "ignore@npm:4.0.6"
@@ -22359,25 +20907,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-cwd@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "import-cwd@npm:2.1.0"
-  dependencies:
-    import-from: ^2.1.0
-  checksum: b8786fa3578f3df55370352bf61f99c2d8e6ee9b5741a07503d5a73d99281d141330a8faf87078e67527be4558f758356791ee5efb4b0112ac5eaed0f07de544
-  languageName: node
-  linkType: hard
-
-"import-fresh@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "import-fresh@npm:2.0.0"
-  dependencies:
-    caller-path: ^2.0.0
-    resolve-from: ^3.0.0
-  checksum: 610255f9753cc6775df00be08e9f43691aa39f7703e3636c45afe22346b8b545e600ccfe100c554607546fc8e861fa149a0d1da078c8adedeea30fff326eef79
-  languageName: node
-  linkType: hard
-
 "import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
@@ -22388,15 +20917,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-from@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "import-from@npm:2.1.0"
-  dependencies:
-    resolve-from: ^3.0.0
-  checksum: 91f6f89f46a07227920ef819181bb52eb93023ccc0bdf00224fdfb326f8f753e279ad06819f39a02bb88c9d3a4606adc85b0cc995285e5d65feeb59f1421a1d4
-  languageName: node
-  linkType: hard
-
 "import-lazy@npm:^2.1.0":
   version: 2.1.0
   resolution: "import-lazy@npm:2.1.0"
@@ -22437,13 +20957,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"indexes-of@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "indexes-of@npm:1.0.1"
-  checksum: 4f9799b1739a62f3e02d09f6f4162cf9673025282af7fa36e790146e7f4e216dad3e776a25b08536c093209c9fcb5ea7bd04b082d42686a45f58ff401d6da32e
-  languageName: node
-  linkType: hard
-
 "indexof@npm:0.0.1":
   version: 0.0.1
   resolution: "indexof@npm:0.0.1"
@@ -22555,9 +21068,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:^8.0.0":
-  version: 8.2.0
-  resolution: "inquirer@npm:8.2.0"
+"inquirer@npm:^8.2.2":
+  version: 8.2.2
+  resolution: "inquirer@npm:8.2.2"
   dependencies:
     ansi-escapes: ^4.2.1
     chalk: ^4.1.1
@@ -22569,11 +21082,11 @@ __metadata:
     mute-stream: 0.0.8
     ora: ^5.4.1
     run-async: ^2.4.0
-    rxjs: ^7.2.0
+    rxjs: ^7.5.5
     string-width: ^4.1.0
     strip-ansi: ^6.0.0
     through: ^2.3.6
-  checksum: 861d1a9324ae933b49126b3541d94e4d6a2f2a25411b3f3cc00c34bf1bdab34146362d702cf289efe6d8034900dc5905bcf2ea716092a02b6fc390e5986dd236
+  checksum: 69a2cf32f51af0e94dd66c597fdca42b890ff521b537dbfe1fd532c19a751d54893b7896523691ec30357f6212a80a2417fec7bf34411f369bbf151bdbc95ae9
   languageName: node
   linkType: hard
 
@@ -22623,13 +21136,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip-regex@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ip-regex@npm:2.1.0"
-  checksum: 331d95052aa53ce245745ea0fc3a6a1e2e3c8d6da65fa8ea52bf73768c1b22a9ac50629d1d2b08c04e7b3ac4c21b536693c149ce2c2615ee4796030e5b3e3cba
-  languageName: node
-  linkType: hard
-
 "ip@npm:^1.1.5":
   version: 1.1.5
   resolution: "ip@npm:1.1.5"
@@ -22651,7 +21157,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-absolute-url@npm:^3.0.0, is-absolute-url@npm:^3.0.3":
+"is-absolute-url@npm:^3.0.0":
   version: 3.0.3
   resolution: "is-absolute-url@npm:3.0.3"
   checksum: 5159b51d065d9ad29e16a2f78d6c0e41c43227caf90a45e659c54ea6fd50ef0595b1871ce392e84b1df7cfdcad9a8e66eec0813a029112188435abf115accb16
@@ -22770,7 +21276,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.1.5, is-callable@npm:^1.2.4":
+"is-callable@npm:^1.1.4, is-callable@npm:^1.1.5, is-callable@npm:^1.2.4":
   version: 1.2.4
   resolution: "is-callable@npm:1.2.4"
   checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f
@@ -22873,13 +21379,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-directory@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "is-directory@npm:0.3.1"
-  checksum: dce9a9d3981e38f2ded2a80848734824c50ee8680cd09aa477bef617949715cfc987197a2ca0176c58a9fb192a1a0d69b535c397140d241996a609d5906ae524
-  languageName: node
-  linkType: hard
-
 "is-docker@npm:^2.0.0, is-docker@npm:^2.1.1":
   version: 2.2.1
   resolution: "is-docker@npm:2.2.1"
@@ -23206,13 +21705,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-resolvable@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-resolvable@npm:1.1.0"
-  checksum: 2ddff983be0cabc2c8d60246365755f8fb322f5fb9db834740d3e694c635c1b74c1bd674cf221e072fc4bd911ef3f08f2247d390e476f7e80af9092443193c68
-  languageName: node
-  linkType: hard
-
 "is-root@npm:^2.1.0":
   version: 2.1.0
   resolution: "is-root@npm:2.1.0"
@@ -23468,13 +21960,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-coverage@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "istanbul-lib-coverage@npm:2.0.5"
-  checksum: c83bf39dc722d2a3e7c98b16643f2fef719fd59adf23441ad8a1e6422bb1f3367ac7d4c42ac45d0d87413476891947b6ffbdecf2184047436336aa0c28bbfc15
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.0.1, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
@@ -23482,33 +21967,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-instrument@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "istanbul-lib-instrument@npm:3.3.0"
-  dependencies:
-    "@babel/generator": ^7.4.0
-    "@babel/parser": ^7.4.3
-    "@babel/template": ^7.4.0
-    "@babel/traverse": ^7.4.3
-    "@babel/types": ^7.4.0
-    istanbul-lib-coverage: ^2.0.5
-    semver: ^6.0.0
-  checksum: 5ff86440c2f4afe83603f899721e43f9bbc0049ebf4e7fd696ea361d0c9ae5c831c656eec07c13f42ba934fc808c78f42a7884f1a08349802bc9bfa5af760571
-  languageName: node
-  linkType: hard
-
-"istanbul-lib-instrument@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "istanbul-lib-instrument@npm:4.0.3"
-  dependencies:
-    "@babel/core": ^7.7.5
-    "@istanbuljs/schema": ^0.1.2
-    istanbul-lib-coverage: ^3.0.0
-    semver: ^6.3.0
-  checksum: fa1171d3022b1bb8f6a734042620ac5d9ee7dc80f3065a0bb12863e9f0494d0eefa3d86608fcc0254ab2765d29d7dad8bdc42e5f8df2f9a1fbe85ccc59d76cb9
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-instrument@npm:^5.0.4":
   version: 5.0.4
   resolution: "istanbul-lib-instrument@npm:5.0.4"
@@ -23594,13 +22052,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-canvas-mock@npm:2.3.0":
-  version: 2.3.0
-  resolution: "jest-canvas-mock@npm:2.3.0"
+"jest-canvas-mock@npm:2.3.1":
+  version: 2.3.1
+  resolution: "jest-canvas-mock@npm:2.3.1"
   dependencies:
     cssfontparser: ^1.2.1
     moo-color: ^1.0.2
-  checksum: 96d4cb72c2a8678b3c2305b8a5203ca2b458782c5c943b7af9061d5fa86cc005b216dac22f52371aef8a007ecdc22894c7d4094e558cfe8a6590c307427e9af6
+  checksum: 82606d348cf4f671af098dcebac19c98643fc5896c6e1af24b572b8e477e7bee18e4c65e0aee8d72d3af88511eba265e12001c6fb72c319d7efe15a6ba23b58b
   languageName: node
   linkType: hard
 
@@ -23614,17 +22072,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-changed-files@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    execa: ^4.0.0
-    throat: ^5.0.0
-  checksum: 8c405f5ff905ee69ace9fd39355233206e3e233badf6a3f3b27e45bbf0a46d86943430be2e080d25b1e085f4231b9b3b27c94317aa04116efb40b592184066f4
-  languageName: node
-  linkType: hard
-
 "jest-changed-files@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-changed-files@npm:27.5.1"
@@ -23663,29 +22110,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "jest-cli@npm:26.6.3"
-  dependencies:
-    "@jest/core": ^26.6.3
-    "@jest/test-result": ^26.6.2
-    "@jest/types": ^26.6.2
-    chalk: ^4.0.0
-    exit: ^0.1.2
-    graceful-fs: ^4.2.4
-    import-local: ^3.0.2
-    is-ci: ^2.0.0
-    jest-config: ^26.6.3
-    jest-util: ^26.6.2
-    jest-validate: ^26.6.2
-    prompts: ^2.0.1
-    yargs: ^15.4.1
-  bin:
-    jest: bin/jest.js
-  checksum: c8554147be756f09f5566974f0026485f78742e8642d2723f8fbee5746f50f44fb72b17aad181226655a8446d3ecc8ad8ed0a11a8a55686fa2b9c10d85700121
-  languageName: node
-  linkType: hard
-
 "jest-cli@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-cli@npm:27.5.1"
@@ -23713,37 +22137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-config@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "jest-config@npm:26.6.3"
-  dependencies:
-    "@babel/core": ^7.1.0
-    "@jest/test-sequencer": ^26.6.3
-    "@jest/types": ^26.6.2
-    babel-jest: ^26.6.3
-    chalk: ^4.0.0
-    deepmerge: ^4.2.2
-    glob: ^7.1.1
-    graceful-fs: ^4.2.4
-    jest-environment-jsdom: ^26.6.2
-    jest-environment-node: ^26.6.2
-    jest-get-type: ^26.3.0
-    jest-jasmine2: ^26.6.3
-    jest-regex-util: ^26.0.0
-    jest-resolve: ^26.6.2
-    jest-util: ^26.6.2
-    jest-validate: ^26.6.2
-    micromatch: ^4.0.2
-    pretty-format: ^26.6.2
-  peerDependencies:
-    ts-node: ">=9.0.0"
-  peerDependenciesMeta:
-    ts-node:
-      optional: true
-  checksum: 303c798582d3c5d4b4e6ab8a4d91a83ded28e4ebbc0bcfc1ad271f9864437ef5409b7c7773010143811bc8176b0695c096717b91419c6484b56dcc032560a74b
-  languageName: node
-  linkType: hard
-
 "jest-config@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-config@npm:27.5.1"
@@ -23799,7 +22192,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^26.0.0, jest-diff@npm:^26.6.2":
+"jest-diff@npm:^26.0.0":
   version: 26.6.2
   resolution: "jest-diff@npm:26.6.2"
   dependencies:
@@ -23835,15 +22228,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^26.0.0":
-  version: 26.0.0
-  resolution: "jest-docblock@npm:26.0.0"
-  dependencies:
-    detect-newline: ^3.0.0
-  checksum: e03ef104ee8c571335e6fa394b8fc8d2bd87eec9fe8b3d7d9aac056ada7de288f37ee8ac4922bb3a4222ac304db975d8832d5abc85486092866c534a16847cd5
-  languageName: node
-  linkType: hard
-
 "jest-docblock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-docblock@npm:27.5.1"
@@ -23853,19 +22237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-each@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-each@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    chalk: ^4.0.0
-    jest-get-type: ^26.3.0
-    jest-util: ^26.6.2
-    pretty-format: ^26.6.2
-  checksum: 4e00ea4667e4fe015b894dc698cce0ae695cf458e021e5da62d4a5b052cd2c0a878da93f8c97cbdde60bcecf70982e8d3a7a5d63e1588f59531cc797a18c39ef
-  languageName: node
-  linkType: hard
-
 "jest-each@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-each@npm:27.5.1"
@@ -23879,35 +22250,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom-fifteen@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "jest-environment-jsdom-fifteen@npm:1.0.2"
-  dependencies:
-    "@jest/environment": ^24.3.0
-    "@jest/fake-timers": ^24.3.0
-    "@jest/types": ^24.3.0
-    jest-mock: ^24.0.0
-    jest-util: ^24.0.0
-    jsdom: ^15.2.1
-  checksum: 9ad13c6d24972570392969faa4b5369e3e59b37fdfcc54dd418203fa41930a7634878ff13b6ecb48ec4e2ca43d3b255569b8b743f591a5c91e0e4b6422e67b5e
-  languageName: node
-  linkType: hard
-
-"jest-environment-jsdom@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-environment-jsdom@npm:26.6.2"
-  dependencies:
-    "@jest/environment": ^26.6.2
-    "@jest/fake-timers": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    jest-mock: ^26.6.2
-    jest-util: ^26.6.2
-    jsdom: ^16.4.0
-  checksum: 8af9ffdf1b147362a19032bfe9ed51b709d43c74dc4b1c45e56d721808bf6cabdca8c226855b55a985ea196ce51cdb171bfe420ceec3daa2d13818d5c1915890
-  languageName: node
-  linkType: hard
-
 "jest-environment-jsdom@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-environment-jsdom@npm:27.5.1"
@@ -23923,20 +22265,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-environment-node@npm:26.6.2"
-  dependencies:
-    "@jest/environment": ^26.6.2
-    "@jest/fake-timers": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    jest-mock: ^26.6.2
-    jest-util: ^26.6.2
-  checksum: 0b69b481e6d6f2350ed241c2dabc70b0b1f3a00f9a410b7dad97c8ab38e88026acf7445ca663eb314f46ff50acee0133100b1006bf4ebda5298ffb02763a6861
-  languageName: node
-  linkType: hard
-
 "jest-environment-node@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-environment-node@npm:27.5.1"
@@ -23981,29 +22309,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-haste-map@npm:24.9.0"
-  dependencies:
-    "@jest/types": ^24.9.0
-    anymatch: ^2.0.0
-    fb-watchman: ^2.0.0
-    fsevents: ^1.2.7
-    graceful-fs: ^4.1.15
-    invariant: ^2.2.4
-    jest-serializer: ^24.9.0
-    jest-util: ^24.9.0
-    jest-worker: ^24.9.0
-    micromatch: ^3.1.10
-    sane: ^4.0.3
-    walker: ^1.0.7
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 3ec2d60863c315d52a32b2d1df3cc8bb5403f7d8bf159e556c878db09dedc4d1fb4e4d5f56cb67c92663b334d49ef8b768375b0d153adebf4d48a7b6959e71b3
-  languageName: node
-  linkType: hard
-
 "jest-haste-map@npm:^26.6.2":
   version: 26.6.2
   resolution: "jest-haste-map@npm:26.6.2"
@@ -24053,32 +22358,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-jasmine2@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "jest-jasmine2@npm:26.6.3"
-  dependencies:
-    "@babel/traverse": ^7.1.0
-    "@jest/environment": ^26.6.2
-    "@jest/source-map": ^26.6.2
-    "@jest/test-result": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    chalk: ^4.0.0
-    co: ^4.6.0
-    expect: ^26.6.2
-    is-generator-fn: ^2.0.0
-    jest-each: ^26.6.2
-    jest-matcher-utils: ^26.6.2
-    jest-message-util: ^26.6.2
-    jest-runtime: ^26.6.3
-    jest-snapshot: ^26.6.2
-    jest-util: ^26.6.2
-    pretty-format: ^26.6.2
-    throat: ^5.0.0
-  checksum: 41df0b993ae0cdeb2660fb3d8e88e2dcc83aec6b5c27d85eb233c2d507b546f8dce45fc54898ffbefa48ccc4633f225d0e023fd0979b8f7f2f1626074a69a9a3
-  languageName: node
-  linkType: hard
-
 "jest-jasmine2@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-jasmine2@npm:27.5.1"
@@ -24104,6 +22383,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-junit@npm:13.1.0":
+  version: 13.1.0
+  resolution: "jest-junit@npm:13.1.0"
+  dependencies:
+    mkdirp: ^1.0.4
+    strip-ansi: ^6.0.1
+    uuid: ^8.3.2
+    xml: ^1.0.1
+  checksum: a12ec522012cf9d0e97d4c665d8ca05b97dc3d25ef3cd0dbba2b095da4b68e1cabac9751a2718a9593b55c620a2b980e0b6c7dd7d33dfc4b73193bc67b9c9ae0
+  languageName: node
+  linkType: hard
+
 "jest-junit@npm:13.2.0":
   version: 13.2.0
   resolution: "jest-junit@npm:13.2.0"
@@ -24116,28 +22407,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-junit@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "jest-junit@npm:13.0.0"
-  dependencies:
-    mkdirp: ^1.0.4
-    strip-ansi: ^6.0.1
-    uuid: ^8.3.2
-    xml: ^1.0.1
-  checksum: d3a1bf6e98250837d1a9939cd54f29a7bd4fb835af30e92d0d544300fbe634eb86d2b018c79a7a35b123d933bf3e6c96ba13c0161cdefbf66fc3ab771707572e
-  languageName: node
-  linkType: hard
-
-"jest-leak-detector@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-leak-detector@npm:26.6.2"
-  dependencies:
-    jest-get-type: ^26.3.0
-    pretty-format: ^26.6.2
-  checksum: 364dd4d021347e26c66ba9c09da8a30477f14a3a8a208d2d7d64e4c396db81b85d8cb6b6834bcfc47a61b5938e274553957d11a7de2255f058c9d55d7f8fdfe7
-  languageName: node
-  linkType: hard
-
 "jest-leak-detector@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-leak-detector@npm:27.5.1"
@@ -24160,51 +22429,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-matcher-utils@npm:26.6.2"
-  dependencies:
-    chalk: ^4.0.0
-    jest-diff: ^26.6.2
-    jest-get-type: ^26.3.0
-    pretty-format: ^26.6.2
-  checksum: 74d2165c1ac7fe98fe27cd2b5407499478e6b2fe99dd54e26d8ee5c9f5f913bdd7bdc07c7221b9b04df0c15e9be0e866ff3455b03e38cc66c480d9996d6d5405
-  languageName: node
-  linkType: hard
-
-"jest-message-util@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-message-util@npm:24.9.0"
-  dependencies:
-    "@babel/code-frame": ^7.0.0
-    "@jest/test-result": ^24.9.0
-    "@jest/types": ^24.9.0
-    "@types/stack-utils": ^1.0.1
-    chalk: ^2.0.1
-    micromatch: ^3.1.10
-    slash: ^2.0.0
-    stack-utils: ^1.0.1
-  checksum: c173117b245090967db4853c28c3452ad2987a10caf28161abbfeb8d96be13f0d9e25422df10162bcc5e46860887e35ec4b4963f85392c4a625e4c37ad242f0b
-  languageName: node
-  linkType: hard
-
-"jest-message-util@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-message-util@npm:26.6.2"
-  dependencies:
-    "@babel/code-frame": ^7.0.0
-    "@jest/types": ^26.6.2
-    "@types/stack-utils": ^2.0.0
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.4
-    micromatch: ^4.0.2
-    pretty-format: ^26.6.2
-    slash: ^3.0.0
-    stack-utils: ^2.0.2
-  checksum: ffe5a715591c41240b9ed4092faf10f3eaf9ddfdf25d257a0c9f903aaa8d9eed5baa7e38016d2ec4f610fd29225e0f5231a91153e087a043e62824972c83d015
-  languageName: node
-  linkType: hard
-
 "jest-message-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-message-util@npm:27.5.1"
@@ -24231,25 +22455,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^24.0.0, jest-mock@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-mock@npm:24.9.0"
-  dependencies:
-    "@jest/types": ^24.9.0
-  checksum: 823feac37b003543fe81e05d5d8a1ec69cdf9ae5b797582a3e90424ec476120ce42a11e6b1d8231958e01232d4e40e57207cf2c56197d63d309bdeaf63fcf804
-  languageName: node
-  linkType: hard
-
-"jest-mock@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-mock@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-  checksum: 6c0fe028ff0cdc87b5d63b9ca749af04cae6c5577aaab234f602e546cae3f4b932adac9d77e6de2abb24955ee00978e1e5d5a861725654e2f9a42317d91fbc1f
-  languageName: node
-  linkType: hard
-
 "jest-mock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-mock@npm:27.5.1"
@@ -24272,13 +22477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-regex-util@npm:24.9.0"
-  checksum: 94299972501ae5dfc3932673b263fd15dba5e28698571687a28cc59b5a173edcbf52b992f4d5a6eded9da5b7e1468d263ef96a1564267832799b41c2986fc423
-  languageName: node
-  linkType: hard
-
 "jest-regex-util@npm:^26.0.0":
   version: 26.0.0
   resolution: "jest-regex-util@npm:26.0.0"
@@ -24293,17 +22491,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "jest-resolve-dependencies@npm:26.6.3"
-  dependencies:
-    "@jest/types": ^26.6.2
-    jest-regex-util: ^26.0.0
-    jest-snapshot: ^26.6.2
-  checksum: 533ea1e271426006ff02c03c9802b108fcd68f2144615b6110ae59f3a0a2cc4a7abb3f44c3c65299c76b3a725d5d8220aaed9c58b79c8c8c508c18699a96e3f7
-  languageName: node
-  linkType: hard
-
 "jest-resolve-dependencies@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-resolve-dependencies@npm:27.5.1"
@@ -24315,22 +22502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-resolve@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.4
-    jest-pnp-resolver: ^1.2.2
-    jest-util: ^26.6.2
-    read-pkg-up: ^7.0.1
-    resolve: ^1.18.1
-    slash: ^3.0.0
-  checksum: d6264d3f39b098753802a237c8c54f3109f5f3b3b7fa6f8d7aec7dca01b357ddf518ce1c33a68454357c15f48fb3c6026a92b9c4f5d72f07e24e80f04bcc8d58
-  languageName: node
-  linkType: hard
-
 "jest-resolve@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-resolve@npm:27.5.1"
@@ -24349,34 +22520,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "jest-runner@npm:26.6.3"
-  dependencies:
-    "@jest/console": ^26.6.2
-    "@jest/environment": ^26.6.2
-    "@jest/test-result": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    chalk: ^4.0.0
-    emittery: ^0.7.1
-    exit: ^0.1.2
-    graceful-fs: ^4.2.4
-    jest-config: ^26.6.3
-    jest-docblock: ^26.0.0
-    jest-haste-map: ^26.6.2
-    jest-leak-detector: ^26.6.2
-    jest-message-util: ^26.6.2
-    jest-resolve: ^26.6.2
-    jest-runtime: ^26.6.3
-    jest-util: ^26.6.2
-    jest-worker: ^26.6.2
-    source-map-support: ^0.5.6
-    throat: ^5.0.0
-  checksum: ccd69918baa49a5efa45985cf60cfa1fbb1686b32d7a86296b7b55f89684e36d1f08e62598c4b7be7e81f2cf2e245d1a65146ea7bdcaedfa6ed176d3e645d7e2
-  languageName: node
-  linkType: hard
-
 "jest-runner@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-runner@npm:27.5.1"
@@ -24406,43 +22549,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^26.6.3":
-  version: 26.6.3
-  resolution: "jest-runtime@npm:26.6.3"
-  dependencies:
-    "@jest/console": ^26.6.2
-    "@jest/environment": ^26.6.2
-    "@jest/fake-timers": ^26.6.2
-    "@jest/globals": ^26.6.2
-    "@jest/source-map": ^26.6.2
-    "@jest/test-result": ^26.6.2
-    "@jest/transform": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/yargs": ^15.0.0
-    chalk: ^4.0.0
-    cjs-module-lexer: ^0.6.0
-    collect-v8-coverage: ^1.0.0
-    exit: ^0.1.2
-    glob: ^7.1.3
-    graceful-fs: ^4.2.4
-    jest-config: ^26.6.3
-    jest-haste-map: ^26.6.2
-    jest-message-util: ^26.6.2
-    jest-mock: ^26.6.2
-    jest-regex-util: ^26.0.0
-    jest-resolve: ^26.6.2
-    jest-snapshot: ^26.6.2
-    jest-util: ^26.6.2
-    jest-validate: ^26.6.2
-    slash: ^3.0.0
-    strip-bom: ^4.0.0
-    yargs: ^15.4.1
-  bin:
-    jest-runtime: bin/jest-runtime.js
-  checksum: 867922b49f9ab4cf2f5f1356ac3d9962c4477c7a2ff696cc841ea4c600ea389e7d6dfcbf945fec6849e606f81980addf31e4f34d63eaa3d3415f4901de2f605a
-  languageName: node
-  linkType: hard
-
 "jest-runtime@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-runtime@npm:27.5.1"
@@ -24473,13 +22579,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-serializer@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-serializer@npm:24.9.0"
-  checksum: 56d70bd50ebd71de7a38e1f94ef2fdf1293c3810ef6d372b69238263625d3df1e6749417872bc6be0515e39832f4c40df03c74d20d8f0f43efd14ea21e22178d
-  languageName: node
-  linkType: hard
-
 "jest-serializer@npm:^26.6.2":
   version: 26.6.2
   resolution: "jest-serializer@npm:26.6.2"
@@ -24500,30 +22599,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-snapshot@npm:26.6.2"
-  dependencies:
-    "@babel/types": ^7.0.0
-    "@jest/types": ^26.6.2
-    "@types/babel__traverse": ^7.0.4
-    "@types/prettier": ^2.0.0
-    chalk: ^4.0.0
-    expect: ^26.6.2
-    graceful-fs: ^4.2.4
-    jest-diff: ^26.6.2
-    jest-get-type: ^26.3.0
-    jest-haste-map: ^26.6.2
-    jest-matcher-utils: ^26.6.2
-    jest-message-util: ^26.6.2
-    jest-resolve: ^26.6.2
-    natural-compare: ^1.4.0
-    pretty-format: ^26.6.2
-    semver: ^7.3.2
-  checksum: 53f1de055b1d3840bc6e851fd674d5991b844d4695dadbd07354c93bf191048d8767b8606999847e97c4214a485b9afb45c1d2411772befa1870414ac973b3e2
-  languageName: node
-  linkType: hard
-
 "jest-snapshot@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-snapshot@npm:27.5.1"
@@ -24554,27 +22629,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-util@npm:^24.0.0, jest-util@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-util@npm:24.9.0"
-  dependencies:
-    "@jest/console": ^24.9.0
-    "@jest/fake-timers": ^24.9.0
-    "@jest/source-map": ^24.9.0
-    "@jest/test-result": ^24.9.0
-    "@jest/types": ^24.9.0
-    callsites: ^3.0.0
-    chalk: ^2.0.1
-    graceful-fs: ^4.1.15
-    is-ci: ^2.0.0
-    mkdirp: ^0.5.1
-    slash: ^2.0.0
-    source-map: ^0.6.0
-  checksum: ee84238bfb8c4aa60830b546e0e5dbdff53bbe55a1462f023182130ee7f1f3aac2dce0ab8395ab72b93e5a889fa12a55cebeeab04352a623d00d29c262dfbeb0
-  languageName: node
-  linkType: hard
-
-"jest-util@npm:^26.1.0, jest-util@npm:^26.6.2":
+"jest-util@npm:^26.6.2":
   version: 26.6.2
   resolution: "jest-util@npm:26.6.2"
   dependencies:
@@ -24616,7 +22671,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^26.5.2, jest-validate@npm:^26.6.2":
+"jest-validate@npm:^26.5.2":
   version: 26.6.2
   resolution: "jest-validate@npm:26.6.2"
   dependencies:
@@ -24644,21 +22699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "jest-watcher@npm:26.6.2"
-  dependencies:
-    "@jest/test-result": ^26.6.2
-    "@jest/types": ^26.6.2
-    "@types/node": "*"
-    ansi-escapes: ^4.2.1
-    chalk: ^4.0.0
-    jest-util: ^26.6.2
-    string-length: ^4.0.1
-  checksum: 401137f1a73bf23cdf390019ebffb3f6f89c53ca49d48252d1dd6daf17a68787fef75cc55a623de28b63d87d0e8f13d8972d7dd06740f2f64f7b2a0409d119d2
-  languageName: node
-  linkType: hard
-
 "jest-watcher@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-watcher@npm:27.5.1"
@@ -24674,26 +22714,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^24.9.0":
-  version: 24.9.0
-  resolution: "jest-worker@npm:24.9.0"
-  dependencies:
-    merge-stream: ^2.0.0
-    supports-color: ^6.1.0
-  checksum: bd23b6c8728dcf3bad0d84543ea1bc4a95ccd3b5a40f9e2796d527ab0e87dc6afa6c30cc7b67845dce1cfe7894753812d19793de605db1976b7ac08930671bff
-  languageName: node
-  linkType: hard
-
-"jest-worker@npm:^25.4.0":
-  version: 25.5.0
-  resolution: "jest-worker@npm:25.5.0"
-  dependencies:
-    merge-stream: ^2.0.0
-    supports-color: ^7.0.0
-  checksum: 773ad5c680f7c47c023e90a63faffe041dc297c19df90d31768598d700517ef31ad5e3289e68bdf85ab7eca91efde8134f8646472747f47ae3f60c96a37d1c4b
-  languageName: node
-  linkType: hard
-
 "jest-worker@npm:^26.2.1, jest-worker@npm:^26.5.0, jest-worker@npm:^26.6.2":
   version: 26.6.2
   resolution: "jest-worker@npm:26.6.2"
@@ -24705,6 +22725,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-worker@npm:^27.0.2, jest-worker@npm:^27.5.1":
+  version: 27.5.1
+  resolution: "jest-worker@npm:27.5.1"
+  dependencies:
+    "@types/node": "*"
+    merge-stream: ^2.0.0
+    supports-color: ^8.0.0
+  checksum: 98cd68b696781caed61c983a3ee30bf880b5bd021c01d98f47b143d4362b85d0737f8523761e2713d45e18b4f9a2b98af1eaee77afade4111bb65c77d6f7c980
+  languageName: node
+  linkType: hard
+
 "jest-worker@npm:^27.0.6, jest-worker@npm:^27.3.1":
   version: 27.3.1
   resolution: "jest-worker@npm:27.3.1"
@@ -24727,30 +22758,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-worker@npm:27.5.1"
-  dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: 98cd68b696781caed61c983a3ee30bf880b5bd021c01d98f47b143d4362b85d0737f8523761e2713d45e18b4f9a2b98af1eaee77afade4111bb65c77d6f7c980
-  languageName: node
-  linkType: hard
-
-"jest@npm:26.6.3":
-  version: 26.6.3
-  resolution: "jest@npm:26.6.3"
-  dependencies:
-    "@jest/core": ^26.6.3
-    import-local: ^3.0.2
-    jest-cli: ^26.6.3
-  bin:
-    jest: bin/jest.js
-  checksum: 3a9b4c70e9bd5391e7367a0036045c1d3545c2a39e1439a71fb4b59b1748bc34e2ccb324faa1046b99bffc8dc2ed7b3c59016c462255b2646f5fa9300351f914
-  languageName: node
-  linkType: hard
-
 "jest@npm:27.5.1":
   version: 27.5.1
   resolution: "jest@npm:27.5.1"
@@ -24873,6 +22880,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsdoc-type-pratt-parser@npm:~2.2.5":
+  version: 2.2.5
+  resolution: "jsdoc-type-pratt-parser@npm:2.2.5"
+  checksum: 47d68147fae7fe4343e0c1d47cbf55d2d963696e0583a1d398846be06df2df8e149e34a6304e04b6c148839600234e99a860bc712af829fac557fe7e5cd82141
+  languageName: node
+  linkType: hard
+
 "jsdoc-type-pratt-parser@npm:~3.1.0":
   version: 3.1.0
   resolution: "jsdoc-type-pratt-parser@npm:3.1.0"
@@ -24880,46 +22894,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^15.2.1":
-  version: 15.2.1
-  resolution: "jsdom@npm:15.2.1"
-  dependencies:
-    abab: ^2.0.0
-    acorn: ^7.1.0
-    acorn-globals: ^4.3.2
-    array-equal: ^1.0.0
-    cssom: ^0.4.1
-    cssstyle: ^2.0.0
-    data-urls: ^1.1.0
-    domexception: ^1.0.1
-    escodegen: ^1.11.1
-    html-encoding-sniffer: ^1.0.2
-    nwsapi: ^2.2.0
-    parse5: 5.1.0
-    pn: ^1.1.0
-    request: ^2.88.0
-    request-promise-native: ^1.0.7
-    saxes: ^3.1.9
-    symbol-tree: ^3.2.2
-    tough-cookie: ^3.0.1
-    w3c-hr-time: ^1.0.1
-    w3c-xmlserializer: ^1.1.2
-    webidl-conversions: ^4.0.2
-    whatwg-encoding: ^1.0.5
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^7.0.0
-    ws: ^7.0.0
-    xml-name-validator: ^3.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: eff437b977330b1e63cd3ee2c2fe7c799c876799cae35525e1e6864d939dd41631ebd65f847adaeb83c2160c828d027d0f1d0dbe88366d1da22c875a5165a78c
-  languageName: node
-  linkType: hard
-
-"jsdom@npm:^16.4.0, jsdom@npm:^16.6.0":
+"jsdom@npm:^16.6.0":
   version: 16.7.0
   resolution: "jsdom@npm:16.7.0"
   dependencies:
@@ -25072,15 +23047,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^0.5.0":
-  version: 0.5.1
-  resolution: "json5@npm:0.5.1"
-  bin:
-    json5: lib/cli.js
-  checksum: 9b85bf06955b23eaa4b7328aa8892e3887e81ca731dd27af04a5f5f1458fbc5e1de57a24442e3272f8a888dd1abe1cb68eb693324035f6b3aeba4fcab7667d62
-  languageName: node
-  linkType: hard
-
 "json5@npm:^1.0.1":
   version: 1.0.1
   resolution: "json5@npm:1.0.1"
@@ -25092,6 +23058,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json5@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "json5@npm:2.2.1"
+  bin:
+    json5: lib/cli.js
+  checksum: 74b8a23b102a6f2bf2d224797ae553a75488b5adbaee9c9b6e5ab8b510a2fc6e38f876d4c77dea672d4014a44b2399e15f2051ac2b37b87f74c0c7602003543b
+  languageName: node
+  linkType: hard
+
 "jsonfile@npm:^2.1.0":
   version: 2.4.0
   resolution: "jsonfile@npm:2.4.0"
@@ -25313,16 +23288,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"last-call-webpack-plugin@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "last-call-webpack-plugin@npm:3.0.0"
-  dependencies:
-    lodash: ^4.17.5
-    webpack-sources: ^1.1.0
-  checksum: 23c25a2397c9f75b769b5238ab798873e857baf2363d471d186c9f05212457943f0de16181f33aeecbfd42116b72a0f343fe8910d5d8010f24956d95d536c743
-  languageName: node
-  linkType: hard
-
 "latest-version@npm:^5.1.0":
   version: 5.1.0
   resolution: "latest-version@npm:5.1.0"
@@ -25387,23 +23352,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"less-loader@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "less-loader@npm:5.0.0"
+"less-loader@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "less-loader@npm:10.2.0"
   dependencies:
-    clone: ^2.1.1
-    loader-utils: ^1.1.0
-    pify: ^4.0.1
+    klona: ^2.0.4
   peerDependencies:
-    less: ^2.3.1 || ^3.0.0
-    webpack: ^2.0.0 || ^3.0.0 || ^4.0.0
-  checksum: b06dfef24ade4668e5a076e83a867506e685d1642b715af43e3c9e19b41f07d56afad948cdb4d1d39450dbcc2b26c726034307af0c0672479e851b5fe68ec0e5
+    less: ^3.5.0 || ^4.0.0
+    webpack: ^5.0.0
+  checksum: 42a2b56a9d474c066b22423e8ed82821ed6dbc5effad8d84b2a3d8651fb4c5027f32ac770a0fe4810e3e6d0595be576a2f7f2341f2603bdf795cff4e94d7340b
   languageName: node
   linkType: hard
 
-"less@npm:^3.11.1":
-  version: 3.13.1
-  resolution: "less@npm:3.13.1"
+"less@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "less@npm:4.1.2"
   dependencies:
     copy-anything: ^2.0.1
     errno: ^0.1.1
@@ -25411,9 +23374,10 @@ __metadata:
     image-size: ~0.5.0
     make-dir: ^2.1.0
     mime: ^1.4.1
-    native-request: ^1.0.5
+    needle: ^2.5.2
+    parse-node-version: ^1.0.1
     source-map: ~0.6.0
-    tslib: ^1.10.0
+    tslib: ^2.3.0
   dependenciesMeta:
     errno:
       optional: true
@@ -25425,13 +23389,13 @@ __metadata:
       optional: true
     mime:
       optional: true
-    native-request:
+    needle:
       optional: true
     source-map:
       optional: true
   bin:
-    lessc: ./bin/lessc
-  checksum: cfc2c56f135bbf47d8e53a6d083640e98ed8e92ae8ef36a7103aee571949779af5ee299342a5be83eca8932625adf9ff97017a3c82018e63e8fb9f5e5ab948a5
+    lessc: bin/lessc
+  checksum: d3cbc3e18a8313e44f7feaf5fce1728b25911e116a8b9f7206e1f7bf5660902ddaf470b58e68a52288488c8a337433b7de686a3d2405ce49155c2280191983de
   languageName: node
   linkType: hard
 
@@ -25651,19 +23615,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loader-utils@npm:^0.2.16":
-  version: 0.2.17
-  resolution: "loader-utils@npm:0.2.17"
-  dependencies:
-    big.js: ^3.1.3
-    emojis-list: ^2.0.0
-    json5: ^0.5.0
-    object-assign: ^4.0.1
-  checksum: 3045c83ef8b19d66d4c25e3245120c579883f473fe0d0559552f55502be913725c4d558a7c866191a74b19ef2af20b094afe3b144ae1e717ea4c245d52f60a09
-  languageName: node
-  linkType: hard
-
-"loader-utils@npm:^1.0.2, loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0":
+"loader-utils@npm:^1.0.2, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0":
   version: 1.4.0
   resolution: "loader-utils@npm:1.4.0"
   dependencies:
@@ -25803,13 +23755,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.sortby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.sortby@npm:4.7.0"
-  checksum: db170c9396d29d11fe9a9f25668c4993e0c1331bcb941ddbd48fb76f492e732add7f2a47cfdf8e9d740fa59ac41bbfaf931d268bc72aab3ab49e9f89354d718c
-  languageName: node
-  linkType: hard
-
 "lodash.template@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.template@npm:4.5.0"
@@ -25843,7 +23788,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.0.0, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.3, lodash@npm:^4.17.4, lodash@npm:^4.17.5, lodash@npm:^4.7.0, lodash@npm:~4.17.15":
+"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.0.0, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0, lodash@npm:~4.17.15":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -25869,15 +23814,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"log-symbols@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "log-symbols@npm:3.0.0"
-  dependencies:
-    chalk: ^2.4.2
-  checksum: f2322e1452d819050b11aad247660e1494f8b2219d40a964af91d5f9af1a90636f1b3d93f2952090e42af07cc5550aecabf6c1d8ec1181207e95cb66ba112361
-  languageName: node
-  linkType: hard
-
 "log-update@npm:^4.0.0":
   version: 4.0.0
   resolution: "log-update@npm:4.0.0"
@@ -25941,13 +23877,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lower-case@npm:^1.1.1":
-  version: 1.1.4
-  resolution: "lower-case@npm:1.1.4"
-  checksum: 1ca9393b5eaef94a64e3f89e38b63d15bc7182a91171e6ad1550f51d710ec941540a065b274188f2e6b4576110cc2d11b50bc4bb7c603a040ddeb1db4ca95197
-  languageName: node
-  linkType: hard
-
 "lower-case@npm:^2.0.2":
   version: 2.0.2
   resolution: "lower-case@npm:2.0.2"
@@ -26120,13 +24049,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mamacro@npm:^0.0.3":
-  version: 0.0.3
-  resolution: "mamacro@npm:0.0.3"
-  checksum: ed3f970007248e377cd3a141866e2d6ba0ef09344b4ed1d80dcce6b5d6cdec6a50675894cc5249efdefeace60dd430afcf4af6cbd6bf975d79feb9c4b703fbc2
-  languageName: node
-  linkType: hard
-
 "map-age-cleaner@npm:^0.1.3":
   version: 0.1.3
   resolution: "map-age-cleaner@npm:0.1.3"
@@ -26639,7 +24561,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:2.6.0":
+"mini-css-extract-plugin@npm:2.6.0, mini-css-extract-plugin@npm:^2.6.0":
   version: 2.6.0
   resolution: "mini-css-extract-plugin@npm:2.6.0"
   dependencies:
@@ -26650,20 +24572,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "mini-css-extract-plugin@npm:0.7.0"
-  dependencies:
-    loader-utils: ^1.1.0
-    normalize-url: 1.9.1
-    schema-utils: ^1.0.0
-    webpack-sources: ^1.1.0
-  peerDependencies:
-    webpack: ^4.4.0
-  checksum: dd783b1d3f002b1d2f606e0458c99f2f45507c0b2e9f91ce99807f9875d4b394fc201cad07c1d2bda7ce88877f97ab6228178be93133b9586f93cc7b7da3cf02
-  languageName: node
-  linkType: hard
-
 "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
@@ -26879,15 +24787,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:1.x, mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "mkdirp@npm:1.0.4"
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
-  languageName: node
-  linkType: hard
-
 "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5":
   version: 0.5.5
   resolution: "mkdirp@npm:0.5.5"
@@ -26899,6 +24798,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "mkdirp@npm:1.0.4"
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
+  languageName: node
+  linkType: hard
+
 "mocha@npm:10.0.0":
   version: 10.0.0
   resolution: "mocha@npm:10.0.0"
@@ -27185,13 +25093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"native-request@npm:^1.0.5":
-  version: 1.1.0
-  resolution: "native-request@npm:1.1.0"
-  checksum: ab96f79c7a5e726a88eaa90c700d4d844af884e68d9784d90d42134c12224105453e4db82b5985624b458e4a304d5f664c1be760e88b63f7f247001f4e755603
-  languageName: node
-  linkType: hard
-
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
@@ -27216,6 +25117,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"needle@npm:^2.5.2":
+  version: 2.9.1
+  resolution: "needle@npm:2.9.1"
+  dependencies:
+    debug: ^3.2.6
+    iconv-lite: ^0.4.4
+    sax: ^1.2.4
+  bin:
+    needle: ./bin/needle
+  checksum: 746ae3a3782f0a057ff304a98843cc6f2009f978a0fad0c3e641a9d46d0b5702bb3e197ba08aecd48678067874a991c4f5fc320c7e51a4c041d9dd3441146cf0
+  languageName: node
+  linkType: hard
+
 "negotiator@npm:0.6.2, negotiator@npm:^0.6.2":
   version: 0.6.2
   resolution: "negotiator@npm:0.6.2"
@@ -27281,15 +25195,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"no-case@npm:^2.2.0":
-  version: 2.3.2
-  resolution: "no-case@npm:2.3.2"
-  dependencies:
-    lower-case: ^1.1.1
-  checksum: 856487731936fef44377ca74fdc5076464aba2e0734b56a4aa2b2a23d5b154806b591b9b2465faa59bb982e2b5c9391e3685400957fb4eeb38f480525adcf3dd
-  languageName: node
-  linkType: hard
-
 "no-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "no-case@npm:3.0.4"
@@ -27459,20 +25364,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-notifier@npm:^8.0.0":
-  version: 8.0.2
-  resolution: "node-notifier@npm:8.0.2"
-  dependencies:
-    growly: ^1.3.0
-    is-wsl: ^2.2.0
-    semver: ^7.3.2
-    shellwords: ^0.1.1
-    uuid: ^8.3.0
-    which: ^2.0.2
-  checksum: 7db1683003f6aaa4324959dfa663cd56e301ccc0165977a9e7737989ffe3b4763297f9fc85f44d0662b63a4fd85516eda43411b492a4d2fae207afb23773f912
-  languageName: node
-  linkType: hard
-
 "node-releases@npm:^2.0.1":
   version: 2.0.1
   resolution: "node-releases@npm:2.0.1"
@@ -27602,18 +25493,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-url@npm:1.9.1":
-  version: 1.9.1
-  resolution: "normalize-url@npm:1.9.1"
-  dependencies:
-    object-assign: ^4.0.1
-    prepend-http: ^1.0.0
-    query-string: ^4.1.0
-    sort-keys: ^1.0.0
-  checksum: 4b03c22bebbb822874ce3b9204367ad1f27c314ae09b13aa201de730b3cf95f00dadf378277a56062322968c95c06e5764d01474d26af8b43d20bc4c8c491f84
-  languageName: node
-  linkType: hard
-
 "normalize-url@npm:^4.1.0":
   version: 4.5.1
   resolution: "normalize-url@npm:4.5.1"
@@ -27914,7 +25793,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.1, object.getownpropertydescriptors@npm:^2.1.2":
+"object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.2":
   version: 2.1.3
   resolution: "object.getownpropertydescriptors@npm:2.1.3"
   dependencies:
@@ -28056,19 +25935,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optimize-css-assets-webpack-plugin@npm:6.0.1":
-  version: 6.0.1
-  resolution: "optimize-css-assets-webpack-plugin@npm:6.0.1"
-  dependencies:
-    cssnano: ^5.0.2
-    last-call-webpack-plugin: ^3.0.0
-    postcss: ^8.2.1
-  peerDependencies:
-    webpack: ^4.0.0
-  checksum: 84975f52890e98d4610e58b6bd972837c7d11c157d2b31d63f02069b58da42445445225495043c7e2e16a0f90f8dfd12221f20cc7a7917d198e68ce903a5b2a0
-  languageName: node
-  linkType: hard
-
 "optionator@npm:^0.8.1":
   version: 0.8.3
   resolution: "optionator@npm:0.8.3"
@@ -28097,22 +25963,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ora@npm:^4.0.3":
-  version: 4.1.1
-  resolution: "ora@npm:4.1.1"
-  dependencies:
-    chalk: ^3.0.0
-    cli-cursor: ^3.1.0
-    cli-spinners: ^2.2.0
-    is-interactive: ^1.0.0
-    log-symbols: ^3.0.0
-    mute-stream: 0.0.8
-    strip-ansi: ^6.0.0
-    wcwidth: ^1.0.1
-  checksum: 5dcee3a2e143c7b578531ceda051e8c4b64655a019030fe3de4aef67ac28d08fca996aef71522d40b2316a272aa158d65028d7f43c126d318b70a49d9fa4f991
-  languageName: node
-  linkType: hard
-
 "ora@npm:^5.1.0, ora@npm:^5.4.1":
   version: 5.4.1
   resolution: "ora@npm:5.4.1"
@@ -28207,13 +26057,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-each-series@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "p-each-series@npm:2.2.0"
-  checksum: 5fbe2f1f1966f55833bd401fe36f7afe410707d5e9fb6032c6dde8aa716d50521c3bb201fdb584130569b5941d5e84993e09e0b3f76a474288e0ede8f632983c
-  languageName: node
-  linkType: hard
-
 "p-event@npm:^4.1.0":
   version: 4.2.0
   resolution: "p-event@npm:4.2.0"
@@ -28248,7 +26091,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0, p-limit@npm:^2.2.1, p-limit@npm:^2.3.0":
+"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
   version: 2.3.0
   resolution: "p-limit@npm:2.3.0"
   dependencies:
@@ -28487,15 +26330,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"param-case@npm:2.1.x":
-  version: 2.1.1
-  resolution: "param-case@npm:2.1.1"
-  dependencies:
-    no-case: ^2.2.0
-  checksum: 3a63dcb8d8dc7995a612de061afdc7bb6fe7bd0e6db994db8d4cae999ed879859fd24389090e1a0d93f4c9207ebf8c048c870f468a3f4767161753e03cb9ab58
-  languageName: node
-  linkType: hard
-
 "param-case@npm:^3.0.3, param-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "param-case@npm:3.0.4"
@@ -28571,6 +26405,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-node-version@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "parse-node-version@npm:1.0.1"
+  checksum: c192393b6a978092c1ef8df2c42c0a02e4534b96543e23d335f1b9b5b913ac75473d18fe6050b58d6995c57fb383ee71a5cb8397e363caaf38a6df8215cc52fd
+  languageName: node
+  linkType: hard
+
 "parse-path@npm:^4.0.0":
   version: 4.0.3
   resolution: "parse-path@npm:4.0.3"
@@ -28604,13 +26445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:5.1.0":
-  version: 5.1.0
-  resolution: "parse5@npm:5.1.0"
-  checksum: 13c44c6d47035a3cc75303655ae5630dc264f9b9ab8344feb3f79ca195d8b57a2a246af902abef1d780ad1eee92eb9b88cd03098a7ee7dd111f032152ebaf0a6
-  languageName: node
-  linkType: hard
-
 "parse5@npm:6.0.1, parse5@npm:^6.0.0, parse5@npm:^6.0.1":
   version: 6.0.1
   resolution: "parse5@npm:6.0.1"
@@ -28864,7 +26698,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pixelmatch@npm:^5.1.0":
+"pixelmatch@npm:^5.2.1":
   version: 5.2.1
   resolution: "pixelmatch@npm:5.2.1"
   dependencies:
@@ -28925,13 +26759,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pn@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "pn@npm:1.1.0"
-  checksum: e4654186dc92a187c8c7fe4ccda902f4d39dd9c10f98d1c5a08ce5fad5507ef1e33ddb091240c3950bee81bd201b4c55098604c433a33b5e8bdd97f38b732fa0
-  languageName: node
-  linkType: hard
-
 "pngjs-image@npm:~0.11.5":
   version: 0.11.7
   resolution: "pngjs-image@npm:0.11.7"
@@ -28976,15 +26803,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pnp-webpack-plugin@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "pnp-webpack-plugin@npm:1.7.0"
-  dependencies:
-    ts-pnp: ^1.1.6
-  checksum: a41716d13607be5a3e06ba58b17e9e619cf07da3a0a7b10bd41cd89362873041054fd2b7966ad30a1b26b826cfb8fecc0469a95902d5b1b8ba8f591e2fe6b96d
-  languageName: node
-  linkType: hard
-
 "pofile@npm:^1.1.0":
   version: 1.1.1
   resolution: "pofile@npm:1.1.1"
@@ -29019,25 +26837,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-attribute-case-insensitive@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "postcss-attribute-case-insensitive@npm:4.0.2"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-selector-parser: ^6.0.2
-  checksum: e9cf4b61f443bf302dcd1110ef38d6a808fa38ae5d85bfd0aaaa6d35bef3825e0434f1aed8eb9596a5d88f21580ce8b9cd0098414d8490293ef71149695cae9a
-  languageName: node
-  linkType: hard
-
-"postcss-calc@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "postcss-calc@npm:8.0.0"
+"postcss-attribute-case-insensitive@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-attribute-case-insensitive@npm:5.0.0"
   dependencies:
     postcss-selector-parser: ^6.0.2
-    postcss-value-parser: ^4.0.2
   peerDependencies:
-    postcss: ^8.2.2
-  checksum: d945c49f317d6e8f220bce33075f2eec8e26052158a5a694186c11a26d23098b0300a3d44f666fda2feaa3ec93a636282881ee50b9e32776e08e5338e4a8c887
+    postcss: ^8.0.2
+  checksum: 6e0e872af10ba040af79fd0ee63b29cd6bc87a23a146fe71f9942d15769619c1f5b993b3238bdf30eb4f4c24887d2b85755692bc17e21e0ed3b24bd650cbf38b
   languageName: node
   linkType: hard
 
@@ -29053,69 +26860,47 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "postcss-color-functional-notation@npm:2.0.1"
+"postcss-clamp@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "postcss-clamp@npm:4.1.0"
   dependencies:
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: 0bfd1fa93bc54a07240d821d091093256511f70f0df5349e27e4d8b034ee3345f0ae58674ce425be6a91cc934325b2ce36ecddbf958fa8805fed6647cf671348
-  languageName: node
-  linkType: hard
-
-"postcss-color-gray@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-color-gray@npm:5.0.0"
-  dependencies:
-    "@csstools/convert-colors": ^1.4.0
-    postcss: ^7.0.5
-    postcss-values-parser: ^2.0.0
-  checksum: 81a62b3e2c170ffadc085c1643a7b5f1c153837d7ca228b07df88b9aeb0ec9088a92f8d919a748137ead3936e8dac2606e32b14b5166a59143642c8573949db5
-  languageName: node
-  linkType: hard
-
-"postcss-color-hex-alpha@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "postcss-color-hex-alpha@npm:5.0.3"
-  dependencies:
-    postcss: ^7.0.14
-    postcss-values-parser: ^2.0.1
-  checksum: 0a0ccb42c7c6a271ffd3c8b123b9c67744827d4b810b759731bc702fea1e00f05f08479ec7cbd8dfa47bc20510830a69f1e316a5724b9e53d5fdc6fabf90afc4
-  languageName: node
-  linkType: hard
-
-"postcss-color-mod-function@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "postcss-color-mod-function@npm:3.0.3"
-  dependencies:
-    "@csstools/convert-colors": ^1.4.0
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: ecbf74e9395527aaf3e83b90b1a6c9bba0a1904038d8acef1f530d50a68d912d6b1af8df690342f942be8b89fa7dfaa35ae67cb5fb48013cb389ecb8c74deadb
-  languageName: node
-  linkType: hard
-
-"postcss-color-rebeccapurple@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-color-rebeccapurple@npm:4.0.1"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: a7b1a204dfc5163ac4195cc3cb0c7b1bba9561feab49d24be8a17d695d6b69fd92f3da23d638260fe7e9d5076cf81bb798b25134fa2a2fbf7f74b0dda2829a96
-  languageName: node
-  linkType: hard
-
-"postcss-colormin@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "postcss-colormin@npm:5.2.1"
-  dependencies:
-    browserslist: ^4.16.6
-    caniuse-api: ^3.0.0
-    colord: ^2.9.1
-    postcss-value-parser: ^4.1.0
+    postcss-value-parser: ^4.2.0
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: c5337ae9477a6ad787a5bd366a6a418da65fd6212e4dade2ba14c5975faec5b16b69533fc0e5130f34b42a81bc2d1db17436b60f204ef7935cfc555187731579
+    postcss: ^8.4.6
+  checksum: 118eec936b3b035dc8d75c89973408f15c5a3de3d1ee210a2b3511e3e431d9c56e6f354b509a90540241e2225ffe3caaa2fdf25919c63348ce4583a28ada642c
+  languageName: node
+  linkType: hard
+
+"postcss-color-functional-notation@npm:^4.2.2":
+  version: 4.2.2
+  resolution: "postcss-color-functional-notation@npm:4.2.2"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 77cc5d5526c3228737f2642472546498f0d963b8617c7cae453423331ecb868712ed1557007eab0cd5ff183d60bba24fa2e4bc83e550ddd45f1399e354704b81
+  languageName: node
+  linkType: hard
+
+"postcss-color-hex-alpha@npm:^8.0.3":
+  version: 8.0.3
+  resolution: "postcss-color-hex-alpha@npm:8.0.3"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 3b5c1d12f86fc2b4b5b618e3842d03754eeae8c25cf252201a9bf67d2ef2845b50c23bd2854e631d8133418c13700be93a2a8689cccdfee446f25436adff9e46
+  languageName: node
+  linkType: hard
+
+"postcss-color-rebeccapurple@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-color-rebeccapurple@npm:7.0.2"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.3
+  checksum: 7d734ac50769f2cf42ac1e58247e45dffa3cc5fb663e67fa5b8ca1a71e1e950603263aad2e98d1629db6058b173ade0c5b5de0390d51d240da8c8674c036c8c7
   languageName: node
   linkType: hard
 
@@ -29133,17 +26918,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "postcss-convert-values@npm:5.0.2"
-  dependencies:
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 02a31f72b3365345db8aa1d83b084c96975d99a6494359378069431fd810e78ebf3bd96d03a598255daa8f6e2cd63722f119ddec9d24f66b6974b57819feb034
-  languageName: node
-  linkType: hard
-
 "postcss-convert-values@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-convert-values@npm:5.1.1"
@@ -29156,51 +26930,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^7.0.8":
-  version: 7.0.8
-  resolution: "postcss-custom-media@npm:7.0.8"
-  dependencies:
-    postcss: ^7.0.14
-  checksum: 3786eb10f238b22dc620cfcc9257779e27d8cee4510b3209d0ab67310e07dc68b69f3359db7a911f5e76df466f73d078fc80100943fe2e8fa9bcacf226705a2d
-  languageName: node
-  linkType: hard
-
-"postcss-custom-properties@npm:^8.0.11":
-  version: 8.0.11
-  resolution: "postcss-custom-properties@npm:8.0.11"
-  dependencies:
-    postcss: ^7.0.17
-    postcss-values-parser: ^2.0.1
-  checksum: cb1b47459a23ff2e48714c5d48d50070d573ef829dc7e57189d1b38c6fba0de7084f1acefbd84c61dd67e30bd9a7d154b22f195547728a9dc5f76f7d3f03ffea
-  languageName: node
-  linkType: hard
-
-"postcss-custom-selectors@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "postcss-custom-selectors@npm:5.1.2"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-selector-parser: ^5.0.0-rc.3
-  checksum: 26c83d348448f4ab5931cc1621606b09a6b1171e25fac2404073f3e298e77494ac87d4a21009679503b4895452810e93e618b5af26b4c7180a9013f283bb8088
-  languageName: node
-  linkType: hard
-
-"postcss-dir-pseudo-class@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-dir-pseudo-class@npm:5.0.0"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-selector-parser: ^5.0.0-rc.3
-  checksum: 703156fc65f259ec2e86ba51d18370a6d3b71f2e6473c7d65694676a8f0152137b1997bc0a53f7f373c8c3e4d63c72f7b5e2049f2ef3a7276b49409395722044
-  languageName: node
-  linkType: hard
-
-"postcss-discard-comments@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-discard-comments@npm:5.0.1"
+"postcss-custom-media@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-custom-media@npm:8.0.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: c561952bbffa799cfc96216098d7ccc14b1dc776f0a8038c52eafe89fbec02701a234f35f7244aa06d58127103e7dd5f0bfd1db18a53c1438fef5c0a9b2dbddf
+    postcss: ^8.1.0
+  checksum: 11c22e1b8cd5ec13093cb563a3a44817b38127e7f97bde954027f377a6848976092fb5482b96ef0f8b3f716038d9804a01a928eebe98c2d8a1fa9806ff4d3436
+  languageName: node
+  linkType: hard
+
+"postcss-custom-properties@npm:^12.1.5":
+  version: 12.1.7
+  resolution: "postcss-custom-properties@npm:12.1.7"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 98c313c2318679b727080297a12fb6674e5ea5a3343f693167e985793afd9c7d71ce25a17139864ccfe76d32d7474bb89a2ad02830c8e40fa57ccb0a699b528d
+  languageName: node
+  linkType: hard
+
+"postcss-custom-selectors@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-custom-selectors@npm:6.0.0"
+  dependencies:
+    postcss-selector-parser: ^6.0.4
+  peerDependencies:
+    postcss: ^8.1.2
+  checksum: 64640f6beab468222fefc7194b5de1520b0962654d860b71996ab8582e22e9918775582488fe8567faf9d0fb6a032fbafe89a836cfe9008d0985fe4f1d2f033e
+  languageName: node
+  linkType: hard
+
+"postcss-dir-pseudo-class@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-dir-pseudo-class@npm:6.0.4"
+  dependencies:
+    postcss-selector-parser: ^6.0.9
+  peerDependencies:
+    postcss: ^8.4
+  checksum: e493e6ed54c50b8b1bda1a0cde55fc2dec04d22983e5af178090ff592854a29866c1c255637cb047b2b40c18e6ef15c1aa45aa354735f79a7709e9add5ea2e3e
   languageName: node
   linkType: hard
 
@@ -29213,15 +26981,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-discard-duplicates@npm:5.0.1"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: becb68fd5ccd632fe51413a6ab4fd5c8aa3aae9d12947238014c2fb7816a2e0eb9a5454ee7207cac19f4a093c799be6053f13bf4048e97e20d88d5af4a0656bc
-  languageName: node
-  linkType: hard
-
 "postcss-discard-duplicates@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-discard-duplicates@npm:5.1.0"
@@ -29231,15 +26990,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-discard-empty@npm:5.0.1"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 2465ddabb18774c4996c18b8370498cf71597a23c45518ea75e7b73cd8f003b0be52ea9f27f28e24bba408d08ec5152e019cc595611bb097748993c1788d9f4f
-  languageName: node
-  linkType: hard
-
 "postcss-discard-empty@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-discard-empty@npm:5.1.1"
@@ -29249,15 +26999,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-discard-overridden@npm:5.0.1"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 7da9a4bda963145c45b0b51ddf7684e37072569d6f5d22f6cab9f37ea953426274f52eeec87391cd2bd1dd561a6a26cbd1f39debb124ccd8b665b760eda849b4
-  languageName: node
-  linkType: hard
-
 "postcss-discard-overridden@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-discard-overridden@npm:5.1.0"
@@ -29267,32 +27008,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "postcss-double-position-gradients@npm:1.0.0"
+"postcss-double-position-gradients@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "postcss-double-position-gradients@npm:3.1.1"
   dependencies:
-    postcss: ^7.0.5
-    postcss-values-parser: ^2.0.0
-  checksum: d2c4515b38a131ece44dba331aea2b3f9de646e30873b49f03fa8906179a3c43ddc43183bc4df609d8af0834e7c266ec3a63eaa4b3e96aa445d98ecdc12d2544
+    "@csstools/postcss-progressive-custom-properties": ^1.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: c59131b2d03022fbb69336766786e8cc33f6e78c8040e17d2ba499fce789c675c5dcdc4fd3abe1e76e0ecd3dc910ad8c56d49a307c0115047d21a59544afc527
   languageName: node
   linkType: hard
 
-"postcss-env-function@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "postcss-env-function@npm:2.0.2"
+"postcss-env-function@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "postcss-env-function@npm:4.0.6"
   dependencies:
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: 0cfa2e6cad5123cce39dcf5af332ec3b0e3e09b54d5142225f255914079d2afda3f1052e60f4b6d3bccf7eb9d592325b7421f1ecc6674ccb13c267a721fc3128
-  languageName: node
-  linkType: hard
-
-"postcss-flexbugs-fixes@npm:4.2.0":
-  version: 4.2.0
-  resolution: "postcss-flexbugs-fixes@npm:4.2.0"
-  dependencies:
-    postcss: ^7.0.26
-  checksum: 3b229307948167137711281005d8091c8ac20cbd344a875ea5d2929f99514891b439c136fb471814c979c277baeaa03159769096a4846dd0bcc1aaa1a0ca0bf2
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 645b2363cfa21be9dcce7fe4a0f172f0af70c00d6a4c1eb3d7ff7e9cfe26d569e291ec2533114d77b12d610023cd168a92d62c38f2fc969fa333b5ae2bff5ffe
   languageName: node
   linkType: hard
 
@@ -29305,91 +27040,84 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-focus-visible@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-focus-visible@npm:4.0.0"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: a3c93fbb578608f60c5256d0989ae32fd9100f76fa053880e82bfeb43751e81a3a9e69bd8338e06579b7f56b230a80fb2cc671eff134f2682dcbec9bbb8658ae
+"postcss-flexbugs-fixes@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "postcss-flexbugs-fixes@npm:5.0.2"
+  peerDependencies:
+    postcss: ^8.1.4
+  checksum: 022ddbcca8987303b9be75ff259e9de81b98643adac87a5fc6b52a0fcbbf95e1ac9fd508c4ed67cad76ac5d039b7123de8a0832329481b3c626f5d63f7a28f47
   languageName: node
   linkType: hard
 
-"postcss-focus-within@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-focus-within@npm:3.0.0"
+"postcss-focus-visible@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-focus-visible@npm:6.0.4"
   dependencies:
-    postcss: ^7.0.2
-  checksum: 2a31292cd9b929a2dd3171fc4ed287ea4a93c6ec8df1d634503fb97b8b30b33a2970b5e0df60634c60ff887923ab28641b624d566533096950e0a384705e9b90
+    postcss-selector-parser: ^6.0.9
+  peerDependencies:
+    postcss: ^8.4
+  checksum: acd010b9ddef9b86ffb5fa604c13515ba83e18bc5118dad0a1281150f412aa0ece056c2c5ac56b55e2599f53ab0f740f5ebfdc51e1f5cfe43b8130bac0096fcc
   languageName: node
   linkType: hard
 
-"postcss-font-variant@npm:^4.0.0":
+"postcss-focus-within@npm:^5.0.4":
+  version: 5.0.4
+  resolution: "postcss-focus-within@npm:5.0.4"
+  dependencies:
+    postcss-selector-parser: ^6.0.9
+  peerDependencies:
+    postcss: ^8.4
+  checksum: f23d8ab757345a6deaa807d76e10c88caf4b771c38b60e1593b24aee161c503b5823620e89302226a6ae5e7afdb6ac31809241291912e4176eb594a7ddcc9521
+  languageName: node
+  linkType: hard
+
+"postcss-font-variant@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-font-variant@npm:5.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: a19286589261c2bc3e20470486e1ee3b4daf34271c5020167f30856c9b30c26f23264307cb97a184d503814e1b8c5d8a1f9f64a14fd4fd9551c173dca9424695
+  languageName: node
+  linkType: hard
+
+"postcss-gap-properties@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "postcss-gap-properties@npm:3.0.3"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 8b7bb4292093fa66fa874143b69297d25ab83e5b8aef643f0a39cff900d9754cae55f0fb267f9230dbccbf31d538f2e885c59274daabe57a7b56716292dd89d5
+  languageName: node
+  linkType: hard
+
+"postcss-image-set-function@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "postcss-image-set-function@npm:4.0.6"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: bdcd11d5ef9e5beb8ce14888125e8b526b7e01902dcb78b47ea4418297f64cf188343194670a5beb8ee5831cc902a591a8887e3512403a6b932cff921be85de3
+  languageName: node
+  linkType: hard
+
+"postcss-initial@npm:^4.0.1":
   version: 4.0.1
-  resolution: "postcss-font-variant@npm:4.0.1"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: d09836cd848e8c24d144484b6b9b175df26dca59e1a1579e790c7f3dcaea00944a8d0b6ac543f4c128de7b30fab9a0aef544d54789b3b55fd850770b172d980d
+  resolution: "postcss-initial@npm:4.0.1"
+  peerDependencies:
+    postcss: ^8.0.0
+  checksum: 6956953853865de79c39d11533a2860e9f38b770bb284d0010d98a00b9469e22de344e4e5fd8208614d797030487e8918dd2f2c37d9e24d4dd59d565d4fc3e12
   languageName: node
   linkType: hard
 
-"postcss-gap-properties@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "postcss-gap-properties@npm:2.0.0"
+"postcss-lab-function@npm:^4.1.2":
+  version: 4.2.0
+  resolution: "postcss-lab-function@npm:4.2.0"
   dependencies:
-    postcss: ^7.0.2
-  checksum: c842d105c9403e34a8fac7bdef33a63fcb6bde038b04b20cae1e719e1966632887545576af99a4a6f302c98ca029c6f0d746419f498ef7f6821177ba676e6c25
-  languageName: node
-  linkType: hard
-
-"postcss-image-set-function@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "postcss-image-set-function@npm:3.0.1"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: 43958d7c1f80077e60e066bdf61bc326bcac64c272f17fd7a0585a6934fb1ffc7ba7f560a39849f597e4d28b8ae3addd9279c7145b9478d2d91a7c54c2fefd8b
-  languageName: node
-  linkType: hard
-
-"postcss-initial@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "postcss-initial@npm:3.0.4"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: 710ab6cabc5970912c04314099f5334e7d901235014bb1462657e29f8dc97b6e51caa35f0beba7e5dbe440589ef9c1df13a89bc53d6e6aa664573b945f1630bb
-  languageName: node
-  linkType: hard
-
-"postcss-lab-function@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "postcss-lab-function@npm:2.0.1"
-  dependencies:
-    "@csstools/convert-colors": ^1.4.0
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: 598229a7a05803b18cccde28114833e910367c5954341bea03c7d7b7b5a667dfb6a77ef9dd4a16d80fdff8b10dd44c478602a7d56e43687c8687af3710b4706f
-  languageName: node
-  linkType: hard
-
-"postcss-load-config@npm:^2.0.0":
-  version: 2.1.2
-  resolution: "postcss-load-config@npm:2.1.2"
-  dependencies:
-    cosmiconfig: ^5.0.0
-    import-cwd: ^2.0.0
-  checksum: 2e6d3a499512a03c19b0090f4143861612d613511d57122879d9fd545558d2a9fcbe85a2b0faf2ec32bbce0e62d22d2b544d91cbc4d4dfb3f22f841f8271fbc6
-  languageName: node
-  linkType: hard
-
-"postcss-loader@npm:3.0.0":
-  version: 3.0.0
-  resolution: "postcss-loader@npm:3.0.0"
-  dependencies:
-    loader-utils: ^1.1.0
-    postcss: ^7.0.0
-    postcss-load-config: ^2.0.0
-    schema-utils: ^1.0.0
-  checksum: a6a922cbcc225ef57fb88c8248f91195869cd11e0d2b0b0fe84bc89a3074437d592d79a9fc39e50218677b7ba3a41b0e1c7e8f9666e59d41a196d7ab022c5805
+    "@csstools/postcss-progressive-custom-properties": ^1.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 89ca828b8ed16feb201be7b050254560786c76392ce0a4262732438521ce13d083d1e542addf9d14da75249c58802d721df3152316bb591c9f627c7038166c2a
   languageName: node
   linkType: hard
 
@@ -29423,21 +27151,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-logical@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-logical@npm:3.0.0"
+"postcss-loader@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "postcss-loader@npm:6.2.1"
   dependencies:
-    postcss: ^7.0.2
-  checksum: 5278661b78a093661c9cac8c04666d457734bf156f83d8c67f6034c00e8d4b3a26fce32a8a4a251feae3c7587f42556412dca980e100d0c920ee55e878f7b8ee
+    cosmiconfig: ^7.0.0
+    klona: ^2.0.5
+    semver: ^7.3.5
+  peerDependencies:
+    postcss: ^7.0.0 || ^8.0.1
+    webpack: ^5.0.0
+  checksum: e40ae79c3e39df37014677a817b001bd115d8b10dedf53a07b97513d93b1533cd702d7a48831bdd77b9a9484b1ec84a5d4a723f80e83fb28682c75b5e65e8a90
   languageName: node
   linkType: hard
 
-"postcss-media-minmax@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-media-minmax@npm:4.0.0"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: 8a4d94e25089bb5a66c6742bcdd263fce2fea391438151a85b442b7f8b66323bbca552b59a93efd6bcabcfd41845ddd4149bd56d156b008f8d7d04bc84d9fb11
+"postcss-logical@npm:^5.0.4":
+  version: 5.0.4
+  resolution: "postcss-logical@npm:5.0.4"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 17c71291ed6a03883a5aa54b9923b874c32710707d041a0f0752e6febdb09dee5d2abf4ef271978d932e4a4c948f349bb23edf633c03e3427ba15e71bfc66ac7
+  languageName: node
+  linkType: hard
+
+"postcss-media-minmax@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-media-minmax@npm:5.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 2cd7283e07a1ac1acdcc3ecbaa0e9932f8d1e7647e7aeb14d91845fcb890d60d7257ec70c825cae8d48ae80a08cc77ebc4021a0dfa32360e0cd991e2bc021607
   languageName: node
   linkType: hard
 
@@ -29448,19 +27190,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "postcss-merge-longhand@npm:5.0.3"
-  dependencies:
-    css-color-names: ^1.0.1
-    postcss-value-parser: ^4.1.0
-    stylehacks: ^5.0.1
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: a0982ac3533fc2cf24077917050154dd7a9f7d2ad3994e5c9a4a7495192a65fa172997923b7119ec64b7eadfb99630fa11a5d3ee555d95822a02f881d627b0aa
-  languageName: node
-  linkType: hard
-
 "postcss-merge-longhand@npm:^5.1.4":
   version: 5.1.4
   resolution: "postcss-merge-longhand@npm:5.1.4"
@@ -29473,21 +27202,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "postcss-merge-rules@npm:5.0.2"
-  dependencies:
-    browserslist: ^4.16.6
-    caniuse-api: ^3.0.0
-    cssnano-utils: ^2.0.1
-    postcss-selector-parser: ^6.0.5
-    vendors: ^1.0.3
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 04b2be8e9def9822182aeb1362d25ef1bee9d4a5be6715fc9bec7aa4c7e885fb1b22d2d8a4438d58952952d2d3957e423ef8adcd7d5339d8bd046c9bae8c1639
-  languageName: node
-  linkType: hard
-
 "postcss-merge-rules@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-merge-rules@npm:5.1.1"
@@ -29502,17 +27216,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-minify-font-values@npm:5.0.1"
-  dependencies:
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 56aeb2cad5b3c4ca736b7fd7fa331d82281fbecc47e0e275a6a1203b436dbaa9f0772f668c3265dbf7ea2026c68d77c752cf9abe65bd3c65a53e696ae277e6e6
-  languageName: node
-  linkType: hard
-
 "postcss-minify-font-values@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-minify-font-values@npm:5.1.0"
@@ -29524,19 +27227,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "postcss-minify-gradients@npm:5.0.3"
-  dependencies:
-    colord: ^2.9.1
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 9ba5f28baeff45da8a5e759a748d5c26792e955d2cc061975c54f07d18f81518595353ddcd53dc5587342856425eefe909886b0a47bca392a9c9fcff297aab9e
-  languageName: node
-  linkType: hard
-
 "postcss-minify-gradients@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-minify-gradients@npm:5.1.1"
@@ -29550,21 +27240,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-minify-params@npm:5.0.1"
-  dependencies:
-    alphanum-sort: ^1.0.2
-    browserslist: ^4.16.0
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-    uniqs: ^2.0.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 52f210c5240c17d21bf4d1fec6477c929e74b047d084d5bf0f8e388534cc4b821cd4f2880d1aca0a0e0c13fcf133dc566897645d9f1f7e056bd443ef27c9a6c7
-  languageName: node
-  linkType: hard
-
 "postcss-minify-params@npm:^5.1.3":
   version: 5.1.3
   resolution: "postcss-minify-params@npm:5.1.3"
@@ -29578,18 +27253,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-minify-selectors@npm:5.1.0"
-  dependencies:
-    alphanum-sort: ^1.0.2
-    postcss-selector-parser: ^6.0.5
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: bf938e70a77b54d68709ec5e9a500b932e177b2278b5c405c3b59fb6f8315f2013e7b327ba76105949bf3c9ba6d6bef80ced4077cababb8e0015d87b4a086b50
-  languageName: node
-  linkType: hard
-
 "postcss-minify-selectors@npm:^5.2.0":
   version: 5.2.0
   resolution: "postcss-minify-selectors@npm:5.2.0"
@@ -29644,7 +27307,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-modules-scope@npm:^2.1.1, postcss-modules-scope@npm:^2.2.0":
+"postcss-modules-scope@npm:^2.2.0":
   version: 2.2.0
   resolution: "postcss-modules-scope@npm:2.2.0"
   dependencies:
@@ -29686,21 +27349,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "postcss-nesting@npm:7.0.1"
+"postcss-nesting@npm:^10.1.3":
+  version: 10.1.4
+  resolution: "postcss-nesting@npm:10.1.4"
   dependencies:
-    postcss: ^7.0.2
-  checksum: 4056be95759e8b25477f19aff7202b57dd27eeef41d31f7ca14e4c87d16ffb40e4db3f518fc85bd28b20e183f5e5399b56b52fcc79affd556e13a98bbc678169
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-charset@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-charset@npm:5.0.1"
+    postcss-selector-parser: ^6.0.10
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: b74720bf0487809143a30e1965ff756698650abdd072f4fe81f0a32ce41e84c140f107b39ad0babf4d319aa620d1d4e01d1f89dc7c7b3f55fd3b27f243ee26e1
+    postcss: ^8.4
+  checksum: 13dd01f9e43a6f93d48d2f9d5ef08966dbc990864dec585cb799420011c0ffff5b4ec670ba4a912c47a8a57263b4eb95fce352b04ddd2eb70f715bf622ad1a3b
   languageName: node
   linkType: hard
 
@@ -29713,18 +27369,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-display-values@npm:5.0.1"
-  dependencies:
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: ee84d379abd3fefcb23c09789a5f9d384a7f275d56e51b6ea149bf7a1cf512381bff0c3f00d938d0f91ab7c7fe00b19ace280cc3f84a100cd3cd8a604c4c7406
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-display-values@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-display-values@npm:5.1.0"
@@ -29736,17 +27380,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-positions@npm:5.0.1"
-  dependencies:
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 71a97ff851b78cdce8cc1ef21f91d40ddb2aca55d1bdc56056df27037efd9c208290f863ce0adf58a3060f8bb6eb3d66b4cf6d9a1e3ccbb03ba4eb0a0d1b6da4
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-positions@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-positions@npm:5.1.0"
@@ -29758,18 +27391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-repeat-style@npm:5.0.1"
-  dependencies:
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 24f21dd8eee0f5ef9119e71ba57174f675d16fe9a8f368656d64a4e5f2d69cb41ae42f70b814e5ef40f93857ff759205642f78781ff8854f473b7d726e93bc99
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-repeat-style@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-repeat-style@npm:5.1.0"
@@ -29781,17 +27402,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-string@npm:5.0.1"
-  dependencies:
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 4b42d41a05780517647b9a55888d314bfdfda2042f7a84050555e64da5eccade966fdca645c4ef66503fa95d642e89f2950e5b556b2a38a1a8f3120a24816c73
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-string@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-string@npm:5.1.0"
@@ -29803,18 +27413,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-timing-functions@npm:5.0.1"
-  dependencies:
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: fa58de8f9f6f8d4b507f9f029b18a0903a69a3b5088a2a1306e22163d81ca041d0f179888f5696516a9f75e188df904b0e082ec522b497a46ad1bfc24b06f348
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-timing-functions@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-timing-functions@npm:5.1.0"
@@ -29826,18 +27424,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-unicode@npm:5.0.1"
-  dependencies:
-    browserslist: ^4.16.0
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: d5a0e0c107639847709c1e9badf09267ee7c67206ac4c19df4f9479308866f0592773ff4063e58d48a6a1d638637a0f7b187ec429ddd3385bab32a06e2d020fd
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-unicode@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-unicode@npm:5.1.0"
@@ -29850,19 +27436,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "postcss-normalize-url@npm:5.0.2"
-  dependencies:
-    is-absolute-url: ^3.0.3
-    normalize-url: ^6.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 161a0a02d33188f61e6e46f10c0f2dcb1f0360adf1c39748340b691b9a686d2885a2aa29341e0733f8250060466e0c1b234ae49232d7827fd8689ee25222bb8c
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-url@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-url@npm:5.1.0"
@@ -29875,17 +27448,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-normalize-whitespace@npm:5.0.1"
-  dependencies:
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: cefb27d2443d4a8fc34aa2a0aebd470d7d5a58d9adcf39f5e2a80455f4ab37b171a24f58dc47b3111232c1adbb1c8702f80c0ecac1cfcef03e48e00dac6a4a58
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-whitespace@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-normalize-whitespace@npm:5.1.1"
@@ -29897,15 +27459,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "postcss-ordered-values@npm:5.0.2"
-  dependencies:
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 80b1cab96e3e9caf23de9b5436b36d7dc1efdd7ff9ee7b02c5ddc88c3564ec5adfa08e66f64c3b335beeb74a8c690a89e1594be14f2d5b708deb2c259de69619
+"postcss-opacity-percentage@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "postcss-opacity-percentage@npm:1.1.2"
+  checksum: b582f6d4efb6a14aa09ba49869774c2f060558a68af8a0c3aa9efc0e01b35a4985e783640806a76d4e26d2ba97556f9b5e88dde91d1664a2e2c24688e4bbcf61
   languageName: node
   linkType: hard
 
@@ -29921,98 +27478,96 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-overflow-shorthand@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "postcss-overflow-shorthand@npm:2.0.0"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: 553be1b7f9645017d33b654f9a436ce4f4406066c3056ca4c7ee06c21c2964fbe3437a9a3f998137efb6a17c1a79ee7e8baa39332c7dd9874aac8b69a3ad08b0
-  languageName: node
-  linkType: hard
-
-"postcss-page-break@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "postcss-page-break@npm:2.0.0"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: 65a4453883e904ca0f337d3a988a1b5a090e2e8bc2855913cb0b4b741158e6ea2e4eed9b33f5989e7ae55faa0f7b83cdc09693d600ac4c86ce804ae381ec48a4
-  languageName: node
-  linkType: hard
-
-"postcss-place@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-place@npm:4.0.1"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-values-parser: ^2.0.0
-  checksum: 26b2a443b0a8fcb6774d00036fa351633798a655ccd609da2d561fbd6561b0ba6f6b6d89e15fb074389fadb7da4cbc59c48ba75f1f5fdc478c020febb4e2b557
-  languageName: node
-  linkType: hard
-
-"postcss-preset-env@npm:6.7.0":
-  version: 6.7.0
-  resolution: "postcss-preset-env@npm:6.7.0"
-  dependencies:
-    autoprefixer: ^9.6.1
-    browserslist: ^4.6.4
-    caniuse-lite: ^1.0.30000981
-    css-blank-pseudo: ^0.1.4
-    css-has-pseudo: ^0.10.0
-    css-prefers-color-scheme: ^3.1.1
-    cssdb: ^4.4.0
-    postcss: ^7.0.17
-    postcss-attribute-case-insensitive: ^4.0.1
-    postcss-color-functional-notation: ^2.0.1
-    postcss-color-gray: ^5.0.0
-    postcss-color-hex-alpha: ^5.0.3
-    postcss-color-mod-function: ^3.0.3
-    postcss-color-rebeccapurple: ^4.0.1
-    postcss-custom-media: ^7.0.8
-    postcss-custom-properties: ^8.0.11
-    postcss-custom-selectors: ^5.1.2
-    postcss-dir-pseudo-class: ^5.0.0
-    postcss-double-position-gradients: ^1.0.0
-    postcss-env-function: ^2.0.2
-    postcss-focus-visible: ^4.0.0
-    postcss-focus-within: ^3.0.0
-    postcss-font-variant: ^4.0.0
-    postcss-gap-properties: ^2.0.0
-    postcss-image-set-function: ^3.0.1
-    postcss-initial: ^3.0.0
-    postcss-lab-function: ^2.0.1
-    postcss-logical: ^3.0.0
-    postcss-media-minmax: ^4.0.0
-    postcss-nesting: ^7.0.0
-    postcss-overflow-shorthand: ^2.0.0
-    postcss-page-break: ^2.0.0
-    postcss-place: ^4.0.1
-    postcss-pseudo-class-any-link: ^6.0.0
-    postcss-replace-overflow-wrap: ^3.0.0
-    postcss-selector-matches: ^4.0.0
-    postcss-selector-not: ^4.0.0
-  checksum: 209cbb63443a1631aa97ccfc3b95b1ff519ddaeb672f84d6af501bd9e9ad6727680b5b1bffb8209322e47d93029a69df6064f75cd0b7633b6df943cbef33f22e
-  languageName: node
-  linkType: hard
-
-"postcss-pseudo-class-any-link@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-pseudo-class-any-link@npm:6.0.0"
-  dependencies:
-    postcss: ^7.0.2
-    postcss-selector-parser: ^5.0.0-rc.3
-  checksum: d7dc3bba45df2966f8512c082a9cc341e63edac14d915ad9f41c62c452cd306d82da6baeee757dd4e7deafe3fa33b26c16e5236c670916bbb7ff4b4723453541
-  languageName: node
-  linkType: hard
-
-"postcss-reduce-initial@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-reduce-initial@npm:5.0.1"
-  dependencies:
-    browserslist: ^4.16.0
-    caniuse-api: ^3.0.0
+"postcss-overflow-shorthand@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "postcss-overflow-shorthand@npm:3.0.3"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: c33306694ebd98e8a9402bf9eef1b1724e351e884d0c10f4c77ee34e8f603442d45c20862794ee05793b29d5c10f23b0e3f5697f02600b568911d48be41d421a
+    postcss: ^8.4
+  checksum: 52080efd1cefbc01a0f931f247c69470a565684cd8e3585c3f5bfa45e849abe12cd4997b031179ea66fc1339eaf72dc9e3d87a218822fd6b958ce71632da23cb
+  languageName: node
+  linkType: hard
+
+"postcss-page-break@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "postcss-page-break@npm:3.0.4"
+  peerDependencies:
+    postcss: ^8
+  checksum: a7d08c945fc691f62c77ac701e64722218b14ec5c8fc1972b8af9c21553492d40808cf95e61b9697b1dacaf7e6180636876d7fee314f079e6c9e39ac1b1edc6f
+  languageName: node
+  linkType: hard
+
+"postcss-place@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-place@npm:7.0.4"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: dd1738ec9bf324889e4c51f390b4e2774c3b7a040ff277ce88c6e2f139374cf2a5d921d78b156347d57ee618e9029c1907790a50290f48918afb67c5e53bc36e
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:7.4.3":
+  version: 7.4.3
+  resolution: "postcss-preset-env@npm:7.4.3"
+  dependencies:
+    "@csstools/postcss-color-function": ^1.0.3
+    "@csstools/postcss-font-format-keywords": ^1.0.0
+    "@csstools/postcss-hwb-function": ^1.0.0
+    "@csstools/postcss-ic-unit": ^1.0.0
+    "@csstools/postcss-is-pseudo-class": ^2.0.1
+    "@csstools/postcss-normalize-display-values": ^1.0.0
+    "@csstools/postcss-oklab-function": ^1.0.2
+    "@csstools/postcss-progressive-custom-properties": ^1.3.0
+    autoprefixer: ^10.4.4
+    browserslist: ^4.20.2
+    css-blank-pseudo: ^3.0.3
+    css-has-pseudo: ^3.0.4
+    css-prefers-color-scheme: ^6.0.3
+    cssdb: ^6.5.0
+    postcss-attribute-case-insensitive: ^5.0.0
+    postcss-clamp: ^4.1.0
+    postcss-color-functional-notation: ^4.2.2
+    postcss-color-hex-alpha: ^8.0.3
+    postcss-color-rebeccapurple: ^7.0.2
+    postcss-custom-media: ^8.0.0
+    postcss-custom-properties: ^12.1.5
+    postcss-custom-selectors: ^6.0.0
+    postcss-dir-pseudo-class: ^6.0.4
+    postcss-double-position-gradients: ^3.1.1
+    postcss-env-function: ^4.0.6
+    postcss-focus-visible: ^6.0.4
+    postcss-focus-within: ^5.0.4
+    postcss-font-variant: ^5.0.0
+    postcss-gap-properties: ^3.0.3
+    postcss-image-set-function: ^4.0.6
+    postcss-initial: ^4.0.1
+    postcss-lab-function: ^4.1.2
+    postcss-logical: ^5.0.4
+    postcss-media-minmax: ^5.0.0
+    postcss-nesting: ^10.1.3
+    postcss-opacity-percentage: ^1.1.2
+    postcss-overflow-shorthand: ^3.0.3
+    postcss-page-break: ^3.0.4
+    postcss-place: ^7.0.4
+    postcss-pseudo-class-any-link: ^7.1.1
+    postcss-replace-overflow-wrap: ^4.0.0
+    postcss-selector-not: ^5.0.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.4
+  checksum: a3b5c93c6df29a0e44485ea4413fed58f367090e74ddfa27aee88548e9f6c40ee4c0ce0ec9274e2908a3aa3fe2cdbfeb0b326bcccee4095d46c9014ea53febd2
+  languageName: node
+  linkType: hard
+
+"postcss-pseudo-class-any-link@npm:^7.1.1":
+  version: 7.1.2
+  resolution: "postcss-pseudo-class-any-link@npm:7.1.2"
+  dependencies:
+    postcss-selector-parser: ^6.0.10
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 0653c129790008c43762f79d59c4133eb54c60ca79a2a5953886cabf69de11d411db78096c8e25431de735be450a9fd4e43b0d5b16d08e4f2cf8fbd0bbcdb502
   languageName: node
   linkType: hard
 
@@ -30028,18 +27583,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-reduce-transforms@npm:5.0.1"
-  dependencies:
-    cssnano-utils: ^2.0.1
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 89e033ba1fe92057e6196237d5ae6f30b7ca86a98d91a01aa1853baea36ea6c092d29d354d3281000a618445a780c30277868b10d517015317fdc8b97739d34e
-  languageName: node
-  linkType: hard
-
 "postcss-reduce-transforms@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-reduce-transforms@npm:5.1.0"
@@ -30051,12 +27594,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-replace-overflow-wrap@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-replace-overflow-wrap@npm:3.0.0"
-  dependencies:
-    postcss: ^7.0.2
-  checksum: 8c5b512a1172dd3d7b4a06d56d3b64c76dea01ca0950b546f83ae993f83aa95f933239e18deed0a5f3d2ef47840de55fa73498c4a46bfbe7bd892eb0dd8b606c
+"postcss-replace-overflow-wrap@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-replace-overflow-wrap@npm:4.0.0"
+  peerDependencies:
+    postcss: ^8.0.3
+  checksum: 3ffe20b300a4c377a11c588b142740d8557e03c707474c45234c934190ac374750ddc92c7906c373471d273a20504a429c2062c21fdcaff830fb28e0a81ac1dc
   languageName: node
   linkType: hard
 
@@ -30106,34 +27649,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-matches@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-selector-matches@npm:4.0.0"
-  dependencies:
-    balanced-match: ^1.0.0
-    postcss: ^7.0.2
-  checksum: 724f6cb345477691909468268a456f978ad3bae9ecd9908b2bb55c55c5f3c6d54a1fe50ce3956d93b122d05fc36677a8e4a34eed07bccda969c3f8baa43669a6
-  languageName: node
-  linkType: hard
-
-"postcss-selector-not@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "postcss-selector-not@npm:4.0.1"
-  dependencies:
-    balanced-match: ^1.0.0
-    postcss: ^7.0.2
-  checksum: 08fbd3e5ca273f3b767bd35d6bd033647a68f59b596d8aec19a9089b750539bdf85121ed7fd00a7763174a55c75c22a309d75d306127e23dc396069781efbaa4
-  languageName: node
-  linkType: hard
-
-"postcss-selector-parser@npm:^5.0.0-rc.3, postcss-selector-parser@npm:^5.0.0-rc.4":
+"postcss-selector-not@npm:^5.0.0":
   version: 5.0.0
-  resolution: "postcss-selector-parser@npm:5.0.0"
+  resolution: "postcss-selector-not@npm:5.0.0"
   dependencies:
-    cssesc: ^2.0.0
-    indexes-of: ^1.0.1
-    uniq: ^1.0.1
-  checksum: e49d21455e06d2cb9bf2a615bf3e605e0603c2c430a84c37a34f8baedaf3e8f9d0059a085d3e0483cbfa04c0d4153c7da28e7ac0ada319efdefe407df11dc1d4
+    balanced-match: ^1.0.0
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: eb7bdfdd665b2f0db660d4a2061f103b96d7c326a4b9d6241d55bf32bdcd1f5defaa4c8251123c73e1bcc75dad5a2ce77c520e42ce26ecd1e42f2f842baa155f
   languageName: node
   linkType: hard
 
@@ -30147,7 +27670,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.9":
+"postcss-selector-parser@npm:^6.0.10":
   version: 6.0.10
   resolution: "postcss-selector-parser@npm:6.0.10"
   dependencies:
@@ -30157,6 +27680,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-selector-parser@npm:^6.0.9":
+  version: 6.0.9
+  resolution: "postcss-selector-parser@npm:6.0.9"
+  dependencies:
+    cssesc: ^3.0.0
+    util-deprecate: ^1.0.2
+  checksum: f8161ab4d3e5c76b8467189c6d164ba0f6b6e74677435f29e34caa1df01e052b582b4ae4f7468b2243c4befdd8bdcdb7685542d1b2fca8deae21b3e849c78802
+  languageName: node
+  linkType: hard
+
 "postcss-sorting@npm:^7.0.1":
   version: 7.0.1
   resolution: "postcss-sorting@npm:7.0.1"
@@ -30166,18 +27699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "postcss-svgo@npm:5.0.3"
-  dependencies:
-    postcss-value-parser: ^4.1.0
-    svgo: ^2.7.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 7da0bfd6ecae300f1d82432d987ed3a4034a1502c4c458a0cf7284e172e8e86aa5098a89d9c23ee6b1360695c969f0f61ed776dd8098e26ee2a0b132ff1a7a5d
-  languageName: node
-  linkType: hard
-
 "postcss-svgo@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-svgo@npm:5.1.0"
@@ -30190,19 +27711,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-unique-selectors@npm:5.0.1"
-  dependencies:
-    alphanum-sort: ^1.0.2
-    postcss-selector-parser: ^6.0.5
-    uniqs: ^2.0.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 4346c4715b3f5facfd4b52fc8553085241c98b533b8965b1d3c1e370f277092d02c72bde519d70a82102467464e6cde9581e0d0592d07108c67e7ad20e67a23a
-  languageName: node
-  linkType: hard
-
 "postcss-unique-selectors@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-unique-selectors@npm:5.1.1"
@@ -30214,7 +27722,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0":
+"postcss-value-parser@npm:^4.1.0":
   version: 4.1.0
   resolution: "postcss-value-parser@npm:4.1.0"
   checksum: 68a9ea27c780fa3cc350be37b47cc46385c61dd9627990909230e0e9c3debf6d5beb49006bd743a2e506cdd6fa7d07637f2d9504a394f67cc3011d1ff0134886
@@ -30228,18 +27736,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-values-parser@npm:^2.0.0, postcss-values-parser@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "postcss-values-parser@npm:2.0.1"
-  dependencies:
-    flatten: ^1.0.2
-    indexes-of: ^1.0.1
-    uniq: ^1.0.1
-  checksum: 050877880937e15af8d18bf48902e547e2123d7cc32c1f215b392642bc5e2598a87a341995d62f38e450aab4186b8afeb2c9541934806d458ad8b117020b2ebf
-  languageName: node
-  linkType: hard
-
-"postcss@npm:8.4.14":
+"postcss@npm:8.4.14, postcss@npm:^8.4.12":
   version: 8.4.14
   resolution: "postcss@npm:8.4.14"
   dependencies:
@@ -30250,7 +27747,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^7.0.0, postcss@npm:^7.0.14, postcss@npm:^7.0.17, postcss@npm:^7.0.2, postcss@npm:^7.0.23, postcss@npm:^7.0.26, postcss@npm:^7.0.32, postcss@npm:^7.0.36, postcss@npm:^7.0.5, postcss@npm:^7.0.6":
+"postcss@npm:^7.0.14, postcss@npm:^7.0.26, postcss@npm:^7.0.32, postcss@npm:^7.0.36, postcss@npm:^7.0.5, postcss@npm:^7.0.6":
   version: 7.0.39
   resolution: "postcss@npm:7.0.39"
   dependencies:
@@ -30260,17 +27757,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.1, postcss@npm:^8.3.11":
-  version: 8.3.11
-  resolution: "postcss@npm:8.3.11"
-  dependencies:
-    nanoid: ^3.1.30
-    picocolors: ^1.0.0
-    source-map-js: ^0.6.2
-  checksum: 1a230553d74c66aa9585c90781ed8ea75f19cefea405d2117b67fbeb24b5b5e0e17be2e0c5a07db31dd085643a13394127ab2222e940771b70498331bf20f35e
-  languageName: node
-  linkType: hard
-
 "postcss@npm:^8.2.15, postcss@npm:^8.4.7":
   version: 8.4.7
   resolution: "postcss@npm:8.4.7"
@@ -30282,6 +27768,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:^8.3.11, postcss@npm:^8.3.5":
+  version: 8.3.11
+  resolution: "postcss@npm:8.3.11"
+  dependencies:
+    nanoid: ^3.1.30
+    picocolors: ^1.0.0
+    source-map-js: ^0.6.2
+  checksum: 1a230553d74c66aa9585c90781ed8ea75f19cefea405d2117b67fbeb24b5b5e0e17be2e0c5a07db31dd085643a13394127ab2222e940771b70498331bf20f35e
+  languageName: node
+  linkType: hard
+
 "postcss@npm:^8.4.13":
   version: 8.4.13
   resolution: "postcss@npm:8.4.13"
@@ -30445,13 +27942,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prepend-http@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "prepend-http@npm:1.0.4"
-  checksum: 01e7baf4ad38af02257b99098543469332fc42ae50df33d97a124bf8172295907352fa6138c9b1610c10c6dd0847ca736e53fda736387cc5cf8fcffe96b47f29
-  languageName: node
-  linkType: hard
-
 "prepend-http@npm:^2.0.0":
   version: 2.0.0
   resolution: "prepend-http@npm:2.0.0"
@@ -30459,24 +27949,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: ^1.1.2
-  checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
-  languageName: node
-  linkType: hard
-
-"prettier@npm:2.5.1, prettier@npm:^2.3.2":
-  version: 2.5.1
-  resolution: "prettier@npm:2.5.1"
-  bin:
-    prettier: bin-prettier.js
-  checksum: 21b9408476ea1c544b0e45d51ceb94a84789ff92095abb710942d780c862d0daebdb29972d47f6b4d0f7ebbfb0ffbf56cc2cfa3e3e9d1cca54864af185b15b66
-  languageName: node
-  linkType: hard
-
 "prettier@npm:2.6.0":
   version: 2.6.0
   resolution: "prettier@npm:2.6.0"
@@ -30504,6 +27976,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^2.3.2":
+  version: 2.5.1
+  resolution: "prettier@npm:2.5.1"
+  bin:
+    prettier: bin-prettier.js
+  checksum: 21b9408476ea1c544b0e45d51ceb94a84789ff92095abb710942d780c862d0daebdb29972d47f6b4d0f7ebbfb0ffbf56cc2cfa3e3e9d1cca54864af185b15b66
+  languageName: node
+  linkType: hard
+
 "pretty-bytes@npm:^5.6.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
@@ -30511,7 +27992,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-error@npm:^2.0.2, pretty-error@npm:^2.1.1":
+"pretty-error@npm:^2.1.1":
   version: 2.1.2
   resolution: "pretty-error@npm:2.1.2"
   dependencies:
@@ -30587,13 +28068,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"private@npm:~0.1.5":
-  version: 0.1.8
-  resolution: "private@npm:0.1.8"
-  checksum: a00abd713d25389f6de7294f0e7879b8a5d09a9ec5fd81cc2f21b29d4f9a80ec53bc4222927d3a281d4aadd4cd373d9a28726fca3935921950dc75fd71d1fdbb
-  languageName: node
-  linkType: hard
-
 "process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
@@ -30938,16 +28412,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"query-string@npm:^4.1.0":
-  version: 4.3.4
-  resolution: "query-string@npm:4.3.4"
-  dependencies:
-    object-assign: ^4.1.0
-    strict-uri-encode: ^1.0.0
-  checksum: 3b2bae6a8454cf0edf11cf1aa4d1f920398bbdabc1c39222b9bb92147e746fcd97faf00e56f494728fb66b2961b495ba0fde699d5d3bd06b11472d664b36c6cf
-  languageName: node
-  linkType: hard
-
 "query-string@npm:^6.13.8":
   version: 6.14.1
   resolution: "query-string@npm:6.14.1"
@@ -32456,16 +29920,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "read-pkg-up@npm:4.0.0"
-  dependencies:
-    find-up: ^3.0.0
-    read-pkg: ^3.0.0
-  checksum: dd867d9a912707bc11340aebc91780be9f36f34ee1d27a5dafb8520e0cb6344138b80eb8bf8325bebf519d26ecf14cbf6190d9e5f765f0120da5ede4013f4d13
-  languageName: node
-  linkType: hard
-
 "read-pkg-up@npm:^7.0.1":
   version: 7.0.1
   resolution: "read-pkg-up@npm:7.0.1"
@@ -32588,27 +30042,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"realpath-native@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "realpath-native@npm:1.1.0"
-  dependencies:
-    util.promisify: ^1.0.0
-  checksum: 75ef0595dea6186384b785a9e0993c58ec604f8be2e39b602fec6d7837c7f770af4a4eb3c81f864a7d81c518a7167a6eaabbc7695b7a88c56e1ef04b91c1d586
-  languageName: node
-  linkType: hard
-
-"recast@npm:~0.11.12":
-  version: 0.11.23
-  resolution: "recast@npm:0.11.23"
-  dependencies:
-    ast-types: 0.9.6
-    esprima: ~3.1.0
-    private: ~0.1.5
-    source-map: ~0.5.0
-  checksum: e2a6f973fa8e7f4aac6fdebd27706d67570c71d127632f15fad350a430c63b0dcdd9d7ceffad547b07114b5d28895e6fe078a287c1f8e5410c90aaa7289787ac
-  languageName: node
-  linkType: hard
-
 "rechoir@npm:^0.7.0":
   version: 0.7.1
   resolution: "rechoir@npm:0.7.1"
@@ -32866,7 +30299,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"relateurl@npm:0.2.x, relateurl@npm:^0.2.7":
+"relateurl@npm:^0.2.7":
   version: 0.2.7
   resolution: "relateurl@npm:0.2.7"
   checksum: 5891e792eae1dfc3da91c6fda76d6c3de0333a60aa5ad848982ebb6dccaa06e86385fb1235a1582c680a3d445d31be01c6bfc0804ebbcab5aaf53fa856fde6b6
@@ -33000,26 +30433,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"replace-in-file-webpack-plugin@npm:^1.0.6":
+"replace-in-file-webpack-plugin@npm:1.0.6":
   version: 1.0.6
   resolution: "replace-in-file-webpack-plugin@npm:1.0.6"
   checksum: 0c00a074e544ebe1aef0615e594f6daad47427950a2454e88f94dcb185839d68ce07854b83bbcb5f9b2336f8e8ae24017db4eca085135a9be84e43585163301a
   languageName: node
   linkType: hard
 
-"replace-in-file@npm:^4.1.0":
-  version: 4.3.1
-  resolution: "replace-in-file@npm:4.3.1"
-  dependencies:
-    chalk: ^2.4.2
-    glob: ^7.1.6
-    yargs: ^15.0.2
-  bin:
-    replace-in-file: ./bin/cli.js
-  checksum: f6a014ef9b75726b19cfea83828bf3c92157a92347bd119d44ea5a5d2b1dbebaf189af72b58b04b5840421f523136d69f74ddc52a38818f3211d6d465687211a
-  languageName: node
-  linkType: hard
-
 "request-progress@npm:^3.0.0":
   version: 3.0.0
   resolution: "request-progress@npm:3.0.0"
@@ -33029,30 +30449,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request-promise-core@npm:1.1.4":
-  version: 1.1.4
-  resolution: "request-promise-core@npm:1.1.4"
-  dependencies:
-    lodash: ^4.17.19
-  peerDependencies:
-    request: ^2.34
-  checksum: c798bafd552961e36fbf5023b1d081e81c3995ab390f1bc8ef38a711ba3fe4312eb94dbd61887073d7356c3499b9380947d7f62faa805797c0dc50f039425699
-  languageName: node
-  linkType: hard
-
-"request-promise-native@npm:^1.0.7":
-  version: 1.0.9
-  resolution: "request-promise-native@npm:1.0.9"
-  dependencies:
-    request-promise-core: 1.1.4
-    stealthy-require: ^1.1.1
-    tough-cookie: ^2.3.3
-  peerDependencies:
-    request: ^2.34
-  checksum: 3e2c694eefac88cb20beef8911ad57a275ab3ccbae0c4ca6c679fffb09d5fd502458aab08791f0814ca914b157adab2d4e472597c97a73be702918e41725ed69
-  languageName: node
-  linkType: hard
-
 "request@npm:^2.55.0, request@npm:^2.88.0, request@npm:^2.88.2":
   version: 2.88.2
   resolution: "request@npm:2.88.2"
@@ -33095,13 +30491,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"require-main-filename@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "require-main-filename@npm:2.0.0"
-  checksum: e9e294695fea08b076457e9ddff854e81bffbe248ed34c1eec348b7abbd22a0d02e8d75506559e2265e96978f3c4720bd77a6dad84755de8162b357eb6c778c7
-  languageName: node
-  linkType: hard
-
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"
@@ -33148,13 +30537,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-from@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "resolve-from@npm:3.0.0"
-  checksum: fff9819254d2d62b57f74e5c2ca9c0bdd425ca47287c4d801bc15f947533148d858229ded7793b0f59e61e49e782fffd6722048add12996e1bd4333c29669062
-  languageName: node
-  linkType: hard
-
 "resolve-from@npm:^4.0.0":
   version: 4.0.0
   resolution: "resolve-from@npm:4.0.0"
@@ -33199,7 +30581,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.9.0":
+"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.9.0":
   version: 1.20.0
   resolution: "resolve@npm:1.20.0"
   dependencies:
@@ -33251,7 +30633,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.18.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
   version: 1.20.0
   resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=07638b"
   dependencies:
@@ -33382,7 +30764,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^2.2.8, rimraf@npm:^2.5.4, rimraf@npm:^2.6.3, rimraf@npm:^2.7.1":
+"rimraf@npm:^2.2.8, rimraf@npm:^2.5.4, rimraf@npm:^2.6.3":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
   dependencies:
@@ -33538,7 +30920,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.5.5, rxjs@npm:^7.5.4":
+"rxjs@npm:7.5.5, rxjs@npm:^7.5.4, rxjs@npm:^7.5.5":
   version: 7.5.5
   resolution: "rxjs@npm:7.5.5"
   dependencies:
@@ -33547,7 +30929,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^6.6.0, rxjs@npm:^6.6.3, rxjs@npm:^6.6.7":
+"rxjs@npm:^6.6.0, rxjs@npm:^6.6.7":
   version: 6.6.7
   resolution: "rxjs@npm:6.6.7"
   dependencies:
@@ -33655,20 +31037,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:8.0.2":
-  version: 8.0.2
-  resolution: "sass-loader@npm:8.0.2"
+"sass-loader@npm:^12.6.0":
+  version: 12.6.0
+  resolution: "sass-loader@npm:12.6.0"
   dependencies:
-    clone-deep: ^4.0.1
-    loader-utils: ^1.2.3
-    neo-async: ^2.6.1
-    schema-utils: ^2.6.1
-    semver: ^6.3.0
+    klona: ^2.0.4
+    neo-async: ^2.6.2
   peerDependencies:
     fibers: ">= 3.1.0"
-    node-sass: ^4.0.0
+    node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
     sass: ^1.3.0
-    webpack: ^4.36.0 || ^5.0.0
+    sass-embedded: "*"
+    webpack: ^5.0.0
   peerDependenciesMeta:
     fibers:
       optional: true
@@ -33676,18 +31056,9 @@ __metadata:
       optional: true
     sass:
       optional: true
-  checksum: 3e9ba97432fcf1092600a31501298f37a0a913f86086b841740f9f8371ee33de55b9740b31563b089524aeb9020fbc51126730fa51d18b2e724a4ada71e2ff81
-  languageName: node
-  linkType: hard
-
-"sass@npm:1.27.0":
-  version: 1.27.0
-  resolution: "sass@npm:1.27.0"
-  dependencies:
-    chokidar: ">=2.0.0 <4.0.0"
-  bin:
-    sass: sass.js
-  checksum: b57a34c6f231997d1ab938ed0a92329694b8d19dd10db006eb158d87ad144f0c7921a3ea1a5e61b897779e3e3d7ea3f0d8023ca768d9e0b962c7577f42cae313
+    sass-embedded:
+      optional: true
+  checksum: 5d73a428588150f704016aa27397941bb9246cecd2ee083b573e95d969fc080ac6a16f2fe1cc64aca08f6e70da6f3c586ee68f0efc9f527fecc360e5f1c299ec
   languageName: node
   linkType: hard
 
@@ -33704,12 +31075,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"saxes@npm:^3.1.9":
-  version: 3.1.11
-  resolution: "saxes@npm:3.1.11"
+"sass@npm:^1.49.9":
+  version: 1.50.1
+  resolution: "sass@npm:1.50.1"
   dependencies:
-    xmlchars: ^2.1.1
-  checksum: 3b69918c013fffae51c561f629a0f620c02dba70f762dab38f3cd92676dfe5edf1f0a523ca567882838f1a80e26e4671a8c2c689afa05c68f45a78261445aba0
+    chokidar: ">=3.0.0 <4.0.0"
+    immutable: ^4.0.0
+    source-map-js: ">=0.6.2 <2.0.0"
+  bin:
+    sass: sass.js
+  checksum: c06334dbf8eddd508d90ca529c6ffb88cb5861d18cec285480d212b9dbe0a46441cbfd8aa10565780551c71372617465e6c77298e734180e2da2628ce6c46545
+  languageName: node
+  linkType: hard
+
+"sax@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "sax@npm:1.2.4"
+  checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
   languageName: node
   linkType: hard
 
@@ -33754,7 +31136,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^2.5.0, schema-utils@npm:^2.6.0, schema-utils@npm:^2.6.1, schema-utils@npm:^2.6.4, schema-utils@npm:^2.6.5, schema-utils@npm:^2.6.6, schema-utils@npm:^2.7.0":
+"schema-utils@npm:^2.6.5, schema-utils@npm:^2.7.0":
   version: 2.7.1
   resolution: "schema-utils@npm:2.7.1"
   dependencies:
@@ -33959,15 +31341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "serialize-javascript@npm:3.1.0"
-  dependencies:
-    randombytes: ^2.1.0
-  checksum: 0fc0131a78168d6237cfe1b21564f20a3b9b72e8ceebb21935baacf026631ed636912c20c7e9fa721a8f27a247e6f9849e705f27032d19863333c2cfab16d1c9
-  languageName: node
-  linkType: hard
-
 "serialize-javascript@npm:^4.0.0":
   version: 4.0.0
   resolution: "serialize-javascript@npm:4.0.0"
@@ -34191,17 +31564,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-git@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "simple-git@npm:3.5.0"
-  dependencies:
-    "@kwsites/file-exists": ^1.1.1
-    "@kwsites/promise-deferred": ^1.1.1
-    debug: ^4.3.3
-  checksum: be078d9e898d1dea99bb15d4f6927c0f61aafde73114c7423fb0efca6d6f99012da2a2f43b5e2151a1707994cc9c75139bc12e3d307dd25da48ed1dce1167748
-  languageName: node
-  linkType: hard
-
 "simple-git@npm:^3.6.0":
   version: 3.7.1
   resolution: "simple-git@npm:3.7.1"
@@ -34252,13 +31614,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slash@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "slash@npm:1.0.0"
-  checksum: 4b6e21b1fba6184a7e2efb1dd173f692d8a845584c1bbf9dc818ff86f5a52fc91b413008223d17cc684604ee8bb9263a420b1182027ad9762e35388434918860
-  languageName: node
-  linkType: hard
-
 "slash@npm:^2.0.0":
   version: 2.0.0
   resolution: "slash@npm:2.0.0"
@@ -34501,15 +31856,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sort-keys@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "sort-keys@npm:1.1.2"
-  dependencies:
-    is-plain-obj: ^1.0.0
-  checksum: 5963fd191a2a185a5ec86f06e47721e8e04713eda43bb04ae60d2a8afb21241553dd5bc9d863ed2bd7c3d541b609b0c8d0e58836b1a3eb6764c09c094bcc8b00
-  languageName: node
-  linkType: hard
-
 "sort-keys@npm:^2.0.0":
   version: 2.0.0
   resolution: "sort-keys@npm:2.0.0"
@@ -34623,7 +31969,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.5.0, source-map@npm:^0.5.6, source-map@npm:^0.5.7, source-map@npm:~0.5.0":
+"source-map@npm:^0.5.0, source-map@npm:^0.5.6, source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
   checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
@@ -34658,13 +32004,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spawn-command@npm:^0.0.2-1":
-  version: 0.0.2
-  resolution: "spawn-command@npm:0.0.2"
-  checksum: e35c5d28177b4d461d33c88cc11f6f3a5079e2b132c11e1746453bbb7a0c0b8a634f07541a2a234fa4758239d88203b758def509161b651e81958894c0b4b64b
-  languageName: node
-  linkType: hard
-
 "spdx-correct@npm:^3.0.0":
   version: 3.1.1
   resolution: "spdx-correct@npm:3.1.1"
@@ -34815,16 +32154,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "ssri@npm:7.1.1"
-  dependencies:
-    figgy-pudding: ^3.5.1
-    minipass: ^3.1.1
-  checksum: 8bdb3c198a3cebda54344b3cd9599338c18a4b29f1c857c0ab98cb39ff11a36b4cb6ea5a388c22bd71ac1ae6d8129103336173f77487d94d772eeb9aa0c8545f
-  languageName: node
-  linkType: hard
-
 "ssri@npm:^8.0.0, ssri@npm:^8.0.1":
   version: 8.0.1
   resolution: "ssri@npm:8.0.1"
@@ -34850,16 +32179,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stack-utils@npm:^1.0.1":
-  version: 1.0.5
-  resolution: "stack-utils@npm:1.0.5"
-  dependencies:
-    escape-string-regexp: ^2.0.0
-  checksum: f82baf8d89536252a55c76866d5be3d04c96b09693a8d2ab3794b9fdec3674e05bd3f3d19345093e2cbba116a1f8f413858e0537bc3c81c605249261c3d26182
-  languageName: node
-  linkType: hard
-
-"stack-utils@npm:^2.0.2, stack-utils@npm:^2.0.3":
+"stack-utils@npm:^2.0.3":
   version: 2.0.5
   resolution: "stack-utils@npm:2.0.5"
   dependencies:
@@ -34927,13 +32247,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stealthy-require@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "stealthy-require@npm:1.1.1"
-  checksum: 6805b857a9f3a6a1079fc6652278038b81011f2a5b22cbd559f71a6c02087e6f1df941eb10163e3fdc5391ab5807aa46758d4258547c1f5ede31e6d9bfda8dd3
-  languageName: node
-  linkType: hard
-
 "store2@npm:^2.12.0":
   version: 2.13.1
   resolution: "store2@npm:2.13.1"
@@ -35016,13 +32329,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-uri-encode@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "strict-uri-encode@npm:1.1.0"
-  checksum: 9466d371f7b36768d43f7803f26137657559e4c8b0161fb9e320efb8edba3ae22f8e99d4b0d91da023b05a13f62ec5412c3f4f764b5788fac11d1fea93720bb3
-  languageName: node
-  linkType: hard
-
 "strict-uri-encode@npm:^2.0.0":
   version: 2.0.0
   resolution: "strict-uri-encode@npm:2.0.0"
@@ -35292,19 +32598,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-loader@npm:1.1.3":
-  version: 1.1.3
-  resolution: "style-loader@npm:1.1.3"
-  dependencies:
-    loader-utils: ^1.2.3
-    schema-utils: ^2.6.4
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 1a0b3de4280ee3a924499aa7b3d616ef8fec60385404e8a4db53561b9267a31f98d0c99d2e27f705b1fa5200a4fca30f722e366547507efd849f33f0c4d58d12
-  languageName: node
-  linkType: hard
-
-"style-loader@npm:3.3.1":
+"style-loader@npm:3.3.1, style-loader@npm:^3.3.1":
   version: 3.3.1
   resolution: "style-loader@npm:3.3.1"
   peerDependencies:
@@ -35353,18 +32647,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "stylehacks@npm:5.0.1"
-  dependencies:
-    browserslist: ^4.16.0
-    postcss-selector-parser: ^6.0.4
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 777dbed3987e04f713b9d74e08f66ab4c23c76cabb07c666c0ae9a06e58e8961063e17b5c7b9c23421b75e9caa9fb78084688e509624e57b19c92c174fbd964d
-  languageName: node
-  linkType: hard
-
 "stylehacks@npm:^5.1.0":
   version: 5.1.0
   resolution: "stylehacks@npm:5.1.0"
@@ -35495,7 +32777,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1":
+"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1":
   version: 8.1.1
   resolution: "supports-color@npm:8.1.1"
   dependencies:
@@ -35513,15 +32795,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "supports-color@npm:6.1.0"
-  dependencies:
-    has-flag: ^3.0.0
-  checksum: 74358f9535c83ee113fbaac354b11e808060f6e7d8722082ee43af3578469134e89d00026dce2a6b93ce4e5b89d0e9a10f638b2b9f64c7838c2fb2883a47b3d5
-  languageName: node
-  linkType: hard
-
 "supports-color@npm:^7.0.0, supports-color@npm:^7.1.0, supports-color@npm:^7.2.0":
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
@@ -35586,7 +32859,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"symbol-tree@npm:^3.2.2, symbol-tree@npm:^3.2.4":
+"symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
   checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
@@ -35735,26 +33008,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:2.3.7":
-  version: 2.3.7
-  resolution: "terser-webpack-plugin@npm:2.3.7"
-  dependencies:
-    cacache: ^13.0.1
-    find-cache-dir: ^3.3.1
-    jest-worker: ^25.4.0
-    p-limit: ^2.3.0
-    schema-utils: ^2.6.6
-    serialize-javascript: ^3.1.0
-    source-map: ^0.6.1
-    terser: ^4.6.12
-    webpack-sources: ^1.4.3
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 93c38556803cec68642d351f1db8931e691d77bd6b7c837c59d1f092eba4da3f9021daf12932e5f39ecb25bf5d17add5469b750686086f88abb60047970406d6
-  languageName: node
-  linkType: hard
-
-"terser-webpack-plugin@npm:5.3.1, terser-webpack-plugin@npm:^5.0.3":
+"terser-webpack-plugin@npm:5.3.1, terser-webpack-plugin@npm:^5.0.3, terser-webpack-plugin@npm:^5.3.1":
   version: 5.3.1
   resolution: "terser-webpack-plugin@npm:5.3.1"
   dependencies:
@@ -35837,7 +33091,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser@npm:^4.1.2, terser@npm:^4.6.12, terser@npm:^4.6.3":
+"terser@npm:^4.1.2, terser@npm:^4.6.3":
   version: 4.8.0
   resolution: "terser@npm:4.8.0"
   dependencies:
@@ -35877,18 +33131,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"test-exclude@npm:^5.2.3":
-  version: 5.2.3
-  resolution: "test-exclude@npm:5.2.3"
-  dependencies:
-    glob: ^7.1.3
-    minimatch: ^3.0.4
-    read-pkg-up: ^4.0.0
-    require-main-filename: ^2.0.0
-  checksum: 3a67bee51b0afb0b7a51b649a7dacd920d929de2b3eccb52fa818f0b0bf2ebfced1d1a77a206b74f95c50f6682e313eedb8000cfdd5ac2f9cc6ed8a32fc4ff2e
-  languageName: node
-  linkType: hard
-
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -35952,13 +33194,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"throat@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "throat@npm:5.0.0"
-  checksum: 031ff7f4431618036c1dedd99c8aa82f5c33077320a8358ed829e84b320783781d1869fe58e8f76e948306803de966f5f7573766a437562c9f5c033297ad2fe2
-  languageName: node
-  linkType: hard
-
 "throat@npm:^6.0.1":
   version: 6.0.1
   resolution: "throat@npm:6.0.1"
@@ -35999,7 +33234,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:2, through@npm:2.3.x, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8, through@npm:~2.3.6":
+"through@npm:2, through@npm:2.3.x, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
   checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
@@ -36196,13 +33431,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"toposort@npm:^1.0.0":
-  version: 1.0.7
-  resolution: "toposort@npm:1.0.7"
-  checksum: 68c074586ae4ad8eb518d5b5ebee7b3ef903ace180d822b9846b52bd945b14db00c1c5e1107ed77ea48705806291a6efda95c90ff5b31ce416257cdc21461a86
-  languageName: node
-  linkType: hard
-
 "totalist@npm:^1.0.0":
   version: 1.1.0
   resolution: "totalist@npm:1.1.0"
@@ -36221,27 +33449,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^2.3.3, tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
-  dependencies:
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
-  languageName: node
-  linkType: hard
-
-"tough-cookie@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "tough-cookie@npm:3.0.1"
-  dependencies:
-    ip-regex: ^2.1.0
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 796f6239bce5674a1267b19f41972a2602a2a23715817237b5922b0dc2343512512eea7d41d29210a4ec545f8ef32173bbbf01277dd8ec3ae3841b19cbe69f67
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^4.0.0":
   version: 4.0.0
   resolution: "tough-cookie@npm:4.0.0"
@@ -36253,12 +33460,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "tr46@npm:1.0.1"
+"tough-cookie@npm:~2.5.0":
+  version: 2.5.0
+  resolution: "tough-cookie@npm:2.5.0"
   dependencies:
-    punycode: ^2.1.0
-  checksum: 96d4ed46bc161db75dbf9247a236ea0bfcaf5758baae6749e92afab0bc5a09cb59af21788ede7e55080f2bf02dce3e4a8f2a484cc45164e29f4b5e68f7cbcc1a
+    psl: ^1.1.28
+    punycode: ^2.1.1
+  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
   languageName: node
   linkType: hard
 
@@ -36292,15 +33500,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tree-kill@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "tree-kill@npm:1.2.2"
-  bin:
-    tree-kill: cli.js
-  checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7
-  languageName: node
-  linkType: hard
-
 "trim-newlines@npm:^3.0.0":
   version: 3.0.1
   resolution: "trim-newlines@npm:3.0.1"
@@ -36343,30 +33542,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:26.4.4":
-  version: 26.4.4
-  resolution: "ts-jest@npm:26.4.4"
-  dependencies:
-    "@types/jest": 26.x
-    bs-logger: 0.x
-    buffer-from: 1.x
-    fast-json-stable-stringify: 2.x
-    jest-util: ^26.1.0
-    json5: 2.x
-    lodash.memoize: 4.x
-    make-error: 1.x
-    mkdirp: 1.x
-    semver: 7.x
-    yargs-parser: 20.x
-  peerDependencies:
-    jest: ">=26 <27"
-    typescript: ">=3.8 <5.0"
-  bin:
-    ts-jest: cli.js
-  checksum: da3c878a0a209a52e9b680abde4abc1b0da1bb873364f391bcd9b847708bfb53e4ae9ffa508516d5c3264479c7785533aea444b66438ddc5350571bcd75536b7
-  languageName: node
-  linkType: hard
-
 "ts-jest@npm:27.1.3":
   version: 27.1.3
   resolution: "ts-jest@npm:27.1.3"
@@ -36447,6 +33622,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-loader@npm:^9.2.8":
+  version: 9.2.8
+  resolution: "ts-loader@npm:9.2.8"
+  dependencies:
+    chalk: ^4.1.0
+    enhanced-resolve: ^5.0.0
+    micromatch: ^4.0.0
+    semver: ^7.3.4
+  peerDependencies:
+    typescript: "*"
+    webpack: ^5.0.0
+  checksum: 3afd9a4cc1d46738ac3f2decc7dfa655e0183d4d2d48c7a113ea9f3ac313304f54be59252cde2ef04757c791e28cfcfc63323d3dd1f2f949485242c1ea4835e5
+  languageName: node
+  linkType: hard
+
 "ts-node@npm:10.7.0":
   version: 10.7.0
   resolution: "ts-node@npm:10.7.0"
@@ -36485,26 +33675,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:9.0.0":
-  version: 9.0.0
-  resolution: "ts-node@npm:9.0.0"
-  dependencies:
-    arg: ^4.1.0
-    diff: ^4.0.1
-    make-error: ^1.1.1
-    source-map-support: ^0.5.17
-    yn: 3.1.1
-  peerDependencies:
-    typescript: ">=2.7"
-  bin:
-    ts-node: dist/bin.js
-    ts-node-script: dist/bin-script.js
-    ts-node-transpile-only: dist/bin-transpile.js
-    ts-script: dist/bin-script-deprecated.js
-  checksum: 63105fa59b53a835dd7ca843e392fcbac699a19b861c3fae8a77d73b6205db14f84f45250f57309c782cd2f9fde566963c94b5499f7d6f7bbb1a367f4fb3099b
-  languageName: node
-  linkType: hard
-
 "ts-node@npm:^10.2.1":
   version: 10.5.0
   resolution: "ts-node@npm:10.5.0"
@@ -36542,7 +33712,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^9":
+"ts-node@npm:^9, ts-node@npm:^9.1.0":
   version: 9.1.1
   resolution: "ts-node@npm:9.1.1"
   dependencies:
@@ -36855,18 +34025,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uglify-js@npm:3.4.x":
-  version: 3.4.10
-  resolution: "uglify-js@npm:3.4.10"
-  dependencies:
-    commander: ~2.19.0
-    source-map: ~0.6.1
-  bin:
-    uglifyjs: bin/uglifyjs
-  checksum: dfc61c85b0660216432e021aac6a5f3ea0331720003d4d929b95f297daceb73bc9615875ca150516b49bc57ab60d3cf32415fc006cccf20f275c806f6686da0d
-  languageName: node
-  linkType: hard
-
 "uglify-js@npm:^3.1.4":
   version: 3.14.2
   resolution: "uglify-js@npm:3.14.2"
@@ -36999,20 +34157,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uniq@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "uniq@npm:1.0.1"
-  checksum: 8206535f83745ea83f9da7035f3b983fd6ed5e35b8ed7745441944e4065b616bc67cf0d0a23a86b40ee0074426f0607f0a138f9b78e124eb6a7a6a6966055709
-  languageName: node
-  linkType: hard
-
-"uniqs@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "uniqs@npm:2.0.0"
-  checksum: 5ace63e0521fd1ae2c161b3fa167cf6846fc45a71c00496729e0146402c3ae467c6f025a68fbd6766300a9bfbac9f240f2f0198164283bef48012b39db83f81f
-  languageName: node
-  linkType: hard
-
 "unique-filename@npm:^1.1.1":
   version: 1.1.1
   resolution: "unique-filename@npm:1.1.1"
@@ -37224,13 +34368,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"upper-case@npm:^1.1.1":
-  version: 1.1.3
-  resolution: "upper-case@npm:1.1.3"
-  checksum: 991c845de75fa56e5ad983f15e58494dd77b77cadd79d273cc11e8da400067e9881ae1a52b312aed79b3d754496e2e0712e08d22eae799e35c7f9ba6f3d8a85d
-  languageName: node
-  linkType: hard
-
 "uri-js@npm:^4.2.2":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
@@ -37254,23 +34391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-loader@npm:^2.0.1":
-  version: 2.3.0
-  resolution: "url-loader@npm:2.3.0"
-  dependencies:
-    loader-utils: ^1.2.3
-    mime: ^2.4.4
-    schema-utils: ^2.5.0
-  peerDependencies:
-    file-loader: "*"
-    webpack: ^4.0.0
-  peerDependenciesMeta:
-    file-loader:
-      optional: true
-  checksum: c0a8a6e728331e2189a6538373b9ce4b5589389805c4e98a0386ee5d18cc4ba4c5dec5514d8c852dd533b857461c30c3efc135ed07b6b31a96c5a6fb812a4757
-  languageName: node
-  linkType: hard
-
 "url-loader@npm:^4.1.1":
   version: 4.1.1
   resolution: "url-loader@npm:4.1.1"
@@ -37384,19 +34504,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util.promisify@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "util.promisify@npm:1.1.1"
-  dependencies:
-    call-bind: ^1.0.0
-    define-properties: ^1.1.3
-    for-each: ^0.3.3
-    has-symbols: ^1.0.1
-    object.getownpropertydescriptors: ^2.1.1
-  checksum: ea371c30b90576862487ae4efd7182aa5855019549a4019d82629acc2709e8ccb0f38944403eebec622fff8ebb44ac3f46a52d745d5f543d30606132a4905f96
-  languageName: node
-  linkType: hard
-
 "util@npm:0.10.3":
   version: 0.10.3
   resolution: "util@npm:0.10.3"
@@ -37450,7 +34557,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:8.3.2, uuid@npm:^8.3.0, uuid@npm:^8.3.2":
+"uuid@npm:8.3.2, uuid@npm:^8.3.2":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
   bin:
@@ -37482,17 +34589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v8-to-istanbul@npm:^7.0.0":
-  version: 7.1.2
-  resolution: "v8-to-istanbul@npm:7.1.2"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.1
-    convert-source-map: ^1.6.0
-    source-map: ^0.7.3
-  checksum: e52b48764f55aed62ff87f2b5f710c874f992cd1313eac8f438bf65aeeb0689153d85bb76e39514fd90ba3521d6ebea929a8ae1339b6d7b0cf18fb0ed13d8b40
-  languageName: node
-  linkType: hard
-
 "v8-to-istanbul@npm:^8.0.0":
   version: 8.1.1
   resolution: "v8-to-istanbul@npm:8.1.1"
@@ -37561,13 +34657,6 @@ __metadata:
   languageName: node
   linkType: soft
 
-"vendors@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "vendors@npm:1.0.4"
-  checksum: 4b16e0bc18dbdd7ac8dd745c776c08f6c73e9a7f620ffd9faf94a3d86a35feaf4c6cb1bbdb304d2381548a30d0abe69b83eeb1b7b1bf5bb33935e64b28812681
-  languageName: node
-  linkType: hard
-
 "verror@npm:1.10.0":
   version: 1.10.0
   resolution: "verror@npm:1.10.0"
@@ -37629,7 +34718,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"w3c-hr-time@npm:^1.0.1, w3c-hr-time@npm:^1.0.2":
+"w3c-hr-time@npm:^1.0.2":
   version: 1.0.2
   resolution: "w3c-hr-time@npm:1.0.2"
   dependencies:
@@ -37638,17 +34727,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"w3c-xmlserializer@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "w3c-xmlserializer@npm:1.1.2"
-  dependencies:
-    domexception: ^1.0.1
-    webidl-conversions: ^4.0.2
-    xml-name-validator: ^3.0.0
-  checksum: 1683e083d0dfc1529988f8956510a3a26e90738b41c4df0c7eb95283bfbeabeb492308117dcd32afef2a141e2a959ddf10ce562983d91b9f474a530b9dcdd337
-  languageName: node
-  linkType: hard
-
 "w3c-xmlserializer@npm:^2.0.0":
   version: 2.0.0
   resolution: "w3c-xmlserializer@npm:2.0.0"
@@ -37700,7 +34778,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"watchpack@npm:^1.6.0, watchpack@npm:^1.7.4":
+"watchpack@npm:^1.7.4":
   version: 1.7.5
   resolution: "watchpack@npm:1.7.5"
   dependencies:
@@ -37783,13 +34861,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "webidl-conversions@npm:4.0.2"
-  checksum: c93d8dfe908a0140a4ae9c0ebc87a33805b416a33ee638a605b551523eec94a9632165e54632f6d57a39c5f948c4bab10e0e066525e9a4b87a79f0d04fbca374
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -37998,7 +35069,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-sources@npm:^1.1.0, webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1, webpack-sources@npm:^1.4.3":
+"webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1, webpack-sources@npm:^1.4.3":
   version: 1.4.3
   resolution: "webpack-sources@npm:1.4.3"
   dependencies:
@@ -38008,13 +35079,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-sources@npm:^3.2.0":
-  version: 3.2.1
-  resolution: "webpack-sources@npm:3.2.1"
-  checksum: 438ee4759f70ee2d5ae17a2fc5e66a1f71f0ba8ad9de77edfaf4180c82925f6504790c5a1ddfa2a6d409212cd9e7332a6822d6acabb0f39303bc3b14354872e6
-  languageName: node
-  linkType: hard
-
 "webpack-sources@npm:^3.2.3":
   version: 3.2.3
   resolution: "webpack-sources@npm:3.2.3"
@@ -38076,76 +35140,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:4.41.5":
-  version: 4.41.5
-  resolution: "webpack@npm:4.41.5"
-  dependencies:
-    "@webassemblyjs/ast": 1.8.5
-    "@webassemblyjs/helper-module-context": 1.8.5
-    "@webassemblyjs/wasm-edit": 1.8.5
-    "@webassemblyjs/wasm-parser": 1.8.5
-    acorn: ^6.2.1
-    ajv: ^6.10.2
-    ajv-keywords: ^3.4.1
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^4.1.0
-    eslint-scope: ^4.0.3
-    json-parse-better-errors: ^1.0.2
-    loader-runner: ^2.4.0
-    loader-utils: ^1.2.3
-    memory-fs: ^0.4.1
-    micromatch: ^3.1.10
-    mkdirp: ^0.5.1
-    neo-async: ^2.6.1
-    node-libs-browser: ^2.2.1
-    schema-utils: ^1.0.0
-    tapable: ^1.1.3
-    terser-webpack-plugin: ^1.4.3
-    watchpack: ^1.6.0
-    webpack-sources: ^1.4.1
-  bin:
-    webpack: ./bin/webpack.js
-  checksum: af10da375f0879d36d4ce046f318030dbe19b50861e6bb530022e0d9886dd07f9f561cd2f9604e7c64a7c8cdb4c1d2cbab044721f73fb7879bdb8df6e43292af
-  languageName: node
-  linkType: hard
-
-"webpack@npm:5.58.1":
-  version: 5.58.1
-  resolution: "webpack@npm:5.58.1"
-  dependencies:
-    "@types/eslint-scope": ^3.7.0
-    "@types/estree": ^0.0.50
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/wasm-edit": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-    acorn: ^8.4.1
-    acorn-import-assertions: ^1.7.6
-    browserslist: ^4.14.5
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.8.3
-    es-module-lexer: ^0.9.0
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.4
-    json-parse-better-errors: ^1.0.2
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.1.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.1.3
-    watchpack: ^2.2.0
-    webpack-sources: ^3.2.0
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: e05576c5c7410c9ef25dc3595a870f93b34e3b44778e7df5ccbc1d40a51edb755223959f938b6e8b9b4e2285eb938da2464a08c9103597ff3131cb98c19a1d86
-  languageName: node
-  linkType: hard
-
 "webpack@npm:5.72.1":
   version: 5.72.1
   resolution: "webpack@npm:5.72.1"
@@ -38183,6 +35177,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack@npm:^5.72.0":
+  version: 5.72.0
+  resolution: "webpack@npm:5.72.0"
+  dependencies:
+    "@types/eslint-scope": ^3.7.3
+    "@types/estree": ^0.0.51
+    "@webassemblyjs/ast": 1.11.1
+    "@webassemblyjs/wasm-edit": 1.11.1
+    "@webassemblyjs/wasm-parser": 1.11.1
+    acorn: ^8.4.1
+    acorn-import-assertions: ^1.7.6
+    browserslist: ^4.14.5
+    chrome-trace-event: ^1.0.2
+    enhanced-resolve: ^5.9.2
+    es-module-lexer: ^0.9.0
+    eslint-scope: 5.1.1
+    events: ^3.2.0
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.2.9
+    json-parse-better-errors: ^1.0.2
+    loader-runner: ^4.2.0
+    mime-types: ^2.1.27
+    neo-async: ^2.6.2
+    schema-utils: ^3.1.0
+    tapable: ^2.1.1
+    terser-webpack-plugin: ^5.1.3
+    watchpack: ^2.3.1
+    webpack-sources: ^3.2.3
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 8365f1466d0f7adbf80ebc9b780f263a28eeeabcd5fb515249bfd9a56ab7fe8d29ea53df3d9364d0732ab39ae774445eb28abce694ed375b13882a6b2fe93ffc
+  languageName: node
+  linkType: hard
+
 "webpack@npm:^5.9.0":
   version: 5.70.0
   resolution: "webpack@npm:5.70.0"
@@ -38238,7 +35269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-encoding@npm:^1.0.1, whatwg-encoding@npm:^1.0.5":
+"whatwg-encoding@npm:^1.0.5":
   version: 1.0.5
   resolution: "whatwg-encoding@npm:1.0.5"
   dependencies:
@@ -38263,7 +35294,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-mimetype@npm:^2.2.0, whatwg-mimetype@npm:^2.3.0":
+"whatwg-mimetype@npm:^2.3.0":
   version: 2.3.0
   resolution: "whatwg-mimetype@npm:2.3.0"
   checksum: 23eb885940bcbcca4ff841c40a78e9cbb893ec42743993a42bf7aed16085b048b44b06f3402018931687153550f9a32d259dfa524e4f03577ab898b6965e5383
@@ -38280,17 +35311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "whatwg-url@npm:7.1.0"
-  dependencies:
-    lodash.sortby: ^4.7.0
-    tr46: ^1.0.1
-    webidl-conversions: ^4.0.2
-  checksum: fecb07c87290b47d2ec2fb6d6ca26daad3c9e211e0e531dd7566e7ff95b5b3525a57d4f32640ad4adf057717e0c215731db842ad761e61d947e81010e05cf5fd
-  languageName: node
-  linkType: hard
-
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.4.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"
@@ -38315,13 +35335,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-module@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "which-module@npm:2.0.0"
-  checksum: 809f7fd3dfcb2cdbe0180b60d68100c88785084f8f9492b0998c051d7a8efe56784492609d3f09ac161635b78ea29219eb1418a98c15ce87d085bce905705c9c
-  languageName: node
-  linkType: hard
-
 "which-typed-array@npm:^1.1.2":
   version: 1.1.7
   resolution: "which-typed-array@npm:1.1.7"
@@ -38451,17 +35464,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:2.4.1":
-  version: 2.4.1
-  resolution: "write-file-atomic@npm:2.4.1"
-  dependencies:
-    graceful-fs: ^4.1.11
-    imurmurhash: ^0.1.4
-    signal-exit: ^3.0.2
-  checksum: 9a032212214fb281fa7004e53115dfe38cd6f7191902ac7b691524c42f565f9083f2bb810aa30936b25559ed9f9b1772a2e385c29e5e7e4ef1253388610acdf1
-  languageName: node
-  linkType: hard
-
 "write-file-atomic@npm:^2.4.2":
   version: 2.4.3
   resolution: "write-file-atomic@npm:2.4.3"
@@ -38534,21 +35536,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^7.0.0, ws@npm:^7.3.1, ws@npm:^7.4.6":
-  version: 7.5.5
-  resolution: "ws@npm:7.5.5"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: bd2b437256012af526c69c03d6670a132e7ab0fe5853f3b7092826acea4203fad4ee2a8d0d9bd44834b2b968e747bf34f753ab535f4a3edf40d262da4b1d0805
-  languageName: node
-  linkType: hard
-
 "ws@npm:^7.2.0":
   version: 7.5.6
   resolution: "ws@npm:7.5.6"
@@ -38564,6 +35551,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^7.3.1, ws@npm:^7.4.6":
+  version: 7.5.5
+  resolution: "ws@npm:7.5.5"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ^5.0.2
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: bd2b437256012af526c69c03d6670a132e7ab0fe5853f3b7092826acea4203fad4ee2a8d0d9bd44834b2b968e747bf34f753ab535f4a3edf40d262da4b1d0805
+  languageName: node
+  linkType: hard
+
 "ws@npm:^8.2.3, ws@npm:^8.4.2":
   version: 8.5.0
   resolution: "ws@npm:8.5.0"
@@ -38607,7 +35609,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xmlchars@npm:^2.1.1, xmlchars@npm:^2.2.0":
+"xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"
   checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
@@ -38689,16 +35691,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^18.1.2":
-  version: 18.1.3
-  resolution: "yargs-parser@npm:18.1.3"
-  dependencies:
-    camelcase: ^5.0.0
-    decamelize: ^1.2.0
-  checksum: 60e8c7d1b85814594d3719300ecad4e6ae3796748b0926137bfec1f3042581b8646d67e83c6fc80a692ef08b8390f21ddcacb9464476c39bbdf52e34961dd4d9
-  languageName: node
-  linkType: hard
-
 "yargs-unparser@npm:2.0.0":
   version: 2.0.0
   resolution: "yargs-unparser@npm:2.0.0"
@@ -38726,25 +35718,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^15.0.2, yargs@npm:^15.4.1":
-  version: 15.4.1
-  resolution: "yargs@npm:15.4.1"
-  dependencies:
-    cliui: ^6.0.0
-    decamelize: ^1.2.0
-    find-up: ^4.1.0
-    get-caller-file: ^2.0.1
-    require-directory: ^2.1.1
-    require-main-filename: ^2.0.0
-    set-blocking: ^2.0.0
-    string-width: ^4.2.0
-    which-module: ^2.0.0
-    y18n: ^4.0.0
-    yargs-parser: ^18.1.2
-  checksum: 40b974f508d8aed28598087720e086ecd32a5fd3e945e95ea4457da04ee9bdb8bdd17fd91acff36dc5b7f0595a735929c514c40c402416bbb87c03f6fb782373
-  languageName: node
-  linkType: hard
-
 "yauzl@npm:^2.10.0":
   version: 2.10.0
   resolution: "yauzl@npm:2.10.0"

From c3cc01912b3c7e4e1eb6835da28cb459e81fefaf Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Thu, 26 May 2022 11:06:09 -0400
Subject: [PATCH 062/103] Docs: Move alert rule section to alerting
 fundamentals section (#49657) (#49659)

* initial commit

* Added links to alert rules, and fixes one broken alerting relref.

From 5fd9fee9332d69e483438836b00a353d8ddd0f80 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 12:50:09 -0400
Subject: [PATCH 063/103]  Search: add icon for row and singlestat panels
 (#49620) (#49634)

(cherry picked from commit 2fa91b75e0f185f547222125fb8235550498880a)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .../app/features/search/page/components/columns.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index c38a472a704..2fd1c2860e9 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -296,7 +296,18 @@ function makeTypeColumn(
                 }
                 txt = info.name;
               } else {
-                icon = `public/img/icons/unicons/question.svg`; // plugin not found
+                switch (type) {
+                  case 'row':
+                    txt = 'Row';
+                    icon = `public/img/icons/unicons/bars.svg`;
+                    break;
+                  case 'singlestat': // auto-migration
+                    txt = 'Singlestat';
+                    icon = `public/app/plugins/panel/stat/img/icn-singlestat-panel.svg`;
+                    break;
+                  default:
+                    icon = `public/img/icons/unicons/question.svg`; // plugin not found
+                }
               }
             }
             break;

From ccd1270f2875649afdc0461f2edb78cf334a6b96 Mon Sep 17 00:00:00 2001
From: Jack Baldry <jack.baldry@grafana.com>
Date: Thu, 26 May 2022 18:26:26 +0100
Subject: [PATCH 064/103] Convert TOML front matter to YAML (#49729)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---
 docs/sources/_index.md                        | 19 +++++++++-----
 docs/sources/administration/_index.md         | 13 +++++-----
 docs/sources/administration/cli.md            | 19 +++++++++-----
 docs/sources/administration/configuration.md  | 19 +++++++++-----
 .../administration/configure-docker.md        | 20 +++++++++-----
 .../administration/database-encryption.md     | 20 +++++++++-----
 .../administration/jaeger-instrumentation.md  | 18 ++++++++-----
 .../manage-user-preferences/_index.md         | 20 +++++++++-----
 .../manage-users-and-permissions/_index.md    | 11 ++++----
 .../about-users-and-permissions.md            | 15 +++++++----
 .../manage-dashboard-permissions/_index.md    | 12 +++++----
 .../manage-org-users/_index.md                | 12 +++++----
 .../change-user-org-permissions.md            | 11 ++++----
 .../manage-org-users/invite-user-join-org.md  | 11 ++++----
 .../manage-pending-invites.md                 | 11 ++++----
 .../manage-org-users/remove-user-from-org.md  | 11 ++++----
 .../manage-org-users/view-list-org-users.md   | 11 ++++----
 .../manage-server-users/_index.md             | 13 ++++++----
 .../add-remove-user-to-org.md                 | 12 +++++----
 .../manage-server-users/add-user.md           | 11 ++++----
 .../assign-remove-server-admin-privileges.md  | 11 ++++----
 .../change-user-org-permissions.md            | 11 ++++----
 .../manage-server-users/force-user-logout.md  | 11 ++++----
 .../grant-editor-admin-permissions.md         | 11 ++++----
 .../view-edit-user-account.md                 | 12 +++++----
 .../manage-server-users/view-list-users.md    | 11 ++++----
 .../manage-teams/_index.md                    | 14 ++++++----
 .../administration/preferences/_index.md      | 11 ++++----
 .../preferences/change-grafana-name.md        | 17 +++++++-----
 .../preferences/change-grafana-theme.md       | 19 +++++++++-----
 .../preferences/change-grafana-timezone.md    | 19 +++++++++-----
 .../preferences/change-home-dashboard.md      | 20 +++++++++-----
 docs/sources/administration/provisioning.md   | 18 ++++++++-----
 docs/sources/administration/security.md       | 19 +++++++++-----
 .../set-up-for-high-availability.md           | 18 ++++++++-----
 .../administration/view-server/_index.md      | 11 ++++----
 .../view-server/internal-metrics.md           | 19 +++++++++-----
 .../view-server/view-server-settings.md       | 20 +++++++++-----
 .../view-server/view-server-stats.md          | 17 +++++++-----
 docs/sources/alerting/_index.md               | 12 +++++----
 docs/sources/alerting/alert-groups/_index.md  | 19 +++++++++-----
 .../alerting/alert-groups/filter-alerts.md    | 19 +++++++++-----
 .../alert-groups/view-alert-grouping.md       | 20 +++++++++-----
 docs/sources/alerting/alerting-limitations.md | 11 ++++----
 .../sources/alerting/alerting-rules/_index.md | 13 ++++++----
 .../create-grafana-managed-rule.md            | 21 ++++++++++-----
 ...reate-mimir-loki-managed-recording-rule.md | 23 +++++++++++-----
 .../create-mimir-loki-managed-rule.md         | 22 +++++++++++-----
 .../edit-mimir-loki-namespace-group.md        | 24 ++++++++++++-----
 .../alerting/alerting-rules/rule-list.md      | 21 ++++++++++-----
 .../sources/alerting/contact-points/_index.md | 22 +++++++++++-----
 .../message-templating/_index.md              | 21 ++++++++++-----
 .../message-templating/template-data.md       | 17 ++++++++----
 .../message-templating/template-functions.md  | 17 ++++++++----
 docs/sources/alerting/difference-old-new.md   | 21 +++++++++------
 docs/sources/alerting/fundamentals/_index.md  | 13 ++++++----
 .../fundamentals/alert-rules/_index.md        | 15 ++++++-----
 .../alert-rules/alert-instances.md            | 15 ++++++-----
 .../alert-rules/alert-rule-types.md           | 15 ++++++-----
 .../alert-rules/organising-alerts.md          | 15 ++++++-----
 .../alerting/fundamentals/alertmanager.md     | 13 ++++++----
 .../fundamentals/annotation-label/_index.md   | 21 ++++++++++-----
 .../annotation-label/how-to-use-labels.md     | 16 +++++++-----
 .../labels-and-label-matchers.md              | 16 +++++++-----
 .../variables-label-annotation.md             | 16 +++++++-----
 .../fundamentals/evaluate-grafana-alerts.md   | 13 ++++++----
 .../alerting/fundamentals/state-and-health.md | 18 ++++++++-----
 .../alerting/high-availability/_index.md      | 21 ++++++++++-----
 .../high-availability/enable-alerting-ha.md   | 21 ++++++++++-----
 .../alerting/migrating-alerts/_index.md       | 13 +++++-----
 .../migrating-legacy-alerts.md                | 14 +++++-----
 .../alerting/migrating-alerts/opt-out.md      | 14 +++++-----
 docs/sources/alerting/notifications/_index.md | 21 ++++++++++-----
 .../alerting/notifications/mute-timings.md    | 22 +++++++++++-----
 docs/sources/alerting/silences/_index.md      | 19 +++++++++-----
 .../alerting/silences/create-silence.md       | 19 +++++++++-----
 .../sources/alerting/silences/edit-silence.md | 19 +++++++++-----
 .../label-matching-alert-suppression.md       | 19 +++++++++-----
 .../silences/linking-to-silence-form.md       | 19 +++++++++-----
 .../alerting/silences/remove-silence.md       | 19 +++++++++-----
 docs/sources/auth/_index.md                   | 13 +++++-----
 docs/sources/auth/auth-proxy.md               | 20 +++++++++-----
 docs/sources/auth/azuread.md                  | 19 +++++++++-----
 docs/sources/auth/enhanced_ldap.md            | 21 ++++++++++-----
 docs/sources/auth/generic-oauth.md            | 19 +++++++++-----
 docs/sources/auth/github.md                   | 19 +++++++++-----
 docs/sources/auth/gitlab.md                   | 19 +++++++++-----
 docs/sources/auth/google.md                   | 19 +++++++++-----
 docs/sources/auth/grafana.md                  | 19 +++++++++-----
 docs/sources/auth/jwt.md                      | 20 +++++++++-----
 docs/sources/auth/ldap.md                     | 21 ++++++++++-----
 docs/sources/auth/okta.md                     | 19 +++++++++-----
 docs/sources/auth/overview.md                 | 13 +++++-----
 docs/sources/auth/saml.md                     | 19 +++++++++-----
 docs/sources/auth/team-sync.md                | 19 +++++++++-----
 docs/sources/basics/_index.md                 | 11 ++++----
 docs/sources/basics/exemplars/_index.md       | 19 +++++++++-----
 .../basics/exemplars/view-exemplars.md        | 19 +++++++++-----
 docs/sources/basics/glossary.md               | 21 ++++++++++-----
 docs/sources/basics/intro-histograms.md       | 21 ++++++++++-----
 docs/sources/basics/timeseries-dimensions.md  | 23 +++++++++++-----
 docs/sources/basics/timeseries.md             | 20 +++++++++-----
 docs/sources/best-practices/_index.md         | 13 +++++-----
 .../best-practices-for-creating-dashboards.md | 13 +++++-----
 .../best-practices-for-managing-dashboards.md | 13 +++++-----
 .../common-observability-strategies.md        | 21 ++++++++++-----
 .../dashboard-management-maturity-levels.md   | 13 +++++-----
 docs/sources/dashboards/_index.md             | 12 +++++----
 docs/sources/dashboards/annotations.md        | 18 ++++++++-----
 docs/sources/dashboards/dashboard-create.md   | 12 +++++----
 docs/sources/dashboards/dashboard-folders.md  | 21 ++++++++++-----
 docs/sources/dashboards/dashboard-history.md  | 19 +++++++++-----
 docs/sources/dashboards/dashboard-manage.md   | 12 +++++----
 .../sources/dashboards/dashboard-ui/_index.md | 12 +++++----
 .../dashboard-ui/dashboard-header.md          | 12 +++++----
 .../dashboards/dashboard-ui/dashboard-row.md  | 12 +++++----
 docs/sources/dashboards/export-import.md      | 19 +++++++++-----
 docs/sources/dashboards/json-model.md         | 19 +++++++++-----
 docs/sources/dashboards/playlist.md           | 18 ++++++++-----
 docs/sources/dashboards/previews.md           | 17 +++++++-----
 docs/sources/dashboards/reporting.md          | 18 ++++++++-----
 .../sources/dashboards/scripted-dashboards.md | 18 ++++++++-----
 docs/sources/dashboards/search.md             | 18 ++++++++-----
 docs/sources/dashboards/shortcuts.md          | 11 ++++----
 .../sources/dashboards/time-range-controls.md | 18 ++++++++-----
 docs/sources/datasources/_index.md            | 12 +++++----
 docs/sources/datasources/add-a-data-source.md | 12 +++++----
 docs/sources/datasources/alertmanager.md      | 19 +++++++++-----
 .../datasources/aws-cloudwatch/_index.md      | 19 +++++++++-----
 .../aws-cloudwatch/aws-authentication.md      | 19 +++++++++-----
 .../preconfig-cloudwatch-dashboards.md        | 22 +++++++++++-----
 .../aws-cloudwatch/provision-cloudwatch.md    | 14 +++++-----
 .../template-queries-cloudwatch.md            | 14 +++++-----
 .../datasources/azuremonitor/_index.md        | 25 +++++++++++++-----
 .../deprecated-application-insights.md        | 24 ++++++++++++-----
 .../datasources/azuremonitor/provisioning.md  | 24 ++++++++++++-----
 .../azuremonitor/template-variables.md        | 24 ++++++++++++-----
 docs/sources/datasources/elasticsearch.md     | 19 +++++++++-----
 .../google-cloud-monitoring/_index.md         | 24 ++++++++++++-----
 .../google-authentication.md                  | 19 +++++++++-----
 .../preconfig-cloud-monitoring-dashboards.md  | 23 +++++++++++-----
 docs/sources/datasources/graphite.md          | 19 +++++++++-----
 docs/sources/datasources/influxdb/_index.md   | 20 +++++++++-----
 .../datasources/influxdb/influxdb-flux.md     | 13 +++++-----
 .../influxdb/influxdb-templates.md            | 13 +++++-----
 .../influxdb/provision-influxdb.md            | 13 +++++-----
 docs/sources/datasources/jaeger.md            | 20 +++++++++-----
 docs/sources/datasources/loki.md              | 20 +++++++++-----
 docs/sources/datasources/mssql.md             | 22 +++++++++++-----
 docs/sources/datasources/mysql.md             | 19 +++++++++-----
 docs/sources/datasources/opentsdb.md          | 20 +++++++++-----
 docs/sources/datasources/postgres.md          | 19 +++++++++-----
 docs/sources/datasources/prometheus.md        | 19 +++++++++-----
 docs/sources/datasources/tempo.md             | 21 ++++++++++-----
 docs/sources/datasources/testdata.md          | 19 +++++++++-----
 docs/sources/datasources/zipkin.md            | 19 +++++++++-----
 docs/sources/developers/_index.md             | 12 +++++----
 .../sources/developers/angular_deprecation.md | 17 +++++++-----
 docs/sources/developers/cla.md                | 15 ++++++-----
 docs/sources/developers/contribute.md         | 17 +++++++-----
 docs/sources/developers/http_api/_index.md    | 22 +++++++++++-----
 .../developers/http_api/access_control.md     | 22 +++++++++++-----
 docs/sources/developers/http_api/admin.md     | 19 +++++++++-----
 docs/sources/developers/http_api/alerting.md  | 20 +++++++++-----
 .../alerting_notification_channels.md         | 21 ++++++++++-----
 .../developers/http_api/annotations.md        | 21 ++++++++++-----
 docs/sources/developers/http_api/auth.md      | 20 +++++++++-----
 .../http_api/create-api-tokens-for-org.md     | 21 ++++++++++-----
 .../developers/http_api/curl-examples.md      | 19 +++++++++-----
 docs/sources/developers/http_api/dashboard.md | 19 +++++++++-----
 .../http_api/dashboard_permissions.md         | 23 +++++++++++-----
 .../developers/http_api/dashboard_versions.md | 21 ++++++++++-----
 .../developers/http_api/data_source.md        | 20 +++++++++-----
 .../http_api/datasource_permissions.md        | 24 ++++++++++++-----
 .../http_api/external_group_sync.md           | 23 +++++++++++-----
 docs/sources/developers/http_api/folder.md    | 19 +++++++++-----
 .../http_api/folder_dashboard_search.md       | 21 ++++++++++-----
 .../developers/http_api/folder_permissions.md | 23 +++++++++++-----
 .../developers/http_api/library_element.md    | 19 +++++++++-----
 docs/sources/developers/http_api/licensing.md | 20 +++++++++-----
 docs/sources/developers/http_api/org.md       | 20 +++++++++-----
 docs/sources/developers/http_api/other.md     | 19 +++++++++-----
 docs/sources/developers/http_api/playlist.md  | 19 +++++++++-----
 .../developers/http_api/preferences.md        | 19 +++++++++-----
 .../developers/http_api/query_history.md      | 19 +++++++++-----
 docs/sources/developers/http_api/reporting.md | 18 ++++++++-----
 .../developers/http_api/serviceaccount.md     | 19 +++++++++-----
 docs/sources/developers/http_api/short_url.md | 19 +++++++++-----
 docs/sources/developers/http_api/snapshot.md  | 19 +++++++++-----
 docs/sources/developers/http_api/team.md      | 21 ++++++++++-----
 docs/sources/developers/http_api/user.md      | 19 +++++++++-----
 docs/sources/developers/plugins/_index.md     | 12 +++++----
 ...-authentication-for-data-source-plugins.md | 11 +++++---
 .../plugins/add-query-editor-help.md          |  9 ++++---
 .../plugins/add-support-for-annotations.md    |  9 ++++---
 .../add-support-for-explore-queries.md        |  9 ++++---
 .../plugins/add-support-for-variables.md      |  9 ++++---
 .../developers/plugins/backend/_index.md      | 18 +++++++++----
 .../backend/grafana-plugin-sdk-for-go.md      | 18 +++++++++----
 .../plugins/backend/plugin-protocol.md        | 17 ++++++++----
 .../build-a-logs-data-source-plugin.md        |  9 ++++---
 .../build-a-streaming-data-source-plugin.md   |  9 ++++---
 .../plugins/custom-panel-option-editors.md    |  9 ++++---
 .../sources/developers/plugins/data-frames.md |  9 ++++---
 .../plugins/development-with-local-grafana.md |  9 ++++---
 .../developers/plugins/error-handling.md      |  9 ++++---
 .../developers/plugins/legacy/_index.md       | 14 +++++++---
 .../sources/developers/plugins/legacy/apps.md | 15 +++++++----
 .../developers/plugins/legacy/data-sources.md | 15 +++++++----
 .../legacy/defaults-and-editor-mode.md        | 10 ++++---
 .../developers/plugins/legacy/panels.md       | 16 ++++++++----
 .../plugins/legacy/review-guidelines.md       | 10 ++++---
 .../plugins/legacy/snapshot-mode.md           | 10 ++++---
 .../developers/plugins/legacy/style-guide.md  | 10 ++++---
 docs/sources/developers/plugins/metadata.md   | 15 +++++++----
 .../developers/plugins/migration-guide.md     |  9 ++++---
 .../developers/plugins/package-a-plugin.md    | 12 +++++----
 .../publishing-and-signing-criteria.md        |  9 ++++---
 .../developers/plugins/sign-a-plugin.md       |  9 ++++---
 .../plugins/working-with-data-frames.md       |  9 ++++---
 docs/sources/enterprise/_index.md             | 24 ++++++++++++-----
 .../access-control/configure-rbac.md          |  6 ++---
 .../access-control/rbac-provisioning.md       |  3 ++-
 docs/sources/enterprise/auditing.md           | 19 +++++++++-----
 .../enterprise/datasource_permissions.md      | 24 ++++++++++++-----
 docs/sources/enterprise/enhanced_ldap.md      | 21 ++++++++++-----
 .../enterprise/enterprise-configuration.md    | 19 +++++++++-----
 .../enterprise-encryption/_index.md           | 20 +++++++++-----
 ...ing-aws-kms-to-encrypt-database-secrets.md | 17 +++++++-----
 ...e-key-vault-to-encrypt-database-secrets.md | 17 +++++++-----
 ...e-cloud-kms-to-encrypt-database-secrets.md | 17 +++++++-----
 ...p-key-vault-to-encrypt-database-secrets.md | 17 +++++++-----
 docs/sources/enterprise/export-pdf.md         | 19 +++++++++-----
 docs/sources/enterprise/license/_index.md     | 18 ++++++++-----
 .../_index.md                                 | 20 +++++++++-----
 .../about-ge-license-through-aws.md           | 22 +++++++++++-----
 .../activate-license-on-ecs.md                | 22 +++++++++++-----
 .../activate-license-on-eks.md                | 22 +++++++++++-----
 ...ctivate-license-on-instance-outside-aws.md | 23 +++++++++++-----
 .../manage-license-in-aws-marketplace.md      | 24 ++++++++++++-----
 .../transfer-ge-license.md                    | 22 +++++++++++-----
 .../enterprise/license/activate-license.md    | 19 +++++++++-----
 .../enterprise/license/license-expiration.md  | 18 ++++++++-----
 .../license/license-restrictions.md           | 19 +++++++++-----
 docs/sources/enterprise/query-caching.md      | 19 +++++++++-----
 docs/sources/enterprise/recorded-queries.md   | 19 +++++++++-----
 docs/sources/enterprise/reporting.md          | 18 ++++++++-----
 docs/sources/enterprise/request-security.md   | 18 ++++++++-----
 docs/sources/enterprise/settings-updates.md   | 18 ++++++++-----
 docs/sources/enterprise/team-sync.md          | 19 +++++++++-----
 .../enterprise/usage-insights/_index.md       | 18 ++++++++-----
 .../dashboard-datasource-insights.md          | 18 ++++++++-----
 .../enterprise/usage-insights/export-logs.md  | 19 +++++++++-----
 .../usage-insights/improved-search.md         | 19 +++++++++-----
 .../usage-insights/presence-indicator.md      | 18 ++++++++-----
 docs/sources/enterprise/vault.md              | 18 ++++++++-----
 docs/sources/enterprise/white-labeling.md     | 18 ++++++++-----
 docs/sources/explore/_index.md                | 17 +++++++-----
 docs/sources/explore/explore-inspector.md     | 11 ++++----
 docs/sources/explore/logs-integration.md      | 17 +++++++-----
 docs/sources/explore/query-management.md      | 16 +++++++-----
 docs/sources/explore/trace-integration.md     | 17 +++++++-----
 docs/sources/getting-started/_index.md        | 12 +++++----
 .../getting-started-influxdb.md               | 19 +++++++++-----
 .../getting-started-prometheus.md             | 21 ++++++++++-----
 .../getting-started/getting-started-sql.md    | 23 +++++++++++-----
 .../getting-started/getting-started.md        | 21 ++++++++++-----
 docs/sources/image-rendering/_index.md        | 20 +++++++++-----
 docs/sources/image-rendering/monitoring.md    | 20 +++++++++-----
 .../image-rendering/troubleshooting.md        | 20 +++++++++-----
 docs/sources/installation/_index.md           | 21 ++++++++++-----
 docs/sources/installation/debian.md           | 19 +++++++++-----
 docs/sources/installation/docker.md           | 19 +++++++++-----
 docs/sources/installation/kubernetes.md       | 19 +++++++++-----
 docs/sources/installation/mac.md              | 21 ++++++++++-----
 docs/sources/installation/requirements.md     | 18 ++++++++-----
 docs/sources/installation/restart-grafana.md  | 18 ++++++++-----
 docs/sources/installation/rpm.md              | 24 ++++++++++++-----
 docs/sources/installation/upgrading.md        | 19 +++++++++-----
 docs/sources/installation/windows.md          | 19 +++++++++-----
 docs/sources/introduction/_index.md           | 12 +++++----
 docs/sources/introduction/oss-details.md      | 12 +++++----
 docs/sources/linking/_index.md                | 11 ++++----
 docs/sources/linking/dashboard-links.md       | 20 +++++++++-----
 docs/sources/linking/data-link-variables.md   | 20 +++++++++-----
 docs/sources/linking/data-links.md            | 16 ++++++++----
 docs/sources/linking/linking-overview.md      | 20 +++++++++-----
 docs/sources/linking/panel-links.md           | 22 +++++++++++-----
 docs/sources/live/set-up-grafana-live.md      | 21 +++++++--------
 docs/sources/old-alerting/_index.md           | 13 +++++-----
 .../old-alerting/add-notification-template.md | 22 +++++++++++-----
 docs/sources/old-alerting/create-alerts.md    | 22 ++++++++++------
 docs/sources/old-alerting/notifications.md    | 22 ++++++++++------
 .../old-alerting/pause-an-alert-rule.md       | 23 ++++++++++------
 .../old-alerting/troubleshoot-alerts.md       | 23 ++++++++++------
 docs/sources/old-alerting/view-alerts.md      | 23 ++++++++++------
 docs/sources/panels/_index.md                 | 15 ++++++-----
 .../panels/add-panels-dynamically/_index.md   | 18 ++++++++-----
 .../about-repeating-panels-rows.md            | 12 +++++----
 .../configure-repeating-panels.md             | 12 +++++----
 .../configure-repeating-rows.md               | 12 +++++----
 docs/sources/panels/calculation-types.md      | 14 ++++++----
 docs/sources/panels/format-data/_index.md     | 13 ++++++----
 .../panels/format-data/about-value-mapping.md | 12 +++++----
 .../panels/format-data/edit-value-mapping.md  | 12 +++++----
 .../sources/panels/format-data/map-a-range.md | 12 +++++----
 .../format-data/map-a-regular-expression.md   | 12 +++++----
 .../panels/format-data/map-a-special-value.md | 12 +++++----
 .../sources/panels/format-data/map-a-value.md | 12 +++++----
 docs/sources/panels/library-panels/_index.md  | 13 ++++++----
 .../library-panels/about-library-panels.md    | 12 +++++----
 .../library-panels/add-library-panel.md       | 12 +++++----
 .../library-panels/create-library-panel.md    | 12 +++++----
 .../library-panels/delete-library-panel.md    | 12 +++++----
 .../library-panels/manage-library-panel.md    | 12 +++++----
 .../library-panels/unlink-library-panel.md    | 12 +++++----
 .../panels/override-field-values/_index.md    | 13 ++++++----
 .../about-field-overrides.md                  | 12 +++++----
 .../add-a-field-override.md                   | 12 +++++----
 .../delete-a-field-override.md                | 12 +++++----
 .../edit-field-override.md                    | 12 +++++----
 .../view-field-override.md                    | 12 +++++----
 .../panels/query-a-data-source/_index.md      | 16 ++++++++----
 .../query-a-data-source/about-queries.md      | 12 +++++----
 .../panels/query-a-data-source/add-a-query.md | 12 +++++----
 .../download-raw-query-results.md             | 12 +++++----
 .../inspect-query-performance.md              | 12 +++++----
 .../inspect-request-and-response-data.md      | 12 +++++----
 .../query-a-data-source/manage-queries.md     | 12 +++++----
 .../query-a-data-source/navigate-query-tab.md | 12 +++++----
 .../panels/query-a-data-source/share-query.md | 12 +++++----
 .../_index.md                                 | 12 +++++----
 .../about-expressions.md                      | 12 +++++----
 .../write-an-expression.md                    | 12 +++++----
 docs/sources/panels/query-options.md          | 13 ++++++----
 .../panels/standard-field-definitions.md      | 13 ++++++----
 docs/sources/panels/transform-data/_index.md  | 16 ++++++++----
 .../transform-data/about-transformation.md    | 12 +++++----
 .../add-transformation-to-data.md             | 14 ++++++----
 .../transform-data/debug-transformation.md    | 12 +++++----
 .../transform-data/delete-transformation.md   | 12 +++++----
 .../transformation-functions.md               | 14 ++++++----
 .../panels/working-with-panels/_index.md      | 17 ++++++++----
 .../working-with-panels/add-link-to-panel.md  | 12 +++++----
 .../panels/working-with-panels/add-panel.md   | 12 +++++----
 .../add-title-and-description.md              | 12 +++++----
 .../apply-color-to-series.md                  | 12 +++++----
 .../working-with-panels/configure-legend.md   | 12 +++++----
 .../download-query-results.md                 | 12 +++++----
 .../format-standard-fields.md                 | 12 +++++----
 .../navigate-inspector-panel.md               | 12 +++++----
 .../navigate-panel-editor.md                  | 12 +++++----
 .../working-with-panels/organize-dashboard.md | 12 +++++----
 .../working-with-panels/view-json-model.md    | 12 +++++----
 docs/sources/plugins/_index.md                | 11 ++++----
 docs/sources/plugins/catalog.md               | 11 ++++----
 docs/sources/plugins/installation.md          | 11 ++++----
 docs/sources/plugins/plugin-signatures.md     | 12 +++++----
 docs/sources/release-notes/_index.md          | 11 ++++----
 .../release-notes/release-notes-7-3-0.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-1.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-10.md     | 14 +++++-----
 .../release-notes/release-notes-7-3-2.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-3.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-4.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-5.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-6.md      | 14 +++++-----
 .../release-notes/release-notes-7-3-7.md      | 14 +++++-----
 .../release-notes/release-notes-7-4-0.md      | 14 +++++-----
 .../release-notes/release-notes-7-4-1.md      | 14 +++++-----
 .../release-notes/release-notes-7-4-2.md      | 14 +++++-----
 .../release-notes/release-notes-7-4-3.md      | 14 +++++-----
 .../release-notes/release-notes-7-4-5.md      | 14 +++++-----
 .../release-notes-7-5-0-beta1.md              | 14 +++++-----
 .../release-notes-7-5-0-beta2.md              | 14 +++++-----
 .../release-notes/release-notes-7-5-0.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-1.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-10.md     | 14 +++++-----
 .../release-notes/release-notes-7-5-11.md     | 14 +++++-----
 .../release-notes/release-notes-7-5-12.md     | 14 +++++-----
 .../release-notes/release-notes-7-5-13.md     | 14 +++++-----
 .../release-notes/release-notes-7-5-15.md     | 14 +++++-----
 .../release-notes/release-notes-7-5-2.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-3.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-4.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-5.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-6.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-7.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-8.md      | 14 +++++-----
 .../release-notes/release-notes-7-5-9.md      | 14 +++++-----
 .../release-notes-8-0-0-beta1.md              | 14 +++++-----
 .../release-notes-8-0-0-beta2.md              | 14 +++++-----
 .../release-notes-8-0-0-beta3.md              | 14 +++++-----
 .../release-notes/release-notes-8-0-0.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-1.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-2.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-3.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-4.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-5.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-6.md      | 14 +++++-----
 .../release-notes/release-notes-8-0-7.md      | 14 +++++-----
 .../release-notes-8-1-0-beta1.md              | 14 +++++-----
 .../release-notes-8-1-0-beta2.md              | 14 +++++-----
 .../release-notes-8-1-0-beta3.md              | 14 +++++-----
 .../release-notes/release-notes-8-1-0.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-1.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-2.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-3.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-4.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-5.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-6.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-7.md      | 14 +++++-----
 .../release-notes/release-notes-8-1-8.md      | 14 +++++-----
 .../release-notes-8-2-0-beta1.md              | 14 +++++-----
 .../release-notes-8-2-0-beta2.md              | 14 +++++-----
 .../release-notes/release-notes-8-2-0.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-1.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-2.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-3.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-4.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-5.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-6.md      | 14 +++++-----
 .../release-notes/release-notes-8-2-7.md      | 14 +++++-----
 .../release-notes-8-3-0-beta1.md              | 14 +++++-----
 .../release-notes-8-3-0-beta2.md              | 14 +++++-----
 .../release-notes/release-notes-8-3-0.md      | 14 +++++-----
 .../release-notes/release-notes-8-3-1.md      | 14 +++++-----
 .../release-notes/release-notes-8-3-2.md      | 14 +++++-----
 .../release-notes/release-notes-8-3-3.md      | 14 +++++-----
 .../release-notes/release-notes-8-3-4.md      | 14 +++++-----
 .../release-notes/release-notes-8-3-5.md      | 14 +++++-----
 .../release-notes/release-notes-8-3-6.md      | 11 ++++----
 .../release-notes/release-notes-8-3-7.md      | 11 ++++----
 .../release-notes-8-4-0-beta1.md              | 11 ++++----
 .../release-notes/release-notes-8-4-0.md      | 11 ++++----
 .../release-notes/release-notes-8-4-1.md      | 11 ++++----
 .../release-notes/release-notes-8-4-2.md      | 11 ++++----
 .../release-notes/release-notes-8-4-3.md      | 11 ++++----
 .../release-notes/release-notes-8-4-4.md      | 11 ++++----
 .../release-notes/release-notes-8-4-5.md      | 11 ++++----
 .../release-notes/release-notes-8-4-6.md      | 11 ++++----
 .../release-notes/release-notes-8-4-7.md      | 11 ++++----
 .../release-notes-8-5-0-beta1.md              | 11 ++++----
 .../release-notes/release-notes-8-5-0.md      | 11 ++++----
 .../release-notes/release-notes-8-5-1.md      | 11 ++++----
 .../release-notes/release-notes-8-5-2.md      | 11 ++++----
 .../release-notes/release-notes-8-5-3.md      |  8 +++---
 .../release-notes/release-notes-v7-4-2.md     | 14 +++++-----
 docs/sources/sharing/_index.md                | 11 ++++----
 docs/sources/sharing/playlists.md             | 19 +++++++++-----
 docs/sources/sharing/share-dashboard.md       | 19 +++++++++-----
 docs/sources/sharing/share-panel.md           | 20 +++++++++-----
 docs/sources/troubleshooting/_index.md        | 19 +++++++++-----
 docs/sources/troubleshooting/diagnostics.md   | 11 ++++----
 .../troubleshoot-dashboards.md                | 19 +++++++++-----
 .../troubleshooting/troubleshoot-queries.md   | 20 +++++++++-----
 docs/sources/variables/_index.md              | 11 ++++----
 .../advanced-variable-format-options.md       | 19 +++++++++-----
 .../variables/filter-variables-with-regex.md  | 19 +++++++++-----
 .../formatting-multi-value-variables.md       | 11 ++++----
 docs/sources/variables/inspect-variable.md    | 20 +++++++++-----
 docs/sources/variables/manage-variable.md     | 20 +++++++++-----
 docs/sources/variables/syntax.md              | 20 +++++++++-----
 docs/sources/variables/variable-examples.md   | 19 +++++++++-----
 .../variables/variable-selection-options.md   | 11 ++++----
 .../variables/variable-types/_index.md        | 11 ++++----
 .../variable-types/add-ad-hoc-filters.md      | 12 +++++----
 .../variable-types/add-constant-variable.md   | 12 +++++----
 .../variable-types/add-custom-variable.md     | 12 +++++----
 .../add-data-source-variable.md               | 12 +++++----
 .../variable-types/add-interval-variable.md   | 12 +++++----
 .../variable-types/add-query-variable.md      | 12 +++++----
 .../variable-types/add-text-box-variable.md   | 12 +++++----
 .../variable-types/chained-variables.md       | 20 +++++++++-----
 .../variable-types/global-variables.md        | 22 +++++++++++-----
 docs/sources/visualizations/_index.md         | 12 +++++----
 .../visualizations/alert-list-panel.md        | 21 ++++++++++-----
 docs/sources/visualizations/annotations.md    | 21 ++++++++++-----
 docs/sources/visualizations/bar-chart.md      | 21 ++++++++++-----
 .../sources/visualizations/bar-gauge-panel.md | 20 +++++++++-----
 docs/sources/visualizations/candlestick.md    | 22 +++++++++++-----
 .../visualizations/dashboard-list-panel.md    | 21 ++++++++++-----
 docs/sources/visualizations/gauge-panel.md    | 20 +++++++++-----
 docs/sources/visualizations/geomap.md         | 21 ++++++++++-----
 docs/sources/visualizations/graph-panel.md    | 21 ++++++++++-----
 docs/sources/visualizations/heatmap.md        | 20 +++++++++-----
 docs/sources/visualizations/histogram.md      | 22 +++++++++++-----
 docs/sources/visualizations/logs-panel.md     | 21 ++++++++++-----
 docs/sources/visualizations/news-panel.md     | 19 +++++++++-----
 docs/sources/visualizations/node-graph.md     | 20 +++++++++-----
 .../sources/visualizations/pie-chart-panel.md | 16 +++++++-----
 docs/sources/visualizations/stat-panel.md     | 22 +++++++++++-----
 docs/sources/visualizations/state-timeline.md | 20 +++++++++-----
 docs/sources/visualizations/status-history.md | 20 +++++++++-----
 docs/sources/visualizations/table/_index.md   | 21 ++++++++++-----
 .../table/filter-table-columns.md             | 23 +++++++++++-----
 docs/sources/visualizations/text-panel.md     | 20 +++++++++-----
 .../visualizations/time-series/_index.md      | 20 +++++++++-----
 .../time-series/annotate-time-series.md       | 20 +++++++++-----
 .../time-series/change-axis-display.md        | 19 +++++++++-----
 .../time-series/graph-color-scheme.md         | 19 +++++++++-----
 .../time-series/graph-time-series-as-bars.md  | 19 +++++++++-----
 .../time-series/graph-time-series-as-lines.md | 19 +++++++++-----
 .../graph-time-series-as-points.md            | 19 +++++++++-----
 .../time-series/graph-time-series-stacking.md | 20 +++++++++-----
 docs/sources/visualizations/traces.md         | 18 ++++++++-----
 docs/sources/whatsnew/_index.md               | 12 +++++----
 docs/sources/whatsnew/whats-new-in-v2-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v2-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v2-5.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v2-6.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v3-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v3-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-2.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-3.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-4.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-5.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v4-6.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v5-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v5-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v5-2.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v5-3.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v5-4.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-2.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-3.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-4.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-5.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-6.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v6-7.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v7-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v7-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v7-2.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v7-3.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v7-4.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v7-5.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v8-0.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v8-1.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v8-2.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v8-3.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v8-4.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v8-5.md    | 26 ++++++++++++-------
 docs/sources/whatsnew/whats-new-in-v9-0.md    | 26 ++++++++++++-------
 546 files changed, 5681 insertions(+), 3477 deletions(-)

diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 193dbea6b48..7ff19b1fb26 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/", "/docs/grafana/latest/guides/reference/admin/", "/docs/grafana/v1.1/", "/docs/grafana/v3.1/"]
-description = "Guides, Installation and Feature Documentation"
-keywords = ["grafana", "installation", "documentation"]
-title = "Grafana documentation"
-+++
+---
+aliases:
+  - /docs/grafana/latest/
+  - /docs/grafana/latest/guides/reference/admin/
+  - /docs/grafana/v1.1/
+  - /docs/grafana/v3.1/
+description: Guides, Installation and Feature Documentation
+keywords:
+  - grafana
+  - installation
+  - documentation
+title: Grafana documentation
+---
 
 # Grafana documentation
 
diff --git a/docs/sources/administration/_index.md b/docs/sources/administration/_index.md
index a9798e2b693..84e4e51d12c 100644
--- a/docs/sources/administration/_index.md
+++ b/docs/sources/administration/_index.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/"]
-description = "Administration"
-title = "Administration"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/
+description: Administration
+title: Administration
+weight: 40
+---
 
 # Administration
 
diff --git a/docs/sources/administration/cli.md b/docs/sources/administration/cli.md
index 3056312c725..849d51a76af 100644
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/cli/"]
-description = "Guide to using grafana-cli"
-keywords = ["grafana", "cli", "grafana-cli", "command line interface"]
-title = "Grafana CLI"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/cli/
+description: Guide to using grafana-cli
+keywords:
+  - grafana
+  - cli
+  - grafana-cli
+  - command line interface
+title: Grafana CLI
+weight: 400
+---
 
 # Grafana CLI
 
diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md
index c121b89bf87..311a8fa453c 100644
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/configuration/", "/docs/grafana/latest/installation/configuration/"]
-description = "Configuration documentation"
-keywords = ["grafana", "configuration", "documentation"]
-title = "Configuration"
-weight = 150
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/configuration/
+  - /docs/grafana/latest/installation/configuration/
+description: Configuration documentation
+keywords:
+  - grafana
+  - configuration
+  - documentation
+title: Configuration
+weight: 150
+---
 
 # Configuration
 
diff --git a/docs/sources/administration/configure-docker.md b/docs/sources/administration/configure-docker.md
index 217fa558821..1c1d800b95b 100644
--- a/docs/sources/administration/configure-docker.md
+++ b/docs/sources/administration/configure-docker.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/configure-docker/", "/docs/grafana/latest/installation/configure-docker/"]
-description = "Guide for configuring the Grafana Docker image"
-keywords = ["grafana", "configuration", "documentation", "docker"]
-title = "Configure Grafana Docker image"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/configure-docker/
+  - /docs/grafana/latest/installation/configure-docker/
+description: Guide for configuring the Grafana Docker image
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - docker
+title: Configure Grafana Docker image
+weight: 200
+---
 
 # Configure a Grafana Docker image
 
diff --git a/docs/sources/administration/database-encryption.md b/docs/sources/administration/database-encryption.md
index f88104a9880..0af9ad244ee 100644
--- a/docs/sources/administration/database-encryption.md
+++ b/docs/sources/administration/database-encryption.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/database-encryption/"]
-description = "Grafana database encryption"
-keywords = ["grafana", "database", "encryption", "envelope encryption", "documentation"]
-title = "Database encryption"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/database-encryption/
+description: Grafana database encryption
+keywords:
+  - grafana
+  - database
+  - encryption
+  - envelope encryption
+  - documentation
+title: Database encryption
+weight: 450
+---
 
 # Grafana database encryption
 
diff --git a/docs/sources/administration/jaeger-instrumentation.md b/docs/sources/administration/jaeger-instrumentation.md
index 01981377c52..ebd37888e73 100644
--- a/docs/sources/administration/jaeger-instrumentation.md
+++ b/docs/sources/administration/jaeger-instrumentation.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/jaeger-instrumentation/"]
-description = "Jaeger traces emitted and propagation by Grafana"
-keywords = ["grafana", "jaeger", "tracing"]
-title = "Jaeger instrumentation"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/jaeger-instrumentation/
+description: Jaeger traces emitted and propagation by Grafana
+keywords:
+  - grafana
+  - jaeger
+  - tracing
+title: Jaeger instrumentation
+weight: 900
+---
 
 # Jaeger instrumentation
 
diff --git a/docs/sources/administration/manage-user-preferences/_index.md b/docs/sources/administration/manage-user-preferences/_index.md
index 123f29f7363..809fe239374 100644
--- a/docs/sources/administration/manage-user-preferences/_index.md
+++ b/docs/sources/administration/manage-user-preferences/_index.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/change-your-password/", "/docs/grafana/latest/administration/manage-user-preferences/"]
-description = "Learn how to update your user preferences and switch organizations"
-keywords = ["password", "change", "organization", "change"]
-title = "Manage user preferences"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/change-your-password/
+  - /docs/grafana/latest/administration/manage-user-preferences/
+description: Learn how to update your user preferences and switch organizations
+keywords:
+  - password
+  - change
+  - organization
+  - change
+title: Manage user preferences
+weight: 400
+---
 
 # Manage user preferences
 
diff --git a/docs/sources/administration/manage-users-and-permissions/_index.md b/docs/sources/administration/manage-users-and-permissions/_index.md
index 1e3e48e4bcc..4a0ae999e3b 100644
--- a/docs/sources/administration/manage-users-and-permissions/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/"]
-title = "Manage users and permissions"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/
+title: Manage users and permissions
+weight: 200
+---
 
 # Manage users and permissions
 
diff --git a/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md b/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md
index b471fa27df7..1fa41c94d7c 100644
--- a/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md
+++ b/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md
@@ -1,8 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/", "/docs/grafana/latest/manage-users/", "/docs/grafana/latest/permissions/", "/docs/grafana/latest/permissions/organization_roles/", "/docs/grafana/latest/permissions/overview/"]
-title = "About users and permissions"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/
+  - /docs/grafana/latest/manage-users/
+  - /docs/grafana/latest/permissions/
+  - /docs/grafana/latest/permissions/organization_roles/
+  - /docs/grafana/latest/permissions/overview/
+title: About users and permissions
+weight: 100
+---
 
 # About users and permissions
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md
index d8b8bf76645..0786ad403ba 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/", "/docs/grafana/latest/permissions/dashboard_folder_permissions/"]
-title = "Manage dashboard permissions"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/
+  - /docs/grafana/latest/permissions/dashboard_folder_permissions/
+title: Manage dashboard permissions
+weight: 500
+---
 
 # Manage dashboard permissions
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md
index 7b8b0454d27..a2c8622894a 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/", "/docs/grafana/latest/manage-users/org-admin/"]
-title = "Manage users in an organization"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/
+  - /docs/grafana/latest/manage-users/org-admin/
+title: Manage users in an organization
+weight: 400
+---
 
 # Manage users in an organization
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md
index 70bee3ae264..ea769aa8ff9 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/"]
-title = "Change a user's organization permissions"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/
+title: Change a user's organization permissions
+weight: 30
+---
 
 # Change a user's organization permissions
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md
index 7ae875e82c7..8cef28ced99 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/"]
-title = "Invite a user to join an organization"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/
+title: Invite a user to join an organization
+weight: 10
+---
 
 # Invite a user to join an organization
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md
index a48079703b9..92a2a5a1809 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/"]
-title = "Manage a pending invitation"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/
+title: Manage a pending invitation
+weight: 20
+---
 
 # Manage a pending invitation
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md
index cdc8348e9d7..1d6b68ac0ee 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/"]
-title = "Remove a user from an organization"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/
+title: Remove a user from an organization
+weight: 40
+---
 
 # Remove a user from an organization
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md
index cf03ec5db9a..019027eb360 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/"]
-title = "View a list of organization users"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/
+title: View a list of organization users
+weight: 50
+---
 
 # View a list of organization users
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md
index 867789bcf12..91467e02ca7 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/", "/docs/grafana/latest/manage-users/server-admin/", "/docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/"]
-title = "Manage users globally"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/
+  - /docs/grafana/latest/manage-users/server-admin/
+  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/
+title: Manage users globally
+weight: 300
+---
 
 # Manage users globally
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md
index 31767666dbd..50b9b47c800 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/"]
-title = "Add or remove a user from an organization"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/
+title: Add or remove a user from an organization
+weight: 30
+---
 
 # Add a user to an organization
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md
index 7033dce3749..9450c881d8d 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/"]
-title = "Add a user"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/
+title: Add a user
+weight: 10
+---
 
 # Add a user
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md
index 219d390aea2..27b64fc08c8 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/"]
-title = "Assign or remove Grafana server administrator privileges"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/
+title: Assign or remove Grafana server administrator privileges
+weight: 20
+---
 
 # Assign or remove Grafana server administrator privileges
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md
index 1ca6cee6dbc..5eb323753fb 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/"]
-title = "Change a user's organization permissions"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/
+title: Change a user's organization permissions
+weight: 50
+---
 
 # Change a user's organization permissions
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md
index 3c9199bf881..0cf4c9d87f9 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/"]
-title = "Force a user to logout from Grafana"
-weight = 90
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/
+title: Force a user to logout from Grafana
+weight: 90
+---
 
 # Force a user to log out of Grafana
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md
index 1664e9c1fea..5736cb7df84 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/"]
-title = "Grant editors administrator permissions"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
+title: Grant editors administrator permissions
+weight: 60
+---
 
 # Grant editors administrator permissions
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md
index 03fce48d967..84859121220 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/"]
-title = "View and edit a user account"
-weight = 110
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/
+title: View and edit a user account
+weight: 110
+---
 
 # View user details
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md
index a0e2eed8de2..b834bdb4a8b 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/"]
-title = "View a list of users"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/
+title: View a list of users
+weight: 100
+---
 
 # View a list of users
 
diff --git a/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md
index b6a631a5afe..ad7b15c71e2 100644
--- a/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md
@@ -1,8 +1,12 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/", "/docs/grafana/latest/manage-users/add-or-remove-user-from-team/", "/docs/grafana/latest/manage-users/create-or-remove-team/", "/docs/grafana/latest/manage-users/manage-teams/"]
-title = "Manage teams"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/
+  - /docs/grafana/latest/manage-users/add-or-remove-user-from-team/
+  - /docs/grafana/latest/manage-users/create-or-remove-team/
+  - /docs/grafana/latest/manage-users/manage-teams/
+title: Manage teams
+weight: 600
+---
 
 # Manage teams
 
diff --git a/docs/sources/administration/preferences/_index.md b/docs/sources/administration/preferences/_index.md
index c93e126d798..9c71dfb8dbf 100644
--- a/docs/sources/administration/preferences/_index.md
+++ b/docs/sources/administration/preferences/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/"]
-title = "Preferences"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/
+title: Preferences
+weight: 50
+---
 
 # Grafana preferences
 
diff --git a/docs/sources/administration/preferences/change-grafana-name.md b/docs/sources/administration/preferences/change-grafana-name.md
index 9c043c90d3e..9a2ec90b69f 100644
--- a/docs/sources/administration/preferences/change-grafana-name.md
+++ b/docs/sources/administration/preferences/change-grafana-name.md
@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-name/"]
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change name and email"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-name/
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change name and email
+weight: 100
+---
 
 # Change Grafana name and email
 
diff --git a/docs/sources/administration/preferences/change-grafana-theme.md b/docs/sources/administration/preferences/change-grafana-theme.md
index 27de9025370..2cc4a2c6f1b 100644
--- a/docs/sources/administration/preferences/change-grafana-theme.md
+++ b/docs/sources/administration/preferences/change-grafana-theme.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-theme/"]
-description = "How to set the Grafana UI theme"
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change UI theme"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-theme/
+description: How to set the Grafana UI theme
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change UI theme
+weight: 200
+---
 
 # Change Grafana UI theme
 
diff --git a/docs/sources/administration/preferences/change-grafana-timezone.md b/docs/sources/administration/preferences/change-grafana-timezone.md
index 95f832743d2..d01b67bcc42 100644
--- a/docs/sources/administration/preferences/change-grafana-timezone.md
+++ b/docs/sources/administration/preferences/change-grafana-timezone.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-timezone/"]
-description = "How to change your Grafana timezone"
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change default timezone"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-timezone/
+description: How to change your Grafana timezone
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change default timezone
+weight: 400
+---
 
 # Change the Grafana default timezone
 
diff --git a/docs/sources/administration/preferences/change-home-dashboard.md b/docs/sources/administration/preferences/change-home-dashboard.md
index 2f5bbce5ad2..c867665f6c5 100644
--- a/docs/sources/administration/preferences/change-home-dashboard.md
+++ b/docs/sources/administration/preferences/change-home-dashboard.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/change-home-dashboard/", "/docs/grafana/latest/administration/preferences/change-home-dashboard/"]
-description = "How to replace the default home dashboard"
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change home dashboard"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/change-home-dashboard/
+  - /docs/grafana/latest/administration/preferences/change-home-dashboard/
+description: How to replace the default home dashboard
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change home dashboard
+weight: 300
+---
 
 # Change the default home dashboard
 
diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md
index 239122405f9..f0e0f744fdd 100644
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/provisioning/", "/docs/grafana/latest/installation/provisioning/"]
-description = ""
-keywords = ["grafana", "provisioning"]
-title = "Provisioning"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/provisioning/
+  - /docs/grafana/latest/installation/provisioning/
+description: ''
+keywords:
+  - grafana
+  - provisioning
+title: Provisioning
+weight: 800
+---
 
 # Provisioning Grafana
 
diff --git a/docs/sources/administration/security.md b/docs/sources/administration/security.md
index 100afe745b9..76cec13081e 100644
--- a/docs/sources/administration/security.md
+++ b/docs/sources/administration/security.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/security/", "/docs/grafana/latest/installation/security/"]
-description = "Security Docs"
-keywords = ["grafana", "security", "documentation"]
-title = "Security"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/security/
+  - /docs/grafana/latest/installation/security/
+description: Security Docs
+keywords:
+  - grafana
+  - security
+  - documentation
+title: Security
+weight: 500
+---
 
 # Security
 
diff --git a/docs/sources/administration/set-up-for-high-availability.md b/docs/sources/administration/set-up-for-high-availability.md
index fd6e03d9c14..ff9acc98a66 100644
--- a/docs/sources/administration/set-up-for-high-availability.md
+++ b/docs/sources/administration/set-up-for-high-availability.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/set-up-for-high-availability/", "/docs/grafana/latest/tutorials/ha_setup/"]
-keywords = ["grafana", "tutorials", "HA", "high availability"]
-title = "Set up Grafana for high availability"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/set-up-for-high-availability/
+  - /docs/grafana/latest/tutorials/ha_setup/
+keywords:
+  - grafana
+  - tutorials
+  - HA
+  - high availability
+title: Set up Grafana for high availability
+weight: 1200
+---
 
 # Set up Grafana for high availability
 
diff --git a/docs/sources/administration/view-server/_index.md b/docs/sources/administration/view-server/_index.md
index 0052604e072..b726bf96b37 100644
--- a/docs/sources/administration/view-server/_index.md
+++ b/docs/sources/administration/view-server/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/view-server/"]
-title = "View server"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/view-server/
+title: View server
+weight: 100
+---
 
 # View server information
 
diff --git a/docs/sources/administration/view-server/internal-metrics.md b/docs/sources/administration/view-server/internal-metrics.md
index e8c63990ad6..eb18e74534a 100644
--- a/docs/sources/administration/view-server/internal-metrics.md
+++ b/docs/sources/administration/view-server/internal-metrics.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/admin/metrics/", "/docs/grafana/latest/administration/view-server/internal-metrics/"]
-description = "Internal metrics exposed by Grafana"
-keywords = ["grafana", "metrics", "internal metrics"]
-title = "Internal Grafana metrics"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/admin/metrics/
+  - /docs/grafana/latest/administration/view-server/internal-metrics/
+description: Internal metrics exposed by Grafana
+keywords:
+  - grafana
+  - metrics
+  - internal metrics
+title: Internal Grafana metrics
+weight: 200
+---
 
 # Internal Grafana metrics
 
diff --git a/docs/sources/administration/view-server/view-server-settings.md b/docs/sources/administration/view-server/view-server-settings.md
index dbbcd22162e..7fbf1f6e0e3 100644
--- a/docs/sources/administration/view-server/view-server-settings.md
+++ b/docs/sources/administration/view-server/view-server-settings.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/admin/view-server-settings/", "/docs/grafana/latest/administration/view-server/view-server-settings/"]
-description = "How to view server settings in the Grafana UI"
-keywords = ["grafana", "configuration", "server", "settings"]
-title = "View server settings"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/admin/view-server-settings/
+  - /docs/grafana/latest/administration/view-server/view-server-settings/
+description: How to view server settings in the Grafana UI
+keywords:
+  - grafana
+  - configuration
+  - server
+  - settings
+title: View server settings
+weight: 300
+---
 
 # View Grafana server settings
 
diff --git a/docs/sources/administration/view-server/view-server-stats.md b/docs/sources/administration/view-server/view-server-stats.md
index 3a8f1f33104..b13996451ed 100644
--- a/docs/sources/administration/view-server/view-server-stats.md
+++ b/docs/sources/administration/view-server/view-server-stats.md
@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/admin/view-server-stats/", "/docs/grafana/latest/administration/view-server/view-server-stats/"]
-keywords = ["grafana", "server", "statistics"]
-title = "View server stats"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/admin/view-server-stats/
+  - /docs/grafana/latest/administration/view-server/view-server-stats/
+keywords:
+  - grafana
+  - server
+  - statistics
+title: View server stats
+weight: 400
+---
 
 # View Grafana server stats
 
diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index 080b0e9bf67..6662edb456b 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/", "/docs/grafana/latest/alerting/unified-alerting/alerting/"]
-title = "Alerting"
-weight = 114
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting/
+title: Alerting
+weight: 114
+---
 
 # Grafana alerting
 
diff --git a/docs/sources/alerting/alert-groups/_index.md b/docs/sources/alerting/alert-groups/_index.md
index 0951ad5eb4a..364b7a875f5 100644
--- a/docs/sources/alerting/alert-groups/_index.md
+++ b/docs/sources/alerting/alert-groups/_index.md
@@ -1,10 +1,15 @@
-+++
-title = "Alert groups"
-description = "Alert groups"
-keywords = ["grafana", "alerting", "alerts", "groups"]
-weight = 445
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: Alert groups
+weight: 445
+---
 
 # Alert groups
 
diff --git a/docs/sources/alerting/alert-groups/filter-alerts.md b/docs/sources/alerting/alert-groups/filter-alerts.md
index 778721bb8cc..ac99b231edf 100644
--- a/docs/sources/alerting/alert-groups/filter-alerts.md
+++ b/docs/sources/alerting/alert-groups/filter-alerts.md
@@ -1,10 +1,15 @@
-+++
-title = "Filter alerts"
-description = "Alert groups"
-keywords = ["grafana", "alerting", "alerts", "groups"]
-weight = 445
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: Filter alerts
+weight: 445
+---
 
 # Filter alerts by group
 
diff --git a/docs/sources/alerting/alert-groups/view-alert-grouping.md b/docs/sources/alerting/alert-groups/view-alert-grouping.md
index ea911b291c2..7ba51699158 100644
--- a/docs/sources/alerting/alert-groups/view-alert-grouping.md
+++ b/docs/sources/alerting/alert-groups/view-alert-grouping.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alert-groups/", "/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
-description = "Alert groups"
-keywords = ["grafana", "alerting", "alerts", "groups"]
-title = "View alert groupings"
-weight = 445
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alert-groups/
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: View alert groupings
+weight: 445
+---
 
 # View alert groupings
 
diff --git a/docs/sources/alerting/alerting-limitations.md b/docs/sources/alerting/alerting-limitations.md
index 82094f19cde..1efc1fffeea 100644
--- a/docs/sources/alerting/alerting-limitations.md
+++ b/docs/sources/alerting/alerting-limitations.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-limitations/"]
-title = "Limitations"
-weight = 552
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-limitations/
+title: Limitations
+weight: 552
+---
 
 # Limitations
 
diff --git a/docs/sources/alerting/alerting-rules/_index.md b/docs/sources/alerting/alerting-rules/_index.md
index c7c038200e7..bbbf57cae8c 100644
--- a/docs/sources/alerting/alerting-rules/_index.md
+++ b/docs/sources/alerting/alerting-rules/_index.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/", "/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/"]
-title = "Create and manage rules"
-weight = 130
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/
+  - /docs/grafana/latest/alerting/rules/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/
+title: Create and manage rules
+weight: 130
+---
 
 # Create and manage Grafana alerting rules
 
diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index 6c577300a35..e563c272125 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/"]
-description = "Create Grafana managed alert rule"
-keywords = ["grafana", "alerting", "guide", "rules", "create"]
-title = "Create Grafana managed alert rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/
+description: Create Grafana managed alert rule
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+title: Create Grafana managed alert rule
+weight: 400
+---
 
 # Create a Grafana managed alerting rule
 
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
index 95e11990f97..0ffba84fcb3 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
@@ -1,10 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/"]
-description = "Create Grafana Mimir or Loki managed recording rule"
-keywords = ["grafana", "alerting", "guide", "rules", "recording rules", "create"]
-title = "Create Grafana Mimir or Loki managed recording rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+description: Create Grafana Mimir or Loki managed recording rule
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - recording rules
+  - create
+title: Create Grafana Mimir or Loki managed recording rule
+weight: 400
+---
 
 # Create a Grafana Mimir or Loki managed recording rule
 
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
index ff0baf0e66e..3a28856c6f0 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/"]
-description = "Create Grafana Mimir or Loki managed alerting rule"
-keywords = ["grafana", "alerting", "guide", "rules", "create"]
-title = "Create Grafana Mimir or Loki managed alert rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+description: Create Grafana Mimir or Loki managed alerting rule
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+title: Create Grafana Mimir or Loki managed alert rule
+weight: 400
+---
 
 # Create a Grafana Mimir or Loki managed alerting rule
 
diff --git a/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md b/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md
index a1bd8428ee4..696ca97e9a3 100644
--- a/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md
+++ b/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/"]
-description = "Edit Grafana Mimir or Loki rule groups and namespaces"
-keywords = ["grafana", "alerting", "guide", "group", "namespace", "grafana mimir", "loki"]
-title = "Grafana Mimir or Loki rule groups and namespaces"
-weight = 405
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
+description: Edit Grafana Mimir or Loki rule groups and namespaces
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - group
+  - namespace
+  - grafana mimir
+  - loki
+title: Grafana Mimir or Loki rule groups and namespaces
+weight: 405
+---
 
 # Grafana Mimir or Loki rule groups and namespaces
 
diff --git a/docs/sources/alerting/alerting-rules/rule-list.md b/docs/sources/alerting/alerting-rules/rule-list.md
index 986c9973ed8..5d09c68992a 100644
--- a/docs/sources/alerting/alerting-rules/rule-list.md
+++ b/docs/sources/alerting/alerting-rules/rule-list.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/rule-list/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/"]
-description = "Manage alerting rules"
-keywords = ["grafana", "alerting", "guide", "rules", "view"]
-title = "Manage alerting rules"
-weight = 402
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/rule-list/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/
+description: Manage alerting rules
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - view
+title: Manage alerting rules
+weight: 402
+---
 
 # Manage alerting rules
 
diff --git a/docs/sources/alerting/contact-points/_index.md b/docs/sources/alerting/contact-points/_index.md
index c010672c679..75ebf9bfd09 100644
--- a/docs/sources/alerting/contact-points/_index.md
+++ b/docs/sources/alerting/contact-points/_index.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/contact-points/", "/docs/grafana/latest/alerting/unified-alerting/contact-points/"]
-description = "Create or edit contact point"
-keywords = ["grafana", "alerting", "guide", "contact point", "notification channel", "create"]
-title = "Contact points"
-weight = 430
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/
+  - /docs/grafana/latest/alerting/unified-alerting/contact-points/
+description: Create or edit contact point
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - notification channel
+  - create
+title: Contact points
+weight: 430
+---
 
 # Contact points
 
diff --git a/docs/sources/alerting/contact-points/message-templating/_index.md b/docs/sources/alerting/contact-points/message-templating/_index.md
index 7cf66dbbee0..d7a267fa5c4 100644
--- a/docs/sources/alerting/contact-points/message-templating/_index.md
+++ b/docs/sources/alerting/contact-points/message-templating/_index.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/message-templating/", "/docs/grafana/latest/alerting/unified-alerting/message-templating/"]
-description = "Message templating"
-keywords = ["grafana", "alerting", "guide", "contact point", "templating"]
-title = "Message templating"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+description: Message templating
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Message templating
+weight: 400
+---
 
 # Message templating
 
diff --git a/docs/sources/alerting/contact-points/message-templating/template-data.md b/docs/sources/alerting/contact-points/message-templating/template-data.md
index 71d71b82c07..31839d08be1 100644
--- a/docs/sources/alerting/contact-points/message-templating/template-data.md
+++ b/docs/sources/alerting/contact-points/message-templating/template-data.md
@@ -1,8 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/message-templating/template-data/", "/docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/"]
-keywords = ["grafana", "alerting", "guide", "contact point", "templating"]
-title = "Template data"
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/message-templating/template-data/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Template data
+---
 
 # Template data
 
diff --git a/docs/sources/alerting/contact-points/message-templating/template-functions.md b/docs/sources/alerting/contact-points/message-templating/template-functions.md
index 500dde75a00..6b41a9da0ec 100644
--- a/docs/sources/alerting/contact-points/message-templating/template-functions.md
+++ b/docs/sources/alerting/contact-points/message-templating/template-functions.md
@@ -1,8 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/message-templating/template-functions/", "/docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/"]
-keywords = ["grafana", "alerting", "guide", "contact point", "templating"]
-title = "Template functions"
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Template functions
+---
 
 # Template Functions
 
diff --git a/docs/sources/alerting/difference-old-new.md b/docs/sources/alerting/difference-old-new.md
index 29af5b50597..bb32cd3228f 100644
--- a/docs/sources/alerting/difference-old-new.md
+++ b/docs/sources/alerting/difference-old-new.md
@@ -1,11 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/difference-old-new/", "/docs/grafana/latest/alerting/unified-alerting/difference-old-new/"]
-description = "What's New with Grafana alerts"
-draft = true
-keywords = ["grafana", "alerting", "guide"]
-title = "What's new in Grafana alerting"
-weight = 108
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/difference-old-new/
+  - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/
+description: What's New with Grafana alerts
+draft: true
+keywords:
+  - grafana
+  - alerting
+  - guide
+title: What's new in Grafana alerting
+weight: 108
+---
 
 # What's new in Grafana alerting
 
diff --git a/docs/sources/alerting/fundamentals/_index.md b/docs/sources/alerting/fundamentals/_index.md
index a21778eb7a5..98ede25db8a 100644
--- a/docs/sources/alerting/fundamentals/_index.md
+++ b/docs/sources/alerting/fundamentals/_index.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/unified-alerting/fundamentals/"]
-title = "Alerting fundamentals"
-weight = 110
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/
+title: Alerting fundamentals
+weight: 110
+---
 
 # Alerting fundamentals
 
diff --git a/docs/sources/alerting/fundamentals/alert-rules/_index.md b/docs/sources/alerting/fundamentals/alert-rules/_index.md
index 8ca7ad6c983..4adfff1ed29 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/_index.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md
@@ -1,9 +1,12 @@
-+++
-title = "Alert rules"
-description = "About Grafana alert rules"
-keywords = ["grafana", "alerting", "rules"]
-weight = 101
-+++
+---
+description: About Grafana alert rules
+keywords:
+  - grafana
+  - alerting
+  - rules
+title: Alert rules
+weight: 101
+---
 
 # About alert rules
 
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
index 485c0170b0f..70854972b47 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
@@ -1,9 +1,12 @@
-+++
-title = "Alert instances"
-description = "Learn about Grafana alert instances"
-keywords = ["grafana", "alerting", "instances"]
-weight = 103
-+++
+---
+description: Learn about Grafana alert instances
+keywords:
+  - grafana
+  - alerting
+  - instances
+title: Alert instances
+weight: 103
+---
 
 # Alert instances
 
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
index 18b9553f0f8..3a97e7a4a78 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
@@ -1,9 +1,12 @@
-+++
-title = "Alert rule types"
-description = "Learn about the different alert rule types"
-keywords = ["grafana", "alerting", "rule types"]
-weight = 102
-+++
+---
+description: Learn about the different alert rule types
+keywords:
+  - grafana
+  - alerting
+  - rule types
+title: Alert rule types
+weight: 102
+---
 
 # Alert rule types
 
diff --git a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
index 6a6a0cc50fe..37d53335bd7 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
@@ -1,9 +1,12 @@
-+++
-title = "Organising alert rules"
-description = "Learn how to organize alert rules"
-keywords = ["grafana", "alerting", "organization"]
-weight = 104
-+++
+---
+description: Learn how to organize alert rules
+keywords:
+  - grafana
+  - alerting
+  - organization
+title: Organising alert rules
+weight: 104
+---
 
 ## Namespaces and groups
 
diff --git a/docs/sources/alerting/fundamentals/alertmanager.md b/docs/sources/alerting/fundamentals/alertmanager.md
index 7a849bf7928..27fc0a40ec4 100644
--- a/docs/sources/alerting/fundamentals/alertmanager.md
+++ b/docs/sources/alerting/fundamentals/alertmanager.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/alertmanager/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/"]
-title = "Alertmanager"
-weight = 116
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/alertmanager/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/
+title: Alertmanager
+weight: 116
+---
 
 # Alertmanager
 
diff --git a/docs/sources/alerting/fundamentals/annotation-label/_index.md b/docs/sources/alerting/fundamentals/annotation-label/_index.md
index f91a411b87e..a1478c0bf78 100644
--- a/docs/sources/alerting/fundamentals/annotation-label/_index.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/_index.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/alert-annotation-label/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/"]
-description = "Annotations and labels for alerting"
-keywords = ["grafana", "alerting", "guide", "rules", "create"]
-title = "Annotations and labels for alerting rules"
-weight = 401
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/alert-annotation-label/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/
+description: Annotations and labels for alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+title: Annotations and labels for alerting rules
+weight: 401
+---
 
 # Annotations and labels for alerting rules
 
diff --git a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md b/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
index 2eab1aa0859..a3d43022341 100644
--- a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
@@ -1,9 +1,13 @@
-+++
-title = "Labels in Grafana alerting"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Labels in Grafana alerting
+weight: 117
+---
 
 # Labels in Grafana alerting
 
diff --git a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md b/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
index 07768d26b36..4fd035ac72e 100644
--- a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
@@ -1,9 +1,13 @@
-+++
-title = "Label matchers"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Label matchers
+weight: 117
+---
 
 # How label matching works
 
diff --git a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
index 362943b8af0..2caf38d1fe3 100644
--- a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
@@ -1,9 +1,13 @@
-+++
-title = "Template variables for alerting rule labels and annotations"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Template variables for alerting rule labels and annotations
+weight: 117
+---
 
 # Template variables for alerting rule labels and annotations
 
diff --git a/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md b/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md
index f55944766dd..1c48018d727 100644
--- a/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md
+++ b/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/"]
-title = "Alerting on numeric data"
-weight = 116
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/
+title: Alerting on numeric data
+weight: 116
+---
 
 # Alerting on numeric data
 
diff --git a/docs/sources/alerting/fundamentals/state-and-health.md b/docs/sources/alerting/fundamentals/state-and-health.md
index 796f8e9c2b7..4b8a511f282 100644
--- a/docs/sources/alerting/fundamentals/state-and-health.md
+++ b/docs/sources/alerting/fundamentals/state-and-health.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/state-and-health/", "/docs/grafana/llatest/alerting/unified-alerting/alerting-rules/state-and-health/"]
-description = "State and Health of alerting rules"
-keywords = ["grafana", "alerting", "guide", "state"]
-title = "State and health of alerting rules"
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/state-and-health/
+  - /docs/grafana/llatest/alerting/unified-alerting/alerting-rules/state-and-health/
+description: State and Health of alerting rules
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - state
+title: State and health of alerting rules
+---
 
 # State and health of alerting rules
 
diff --git a/docs/sources/alerting/high-availability/_index.md b/docs/sources/alerting/high-availability/_index.md
index 766ac32f545..8f07d00fd58 100644
--- a/docs/sources/alerting/high-availability/_index.md
+++ b/docs/sources/alerting/high-availability/_index.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/high-availability/", "/docs/grafana/latest/alerting/unified-alerting/high-availability/"]
-description = "High availability"
-keywords = ["grafana", "alerting", "tutorials", "ha", "high availability"]
-title = " Alerting high availability"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/high-availability/
+  - /docs/grafana/latest/alerting/unified-alerting/high-availability/
+description: High availability
+keywords:
+  - grafana
+  - alerting
+  - tutorials
+  - ha
+  - high availability
+title: ' Alerting high availability'
+weight: 450
+---
 
 # About alerting high availability
 
diff --git a/docs/sources/alerting/high-availability/enable-alerting-ha.md b/docs/sources/alerting/high-availability/enable-alerting-ha.md
index 2b2c48d245c..41aa31bcf9c 100644
--- a/docs/sources/alerting/high-availability/enable-alerting-ha.md
+++ b/docs/sources/alerting/high-availability/enable-alerting-ha.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/high-availability/enable-alerting-ha/", "/docs/grafana/latest/alerting/unified-alerting/high-availability/"]
-description = "Enable alerting high availability"
-keywords = ["grafana", "alerting", "tutorials", "ha", "high availability"]
-title = "Enable alerting high availability"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/high-availability/enable-alerting-ha/
+  - /docs/grafana/latest/alerting/unified-alerting/high-availability/
+description: Enable alerting high availability
+keywords:
+  - grafana
+  - alerting
+  - tutorials
+  - ha
+  - high availability
+title: Enable alerting high availability
+weight: 450
+---
 
 # Enable alerting high availability
 
diff --git a/docs/sources/alerting/migrating-alerts/_index.md b/docs/sources/alerting/migrating-alerts/_index.md
index fad45c086e7..256c226c812 100644
--- a/docs/sources/alerting/migrating-alerts/_index.md
+++ b/docs/sources/alerting/migrating-alerts/_index.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/migrating-alerts/"]
-description = "Migrate Grafana alerts"
-title = "Migrate to Grafana alerting"
-weight = 113
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/migrating-alerts/
+description: Migrate Grafana alerts
+title: Migrate to Grafana alerting
+weight: 113
+---
 
 # Migrate to Grafana alerting
 
diff --git a/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md b/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md
index ee404f55a01..c70da4eeb0f 100644
--- a/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md
+++ b/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md
@@ -1,9 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/migrating-legacy-alerts/", "/docs/grafana/latest/alerting/unified-alerting/opt-in/"]
-description = "Migrate legacy dashboard alerts"
-title = "Migrating legacy dashboard alerts"
-weight = 114
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/migrating-legacy-alerts/
+  - /docs/grafana/latest/alerting/unified-alerting/opt-in/
+description: Migrate legacy dashboard alerts
+title: Migrating legacy dashboard alerts
+weight: 114
+---
 
 # Migrating legacy dashboard alerts
 
diff --git a/docs/sources/alerting/migrating-alerts/opt-out.md b/docs/sources/alerting/migrating-alerts/opt-out.md
index c5a4627a1ab..9f90ce6f383 100644
--- a/docs/sources/alerting/migrating-alerts/opt-out.md
+++ b/docs/sources/alerting/migrating-alerts/opt-out.md
@@ -1,9 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/opt-in/", "/docs/grafana/latest/alerting/unified-alerting/opt-in/"]
-description = "Disable Grafana alerts"
-title = "Opt-out of Grafana alerting"
-weight = 113
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/opt-in/
+  - /docs/grafana/latest/alerting/unified-alerting/opt-in/
+description: Disable Grafana alerts
+title: Opt-out of Grafana alerting
+weight: 113
+---
 
 # Opt-out to Grafana alerting in OSS
 
diff --git a/docs/sources/alerting/notifications/_index.md b/docs/sources/alerting/notifications/_index.md
index 01fef50d0a2..a04ca9792b1 100644
--- a/docs/sources/alerting/notifications/_index.md
+++ b/docs/sources/alerting/notifications/_index.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/notifications/", "/docs/grafana/latest/alerting/unified-alerting/notifications/"]
-description = "Notification policies"
-keywords = ["grafana", "alerting", "guide", "notification policies", "routes"]
-title = "Notification policies"
-weight = 440
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/notifications/
+  - /docs/grafana/latest/alerting/unified-alerting/notifications/
+description: Notification policies
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - notification policies
+  - routes
+title: Notification policies
+weight: 440
+---
 
 # Notification policies
 
diff --git a/docs/sources/alerting/notifications/mute-timings.md b/docs/sources/alerting/notifications/mute-timings.md
index 4fbab31dd21..9d941be1735 100644
--- a/docs/sources/alerting/notifications/mute-timings.md
+++ b/docs/sources/alerting/notifications/mute-timings.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/notifications/mute-timings/", "/docs/grafana/latest/alerting/unified-alerting/notifications/mute-timings/"]
-description = "Mute timings"
-keywords = ["grafana", "alerting", "guide", "mute", "mute timings", "mute time interval"]
-title = "Mute timings"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/notifications/mute-timings/
+  - /docs/grafana/latest/alerting/unified-alerting/notifications/mute-timings/
+description: Mute timings
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - mute
+  - mute timings
+  - mute time interval
+title: Mute timings
+weight: 450
+---
 
 # Mute timings
 
diff --git a/docs/sources/alerting/silences/_index.md b/docs/sources/alerting/silences/_index.md
index 9f9f8e43946..259baa64ed0 100644
--- a/docs/sources/alerting/silences/_index.md
+++ b/docs/sources/alerting/silences/_index.md
@@ -1,10 +1,15 @@
-+++
-title = "Silences"
-description = "Silences"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 450
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Silences
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Silences
+weight: 450
+---
 
 # About alerting silences
 
diff --git a/docs/sources/alerting/silences/create-silence.md b/docs/sources/alerting/silences/create-silence.md
index c12bfc37ad8..16460ec1928 100644
--- a/docs/sources/alerting/silences/create-silence.md
+++ b/docs/sources/alerting/silences/create-silence.md
@@ -1,10 +1,15 @@
-+++
-title = "Create a silence"
-description = "Add silence alert notification"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 450
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Add silence alert notification
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Create a silence
+weight: 450
+---
 
 # Create a silence
 
diff --git a/docs/sources/alerting/silences/edit-silence.md b/docs/sources/alerting/silences/edit-silence.md
index d2460b70e4b..0b118e4a7fb 100644
--- a/docs/sources/alerting/silences/edit-silence.md
+++ b/docs/sources/alerting/silences/edit-silence.md
@@ -1,10 +1,15 @@
-+++
-title = "Edit silences"
-description = "Edit alerting silences"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 450
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Edit alerting silences
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Edit silences
+weight: 450
+---
 
 # Edit silences
 
diff --git a/docs/sources/alerting/silences/label-matching-alert-suppression.md b/docs/sources/alerting/silences/label-matching-alert-suppression.md
index 5398941947e..60a1ad0609c 100644
--- a/docs/sources/alerting/silences/label-matching-alert-suppression.md
+++ b/docs/sources/alerting/silences/label-matching-alert-suppression.md
@@ -1,10 +1,15 @@
-+++
-title = "Label matching and alert suppression"
-description = "Silences alert notifications"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 452
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Silences alert notifications
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Label matching and alert suppression
+weight: 452
+---
 
 # About label matching for alert suppression
 
diff --git a/docs/sources/alerting/silences/linking-to-silence-form.md b/docs/sources/alerting/silences/linking-to-silence-form.md
index 8bb4e5a2be9..eb0a1e0ccb7 100644
--- a/docs/sources/alerting/silences/linking-to-silence-form.md
+++ b/docs/sources/alerting/silences/linking-to-silence-form.md
@@ -1,10 +1,15 @@
-+++
-title = "Create URL to link to silence form"
-description = "Linking to a silence form"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 451
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Linking to a silence form
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Create URL to link to silence form
+weight: 451
+---
 
 # Create a URL to link to a silence form
 
diff --git a/docs/sources/alerting/silences/remove-silence.md b/docs/sources/alerting/silences/remove-silence.md
index 32f03a32f67..d7dd7cdc8b6 100644
--- a/docs/sources/alerting/silences/remove-silence.md
+++ b/docs/sources/alerting/silences/remove-silence.md
@@ -1,10 +1,15 @@
-+++
-title = "Remove silences"
-description = "Remove alerting silences"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 451
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Remove alerting silences
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Remove silences
+weight: 451
+---
 
 # Remove silences
 
diff --git a/docs/sources/auth/_index.md b/docs/sources/auth/_index.md
index 502c7f3e8e6..c68ce381a0f 100644
--- a/docs/sources/auth/_index.md
+++ b/docs/sources/auth/_index.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/auth/"]
-description = "Authentication"
-title = "Authentication"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/
+description: Authentication
+title: Authentication
+weight: 30
+---
 
 # User Authentication Overview
 
diff --git a/docs/sources/auth/auth-proxy.md b/docs/sources/auth/auth-proxy.md
index d558098b55f..70fff8ee09c 100644
--- a/docs/sources/auth/auth-proxy.md
+++ b/docs/sources/auth/auth-proxy.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/auth/auth-proxy/", "/docs/grafana/latest/tutorials/authproxy/"]
-description = "Grafana Auth Proxy Guide "
-keywords = ["grafana", "configuration", "documentation", "proxy"]
-title = "Auth Proxy"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/auth-proxy/
+  - /docs/grafana/latest/tutorials/authproxy/
+description: 'Grafana Auth Proxy Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - proxy
+title: Auth Proxy
+weight: 200
+---
 
 # Auth Proxy Authentication
 
diff --git a/docs/sources/auth/azuread.md b/docs/sources/auth/azuread.md
index c4eb067b675..c83943f5907 100644
--- a/docs/sources/auth/azuread.md
+++ b/docs/sources/auth/azuread.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/azuread/"]
-description = "Grafana Azure AD OAuth Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "Azure AD OAuth2 authentication"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/azuread/
+description: 'Grafana Azure AD OAuth Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: Azure AD OAuth2 authentication
+weight: 700
+---
 
 # Azure AD OAuth2 authentication
 
diff --git a/docs/sources/auth/enhanced_ldap.md b/docs/sources/auth/enhanced_ldap.md
index eb8f0750eec..25085763a3d 100644
--- a/docs/sources/auth/enhanced_ldap.md
+++ b/docs/sources/auth/enhanced_ldap.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/auth/enhanced_ldap/"]
-description = "Grafana Enhanced LDAP Integration Guide "
-keywords = ["grafana", "configuration", "documentation", "ldap", "active directory", "enterprise"]
-title = "Enhanced LDAP Integration"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/enhanced_ldap/
+description: 'Grafana Enhanced LDAP Integration Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - ldap
+  - active directory
+  - enterprise
+title: Enhanced LDAP Integration
+weight: 400
+---
 
 # Enhanced LDAP integration
 
diff --git a/docs/sources/auth/generic-oauth.md b/docs/sources/auth/generic-oauth.md
index 3db5506508f..c8171861ba7 100644
--- a/docs/sources/auth/generic-oauth.md
+++ b/docs/sources/auth/generic-oauth.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/generic-oauth/"]
-description = "Grafana OAuthentication Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "OAuth authentication"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/generic-oauth/
+description: 'Grafana OAuthentication Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: OAuth authentication
+weight: 500
+---
 
 # Generic OAuth authentication
 
diff --git a/docs/sources/auth/github.md b/docs/sources/auth/github.md
index 348a74886df..55132eb9148 100644
--- a/docs/sources/auth/github.md
+++ b/docs/sources/auth/github.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/github/"]
-description = "Grafana OAuthentication Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "GitHub OAuth2 Authentication"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/github/
+description: 'Grafana OAuthentication Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: GitHub OAuth2 Authentication
+weight: 800
+---
 
 # GitHub OAuth2 Authentication
 
diff --git a/docs/sources/auth/gitlab.md b/docs/sources/auth/gitlab.md
index a5bd8eb1643..ab8447965d2 100644
--- a/docs/sources/auth/gitlab.md
+++ b/docs/sources/auth/gitlab.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/gitlab/"]
-description = "Grafana OAuthentication Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "GitLab OAuth2 Authentication"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/gitlab/
+description: 'Grafana OAuthentication Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: GitLab OAuth2 Authentication
+weight: 900
+---
 
 # GitLab OAuth2 Authentication
 
diff --git a/docs/sources/auth/google.md b/docs/sources/auth/google.md
index 55d52e44afb..65a820e023c 100644
--- a/docs/sources/auth/google.md
+++ b/docs/sources/auth/google.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/google/"]
-description = "Grafana OAuthentication Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "Google OAuth2 Authentication"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/google/
+description: 'Grafana OAuthentication Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: Google OAuth2 Authentication
+weight: 600
+---
 
 # Google OAuth2 Authentication
 
diff --git a/docs/sources/auth/grafana.md b/docs/sources/auth/grafana.md
index 80375f5e0e0..daba2d407b5 100644
--- a/docs/sources/auth/grafana.md
+++ b/docs/sources/auth/grafana.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/grafana/"]
-description = "Grafana OAuthentication Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "Grafana Authentication"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/grafana/
+description: 'Grafana OAuthentication Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: Grafana Authentication
+weight: 100
+---
 
 ## Grafana Auth
 
diff --git a/docs/sources/auth/jwt.md b/docs/sources/auth/jwt.md
index d5507d8eef6..44822a0ebc9 100644
--- a/docs/sources/auth/jwt.md
+++ b/docs/sources/auth/jwt.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/auth/jwt/"]
-description = "Grafana JWT Authentication"
-keywords = ["grafana", "configuration", "documentation", "jwt", "jwk"]
-title = "JWT Authentication"
-weight = 250
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/jwt/
+description: Grafana JWT Authentication
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - jwt
+  - jwk
+title: JWT Authentication
+weight: 250
+---
 
 # JWT authentication
 
diff --git a/docs/sources/auth/ldap.md b/docs/sources/auth/ldap.md
index 4e43e78eaf3..2a961a4d47c 100644
--- a/docs/sources/auth/ldap.md
+++ b/docs/sources/auth/ldap.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/auth/ldap/", "/docs/grafana/latest/installation/ldap/"]
-description = "Grafana LDAP Authentication Guide "
-keywords = ["grafana", "configuration", "documentation", "ldap", "active directory"]
-title = "LDAP Authentication"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/ldap/
+  - /docs/grafana/latest/installation/ldap/
+description: 'Grafana LDAP Authentication Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - ldap
+  - active directory
+title: LDAP Authentication
+weight: 300
+---
 
 # LDAP Authentication
 
diff --git a/docs/sources/auth/okta.md b/docs/sources/auth/okta.md
index ea949a3d88e..2d58b9b3a9b 100644
--- a/docs/sources/auth/okta.md
+++ b/docs/sources/auth/okta.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/okta/"]
-description = "Grafana Okta OAuth Guide "
-keywords = ["grafana", "configuration", "documentation", "oauth"]
-title = "Okta OAuth2 authentication"
-weight = 1000
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/okta/
+description: 'Grafana Okta OAuth Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - oauth
+title: Okta OAuth2 authentication
+weight: 1000
+---
 
 # Okta OAuth2 authentication
 
diff --git a/docs/sources/auth/overview.md b/docs/sources/auth/overview.md
index 3bea4b9a030..e6f899d3cf3 100644
--- a/docs/sources/auth/overview.md
+++ b/docs/sources/auth/overview.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/auth/overview/"]
-description = "Overview for auth"
-title = "Overview"
-weight = 1
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/overview/
+description: Overview for auth
+title: Overview
+weight: 1
+---
 
 # User Authentication Overview
 
diff --git a/docs/sources/auth/saml.md b/docs/sources/auth/saml.md
index 98e921da278..efb7ee278c0 100644
--- a/docs/sources/auth/saml.md
+++ b/docs/sources/auth/saml.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/saml/"]
-description = "Grafana SAML Authentication"
-keywords = ["grafana", "saml", "documentation", "saml-auth"]
-title = "SAML Authentication"
-weight = 1100
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/saml/
+description: Grafana SAML Authentication
+keywords:
+  - grafana
+  - saml
+  - documentation
+  - saml-auth
+title: SAML Authentication
+weight: 1100
+---
 
 # SAML authentication
 
diff --git a/docs/sources/auth/team-sync.md b/docs/sources/auth/team-sync.md
index 9bebec819fc..c47b4678610 100644
--- a/docs/sources/auth/team-sync.md
+++ b/docs/sources/auth/team-sync.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/saml/", "/docs/grafana/latest/auth/team-sync/"]
-description = "Grafana Team Sync"
-keywords = ["grafana", "auth", "documentation"]
-title = "Team Sync"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/saml/
+  - /docs/grafana/latest/auth/team-sync/
+description: Grafana Team Sync
+keywords:
+  - grafana
+  - auth
+  - documentation
+title: Team Sync
+weight: 1200
+---
 
 # Team sync
 
diff --git a/docs/sources/basics/_index.md b/docs/sources/basics/_index.md
index f26094e6311..2c67abb9305 100644
--- a/docs/sources/basics/_index.md
+++ b/docs/sources/basics/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/basics/"]
-title = "Grafana basics"
-weight = 15
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/
+title: Grafana basics
+weight: 15
+---
 
 # Grafana basics
 
diff --git a/docs/sources/basics/exemplars/_index.md b/docs/sources/basics/exemplars/_index.md
index 4696922e319..c4bb32ac882 100644
--- a/docs/sources/basics/exemplars/_index.md
+++ b/docs/sources/basics/exemplars/_index.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/basics/exemplars/"]
-description = "Exemplars"
-keywords = ["grafana", "concepts", "exemplars", "prometheus"]
-title = "Exemplars"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/exemplars/
+description: Exemplars
+keywords:
+  - grafana
+  - concepts
+  - exemplars
+  - prometheus
+title: Exemplars
+weight: 400
+---
 
 # Introduction to exemplars
 
diff --git a/docs/sources/basics/exemplars/view-exemplars.md b/docs/sources/basics/exemplars/view-exemplars.md
index 4453ebf91ad..3e3620ab927 100644
--- a/docs/sources/basics/exemplars/view-exemplars.md
+++ b/docs/sources/basics/exemplars/view-exemplars.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/basics/exemplars/view-exemplars/"]
-description = "Exemplars"
-keywords = ["grafana", "concepts", "exemplars", "prometheus"]
-title = "View exemplar data"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/exemplars/view-exemplars/
+description: Exemplars
+keywords:
+  - grafana
+  - concepts
+  - exemplars
+  - prometheus
+title: View exemplar data
+weight: 400
+---
 
 # View exemplar data
 
diff --git a/docs/sources/basics/glossary.md b/docs/sources/basics/glossary.md
index 04380473f02..1fd9828ed8a 100644
--- a/docs/sources/basics/glossary.md
+++ b/docs/sources/basics/glossary.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/basics/glossary/", "/docs/grafana/latest/getting-started/glossary/", "/docs/grafana/latest/guides/glossary/"]
-description = "Grafana glossary"
-keywords = ["grafana", "intro", "glossary", "dictionary"]
-title = "Glossary"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/glossary/
+  - /docs/grafana/latest/getting-started/glossary/
+  - /docs/grafana/latest/guides/glossary/
+description: Grafana glossary
+keywords:
+  - grafana
+  - intro
+  - glossary
+  - dictionary
+title: Glossary
+weight: 800
+---
 
 # Glossary
 
diff --git a/docs/sources/basics/intro-histograms.md b/docs/sources/basics/intro-histograms.md
index a3c00e80a0f..8cb0c0ebb86 100644
--- a/docs/sources/basics/intro-histograms.md
+++ b/docs/sources/basics/intro-histograms.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/basics/intro-histograms/", "/docs/grafana/latest/getting-started/intro-histograms/"]
-description = "An introduction to histograms and heatmaps"
-keywords = ["grafana", "heatmap", "panel", "documentation", "histogram"]
-title = "Histograms and heatmaps"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/intro-histograms/
+  - /docs/grafana/latest/getting-started/intro-histograms/
+description: An introduction to histograms and heatmaps
+keywords:
+  - grafana
+  - heatmap
+  - panel
+  - documentation
+  - histogram
+title: Histograms and heatmaps
+weight: 700
+---
 
 # Introduction to histograms and heatmaps
 
diff --git a/docs/sources/basics/timeseries-dimensions.md b/docs/sources/basics/timeseries-dimensions.md
index 88a0fb5cb0a..70fbee143fe 100644
--- a/docs/sources/basics/timeseries-dimensions.md
+++ b/docs/sources/basics/timeseries-dimensions.md
@@ -1,10 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/basics/timeseries-dimensions/", "/docs/grafana/latest/getting-started/timeseries-dimensions/", "/docs/grafana/latest/guides/timeseries-dimensions/"]
-description = "time series dimensions"
-keywords = ["grafana", "intro", "guide", "concepts", "timeseries", "labels"]
-title = "Time series dimensions"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/timeseries-dimensions/
+  - /docs/grafana/latest/getting-started/timeseries-dimensions/
+  - /docs/grafana/latest/guides/timeseries-dimensions/
+description: time series dimensions
+keywords:
+  - grafana
+  - intro
+  - guide
+  - concepts
+  - timeseries
+  - labels
+title: Time series dimensions
+weight: 600
+---
 
 # Time series dimensions
 
diff --git a/docs/sources/basics/timeseries.md b/docs/sources/basics/timeseries.md
index 6197aa2b5dd..a9f61abe6a6 100644
--- a/docs/sources/basics/timeseries.md
+++ b/docs/sources/basics/timeseries.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/basics/timeseries/"]
-description = "Introduction to time series"
-keywords = ["grafana", "intro", "guide", "concepts", "timeseries"]
-title = "Intro to time series"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/basics/timeseries/
+description: Introduction to time series
+keywords:
+  - grafana
+  - intro
+  - guide
+  - concepts
+  - timeseries
+title: Intro to time series
+weight: 400
+---
 
 # Introduction to time series
 
diff --git a/docs/sources/best-practices/_index.md b/docs/sources/best-practices/_index.md
index 70e443ed08b..cb443d43145 100644
--- a/docs/sources/best-practices/_index.md
+++ b/docs/sources/best-practices/_index.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/best-practices/"]
-description = "Best practices for working with Grafana"
-title = "Best practices"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/best-practices/
+description: Best practices for working with Grafana
+title: Best practices
+weight: 20
+---
 
 # Best practices
 
diff --git a/docs/sources/best-practices/best-practices-for-creating-dashboards.md b/docs/sources/best-practices/best-practices-for-creating-dashboards.md
index 4133dbb1816..a2f895dae1d 100644
--- a/docs/sources/best-practices/best-practices-for-creating-dashboards.md
+++ b/docs/sources/best-practices/best-practices-for-creating-dashboards.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/best-practices/best-practices-for-creating-dashboards/"]
-description = "Best practices for creating dashboards in Grafana"
-title = "Best practices for creating dashboards"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/best-practices/best-practices-for-creating-dashboards/
+description: Best practices for creating dashboards in Grafana
+title: Best practices for creating dashboards
+weight: 100
+---
 
 # Best practices for creating dashboards
 
diff --git a/docs/sources/best-practices/best-practices-for-managing-dashboards.md b/docs/sources/best-practices/best-practices-for-managing-dashboards.md
index 17ad57f5f38..f011fadf634 100644
--- a/docs/sources/best-practices/best-practices-for-managing-dashboards.md
+++ b/docs/sources/best-practices/best-practices-for-managing-dashboards.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/best-practices/best-practices-for-managing-dashboards/"]
-description = "Best practices for managing dashboards in Grafana"
-title = "Best practices for managing dashboards"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/best-practices/best-practices-for-managing-dashboards/
+description: Best practices for managing dashboards in Grafana
+title: Best practices for managing dashboards
+weight: 200
+---
 
 # Best practices for managing dashboards
 
diff --git a/docs/sources/best-practices/common-observability-strategies.md b/docs/sources/best-practices/common-observability-strategies.md
index ff66f5bb82b..3d42f617aa0 100644
--- a/docs/sources/best-practices/common-observability-strategies.md
+++ b/docs/sources/best-practices/common-observability-strategies.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/best-practices/common-observability-strategies/", "/docs/grafana/latest/getting-started/strategies/"]
-description = "Common observability strategies"
-keywords = ["grafana", "intro", "guide", "concepts", "methods"]
-title = "Common observability strategies"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/best-practices/common-observability-strategies/
+  - /docs/grafana/latest/getting-started/strategies/
+description: Common observability strategies
+keywords:
+  - grafana
+  - intro
+  - guide
+  - concepts
+  - methods
+title: Common observability strategies
+weight: 300
+---
 
 # Common observability strategies
 
diff --git a/docs/sources/best-practices/dashboard-management-maturity-levels.md b/docs/sources/best-practices/dashboard-management-maturity-levels.md
index 9832750b087..7c6d2bd727c 100644
--- a/docs/sources/best-practices/dashboard-management-maturity-levels.md
+++ b/docs/sources/best-practices/dashboard-management-maturity-levels.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/best-practices/dashboard-management-maturity-levels/"]
-description = "Explanation of dashboard management maturity model"
-title = "Dashboard management maturity model"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/best-practices/dashboard-management-maturity-levels/
+description: Explanation of dashboard management maturity model
+title: Dashboard management maturity model
+weight: 400
+---
 
 # Dashboard management maturity model
 
diff --git a/docs/sources/dashboards/_index.md b/docs/sources/dashboards/_index.md
index 9363d730c81..e33089c3a07 100644
--- a/docs/sources/dashboards/_index.md
+++ b/docs/sources/dashboards/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/", "/docs/grafana/latest/features/dashboard/dashboards/"]
-title = "Dashboards"
-weight = 80
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Dashboards
+weight: 80
+---
 
 # About Grafana dashboards
 
diff --git a/docs/sources/dashboards/annotations.md b/docs/sources/dashboards/annotations.md
index d81e9d965f8..d328ef44603 100644
--- a/docs/sources/dashboards/annotations.md
+++ b/docs/sources/dashboards/annotations.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/annotations/", "/docs/grafana/latest/reference/annotations/"]
-keywords = ["grafana", "annotations", "documentation", "guide"]
-title = "Annotations"
-weight = 9
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/annotations/
+  - /docs/grafana/latest/reference/annotations/
+keywords:
+  - grafana
+  - annotations
+  - documentation
+  - guide
+title: Annotations
+weight: 9
+---
 
 # Annotations
 
diff --git a/docs/sources/dashboards/dashboard-create.md b/docs/sources/dashboards/dashboard-create.md
index 3017af23e4e..6380a4c97b2 100644
--- a/docs/sources/dashboards/dashboard-create.md
+++ b/docs/sources/dashboards/dashboard-create.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-create/", "/docs/grafana/latest/features/dashboard/dashboards/"]
-title = "Create dashboards"
-weight = 7
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-create/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Create dashboards
+weight: 7
+---
 
 ## Create dashboard
 
diff --git a/docs/sources/dashboards/dashboard-folders.md b/docs/sources/dashboards/dashboard-folders.md
index b54d257e689..e0bb3d00542 100644
--- a/docs/sources/dashboards/dashboard-folders.md
+++ b/docs/sources/dashboards/dashboard-folders.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-folders/", "/docs/grafana/latest/reference/dashboard_folders/"]
-keywords = ["grafana", "dashboard", "dashboard folders", "folder", "folders", "documentation", "guide"]
-title = "Dashboard Folders"
-weight = 6
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-folders/
+  - /docs/grafana/latest/reference/dashboard_folders/
+keywords:
+  - grafana
+  - dashboard
+  - dashboard folders
+  - folder
+  - folders
+  - documentation
+  - guide
+title: Dashboard Folders
+weight: 6
+---
 
 # Dashboard Folders
 
diff --git a/docs/sources/dashboards/dashboard-history.md b/docs/sources/dashboards/dashboard-history.md
index daea155bec5..fd78a68fc92 100644
--- a/docs/sources/dashboards/dashboard-history.md
+++ b/docs/sources/dashboards/dashboard-history.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-history/", "/docs/grafana/latest/reference/dashboard_history/"]
-keywords = ["grafana", "dashboard", "documentation", "version", "history"]
-title = "Dashboard version history"
-weight = 14
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-history/
+  - /docs/grafana/latest/reference/dashboard_history/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - version
+  - history
+title: Dashboard version history
+weight: 14
+---
 
 # Dashboard version history
 
diff --git a/docs/sources/dashboards/dashboard-manage.md b/docs/sources/dashboards/dashboard-manage.md
index 46825b835c1..a6effcca652 100644
--- a/docs/sources/dashboards/dashboard-manage.md
+++ b/docs/sources/dashboards/dashboard-manage.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-manage/", "/docs/grafana/latest/features/dashboard/dashboards/"]
-title = "Manage dashboards"
-weight = 8
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-manage/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Manage dashboards
+weight: 8
+---
 
 ## Manage dashboards
 
diff --git a/docs/sources/dashboards/dashboard-ui/_index.md b/docs/sources/dashboards/dashboard-ui/_index.md
index d396a980773..6822d53a687 100644
--- a/docs/sources/dashboards/dashboard-ui/_index.md
+++ b/docs/sources/dashboards/dashboard-ui/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-ui/", "/docs/grafana/latest/features/dashboard/dashboards/"]
-title = " Dashboard UI"
-weight = 2
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-ui/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: ' Dashboard UI'
+weight: 2
+---
 
 # Working with Grafana dashboard UI
 
diff --git a/docs/sources/dashboards/dashboard-ui/dashboard-header.md b/docs/sources/dashboards/dashboard-ui/dashboard-header.md
index 5b0e51ac912..2bcdea21eec 100644
--- a/docs/sources/dashboards/dashboard-ui/dashboard-header.md
+++ b/docs/sources/dashboards/dashboard-ui/dashboard-header.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-ui/dashboard-header/", "/docs/grafana/latest/features/dashboard/dashboards/"]
-title = "Dashboard header"
-weight = 80
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-header/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Dashboard header
+weight: 80
+---
 
 ## Dashboard header
 
diff --git a/docs/sources/dashboards/dashboard-ui/dashboard-row.md b/docs/sources/dashboards/dashboard-ui/dashboard-row.md
index c26b2df886b..e364bd13941 100644
--- a/docs/sources/dashboards/dashboard-ui/dashboard-row.md
+++ b/docs/sources/dashboards/dashboard-ui/dashboard-row.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/dashboard-ui/dashboard-row/", "/docs/grafana/latest/features/dashboard/dashboards/"]
-title = "Dashboard rows"
-weight = 80
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-row/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Dashboard rows
+weight: 80
+---
 
 # Dashboard rows
 
diff --git a/docs/sources/dashboards/export-import.md b/docs/sources/dashboards/export-import.md
index b5094328fb8..302e6d40e7d 100644
--- a/docs/sources/dashboards/export-import.md
+++ b/docs/sources/dashboards/export-import.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/export-import/", "/docs/grafana/latest/reference/export_import/"]
-keywords = ["grafana", "dashboard", "documentation", "export", "import"]
-title = "Export and import"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/export-import/
+  - /docs/grafana/latest/reference/export_import/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - export
+  - import
+title: Export and import
+weight: 800
+---
 
 # Export and import
 
diff --git a/docs/sources/dashboards/json-model.md b/docs/sources/dashboards/json-model.md
index e9e45d9d233..c9d01f8a368 100644
--- a/docs/sources/dashboards/json-model.md
+++ b/docs/sources/dashboards/json-model.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/json-model/", "/docs/grafana/latest/reference/dashboard/"]
-keywords = ["grafana", "dashboard", "documentation", "json", "model"]
-title = "JSON model"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/json-model/
+  - /docs/grafana/latest/reference/dashboard/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - json
+  - model
+title: JSON model
+weight: 1200
+---
 
 # Dashboard JSON model
 
diff --git a/docs/sources/dashboards/playlist.md b/docs/sources/dashboards/playlist.md
index c5a4ccff44f..9fc153aa81f 100644
--- a/docs/sources/dashboards/playlist.md
+++ b/docs/sources/dashboards/playlist.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/playlist/", "/docs/grafana/latest/reference/playlist/"]
-keywords = ["grafana", "dashboard", "documentation", "playlist"]
-title = "Playlist"
-weight = 9
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/playlist/
+  - /docs/grafana/latest/reference/playlist/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - playlist
+title: Playlist
+weight: 9
+---
 
 # Playlist
 
diff --git a/docs/sources/dashboards/previews.md b/docs/sources/dashboards/previews.md
index 1f4c79f759e..fe0a546951d 100644
--- a/docs/sources/dashboards/previews.md
+++ b/docs/sources/dashboards/previews.md
@@ -1,9 +1,14 @@
-+++
-title = "Dashboard previews"
-keywords = ["grafana", "dashboard", "documentation", "previews"]
-aliases = ["/docs/grafana/latest/reference/previews/"]
-weight = 9
-+++
+---
+aliases:
+  - /docs/grafana/latest/reference/previews/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - previews
+title: Dashboard previews
+weight: 9
+---
 
 # Dashboard previews
 
diff --git a/docs/sources/dashboards/reporting.md b/docs/sources/dashboards/reporting.md
index 1a475d4ae05..b3573056b54 100644
--- a/docs/sources/dashboards/reporting.md
+++ b/docs/sources/dashboards/reporting.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/reports/", "/docs/grafana/latest/dashboards/reporting/"]
-description = ""
-keywords = ["grafana", "reporting"]
-title = "Reporting"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/reports/
+  - /docs/grafana/latest/dashboards/reporting/
+description: ''
+keywords:
+  - grafana
+  - reporting
+title: Reporting
+weight: 10
+---
 
 # Reporting
 
diff --git a/docs/sources/dashboards/scripted-dashboards.md b/docs/sources/dashboards/scripted-dashboards.md
index c4204146a53..ba4b1f0c850 100644
--- a/docs/sources/dashboards/scripted-dashboards.md
+++ b/docs/sources/dashboards/scripted-dashboards.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/scripted-dashboards/", "/docs/grafana/latest/reference/scripting/"]
-keywords = ["grafana", "dashboard", "documentation", "scripted"]
-title = "Scripted dashboards"
-weight = 1500
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/scripted-dashboards/
+  - /docs/grafana/latest/reference/scripting/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - scripted
+title: Scripted dashboards
+weight: 1500
+---
 
 # Scripted dashboards
 
diff --git a/docs/sources/dashboards/search.md b/docs/sources/dashboards/search.md
index dbdf9353fb4..60fe8f2b5e6 100644
--- a/docs/sources/dashboards/search.md
+++ b/docs/sources/dashboards/search.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/search/", "/docs/grafana/latest/reference/search/"]
-keywords = ["grafana", "dashboard", "documentation", "search"]
-title = "Search"
-weight = 9
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/search/
+  - /docs/grafana/latest/reference/search/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - search
+title: Search
+weight: 9
+---
 
 # Dashboard Search
 
diff --git a/docs/sources/dashboards/shortcuts.md b/docs/sources/dashboards/shortcuts.md
index 89317a6a553..b0b5fd40522 100644
--- a/docs/sources/dashboards/shortcuts.md
+++ b/docs/sources/dashboards/shortcuts.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/shortcuts/"]
-title = "Keyboard shortcuts"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/shortcuts/
+title: Keyboard shortcuts
+weight: 10
+---
 
 # Keyboard shortcuts
 
diff --git a/docs/sources/dashboards/time-range-controls.md b/docs/sources/dashboards/time-range-controls.md
index 715c13c9c28..608bc926252 100644
--- a/docs/sources/dashboards/time-range-controls.md
+++ b/docs/sources/dashboards/time-range-controls.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/time-range-controls/", "/docs/grafana/latest/reference/timerange/"]
-keywords = ["grafana", "dashboard", "documentation", "time range"]
-title = "Time range controls"
-weight = 13
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/time-range-controls/
+  - /docs/grafana/latest/reference/timerange/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - time range
+title: Time range controls
+weight: 13
+---
 
 # Time range controls
 
diff --git a/docs/sources/datasources/_index.md b/docs/sources/datasources/_index.md
index d59d20fba6f..8acd40d4fd5 100644
--- a/docs/sources/datasources/_index.md
+++ b/docs/sources/datasources/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/", "/docs/grafana/latest/datasources/overview/"]
-title = "Data sources"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/
+  - /docs/grafana/latest/datasources/overview/
+title: Data sources
+weight: 60
+---
 
 # Data sources
 
diff --git a/docs/sources/datasources/add-a-data-source.md b/docs/sources/datasources/add-a-data-source.md
index f1e57a2056b..56b96c80711 100644
--- a/docs/sources/datasources/add-a-data-source.md
+++ b/docs/sources/datasources/add-a-data-source.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/add-a-data-source/", "/docs/grafana/latest/features/datasources/add-a-data-source/"]
-title = "Add data source"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/add-a-data-source/
+  - /docs/grafana/latest/features/datasources/add-a-data-source/
+title: Add data source
+weight: 100
+---
 
 # Add a data source
 
diff --git a/docs/sources/datasources/alertmanager.md b/docs/sources/datasources/alertmanager.md
index aa03f2c0e83..d2df3d05c61 100644
--- a/docs/sources/datasources/alertmanager.md
+++ b/docs/sources/datasources/alertmanager.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/alertmanager/", "/docs/grafana/latest/features/datasources/alertmanager/"]
-description = "Guide for using Alertmanager in Grafana"
-keywords = ["grafana", "prometheus", "guide"]
-title = "Alertmanager"
-weight = 150
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/alertmanager/
+  - /docs/grafana/latest/features/datasources/alertmanager/
+description: Guide for using Alertmanager in Grafana
+keywords:
+  - grafana
+  - prometheus
+  - guide
+title: Alertmanager
+weight: 150
+---
 
 # Alertmanager data source
 
diff --git a/docs/sources/datasources/aws-cloudwatch/_index.md b/docs/sources/datasources/aws-cloudwatch/_index.md
index 514b6ebd21a..6d62699ce12 100644
--- a/docs/sources/datasources/aws-cloudwatch/_index.md
+++ b/docs/sources/datasources/aws-cloudwatch/_index.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/aws-cloudwatch/", "/docs/grafana/latest/datasources/cloudwatch/"]
-description = "Guide for using CloudWatch in Grafana"
-keywords = ["grafana", "cloudwatch", "guide"]
-title = "AWS CloudWatch"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/aws-cloudwatch/
+  - /docs/grafana/latest/datasources/cloudwatch/
+description: Guide for using CloudWatch in Grafana
+keywords:
+  - grafana
+  - cloudwatch
+  - guide
+title: AWS CloudWatch
+weight: 200
+---
 
 # AWS CloudWatch data source
 
diff --git a/docs/sources/datasources/aws-cloudwatch/aws-authentication.md b/docs/sources/datasources/aws-cloudwatch/aws-authentication.md
index 72dd753c548..4e385587817 100644
--- a/docs/sources/datasources/aws-cloudwatch/aws-authentication.md
+++ b/docs/sources/datasources/aws-cloudwatch/aws-authentication.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/", "/docs/grafana/latest/datasources/cloudwatch/"]
-description = "AWS authentication"
-keywords = ["grafana", "aws", "authentication"]
-title = "Authentication"
-weight = 5
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/
+  - /docs/grafana/latest/datasources/cloudwatch/
+description: AWS authentication
+keywords:
+  - grafana
+  - aws
+  - authentication
+title: Authentication
+weight: 5
+---
 
 # AWS authentication
 
diff --git a/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md b/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md
index a66e3c4b0e0..1e6802006d4 100644
--- a/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md
+++ b/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards/", "/docs/grafana/latest/datasources/cloudwatch/"]
-description = "Guide for using AWS CloudWatch in Grafana"
-keywords = ["grafana", "stackdriver", "google", "guide", "cloud", "monitoring"]
-title = "Curated CloudWatch dashboards"
-weight = 15
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards/
+  - /docs/grafana/latest/datasources/cloudwatch/
+description: Guide for using AWS CloudWatch in Grafana
+keywords:
+  - grafana
+  - stackdriver
+  - google
+  - guide
+  - cloud
+  - monitoring
+title: Curated CloudWatch dashboards
+weight: 15
+---
 
 # Curated CloudWatch dashboards
 
diff --git a/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md b/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md
index 147fc7dc2db..a8736a85223 100644
--- a/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md
+++ b/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md
@@ -1,9 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/aws-cloudwatch/provision-cloudwatch/", "/docs/grafana/latest/datasources/cloudwatch/"]
-description = "Guide for provisioning CloudWatch"
-title = "Provision CloudWatch"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/aws-cloudwatch/provision-cloudwatch/
+  - /docs/grafana/latest/datasources/cloudwatch/
+description: Guide for provisioning CloudWatch
+title: Provision CloudWatch
+weight: 400
+---
 
 # Provision CloudWatch data source
 
diff --git a/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md b/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md
index d3a21c1c8b0..ab812279d41 100644
--- a/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md
+++ b/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md
@@ -1,9 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/aws-cloudwatch/template-queries-cloudwatch/", "/docs/grafana/latest/datasources/cloudwatch/"]
-description = "Template variables in CloudWatch queryh"
-title = "Template variables in CloudWatch query"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/aws-cloudwatch/template-queries-cloudwatch/
+  - /docs/grafana/latest/datasources/cloudwatch/
+description: Template variables in CloudWatch queryh
+title: Template variables in CloudWatch query
+weight: 10
+---
 
 # Using template variables in CloudWatch queries
 
diff --git a/docs/sources/datasources/azuremonitor/_index.md b/docs/sources/datasources/azuremonitor/_index.md
index b2f1638a6a3..e0a935bc4ce 100644
--- a/docs/sources/datasources/azuremonitor/_index.md
+++ b/docs/sources/datasources/azuremonitor/_index.md
@@ -1,10 +1,21 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/azuremonitor/", "/docs/grafana/latest/features/datasources/azuremonitor/"]
-description = "Guide for using Azure Monitor in Grafana"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-title = "Azure Monitor"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/azuremonitor/
+  - /docs/grafana/latest/features/datasources/azuremonitor/
+description: Guide for using Azure Monitor in Grafana
+keywords:
+  - grafana
+  - microsoft
+  - azure
+  - monitor
+  - application
+  - insights
+  - log
+  - analytics
+  - guide
+title: Azure Monitor
+weight: 300
+---
 
 # Azure Monitor data source
 
diff --git a/docs/sources/datasources/azuremonitor/deprecated-application-insights.md b/docs/sources/datasources/azuremonitor/deprecated-application-insights.md
index 850e509be22..68c836a83af 100644
--- a/docs/sources/datasources/azuremonitor/deprecated-application-insights.md
+++ b/docs/sources/datasources/azuremonitor/deprecated-application-insights.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/azuremonitor/deprecated-application-insights/"]
-description = "Template to provision the Azure Monitor data source"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-title = "Application Insights deprecation"
-weight = 999
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/azuremonitor/deprecated-application-insights/
+description: Template to provision the Azure Monitor data source
+keywords:
+  - grafana
+  - microsoft
+  - azure
+  - monitor
+  - application
+  - insights
+  - log
+  - analytics
+  - guide
+title: Application Insights deprecation
+weight: 999
+---
 
 # Deprecated Application Insights and Insights Analytics
 
diff --git a/docs/sources/datasources/azuremonitor/provisioning.md b/docs/sources/datasources/azuremonitor/provisioning.md
index b62be69df0c..8ee6790b8ce 100644
--- a/docs/sources/datasources/azuremonitor/provisioning.md
+++ b/docs/sources/datasources/azuremonitor/provisioning.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/azuremonitor/provisioning/"]
-description = "Template to provision the Azure Monitor data source"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-title = "Provisioning Azure Monitor"
-weight = 2
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/azuremonitor/provisioning/
+description: Template to provision the Azure Monitor data source
+keywords:
+  - grafana
+  - microsoft
+  - azure
+  - monitor
+  - application
+  - insights
+  - log
+  - analytics
+  - guide
+title: Provisioning Azure Monitor
+weight: 2
+---
 
 # Configure the data source with provisioning
 
diff --git a/docs/sources/datasources/azuremonitor/template-variables.md b/docs/sources/datasources/azuremonitor/template-variables.md
index a30c3680480..1de3b37a6bd 100644
--- a/docs/sources/datasources/azuremonitor/template-variables.md
+++ b/docs/sources/datasources/azuremonitor/template-variables.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/azuremonitor/template-variables/"]
-description = "Using template variables with Azure Monitor in Grafana"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-title = "Azure Monitor template variables"
-weight = 2
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/azuremonitor/template-variables/
+description: Using template variables with Azure Monitor in Grafana
+keywords:
+  - grafana
+  - microsoft
+  - azure
+  - monitor
+  - application
+  - insights
+  - log
+  - analytics
+  - guide
+title: Azure Monitor template variables
+weight: 2
+---
 
 # Template variables
 
diff --git a/docs/sources/datasources/elasticsearch.md b/docs/sources/datasources/elasticsearch.md
index b81691f04a2..e66013dd91e 100644
--- a/docs/sources/datasources/elasticsearch.md
+++ b/docs/sources/datasources/elasticsearch.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/elasticsearch/", "/docs/grafana/latest/features/datasources/elasticsearch/"]
-description = "Guide for using Elasticsearch in Grafana"
-keywords = ["grafana", "elasticsearch", "guide"]
-title = "Elasticsearch"
-weight = 325
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/elasticsearch/
+  - /docs/grafana/latest/features/datasources/elasticsearch/
+description: Guide for using Elasticsearch in Grafana
+keywords:
+  - grafana
+  - elasticsearch
+  - guide
+title: Elasticsearch
+weight: 325
+---
 
 # Using Elasticsearch in Grafana
 
diff --git a/docs/sources/datasources/google-cloud-monitoring/_index.md b/docs/sources/datasources/google-cloud-monitoring/_index.md
index 28008861985..401bb055bc0 100644
--- a/docs/sources/datasources/google-cloud-monitoring/_index.md
+++ b/docs/sources/datasources/google-cloud-monitoring/_index.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/google-cloud-monitoring/", "/docs/grafana/latest/features/datasources/stackdriver/", "/docs/grafana/next/datasources/cloudmonitoring/", "/docs/grafana/next/features/datasources/cloudmonitoring/"]
-description = "Guide for using Google Cloud Monitoring in Grafana"
-keywords = ["grafana", "stackdriver", "google", "guide", "cloud", "monitoring"]
-title = "Google Cloud Monitoring"
-weight = 350
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/google-cloud-monitoring/
+  - /docs/grafana/latest/features/datasources/stackdriver/
+  - /docs/grafana/next/datasources/cloudmonitoring/
+  - /docs/grafana/next/features/datasources/cloudmonitoring/
+description: Guide for using Google Cloud Monitoring in Grafana
+keywords:
+  - grafana
+  - stackdriver
+  - google
+  - guide
+  - cloud
+  - monitoring
+title: Google Cloud Monitoring
+weight: 350
+---
 
 # Using Google Cloud Monitoring in Grafana
 
diff --git a/docs/sources/datasources/google-cloud-monitoring/google-authentication.md b/docs/sources/datasources/google-cloud-monitoring/google-authentication.md
index 395d94e5b63..7829f8d0d32 100644
--- a/docs/sources/datasources/google-cloud-monitoring/google-authentication.md
+++ b/docs/sources/datasources/google-cloud-monitoring/google-authentication.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/google-cloud-monitoring/google-authentication/", "/docs/grafana/next/datasources/cloudmonitoring/"]
-description = "Google authentication"
-keywords = ["grafana", "google", "authentication"]
-title = "Authentication"
-weight = 5
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/google-cloud-monitoring/google-authentication/
+  - /docs/grafana/next/datasources/cloudmonitoring/
+description: Google authentication
+keywords:
+  - grafana
+  - google
+  - authentication
+title: Authentication
+weight: 5
+---
 
 # Google authentication
 
diff --git a/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md b/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md
index 8bcdc2ef894..c23a2be9a73 100644
--- a/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md
+++ b/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md
@@ -1,10 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards/", "/docs/grafana/latest/features/datasources/stackdriver/", "/docs/grafana/next/features/datasources/cloudmonitoring/"]
-description = "Guide for using Google Cloud Monitoring in Grafana"
-keywords = ["grafana", "stackdriver", "google", "guide", "cloud", "monitoring"]
-title = "Preconfigured dashboards"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards/
+  - /docs/grafana/latest/features/datasources/stackdriver/
+  - /docs/grafana/next/features/datasources/cloudmonitoring/
+description: Guide for using Google Cloud Monitoring in Grafana
+keywords:
+  - grafana
+  - stackdriver
+  - google
+  - guide
+  - cloud
+  - monitoring
+title: Preconfigured dashboards
+weight: 10
+---
 
 # Preconfigured Cloud Monitoring dashboards
 
diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md
index b31ea462836..e4ef27a2b11 100644
--- a/docs/sources/datasources/graphite.md
+++ b/docs/sources/datasources/graphite.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/graphite/", "/docs/grafana/latest/features/datasources/graphite/"]
-description = "Guide for using graphite in Grafana"
-keywords = ["grafana", "graphite", "guide"]
-title = "Graphite"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/graphite/
+  - /docs/grafana/latest/features/datasources/graphite/
+description: Guide for using graphite in Grafana
+keywords:
+  - grafana
+  - graphite
+  - guide
+title: Graphite
+weight: 600
+---
 
 # Using Graphite in Grafana
 
diff --git a/docs/sources/datasources/influxdb/_index.md b/docs/sources/datasources/influxdb/_index.md
index 140fbc05f35..b452368cff1 100644
--- a/docs/sources/datasources/influxdb/_index.md
+++ b/docs/sources/datasources/influxdb/_index.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/influxdb/", "/docs/grafana/latest/features/datasources/influxdb/"]
-description = "Guide for using InfluxDB in Grafana"
-keywords = ["grafana", "influxdb", "guide", "flux"]
-title = "InfluxDB data source"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/influxdb/
+  - /docs/grafana/latest/features/datasources/influxdb/
+description: Guide for using InfluxDB in Grafana
+keywords:
+  - grafana
+  - influxdb
+  - guide
+  - flux
+title: InfluxDB data source
+weight: 700
+---
 
 # InfluxDB data source
 
diff --git a/docs/sources/datasources/influxdb/influxdb-flux.md b/docs/sources/datasources/influxdb/influxdb-flux.md
index aa66380316c..ec7cf40f0e3 100644
--- a/docs/sources/datasources/influxdb/influxdb-flux.md
+++ b/docs/sources/datasources/influxdb/influxdb-flux.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/influxdb/influxdb-flux/"]
-description = "Guide for Flux in Grafana"
-title = "Flux support in Grafana"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/influxdb/influxdb-flux/
+description: Guide for Flux in Grafana
+title: Flux support in Grafana
+weight: 200
+---
 
 # Flux query language in Grafana
 
diff --git a/docs/sources/datasources/influxdb/influxdb-templates.md b/docs/sources/datasources/influxdb/influxdb-templates.md
index e894309078f..ef9732290e7 100644
--- a/docs/sources/datasources/influxdb/influxdb-templates.md
+++ b/docs/sources/datasources/influxdb/influxdb-templates.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/influxdb/influxdb-templates/"]
-description = "Guide for templates in InfluxDB"
-title = "InfluxDB templates"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/influxdb/influxdb-templates/
+description: Guide for templates in InfluxDB
+title: InfluxDB templates
+weight: 300
+---
 
 ## InfluxDB templates
 
diff --git a/docs/sources/datasources/influxdb/provision-influxdb.md b/docs/sources/datasources/influxdb/provision-influxdb.md
index cdabdfdaca0..6caece5f25c 100644
--- a/docs/sources/datasources/influxdb/provision-influxdb.md
+++ b/docs/sources/datasources/influxdb/provision-influxdb.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/influxdb/provision-influxdb/"]
-description = "Guide for provisioning InfluxDB"
-title = "Provision InfluxDB"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/influxdb/provision-influxdb/
+description: Guide for provisioning InfluxDB
+title: Provision InfluxDB
+weight: 400
+---
 
 # Provision InfluxDB
 
diff --git a/docs/sources/datasources/jaeger.md b/docs/sources/datasources/jaeger.md
index 001574b4c45..f6a5518b58d 100644
--- a/docs/sources/datasources/jaeger.md
+++ b/docs/sources/datasources/jaeger.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/jaeger/", "/docs/grafana/latest/features/datasources/jaeger/"]
-description = "Guide for using Jaeger in Grafana"
-keywords = ["grafana", "jaeger", "guide", "tracing"]
-title = "Jaeger"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/jaeger/
+  - /docs/grafana/latest/features/datasources/jaeger/
+description: Guide for using Jaeger in Grafana
+keywords:
+  - grafana
+  - jaeger
+  - guide
+  - tracing
+title: Jaeger
+weight: 800
+---
 
 # Jaeger data source
 
diff --git a/docs/sources/datasources/loki.md b/docs/sources/datasources/loki.md
index 22f40a7eac2..7c2f7fbea70 100644
--- a/docs/sources/datasources/loki.md
+++ b/docs/sources/datasources/loki.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/loki/", "/docs/grafana/latest/features/datasources/loki/"]
-description = "Guide for using Loki in Grafana"
-keywords = ["grafana", "loki", "logging", "guide"]
-title = "Loki"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/loki/
+  - /docs/grafana/latest/features/datasources/loki/
+description: Guide for using Loki in Grafana
+keywords:
+  - grafana
+  - loki
+  - logging
+  - guide
+title: Loki
+weight: 800
+---
 
 # Using Loki in Grafana
 
diff --git a/docs/sources/datasources/mssql.md b/docs/sources/datasources/mssql.md
index d9bd5aa04d5..3d89d0e7957 100644
--- a/docs/sources/datasources/mssql.md
+++ b/docs/sources/datasources/mssql.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/mssql/", "/docs/grafana/latest/features/datasources/mssql/"]
-description = "Guide for using Microsoft SQL Server in Grafana"
-keywords = ["grafana", "MSSQL", "Microsoft", "SQL", "guide", "Azure SQL Database"]
-title = "Microsoft SQL Server"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/mssql/
+  - /docs/grafana/latest/features/datasources/mssql/
+description: Guide for using Microsoft SQL Server in Grafana
+keywords:
+  - grafana
+  - MSSQL
+  - Microsoft
+  - SQL
+  - guide
+  - Azure SQL Database
+title: Microsoft SQL Server
+weight: 900
+---
 
 # Using Microsoft SQL Server in Grafana
 
diff --git a/docs/sources/datasources/mysql.md b/docs/sources/datasources/mysql.md
index 4189a62d7c8..99352d7eb23 100644
--- a/docs/sources/datasources/mysql.md
+++ b/docs/sources/datasources/mysql.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/mysql/", "/docs/grafana/latest/features/datasources/mysql/"]
-description = "Guide for using MySQL in Grafana"
-keywords = ["grafana", "mysql", "guide"]
-title = "MySQL"
-weight = 1000
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/mysql/
+  - /docs/grafana/latest/features/datasources/mysql/
+description: Guide for using MySQL in Grafana
+keywords:
+  - grafana
+  - mysql
+  - guide
+title: MySQL
+weight: 1000
+---
 
 # Using MySQL in Grafana
 
diff --git a/docs/sources/datasources/opentsdb.md b/docs/sources/datasources/opentsdb.md
index f7c8782b3bd..534c5e35ae9 100644
--- a/docs/sources/datasources/opentsdb.md
+++ b/docs/sources/datasources/opentsdb.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/opentsdb/", "/docs/grafana/latest/features/datasources/opentsdb/", "/docs/grafana/latest/features/opentsdb/"]
-description = "Guide for using OpenTSDB in Grafana"
-keywords = ["grafana", "opentsdb", "guide"]
-title = "OpenTSDB"
-weight = 1100
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/opentsdb/
+  - /docs/grafana/latest/features/datasources/opentsdb/
+  - /docs/grafana/latest/features/opentsdb/
+description: Guide for using OpenTSDB in Grafana
+keywords:
+  - grafana
+  - opentsdb
+  - guide
+title: OpenTSDB
+weight: 1100
+---
 
 # Using OpenTSDB in Grafana
 
diff --git a/docs/sources/datasources/postgres.md b/docs/sources/datasources/postgres.md
index 5e9b432a41e..9e4f5ba4daa 100644
--- a/docs/sources/datasources/postgres.md
+++ b/docs/sources/datasources/postgres.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/postgres/", "/docs/grafana/latest/features/datasources/postgres/"]
-description = "Guide for using PostgreSQL in Grafana"
-keywords = ["grafana", "postgresql", "guide"]
-title = "PostgreSQL"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/postgres/
+  - /docs/grafana/latest/features/datasources/postgres/
+description: Guide for using PostgreSQL in Grafana
+keywords:
+  - grafana
+  - postgresql
+  - guide
+title: PostgreSQL
+weight: 1200
+---
 
 # PostgreSQL data source
 
diff --git a/docs/sources/datasources/prometheus.md b/docs/sources/datasources/prometheus.md
index 3b22249aa9d..850fba334c8 100644
--- a/docs/sources/datasources/prometheus.md
+++ b/docs/sources/datasources/prometheus.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/prometheus/", "/docs/grafana/latest/features/datasources/prometheus/"]
-description = "Guide for using Prometheus in Grafana"
-keywords = ["grafana", "prometheus", "guide"]
-title = "Prometheus"
-weight = 1300
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/prometheus/
+  - /docs/grafana/latest/features/datasources/prometheus/
+description: Guide for using Prometheus in Grafana
+keywords:
+  - grafana
+  - prometheus
+  - guide
+title: Prometheus
+weight: 1300
+---
 
 # Prometheus data source
 
diff --git a/docs/sources/datasources/tempo.md b/docs/sources/datasources/tempo.md
index 7993df800f8..6ca483d28a3 100644
--- a/docs/sources/datasources/tempo.md
+++ b/docs/sources/datasources/tempo.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/tempo/", "/docs/grafana/latest/features/datasources/tempo/"]
-description = "High volume, minimal dependency trace storage. OSS tracing solution from Grafana Labs."
-keywords = ["grafana", "tempo", "guide", "tracing"]
-title = "Tempo"
-weight = 1400
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/tempo/
+  - /docs/grafana/latest/features/datasources/tempo/
+description: High volume, minimal dependency trace storage. OSS tracing solution from
+  Grafana Labs.
+keywords:
+  - grafana
+  - tempo
+  - guide
+  - tracing
+title: Tempo
+weight: 1400
+---
 
 # Tempo data source
 
diff --git a/docs/sources/datasources/testdata.md b/docs/sources/datasources/testdata.md
index 01b56da7b2f..75d8a7292d7 100644
--- a/docs/sources/datasources/testdata.md
+++ b/docs/sources/datasources/testdata.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/testdata/", "/docs/grafana/latest/features/datasources/testdata/"]
-keywords = ["grafana", "dashboard", "documentation", "panels", "testdata"]
-title = "TestData"
-weight = 1500
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/testdata/
+  - /docs/grafana/latest/features/datasources/testdata/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - panels
+  - testdata
+title: TestData
+weight: 1500
+---
 
 # Grafana TestData DB
 
diff --git a/docs/sources/datasources/zipkin.md b/docs/sources/datasources/zipkin.md
index 88ba196ce12..e07d659848b 100644
--- a/docs/sources/datasources/zipkin.md
+++ b/docs/sources/datasources/zipkin.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/datasources/zipkin/"]
-description = "Guide for using Zipkin in Grafana"
-keywords = ["grafana", "zipkin", "guide", "tracing"]
-title = "Zipkin"
-weight = 1600
-+++
+---
+aliases:
+  - /docs/grafana/latest/datasources/zipkin/
+description: Guide for using Zipkin in Grafana
+keywords:
+  - grafana
+  - zipkin
+  - guide
+  - tracing
+title: Zipkin
+weight: 1600
+---
 
 # Zipkin data source
 
diff --git a/docs/sources/developers/_index.md b/docs/sources/developers/_index.md
index 9d4232b6191..ef00f162ab5 100644
--- a/docs/sources/developers/_index.md
+++ b/docs/sources/developers/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/developers/", "/docs/grafana/latest/plugins/developing/"]
-title = "Developers"
-weight = 190
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/
+  - /docs/grafana/latest/plugins/developing/
+title: Developers
+weight: 190
+---
 
 # Developers
 
diff --git a/docs/sources/developers/angular_deprecation.md b/docs/sources/developers/angular_deprecation.md
index e03031f1748..1631198066d 100644
--- a/docs/sources/developers/angular_deprecation.md
+++ b/docs/sources/developers/angular_deprecation.md
@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/developers/angular_deprecation/"]
-keywords = ["grafana", "documentation", "developers", "resources"]
-title = "Angular support deprecation"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/angular_deprecation/
+keywords:
+  - grafana
+  - documentation
+  - developers
+  - resources
+title: Angular support deprecation
+weight: 500
+---
 
 # Angular support deprecation
 
diff --git a/docs/sources/developers/cla.md b/docs/sources/developers/cla.md
index b4257216091..291a25c4a14 100644
--- a/docs/sources/developers/cla.md
+++ b/docs/sources/developers/cla.md
@@ -1,9 +1,12 @@
-+++
-aliases = ["/docs/contributing/cla.html/", "/docs/grafana/latest/developers/cla/", "/docs/grafana/latest/project/cla/"]
-description = "Contributor License Agreement (CLA)"
-title = "Contributor License Agreement (CLA)"
-weight = 400
-+++
+---
+aliases:
+  - /docs/contributing/cla.html/
+  - /docs/grafana/latest/developers/cla/
+  - /docs/grafana/latest/project/cla/
+description: Contributor License Agreement (CLA)
+title: Contributor License Agreement (CLA)
+weight: 400
+---
 
 # Grafana Labs Software Grant and Contributor License Agreement ("Agreement")
 
diff --git a/docs/sources/developers/contribute.md b/docs/sources/developers/contribute.md
index eb0f4fe5e10..27839534e50 100644
--- a/docs/sources/developers/contribute.md
+++ b/docs/sources/developers/contribute.md
@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/developers/contribute/"]
-keywords = ["grafana", "documentation", "developers", "resources"]
-title = "Contribute to Grafana"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/contribute/
+keywords:
+  - grafana
+  - documentation
+  - developers
+  - resources
+title: Contribute to Grafana
+weight: 300
+---
 
 # Contribute to Grafana
 
diff --git a/docs/sources/developers/http_api/_index.md b/docs/sources/developers/http_api/_index.md
index 6218af7a49e..df270b512ce 100644
--- a/docs/sources/developers/http_api/_index.md
+++ b/docs/sources/developers/http_api/_index.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/", "/docs/grafana/latest/http_api/", "/docs/grafana/latest/overview/"]
-description = "Grafana HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "overview"]
-title = "HTTP API"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/
+  - /docs/grafana/latest/http_api/
+  - /docs/grafana/latest/overview/
+description: Grafana HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - overview
+title: HTTP API
+weight: 100
+---
 
 # HTTP API reference
 
diff --git a/docs/sources/developers/http_api/access_control.md b/docs/sources/developers/http_api/access_control.md
index 73f709e4965..b523a59ceba 100644
--- a/docs/sources/developers/http_api/access_control.md
+++ b/docs/sources/developers/http_api/access_control.md
@@ -1,9 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/access_control/", "/docs/grafana/latest/http_api/access_control/", "/docs/grafana/latest/http_api/accesscontrol/"]
-description = ""
-keywords = ["grafana", "http", "documentation", "api", "role-based-access-control", "acl", "enterprise"]
-title = "RBAC HTTP API"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/access_control/
+  - /docs/grafana/latest/http_api/access_control/
+  - /docs/grafana/latest/http_api/accesscontrol/
+description: ''
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - role-based-access-control
+  - acl
+  - enterprise
+title: RBAC HTTP API
+---
 
 # RBAC API
 
diff --git a/docs/sources/developers/http_api/admin.md b/docs/sources/developers/http_api/admin.md
index 3dc5de3a592..412db306a79 100644
--- a/docs/sources/developers/http_api/admin.md
+++ b/docs/sources/developers/http_api/admin.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/admin/", "/docs/grafana/latest/http_api/admin/"]
-description = "Grafana Admin HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "admin"]
-title = "Admin HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/admin/
+  - /docs/grafana/latest/http_api/admin/
+description: Grafana Admin HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - admin
+title: 'Admin HTTP API '
+---
 
 # Admin API
 
diff --git a/docs/sources/developers/http_api/alerting.md b/docs/sources/developers/http_api/alerting.md
index 9d43f0b20a7..c92bc04857b 100644
--- a/docs/sources/developers/http_api/alerting.md
+++ b/docs/sources/developers/http_api/alerting.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/alerting/", "/docs/grafana/latest/http_api/alerting/"]
-description = "Grafana Alerts HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "alerting", "alerts"]
-title = "Alerting HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/alerting/
+  - /docs/grafana/latest/http_api/alerting/
+description: Grafana Alerts HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - alerting
+  - alerts
+title: 'Alerting HTTP API '
+---
 
 # Alerting API
 
diff --git a/docs/sources/developers/http_api/alerting_notification_channels.md b/docs/sources/developers/http_api/alerting_notification_channels.md
index 05ef45944a3..2ab22260e1e 100644
--- a/docs/sources/developers/http_api/alerting_notification_channels.md
+++ b/docs/sources/developers/http_api/alerting_notification_channels.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/alerting_notification_channels/", "/docs/grafana/latest/http_api/alerting_notification_channels/"]
-description = "Grafana Alerting Notification Channel HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "alerting", "alerts", "notifications"]
-title = "Alerting Notification Channels HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/alerting_notification_channels/
+  - /docs/grafana/latest/http_api/alerting_notification_channels/
+description: Grafana Alerting Notification Channel HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - alerting
+  - alerts
+  - notifications
+title: 'Alerting Notification Channels HTTP API '
+---
 
 # Alerting Notification Channels API
 
diff --git a/docs/sources/developers/http_api/annotations.md b/docs/sources/developers/http_api/annotations.md
index fa87f9a6ff9..7e6709140bd 100644
--- a/docs/sources/developers/http_api/annotations.md
+++ b/docs/sources/developers/http_api/annotations.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/annotations/", "/docs/grafana/latest/http_api/annotations/"]
-description = "Grafana Annotations HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "annotation", "annotations", "comment"]
-title = "Annotations HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/annotations/
+  - /docs/grafana/latest/http_api/annotations/
+description: Grafana Annotations HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - annotation
+  - annotations
+  - comment
+title: 'Annotations HTTP API '
+---
 
 # Annotations API
 
diff --git a/docs/sources/developers/http_api/auth.md b/docs/sources/developers/http_api/auth.md
index af377df401a..6cec6f4949c 100644
--- a/docs/sources/developers/http_api/auth.md
+++ b/docs/sources/developers/http_api/auth.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/auth/", "/docs/grafana/latest/http_api/auth/", "/docs/grafana/latest/http_api/authentication/"]
-description = "Grafana Authentication HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "authentication"]
-title = "Authentication HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/auth/
+  - /docs/grafana/latest/http_api/auth/
+  - /docs/grafana/latest/http_api/authentication/
+description: Grafana Authentication HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - authentication
+title: 'Authentication HTTP API '
+---
 
 # Authentication API
 
diff --git a/docs/sources/developers/http_api/create-api-tokens-for-org.md b/docs/sources/developers/http_api/create-api-tokens-for-org.md
index 1c93ec6932f..1d35d51beb8 100644
--- a/docs/sources/developers/http_api/create-api-tokens-for-org.md
+++ b/docs/sources/developers/http_api/create-api-tokens-for-org.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/create-api-tokens-for-org/", "/docs/grafana/latest/http_api/create-api-tokens-for-org/", "/docs/grafana/latest/tutorials/api_org_token_howto/"]
-keywords = ["grafana", "tutorials", "API", "Token", "Org", "Organization"]
-title = "API Tutorial: Create API tokens and dashboards for an organization"
-weight = 150
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/create-api-tokens-for-org/
+  - /docs/grafana/latest/http_api/create-api-tokens-for-org/
+  - /docs/grafana/latest/tutorials/api_org_token_howto/
+keywords:
+  - grafana
+  - tutorials
+  - API
+  - Token
+  - Org
+  - Organization
+title: 'API Tutorial: Create API tokens and dashboards for an organization'
+weight: 150
+---
 
 # Create API tokens and dashboards for an organization
 
diff --git a/docs/sources/developers/http_api/curl-examples.md b/docs/sources/developers/http_api/curl-examples.md
index 0849c597899..f8f7be5c2fc 100644
--- a/docs/sources/developers/http_api/curl-examples.md
+++ b/docs/sources/developers/http_api/curl-examples.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/curl-examples/", "/docs/grafana/latest/http_api/curl-examples/"]
-description = "cURL examples"
-keywords = ["grafana", "http", "documentation", "api", "curl"]
-title = "cURL examples"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/curl-examples/
+  - /docs/grafana/latest/http_api/curl-examples/
+description: cURL examples
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - curl
+title: cURL examples
+---
 
 # cURL examples
 
diff --git a/docs/sources/developers/http_api/dashboard.md b/docs/sources/developers/http_api/dashboard.md
index ce0d4ec354c..1ff52ba193c 100644
--- a/docs/sources/developers/http_api/dashboard.md
+++ b/docs/sources/developers/http_api/dashboard.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/dashboard/", "/docs/grafana/latest/http_api/dashboard/"]
-description = "Grafana Dashboard HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "dashboard"]
-title = "Dashboard HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/dashboard/
+  - /docs/grafana/latest/http_api/dashboard/
+description: Grafana Dashboard HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - dashboard
+title: 'Dashboard HTTP API '
+---
 
 # Dashboard API
 
diff --git a/docs/sources/developers/http_api/dashboard_permissions.md b/docs/sources/developers/http_api/dashboard_permissions.md
index 57ec549c021..a04d70b8cde 100644
--- a/docs/sources/developers/http_api/dashboard_permissions.md
+++ b/docs/sources/developers/http_api/dashboard_permissions.md
@@ -1,9 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/dashboard_permissions/", "/docs/grafana/latest/http_api/dashboard_permissions/", "/docs/grafana/latest/http_api/dashboardpermissions/"]
-description = "Grafana Dashboard Permissions HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "dashboard", "permission", "permissions", "acl"]
-title = "Dashboard Permissions HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/dashboard_permissions/
+  - /docs/grafana/latest/http_api/dashboard_permissions/
+  - /docs/grafana/latest/http_api/dashboardpermissions/
+description: Grafana Dashboard Permissions HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - dashboard
+  - permission
+  - permissions
+  - acl
+title: 'Dashboard Permissions HTTP API '
+---
 
 # Dashboard Permissions API
 
diff --git a/docs/sources/developers/http_api/dashboard_versions.md b/docs/sources/developers/http_api/dashboard_versions.md
index 291c03f9ae8..a337cf27218 100644
--- a/docs/sources/developers/http_api/dashboard_versions.md
+++ b/docs/sources/developers/http_api/dashboard_versions.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/dashboard_versions/", "/docs/grafana/latest/http_api/dashboard_versions/", "/docs/grafana/latest/http_api/dashboardversions/"]
-description = "Grafana Dashboard Versions HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "dashboard", "versions"]
-title = "Dashboard Versions HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/dashboard_versions/
+  - /docs/grafana/latest/http_api/dashboard_versions/
+  - /docs/grafana/latest/http_api/dashboardversions/
+description: Grafana Dashboard Versions HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - dashboard
+  - versions
+title: 'Dashboard Versions HTTP API '
+---
 
 # Dashboard Versions
 
diff --git a/docs/sources/developers/http_api/data_source.md b/docs/sources/developers/http_api/data_source.md
index b3c2a024e20..6630998829c 100644
--- a/docs/sources/developers/http_api/data_source.md
+++ b/docs/sources/developers/http_api/data_source.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/data_source/", "/docs/grafana/latest/http_api/data_source/", "/docs/grafana/latest/http_api/datasource/"]
-description = "Grafana Data source HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "data source"]
-title = "Data source HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/data_source/
+  - /docs/grafana/latest/http_api/data_source/
+  - /docs/grafana/latest/http_api/datasource/
+description: Grafana Data source HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - data source
+title: 'Data source HTTP API '
+---
 
 # Data source API
 
diff --git a/docs/sources/developers/http_api/datasource_permissions.md b/docs/sources/developers/http_api/datasource_permissions.md
index e18d3e68b7a..15bbb406e95 100644
--- a/docs/sources/developers/http_api/datasource_permissions.md
+++ b/docs/sources/developers/http_api/datasource_permissions.md
@@ -1,9 +1,21 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/datasource_permissions/", "/docs/grafana/latest/http_api/datasource_permissions/", "/docs/grafana/latest/http_api/datasourcepermissions/"]
-description = "Data Source Permissions API"
-keywords = ["grafana", "http", "documentation", "api", "datasource", "permission", "permissions", "acl", "enterprise"]
-title = "Datasource Permissions HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/datasource_permissions/
+  - /docs/grafana/latest/http_api/datasource_permissions/
+  - /docs/grafana/latest/http_api/datasourcepermissions/
+description: Data Source Permissions API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - datasource
+  - permission
+  - permissions
+  - acl
+  - enterprise
+title: 'Datasource Permissions HTTP API '
+---
 
 # Data Source Permissions API
 
diff --git a/docs/sources/developers/http_api/external_group_sync.md b/docs/sources/developers/http_api/external_group_sync.md
index 65d9791b692..681b894d5e5 100644
--- a/docs/sources/developers/http_api/external_group_sync.md
+++ b/docs/sources/developers/http_api/external_group_sync.md
@@ -1,9 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/external_group_sync/", "/docs/grafana/latest/http_api/external_group_sync/"]
-description = "Grafana External Group Sync HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "team", "teams", "group", "member", "enterprise"]
-title = "External Group Sync HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/external_group_sync/
+  - /docs/grafana/latest/http_api/external_group_sync/
+description: Grafana External Group Sync HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - team
+  - teams
+  - group
+  - member
+  - enterprise
+title: 'External Group Sync HTTP API '
+---
 
 # External Group Synchronization API
 
diff --git a/docs/sources/developers/http_api/folder.md b/docs/sources/developers/http_api/folder.md
index a19275594c9..845c47f6249 100644
--- a/docs/sources/developers/http_api/folder.md
+++ b/docs/sources/developers/http_api/folder.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/folder/", "/docs/grafana/latest/http_api/folder/"]
-description = "Grafana Folder HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "folder"]
-title = "Folder HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/folder/
+  - /docs/grafana/latest/http_api/folder/
+description: Grafana Folder HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - folder
+title: 'Folder HTTP API '
+---
 
 # Folder API
 
diff --git a/docs/sources/developers/http_api/folder_dashboard_search.md b/docs/sources/developers/http_api/folder_dashboard_search.md
index 75890179ffc..f0f1da0d848 100644
--- a/docs/sources/developers/http_api/folder_dashboard_search.md
+++ b/docs/sources/developers/http_api/folder_dashboard_search.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/folder_dashboard_search/", "/docs/grafana/latest/http_api/folder_dashboard_search/"]
-description = "Grafana Folder/Dashboard Search HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "search", "folder", "dashboard"]
-title = "Folder/Dashboard Search HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/folder_dashboard_search/
+  - /docs/grafana/latest/http_api/folder_dashboard_search/
+description: Grafana Folder/Dashboard Search HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - search
+  - folder
+  - dashboard
+title: 'Folder/Dashboard Search HTTP API '
+---
 
 # Folder/Dashboard Search API
 
diff --git a/docs/sources/developers/http_api/folder_permissions.md b/docs/sources/developers/http_api/folder_permissions.md
index 1b06a6b7c03..b3bff5feccd 100644
--- a/docs/sources/developers/http_api/folder_permissions.md
+++ b/docs/sources/developers/http_api/folder_permissions.md
@@ -1,9 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/folder_permissions/", "/docs/grafana/latest/http_api/dashboardpermissions/", "/docs/grafana/latest/http_api/folder_permissions/"]
-description = "Grafana Folder Permissions HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "folder", "permission", "permissions", "acl"]
-title = "Folder Permissions HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/folder_permissions/
+  - /docs/grafana/latest/http_api/dashboardpermissions/
+  - /docs/grafana/latest/http_api/folder_permissions/
+description: Grafana Folder Permissions HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - folder
+  - permission
+  - permissions
+  - acl
+title: 'Folder Permissions HTTP API '
+---
 
 # Folder Permissions API
 
diff --git a/docs/sources/developers/http_api/library_element.md b/docs/sources/developers/http_api/library_element.md
index 38afb3a1cd0..2065b468fb4 100644
--- a/docs/sources/developers/http_api/library_element.md
+++ b/docs/sources/developers/http_api/library_element.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/library_element/", "/docs/grafana/latest/http_api/library_element/"]
-description = "Grafana Library Element HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "library-element"]
-title = "Library Element HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/library_element/
+  - /docs/grafana/latest/http_api/library_element/
+description: Grafana Library Element HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - library-element
+title: 'Library Element HTTP API '
+---
 
 # Library Element API
 
diff --git a/docs/sources/developers/http_api/licensing.md b/docs/sources/developers/http_api/licensing.md
index 2c6bef8ec7f..923cd1c5104 100644
--- a/docs/sources/developers/http_api/licensing.md
+++ b/docs/sources/developers/http_api/licensing.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/licensing/", "/docs/grafana/latest/http_api/licensing/"]
-description = "Enterprise Licensing HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "licensing", "enterprise"]
-title = "Licensing HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/licensing/
+  - /docs/grafana/latest/http_api/licensing/
+description: Enterprise Licensing HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - licensing
+  - enterprise
+title: 'Licensing HTTP API '
+---
 
 # Enterprise License API
 
diff --git a/docs/sources/developers/http_api/org.md b/docs/sources/developers/http_api/org.md
index cff2b6d3979..b395874221c 100644
--- a/docs/sources/developers/http_api/org.md
+++ b/docs/sources/developers/http_api/org.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/org/", "/docs/grafana/latest/http_api/org/", "/docs/grafana/latest/http_api/organization/"]
-description = "Grafana Organization HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "organization"]
-title = "Organization HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/org/
+  - /docs/grafana/latest/http_api/org/
+  - /docs/grafana/latest/http_api/organization/
+description: Grafana Organization HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - organization
+title: 'Organization HTTP API '
+---
 
 # Organization API
 
diff --git a/docs/sources/developers/http_api/other.md b/docs/sources/developers/http_api/other.md
index 1e5118e0323..7b7cda4c8ac 100644
--- a/docs/sources/developers/http_api/other.md
+++ b/docs/sources/developers/http_api/other.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/other/", "/docs/grafana/latest/http_api/other/"]
-description = "Grafana Other HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "other"]
-title = "Other HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/other/
+  - /docs/grafana/latest/http_api/other/
+description: Grafana Other HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - other
+title: 'Other HTTP API '
+---
 
 # Frontend Settings API
 
diff --git a/docs/sources/developers/http_api/playlist.md b/docs/sources/developers/http_api/playlist.md
index b8cb81f253b..feb9ab077b9 100644
--- a/docs/sources/developers/http_api/playlist.md
+++ b/docs/sources/developers/http_api/playlist.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/playlist/", "/docs/grafana/latest/http_api/playlist/"]
-description = "Playlist Admin HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "playlist"]
-title = "Playlist HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/playlist/
+  - /docs/grafana/latest/http_api/playlist/
+description: Playlist Admin HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - playlist
+title: 'Playlist HTTP API '
+---
 
 # Playlist API
 
diff --git a/docs/sources/developers/http_api/preferences.md b/docs/sources/developers/http_api/preferences.md
index da4239620d0..ffc13320203 100644
--- a/docs/sources/developers/http_api/preferences.md
+++ b/docs/sources/developers/http_api/preferences.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/preferences/", "/docs/grafana/latest/http_api/preferences/"]
-description = "Grafana HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "preferences"]
-title = "HTTP Preferences API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/preferences/
+  - /docs/grafana/latest/http_api/preferences/
+description: Grafana HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - preferences
+title: 'HTTP Preferences API '
+---
 
 # User and Org Preferences API
 
diff --git a/docs/sources/developers/http_api/query_history.md b/docs/sources/developers/http_api/query_history.md
index a82f3856a0d..b7616fb1ba8 100644
--- a/docs/sources/developers/http_api/query_history.md
+++ b/docs/sources/developers/http_api/query_history.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/query_history/", "/docs/grafana/latest/http_api/query_history/"]
-description = "Grafana Query History HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "queryHistory"]
-title = "Query History HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/query_history/
+  - /docs/grafana/latest/http_api/query_history/
+description: Grafana Query History HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - queryHistory
+title: 'Query History HTTP API '
+---
 
 # Query history API
 
diff --git a/docs/sources/developers/http_api/reporting.md b/docs/sources/developers/http_api/reporting.md
index 63bc42f59f2..0c53c5a495b 100644
--- a/docs/sources/developers/http_api/reporting.md
+++ b/docs/sources/developers/http_api/reporting.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/reporting/", "/docs/grafana/latest/http_api/reporting/"]
-description = "Grafana Enterprise APIs"
-keywords = ["grafana", "enterprise", "api", "reporting"]
-title = "Reporting API"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/reporting/
+  - /docs/grafana/latest/http_api/reporting/
+description: Grafana Enterprise APIs
+keywords:
+  - grafana
+  - enterprise
+  - api
+  - reporting
+title: Reporting API
+---
 
 # Reporting API
 
diff --git a/docs/sources/developers/http_api/serviceaccount.md b/docs/sources/developers/http_api/serviceaccount.md
index d69e666d42f..017296891e3 100644
--- a/docs/sources/developers/http_api/serviceaccount.md
+++ b/docs/sources/developers/http_api/serviceaccount.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/serviceaccount/", "/docs/grafana/latest/http_api/serviceaccount/"]
-description = "Grafana service account HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "serviceaccount"]
-title = "Service account HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/serviceaccount/
+  - /docs/grafana/latest/http_api/serviceaccount/
+description: Grafana service account HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - serviceaccount
+title: 'Service account HTTP API '
+---
 
 # Service account API
 
diff --git a/docs/sources/developers/http_api/short_url.md b/docs/sources/developers/http_api/short_url.md
index de9f0604ece..1aa9d678d93 100644
--- a/docs/sources/developers/http_api/short_url.md
+++ b/docs/sources/developers/http_api/short_url.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/short_url/", "/docs/grafana/latest/http_api/short_url/"]
-description = "Grafana Short URL HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "shortUrl"]
-title = "Short URL HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/short_url/
+  - /docs/grafana/latest/http_api/short_url/
+description: Grafana Short URL HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - shortUrl
+title: 'Short URL HTTP API '
+---
 
 # Short URL API
 
diff --git a/docs/sources/developers/http_api/snapshot.md b/docs/sources/developers/http_api/snapshot.md
index 0c1ab30eb2e..664cfa4ecb8 100644
--- a/docs/sources/developers/http_api/snapshot.md
+++ b/docs/sources/developers/http_api/snapshot.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/snapshot/", "/docs/grafana/latest/http_api/snapshot/"]
-description = "Grafana HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "snapshot"]
-title = "HTTP Snapshot API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/snapshot/
+  - /docs/grafana/latest/http_api/snapshot/
+description: Grafana HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - snapshot
+title: 'HTTP Snapshot API '
+---
 
 # Snapshot API
 
diff --git a/docs/sources/developers/http_api/team.md b/docs/sources/developers/http_api/team.md
index 44bdcdc5a0c..9e0eb7d7654 100644
--- a/docs/sources/developers/http_api/team.md
+++ b/docs/sources/developers/http_api/team.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/team/", "/docs/grafana/latest/http_api/team/"]
-description = "Grafana Team HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "team", "teams", "group"]
-title = "Team HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/team/
+  - /docs/grafana/latest/http_api/team/
+description: Grafana Team HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - team
+  - teams
+  - group
+title: 'Team HTTP API '
+---
 
 # Team API
 
diff --git a/docs/sources/developers/http_api/user.md b/docs/sources/developers/http_api/user.md
index 354f2f1802f..3e7ccedfa4a 100644
--- a/docs/sources/developers/http_api/user.md
+++ b/docs/sources/developers/http_api/user.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/http_api/user/", "/docs/grafana/latest/http_api/user/"]
-description = "Grafana User HTTP API"
-keywords = ["grafana", "http", "documentation", "api", "user"]
-title = "User HTTP API "
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/http_api/user/
+  - /docs/grafana/latest/http_api/user/
+description: Grafana User HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - user
+title: 'User HTTP API '
+---
 
 # User API
 
diff --git a/docs/sources/developers/plugins/_index.md b/docs/sources/developers/plugins/_index.md
index d3560b3422a..abfabf73b15 100644
--- a/docs/sources/developers/plugins/_index.md
+++ b/docs/sources/developers/plugins/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/", "/docs/grafana/latest/plugins/developing/"]
-title = "Build a plugin"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/
+  - /docs/grafana/latest/plugins/developing/
+title: Build a plugin
+weight: 200
+---
 
 # Build a plugin
 
diff --git a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
index 97a01321337..a92566fb965 100644
--- a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
+++ b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
@@ -1,7 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/add-authentication-for-data-source-plugins/", "/docs/grafana/latest/plugins/developing/auth-for-datasources/", "/docs/grafana/next/developers/plugins/authentication/"]
-title = "Add authentication for data source plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/add-authentication-for-data-source-plugins/
+  - /docs/grafana/latest/plugins/developing/auth-for-datasources/
+  - /docs/grafana/next/developers/plugins/authentication/
+title: Add authentication for data source plugins
+---
 
 # Add authentication for data source plugins
 
diff --git a/docs/sources/developers/plugins/add-query-editor-help.md b/docs/sources/developers/plugins/add-query-editor-help.md
index efe6fff5ebf..ea377ec46bb 100644
--- a/docs/sources/developers/plugins/add-query-editor-help.md
+++ b/docs/sources/developers/plugins/add-query-editor-help.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/add-query-editor-help/"]
-title = "Add query editor help"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/add-query-editor-help/
+title: Add query editor help
+---
 
 # Add a query editor help component
 
diff --git a/docs/sources/developers/plugins/add-support-for-annotations.md b/docs/sources/developers/plugins/add-support-for-annotations.md
index baa5c79cf21..8355ae00fb3 100644
--- a/docs/sources/developers/plugins/add-support-for-annotations.md
+++ b/docs/sources/developers/plugins/add-support-for-annotations.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/add-support-for-annotations/"]
-title = "Add support for annotations"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/add-support-for-annotations/
+title: Add support for annotations
+---
 
 # Add support for annotations
 
diff --git a/docs/sources/developers/plugins/add-support-for-explore-queries.md b/docs/sources/developers/plugins/add-support-for-explore-queries.md
index cc647f39947..224cff98120 100644
--- a/docs/sources/developers/plugins/add-support-for-explore-queries.md
+++ b/docs/sources/developers/plugins/add-support-for-explore-queries.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/add-support-for-explore-queries/"]
-title = "Add support for Explore queries"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/add-support-for-explore-queries/
+title: Add support for Explore queries
+---
 
 # Add support for Explore queries
 
diff --git a/docs/sources/developers/plugins/add-support-for-variables.md b/docs/sources/developers/plugins/add-support-for-variables.md
index d33fd1a1bd1..b70c3643e62 100644
--- a/docs/sources/developers/plugins/add-support-for-variables.md
+++ b/docs/sources/developers/plugins/add-support-for-variables.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/add-support-for-variables/"]
-title = "Add support for variables in plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/add-support-for-variables/
+title: Add support for variables in plugins
+---
 
 # Add support for variables in plugins
 
diff --git a/docs/sources/developers/plugins/backend/_index.md b/docs/sources/developers/plugins/backend/_index.md
index c9e1dc9d608..a370973db06 100644
--- a/docs/sources/developers/plugins/backend/_index.md
+++ b/docs/sources/developers/plugins/backend/_index.md
@@ -1,8 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/backend/", "/docs/grafana/latest/plugins/developing/backend-plugins-guide/"]
-keywords = ["grafana", "plugins", "backend", "plugin", "backend-plugins", "documentation"]
-title = "Backend plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/backend/
+  - /docs/grafana/latest/plugins/developing/backend-plugins-guide/
+keywords:
+  - grafana
+  - plugins
+  - backend
+  - plugin
+  - backend-plugins
+  - documentation
+title: Backend plugins
+---
 
 # Backend plugins
 
diff --git a/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md b/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md
index 3bd6de02255..ebc5cd3a5f8 100644
--- a/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md
+++ b/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md
@@ -1,8 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/backend/grafana-plugin-sdk-for-go/"]
-keywords = ["grafana", "plugins", "backend", "plugin", "backend-plugins", "sdk", "documentation"]
-title = "Grafana Plugin SDK for Go"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/backend/grafana-plugin-sdk-for-go/
+keywords:
+  - grafana
+  - plugins
+  - backend
+  - plugin
+  - backend-plugins
+  - sdk
+  - documentation
+title: Grafana Plugin SDK for Go
+---
 
 # Grafana plugin SDK for Go
 
diff --git a/docs/sources/developers/plugins/backend/plugin-protocol.md b/docs/sources/developers/plugins/backend/plugin-protocol.md
index 2be8462b4dc..e876914ab6f 100644
--- a/docs/sources/developers/plugins/backend/plugin-protocol.md
+++ b/docs/sources/developers/plugins/backend/plugin-protocol.md
@@ -1,8 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/backend/plugin-protocol/"]
-keywords = ["grafana", "plugins", "backend", "plugin", "backend-plugins", "documentation"]
-title = "Plugin protocol"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/backend/plugin-protocol/
+keywords:
+  - grafana
+  - plugins
+  - backend
+  - plugin
+  - backend-plugins
+  - documentation
+title: Plugin protocol
+---
 
 # Plugin protocol
 
diff --git a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
index 5baff091349..bda48878be4 100644
--- a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
+++ b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/build-a-logs-data-source-plugin/"]
-title = "Build a logs data source plugin"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/build-a-logs-data-source-plugin/
+title: Build a logs data source plugin
+---
 
 # Build a logs data source plugin
 
diff --git a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
index 94f9f852236..06e1b748c29 100644
--- a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
+++ b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/build-a-streaming-data-source-plugin/"]
-title = "Build a streaming data source plugin"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/build-a-streaming-data-source-plugin/
+title: Build a streaming data source plugin
+---
 
 # Build a streaming data source plugin
 
diff --git a/docs/sources/developers/plugins/custom-panel-option-editors.md b/docs/sources/developers/plugins/custom-panel-option-editors.md
index d2963cb7191..d9cbcf20a5f 100644
--- a/docs/sources/developers/plugins/custom-panel-option-editors.md
+++ b/docs/sources/developers/plugins/custom-panel-option-editors.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/custom-panel-option-editors/"]
-title = "Custom panel option editors"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/custom-panel-option-editors/
+title: Custom panel option editors
+---
 
 # Custom panel option editors
 
diff --git a/docs/sources/developers/plugins/data-frames.md b/docs/sources/developers/plugins/data-frames.md
index 5b4bd22c890..e2d9cca68d7 100644
--- a/docs/sources/developers/plugins/data-frames.md
+++ b/docs/sources/developers/plugins/data-frames.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/data-frames/"]
-title = "Data frames"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/data-frames/
+title: Data frames
+---
 
 # Data frames
 
diff --git a/docs/sources/developers/plugins/development-with-local-grafana.md b/docs/sources/developers/plugins/development-with-local-grafana.md
index 65c216ca0ba..1d15d333317 100644
--- a/docs/sources/developers/plugins/development-with-local-grafana.md
+++ b/docs/sources/developers/plugins/development-with-local-grafana.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/development-with-local-grafana/"]
-title = "Development with local Grafana"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/development-with-local-grafana/
+title: Development with local Grafana
+---
 
 # Development with local Grafana
 
diff --git a/docs/sources/developers/plugins/error-handling.md b/docs/sources/developers/plugins/error-handling.md
index 203612d8754..bfc1b8e1331 100644
--- a/docs/sources/developers/plugins/error-handling.md
+++ b/docs/sources/developers/plugins/error-handling.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/error-handling/"]
-title = "Error handling"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/error-handling/
+title: Error handling
+---
 
 # Error handling
 
diff --git a/docs/sources/developers/plugins/legacy/_index.md b/docs/sources/developers/plugins/legacy/_index.md
index 9a96c0679f3..63b5cbdd4f4 100644
--- a/docs/sources/developers/plugins/legacy/_index.md
+++ b/docs/sources/developers/plugins/legacy/_index.md
@@ -1,7 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/", "/docs/grafana/latest/plugins/development/", "/docs/grafana/next/plugins/apps/", "/docs/grafana/next/plugins/datasources/", "/docs/grafana/next/plugins/developing/development/", "/docs/grafana/next/plugins/panels/"]
-title = "Legacy plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/
+  - /docs/grafana/latest/plugins/development/
+  - /docs/grafana/next/plugins/apps/
+  - /docs/grafana/next/plugins/datasources/
+  - /docs/grafana/next/plugins/developing/development/
+  - /docs/grafana/next/plugins/panels/
+title: Legacy plugins
+---
 
 # Legacy plugins
 
diff --git a/docs/sources/developers/plugins/legacy/apps.md b/docs/sources/developers/plugins/legacy/apps.md
index f653ff56c87..9a43032325b 100644
--- a/docs/sources/developers/plugins/legacy/apps.md
+++ b/docs/sources/developers/plugins/legacy/apps.md
@@ -1,8 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/apps/", "/docs/grafana/latest/plugins/developing/apps/"]
-keywords = ["grafana", "plugins", "documentation"]
-title = "Legacy app plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/apps/
+  - /docs/grafana/latest/plugins/developing/apps/
+keywords:
+  - grafana
+  - plugins
+  - documentation
+title: Legacy app plugins
+---
 
 # Legacy app plugins
 
diff --git a/docs/sources/developers/plugins/legacy/data-sources.md b/docs/sources/developers/plugins/legacy/data-sources.md
index 8c7f31459c9..a3116f4ee0e 100644
--- a/docs/sources/developers/plugins/legacy/data-sources.md
+++ b/docs/sources/developers/plugins/legacy/data-sources.md
@@ -1,8 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/data-sources/", "/docs/grafana/latest/plugins/developing/datasources/"]
-keywords = ["grafana", "plugins", "documentation"]
-title = "Legacy data source plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/data-sources/
+  - /docs/grafana/latest/plugins/developing/datasources/
+keywords:
+  - grafana
+  - plugins
+  - documentation
+title: Legacy data source plugins
+---
 
 # Legacy data source plugins
 
diff --git a/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md b/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md
index c6da24ecb54..c686938978d 100644
--- a/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md
+++ b/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md
@@ -1,7 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/defaults-and-editor-mode/", "/docs/grafana/latest/plugins/developing/defaults-and-editor-mode/"]
-title = "Legacy defaults and editor mode"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/defaults-and-editor-mode/
+  - /docs/grafana/latest/plugins/developing/defaults-and-editor-mode/
+title: Legacy defaults and editor mode
+---
 
 # Legacy defaults and editor mode
 
diff --git a/docs/sources/developers/plugins/legacy/panels.md b/docs/sources/developers/plugins/legacy/panels.md
index 0f5525d2bdd..9ffd453586e 100644
--- a/docs/sources/developers/plugins/legacy/panels.md
+++ b/docs/sources/developers/plugins/legacy/panels.md
@@ -1,8 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/panels/", "/docs/grafana/latest/plugins/developing/panels/"]
-keywords = ["grafana", "plugins", "panel", "documentation"]
-title = "Legacy panel plugins"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/panels/
+  - /docs/grafana/latest/plugins/developing/panels/
+keywords:
+  - grafana
+  - plugins
+  - panel
+  - documentation
+title: Legacy panel plugins
+---
 
 # Legacy panel plugins
 
diff --git a/docs/sources/developers/plugins/legacy/review-guidelines.md b/docs/sources/developers/plugins/legacy/review-guidelines.md
index 7f5d9e71796..0e07bf020ad 100644
--- a/docs/sources/developers/plugins/legacy/review-guidelines.md
+++ b/docs/sources/developers/plugins/legacy/review-guidelines.md
@@ -1,7 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/review-guidelines/", "/docs/grafana/latest/plugins/developing/plugin-review-guidelines/"]
-title = "Legacy review guidelines"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/review-guidelines/
+  - /docs/grafana/latest/plugins/developing/plugin-review-guidelines/
+title: Legacy review guidelines
+---
 
 # Legacy review guidelines
 
diff --git a/docs/sources/developers/plugins/legacy/snapshot-mode.md b/docs/sources/developers/plugins/legacy/snapshot-mode.md
index 826a6c33b8a..bfcb418cac0 100644
--- a/docs/sources/developers/plugins/legacy/snapshot-mode.md
+++ b/docs/sources/developers/plugins/legacy/snapshot-mode.md
@@ -1,7 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/snapshot-mode/", "/docs/grafana/latest/plugins/developing/snapshot-mode/"]
-title = "Legacy snapshot mode"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/snapshot-mode/
+  - /docs/grafana/latest/plugins/developing/snapshot-mode/
+title: Legacy snapshot mode
+---
 
 # Legacy snapshot mode
 
diff --git a/docs/sources/developers/plugins/legacy/style-guide.md b/docs/sources/developers/plugins/legacy/style-guide.md
index 812060d6022..fa0d308671e 100644
--- a/docs/sources/developers/plugins/legacy/style-guide.md
+++ b/docs/sources/developers/plugins/legacy/style-guide.md
@@ -1,7 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/legacy/style-guide/", "/docs/grafana/latest/plugins/developing/code-styleguide/"]
-title = "Legacy code style guide"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/legacy/style-guide/
+  - /docs/grafana/latest/plugins/developing/code-styleguide/
+title: Legacy code style guide
+---
 
 # Legacy code style guide
 
diff --git a/docs/sources/developers/plugins/metadata.md b/docs/sources/developers/plugins/metadata.md
index 3bdaea28ffe..9de5660286d 100644
--- a/docs/sources/developers/plugins/metadata.md
+++ b/docs/sources/developers/plugins/metadata.md
@@ -1,8 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/metadata/", "/docs/grafana/latest/plugins/developing/plugin.json/"]
-keywords = ["grafana", "plugins", "documentation"]
-title = "plugin.json"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/metadata/
+  - /docs/grafana/latest/plugins/developing/plugin.json/
+keywords:
+  - grafana
+  - plugins
+  - documentation
+title: plugin.json
+---
 
 # plugin.json
 
diff --git a/docs/sources/developers/plugins/migration-guide.md b/docs/sources/developers/plugins/migration-guide.md
index 00153a20ede..ed3591af874 100644
--- a/docs/sources/developers/plugins/migration-guide.md
+++ b/docs/sources/developers/plugins/migration-guide.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/migration-guide/"]
-title = "Plugin migration guide"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/migration-guide/
+title: Plugin migration guide
+---
 
 # Plugin migration guide
 
diff --git a/docs/sources/developers/plugins/package-a-plugin.md b/docs/sources/developers/plugins/package-a-plugin.md
index ae33ce3e531..dbb374102dd 100644
--- a/docs/sources/developers/plugins/package-a-plugin.md
+++ b/docs/sources/developers/plugins/package-a-plugin.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/package-a-plugin/", "/docs/grafana/latest/developers/plugins/share-a-plugin/"]
-title = "Package a plugin"
-type = "docs"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/package-a-plugin/
+  - /docs/grafana/latest/developers/plugins/share-a-plugin/
+title: Package a plugin
+type: docs
+---
 
 # Package a plugin
 
diff --git a/docs/sources/developers/plugins/publishing-and-signing-criteria.md b/docs/sources/developers/plugins/publishing-and-signing-criteria.md
index e9031bed87b..8e85d43abc2 100644
--- a/docs/sources/developers/plugins/publishing-and-signing-criteria.md
+++ b/docs/sources/developers/plugins/publishing-and-signing-criteria.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/publishing-and-signing-criteria/"]
-title = "Plugin publishing and signing criteria"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/publishing-and-signing-criteria/
+title: Plugin publishing and signing criteria
+---
 
 # Plugin publishing and signing criteria
 
diff --git a/docs/sources/developers/plugins/sign-a-plugin.md b/docs/sources/developers/plugins/sign-a-plugin.md
index dee4e2588d1..f72ce4ad424 100644
--- a/docs/sources/developers/plugins/sign-a-plugin.md
+++ b/docs/sources/developers/plugins/sign-a-plugin.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/sign-a-plugin/"]
-title = "Sign a plugin"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/sign-a-plugin/
+title: Sign a plugin
+---
 
 # Sign a plugin
 
diff --git a/docs/sources/developers/plugins/working-with-data-frames.md b/docs/sources/developers/plugins/working-with-data-frames.md
index 4208f0c0c3a..f1f3803eff3 100644
--- a/docs/sources/developers/plugins/working-with-data-frames.md
+++ b/docs/sources/developers/plugins/working-with-data-frames.md
@@ -1,7 +1,8 @@
-+++
-aliases = ["/docs/grafana/latest/developers/plugins/working-with-data-frames/"]
-title = "Working with data frames"
-+++
+---
+aliases:
+  - /docs/grafana/latest/developers/plugins/working-with-data-frames/
+title: Working with data frames
+---
 
 # Working with data frames
 
diff --git a/docs/sources/enterprise/_index.md b/docs/sources/enterprise/_index.md
index 5450e2f4fe8..0e5139cad96 100644
--- a/docs/sources/enterprise/_index.md
+++ b/docs/sources/enterprise/_index.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/"]
-description = "Grafana Enterprise overview"
-keywords = ["grafana", "documentation", "datasource", "permissions", "ldap", "licensing", "enterprise", "insights", "reporting"]
-title = "Grafana Enterprise"
-weight = 150
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/
+description: Grafana Enterprise overview
+keywords:
+  - grafana
+  - documentation
+  - datasource
+  - permissions
+  - ldap
+  - licensing
+  - enterprise
+  - insights
+  - reporting
+title: Grafana Enterprise
+weight: 150
+---
 
 # Grafana Enterprise
 
diff --git a/docs/sources/enterprise/access-control/configure-rbac.md b/docs/sources/enterprise/access-control/configure-rbac.md
index f49f2e0467f..7cc0e950dbe 100644
--- a/docs/sources/enterprise/access-control/configure-rbac.md
+++ b/docs/sources/enterprise/access-control/configure-rbac.md
@@ -1,8 +1,8 @@
 ---
-title: 'Configure RBAC in Grafana'
-menuTitle: 'Configure RBAC'
-description: 'Learn how to configure RBAC.'
 aliases: []
+description: Learn how to configure RBAC.
+menuTitle: Configure RBAC
+title: Configure RBAC in Grafana
 weight: 30
 ---
 
diff --git a/docs/sources/enterprise/access-control/rbac-provisioning.md b/docs/sources/enterprise/access-control/rbac-provisioning.md
index 0d767e05067..2593af6f9aa 100644
--- a/docs/sources/enterprise/access-control/rbac-provisioning.md
+++ b/docs/sources/enterprise/access-control/rbac-provisioning.md
@@ -1,7 +1,8 @@
 ---
 aliases:
   - /docs/grafana/latest/enterprise/access-control/rbac-provisioning/
-description: Learn about RBAC provisioning and view an example YAML provisioning file that configures Grafana role assignments.
+description: Learn about RBAC provisioning and view an example YAML provisioning file
+  that configures Grafana role assignments.
 menuTitle: RBAC provisioning
 title: Grafana RBAC provisioning
 weight: 60
diff --git a/docs/sources/enterprise/auditing.md b/docs/sources/enterprise/auditing.md
index 644d974482e..78d187edf8b 100644
--- a/docs/sources/enterprise/auditing.md
+++ b/docs/sources/enterprise/auditing.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/auditing/"]
-description = "Auditing"
-keywords = ["grafana", "auditing", "audit", "logs"]
-title = "Auditing"
-weight = 1100
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/auditing/
+description: Auditing
+keywords:
+  - grafana
+  - auditing
+  - audit
+  - logs
+title: Auditing
+weight: 1100
+---
 
 # Auditing
 
diff --git a/docs/sources/enterprise/datasource_permissions.md b/docs/sources/enterprise/datasource_permissions.md
index 76fb1c0c9e6..d79ff9fc49c 100644
--- a/docs/sources/enterprise/datasource_permissions.md
+++ b/docs/sources/enterprise/datasource_permissions.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/datasource_permissions/", "/docs/sources/permissions/datasource_permissions/"]
-description = "Grafana Datasource Permissions Guide"
-keywords = ["grafana", "configuration", "documentation", "datasource", "permissions", "users", "teams", "enterprise"]
-title = "Data source permissions"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/datasource_permissions/
+  - /docs/sources/permissions/datasource_permissions/
+description: Grafana Datasource Permissions Guide
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - datasource
+  - permissions
+  - users
+  - teams
+  - enterprise
+title: Data source permissions
+weight: 500
+---
 
 # Data source permissions
 
diff --git a/docs/sources/enterprise/enhanced_ldap.md b/docs/sources/enterprise/enhanced_ldap.md
index ca2a0972226..8da2ba4a99b 100644
--- a/docs/sources/enterprise/enhanced_ldap.md
+++ b/docs/sources/enterprise/enhanced_ldap.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enhanced_ldap/"]
-description = "Grafana Enhanced LDAP Integration Guide "
-keywords = ["grafana", "configuration", "documentation", "ldap", "active directory", "enterprise"]
-title = "Enhanced LDAP Integration"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enhanced_ldap/
+description: 'Grafana Enhanced LDAP Integration Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - ldap
+  - active directory
+  - enterprise
+title: Enhanced LDAP Integration
+weight: 600
+---
 
 # Enhanced LDAP integration
 
diff --git a/docs/sources/enterprise/enterprise-configuration.md b/docs/sources/enterprise/enterprise-configuration.md
index 2ccb1e2767b..36ce654d29d 100644
--- a/docs/sources/enterprise/enterprise-configuration.md
+++ b/docs/sources/enterprise/enterprise-configuration.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enterprise-configuration/"]
-description = "Enterprise configuration documentation"
-keywords = ["grafana", "configuration", "documentation", "enterprise"]
-title = "Enterprise configuration"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enterprise-configuration/
+description: Enterprise configuration documentation
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - enterprise
+title: Enterprise configuration
+weight: 700
+---
 
 # Grafana Enterprise configuration
 
diff --git a/docs/sources/enterprise/enterprise-encryption/_index.md b/docs/sources/enterprise/enterprise-encryption/_index.md
index 87d9862f054..b7c8b6548b0 100644
--- a/docs/sources/enterprise/enterprise-encryption/_index.md
+++ b/docs/sources/enterprise/enterprise-encryption/_index.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enterprise-encryption/"]
-description = "Grafana Enterprise database encryption"
-keywords = ["grafana", "enterprise", "database", "encryption", "documentation"]
-title = "Enterprise database encryption"
-weight = 130
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enterprise-encryption/
+description: Grafana Enterprise database encryption
+keywords:
+  - grafana
+  - enterprise
+  - database
+  - encryption
+  - documentation
+title: Enterprise database encryption
+weight: 130
+---
 
 # Grafana Enterprise database encryption
 
diff --git a/docs/sources/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets.md b/docs/sources/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets.md
index e28e4cf8d45..51877da2748 100644
--- a/docs/sources/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets.md
+++ b/docs/sources/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets.md
@@ -1,10 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets/"]
-description = "Using AWS KMS to encrypt database secrets"
-keywords = ["grafana", "AWS KMS integration"]
-title = "AMS KMS"
-weight = 3
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets/
+description: Using AWS KMS to encrypt database secrets
+keywords:
+  - grafana
+  - AWS KMS integration
+title: AMS KMS
+weight: 3
+---
 
 # Using AWS KMS to encrypt database secrets
 
diff --git a/docs/sources/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets.md b/docs/sources/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets.md
index 7d5bfe7f63f..1f910db1f3f 100644
--- a/docs/sources/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets.md
+++ b/docs/sources/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets.md
@@ -1,10 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets/"]
-description = "Using Azure Key Vault to encrypt database secrets"
-keywords = ["grafana", "Azure key vault"]
-title = "Azure Key Vault"
-weight = 2
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets/
+description: Using Azure Key Vault to encrypt database secrets
+keywords:
+  - grafana
+  - Azure key vault
+title: Azure Key Vault
+weight: 2
+---
 
 # Using Azure Key Vault to encrypt database secrets
 
diff --git a/docs/sources/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets.md b/docs/sources/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets.md
index adc9bdc024e..dd5ab2dcd72 100644
--- a/docs/sources/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets.md
+++ b/docs/sources/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets.md
@@ -1,10 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets/"]
-description = "Using Google Cloud KMS to encrypt database secrets"
-keywords = ["grafana", "Google Cloud KMS integration"]
-title = "Google Cloud KMS"
-weight = 3
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets/
+description: Using Google Cloud KMS to encrypt database secrets
+keywords:
+  - grafana
+  - Google Cloud KMS integration
+title: Google Cloud KMS
+weight: 3
+---
 
 # Using Google Cloud KMS to encrypt database secrets
 
diff --git a/docs/sources/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets.md b/docs/sources/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets.md
index 711d2ded059..635f1b7ecf1 100644
--- a/docs/sources/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets.md
+++ b/docs/sources/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets.md
@@ -1,10 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets/"]
-description = "Using Hashicorp Vault to encrypt database secrets"
-keywords = ["grafana", "Hashicorp Vault integration"]
-title = "Hashicorp Vault"
-weight = 3
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets/
+description: Using Hashicorp Vault to encrypt database secrets
+keywords:
+  - grafana
+  - Hashicorp Vault integration
+title: Hashicorp Vault
+weight: 3
+---
 
 # Using Hashicorp Vault to encrypt database secrets
 
diff --git a/docs/sources/enterprise/export-pdf.md b/docs/sources/enterprise/export-pdf.md
index c7f7b97d28a..73c56740c8c 100644
--- a/docs/sources/enterprise/export-pdf.md
+++ b/docs/sources/enterprise/export-pdf.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/export-pdf/"]
-description = ""
-keywords = ["grafana", "export", "pdf", "share"]
-title = "Export dashboard as PDF"
-weight = 1400
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/export-pdf/
+description: ''
+keywords:
+  - grafana
+  - export
+  - pdf
+  - share
+title: Export dashboard as PDF
+weight: 1400
+---
 
 # Export dashboard as PDF
 
diff --git a/docs/sources/enterprise/license/_index.md b/docs/sources/enterprise/license/_index.md
index 3c5324b97f9..37352ece76e 100644
--- a/docs/sources/enterprise/license/_index.md
+++ b/docs/sources/enterprise/license/_index.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/license/"]
-description = "Enterprise license"
-keywords = ["grafana", "licensing", "enterprise"]
-title = "Grafana Enterprise license"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/license/
+description: Enterprise license
+keywords:
+  - grafana
+  - licensing
+  - enterprise
+title: Grafana Enterprise license
+weight: 10
+---
 
 # Grafana Enterprise license
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/_index.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/_index.md
index 65f70087e54..22e8fae35ce 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/_index.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/_index.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/"]
-description = "Activate Enterprise license purchased through AWS Marketplace"
-keywords = ["grafana", "aws", "marketplace", "enterprise", "license"]
-title = "Activate a Grafana Enterprise license purchased through AWS Marketplace"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/
+description: Activate Enterprise license purchased through AWS Marketplace
+keywords:
+  - grafana
+  - aws
+  - marketplace
+  - enterprise
+  - license
+title: Activate a Grafana Enterprise license purchased through AWS Marketplace
+weight: 400
+---
 
 # Activate a Grafana Enterprise license purchased through AWS Marketplace
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws.md
index 38ef63d86f4..8b2a22e77f9 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/", "/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/"]
-description = "About Grafana Enterprise licenses from AWS Marketplace"
-keywords = ["grafana", "about", "enterprise", "overview", "aws", "marketplace"]
-title = "About Grafana Enterprise licenses from AWS Marketplace"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/
+description: About Grafana Enterprise licenses from AWS Marketplace
+keywords:
+  - grafana
+  - about
+  - enterprise
+  - overview
+  - aws
+  - marketplace
+title: About Grafana Enterprise licenses from AWS Marketplace
+weight: 100
+---
 
 # About Grafana Enterprise licenses from AWS Marketplace
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs.md
index d1f2172af70..e674dad48da 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-ecs/", "/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/"]
-description = "Activate a Grafana Enterprise license from AWS Marketplace on ECS"
-keywords = ["grafana", "ecs", "enterprise", "aws", "marketplace", "activate"]
-title = "Activate a Grafana Enterprise license from AWS Marketplace on ECS"
-weight = 250
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-ecs/
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/
+description: Activate a Grafana Enterprise license from AWS Marketplace on ECS
+keywords:
+  - grafana
+  - ecs
+  - enterprise
+  - aws
+  - marketplace
+  - activate
+title: Activate a Grafana Enterprise license from AWS Marketplace on ECS
+weight: 250
+---
 
 # Activate a Grafana Enterprise license from AWS Marketplace on ECS
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks.md
index 77084375a36..18a70d719ed 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-eks/", "/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/"]
-description = "Activate a Grafana Enterprise license from AWS Marketplace on EKS"
-keywords = ["grafana", "enterprise", "aws", "marketplace", "eks", "activate"]
-title = "Activate a Grafana Enterprise license from AWS Marketplace on EKS"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-eks/
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/
+description: Activate a Grafana Enterprise license from AWS Marketplace on EKS
+keywords:
+  - grafana
+  - enterprise
+  - aws
+  - marketplace
+  - eks
+  - activate
+title: Activate a Grafana Enterprise license from AWS Marketplace on EKS
+weight: 200
+---
 
 # Activate a Grafana Enterprise license from AWS Marketplace on EKS
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md
index d333cecacf2..9b472872d54 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md
@@ -1,10 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/", "/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/"]
-description = "Activate a Grafana Enterprise license from AWS on an instance deployed outside of AWS"
-keywords = ["grafana", "enterprise", "aws", "marketplace", "activate"]
-title = "Activate a Grafana Enterprise license from AWS on an instance deployed outside of AWS"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
+description: Activate a Grafana Enterprise license from AWS on an instance deployed
+  outside of AWS
+keywords:
+  - grafana
+  - enterprise
+  - aws
+  - marketplace
+  - activate
+title: Activate a Grafana Enterprise license from AWS on an instance deployed outside
+  of AWS
+weight: 300
+---
 
 # Activate a Grafana Enterprise license from AWS on an instance deployed outside of AWS
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md
index 600e9d50d35..861d723031a 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/", "/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/"]
-description = "Manage your Grafana Enterprise license in AWS Marketplace"
-keywords = ["grafana", "enterprise", "aws", "marketplace", "manage", "add", "remove", "users"]
-title = "Manage your Grafana Enterprise license in AWS Marketplace"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
+description: Manage your Grafana Enterprise license in AWS Marketplace
+keywords:
+  - grafana
+  - enterprise
+  - aws
+  - marketplace
+  - manage
+  - add
+  - remove
+  - users
+title: Manage your Grafana Enterprise license in AWS Marketplace
+weight: 400
+---
 
 ## Manage your Grafana Enterprise license in AWS Marketplace
 
diff --git a/docs/sources/enterprise/license/activate-aws-marketplace-license/transfer-ge-license.md b/docs/sources/enterprise/license/activate-aws-marketplace-license/transfer-ge-license.md
index b0480359782..a7ec2bfc919 100644
--- a/docs/sources/enterprise/license/activate-aws-marketplace-license/transfer-ge-license.md
+++ b/docs/sources/enterprise/license/activate-aws-marketplace-license/transfer-ge-license.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-aws-marketplace-license/transfer-ge-license/", "/docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/transfer-ge-license/"]
-description = "Transfer your AWS Marketplace Grafana Enterprise license"
-keywords = ["grafana", "enterprise", "aws", "marketplace", "transfer", "move"]
-title = "Transfer your AWS Marketplace Grafana Enterprise license"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/transfer-ge-license/
+  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/transfer-ge-license/
+description: Transfer your AWS Marketplace Grafana Enterprise license
+keywords:
+  - grafana
+  - enterprise
+  - aws
+  - marketplace
+  - transfer
+  - move
+title: Transfer your AWS Marketplace Grafana Enterprise license
+weight: 400
+---
 
 # Transfer your AWS Marketplace Grafana Enterprise license
 
diff --git a/docs/sources/enterprise/license/activate-license.md b/docs/sources/enterprise/license/activate-license.md
index c246719ad0c..7fa0a651ad8 100644
--- a/docs/sources/enterprise/license/activate-license.md
+++ b/docs/sources/enterprise/license/activate-license.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/activate-license/", "/docs/grafana/latest/enterprise/license/activate-license/"]
-description = "Activate an Enterprise license"
-keywords = ["grafana", "licensing", "enterprise"]
-title = "Activate an Enterprise license"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/activate-license/
+  - /docs/grafana/latest/enterprise/license/activate-license/
+description: Activate an Enterprise license
+keywords:
+  - grafana
+  - licensing
+  - enterprise
+title: Activate an Enterprise license
+weight: 100
+---
 
 # Activate an Enterprise license
 
diff --git a/docs/sources/enterprise/license/license-expiration.md b/docs/sources/enterprise/license/license-expiration.md
index 70c0939084a..d2168eb3a9e 100644
--- a/docs/sources/enterprise/license/license-expiration.md
+++ b/docs/sources/enterprise/license/license-expiration.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/license-expiration/", "/docs/grafana/latest/enterprise/license/license-expiration/"]
-description = ""
-keywords = ["grafana", "licensing"]
-title = "License expiration"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/license-expiration/
+  - /docs/grafana/latest/enterprise/license/license-expiration/
+description: ''
+keywords:
+  - grafana
+  - licensing
+title: License expiration
+weight: 200
+---
 
 # License expiration
 
diff --git a/docs/sources/enterprise/license/license-restrictions.md b/docs/sources/enterprise/license/license-restrictions.md
index 11c24828468..574b72f934f 100644
--- a/docs/sources/enterprise/license/license-restrictions.md
+++ b/docs/sources/enterprise/license/license-restrictions.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/license-restrictions/", "/docs/grafana/latest/enterprise/license/license-restrictions/"]
-description = "Grafana Enterprise license restrictions"
-keywords = ["grafana", "licensing", "enterprise"]
-title = "License restrictions"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/license-restrictions/
+  - /docs/grafana/latest/enterprise/license/license-restrictions/
+description: Grafana Enterprise license restrictions
+keywords:
+  - grafana
+  - licensing
+  - enterprise
+title: License restrictions
+weight: 300
+---
 
 # Understanding Grafana Enterprise licensing
 
diff --git a/docs/sources/enterprise/query-caching.md b/docs/sources/enterprise/query-caching.md
index 1f62dad8eb1..c0c9b51814d 100644
--- a/docs/sources/enterprise/query-caching.md
+++ b/docs/sources/enterprise/query-caching.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/query-caching/"]
-description = "Grafana Enterprise data source query caching"
-keywords = ["grafana", "plugins", "query", "caching"]
-title = "Query caching"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/query-caching/
+description: Grafana Enterprise data source query caching
+keywords:
+  - grafana
+  - plugins
+  - query
+  - caching
+title: Query caching
+weight: 300
+---
 
 # Query caching
 
diff --git a/docs/sources/enterprise/recorded-queries.md b/docs/sources/enterprise/recorded-queries.md
index 5a178de76d1..599e1c1255b 100644
--- a/docs/sources/enterprise/recorded-queries.md
+++ b/docs/sources/enterprise/recorded-queries.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/recorded-queries/"]
-description = "Grafana Enterprise recorded queries"
-keywords = ["grafana", "query", "queries", "recorded"]
-title = "Recorded queries"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/recorded-queries/
+description: Grafana Enterprise recorded queries
+keywords:
+  - grafana
+  - query
+  - queries
+  - recorded
+title: Recorded queries
+weight: 300
+---
 
 # Recorded queries
 
diff --git a/docs/sources/enterprise/reporting.md b/docs/sources/enterprise/reporting.md
index ed6fbe2b745..9bb0c6de6cd 100644
--- a/docs/sources/enterprise/reporting.md
+++ b/docs/sources/enterprise/reporting.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/reports/", "/docs/grafana/latest/enterprise/reporting/"]
-description = ""
-keywords = ["grafana", "reporting"]
-title = "Reporting"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/reports/
+  - /docs/grafana/latest/enterprise/reporting/
+description: ''
+keywords:
+  - grafana
+  - reporting
+title: Reporting
+weight: 800
+---
 
 # Reporting
 
diff --git a/docs/sources/enterprise/request-security.md b/docs/sources/enterprise/request-security.md
index ccf6a4d3acc..d02ded36429 100644
--- a/docs/sources/enterprise/request-security.md
+++ b/docs/sources/enterprise/request-security.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/request-security/"]
-description = "Grafana Enterprise request security"
-keywords = ["grafana", "security", "enterprise"]
-title = "Request security"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/request-security/
+description: Grafana Enterprise request security
+keywords:
+  - grafana
+  - security
+  - enterprise
+title: Request security
+weight: 400
+---
 
 # Request security
 
diff --git a/docs/sources/enterprise/settings-updates.md b/docs/sources/enterprise/settings-updates.md
index d192920b1a8..a33c6c573a5 100644
--- a/docs/sources/enterprise/settings-updates.md
+++ b/docs/sources/enterprise/settings-updates.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/settings-updates/"]
-description = "Settings updates at runtime"
-keywords = ["grafana", "runtime", "settings"]
-title = "Settings updates at runtime"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/settings-updates/
+description: Settings updates at runtime
+keywords:
+  - grafana
+  - runtime
+  - settings
+title: Settings updates at runtime
+weight: 500
+---
 
 # Settings updates at runtime
 
diff --git a/docs/sources/enterprise/team-sync.md b/docs/sources/enterprise/team-sync.md
index 708cce1470e..21d63ede58c 100644
--- a/docs/sources/enterprise/team-sync.md
+++ b/docs/sources/enterprise/team-sync.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/auth/saml/", "/docs/grafana/latest/enterprise/team-sync/"]
-description = "Grafana Team Sync"
-keywords = ["grafana", "auth", "documentation"]
-title = "Team sync"
-weight = 1000
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/saml/
+  - /docs/grafana/latest/enterprise/team-sync/
+description: Grafana Team Sync
+keywords:
+  - grafana
+  - auth
+  - documentation
+title: Team sync
+weight: 1000
+---
 
 # Team sync
 
diff --git a/docs/sources/enterprise/usage-insights/_index.md b/docs/sources/enterprise/usage-insights/_index.md
index 9e2885baa24..608689eef55 100644
--- a/docs/sources/enterprise/usage-insights/_index.md
+++ b/docs/sources/enterprise/usage-insights/_index.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/usage-insights/"]
-description = "Understand how your Grafana instance is used"
-keywords = ["grafana", "usage-insights", "enterprise"]
-title = "Usage insights"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/usage-insights/
+description: Understand how your Grafana instance is used
+keywords:
+  - grafana
+  - usage-insights
+  - enterprise
+title: Usage insights
+weight: 200
+---
 
 # Usage insights
 
diff --git a/docs/sources/enterprise/usage-insights/dashboard-datasource-insights.md b/docs/sources/enterprise/usage-insights/dashboard-datasource-insights.md
index ab18ad807dc..e284d0a016b 100644
--- a/docs/sources/enterprise/usage-insights/dashboard-datasource-insights.md
+++ b/docs/sources/enterprise/usage-insights/dashboard-datasource-insights.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/usage-insights/dashboard-datasource-insights/"]
-description = "Understand how your dashboards and data sources are used"
-keywords = ["grafana", "usage-insights", "enterprise"]
-title = "Dashboard and data source insights"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/usage-insights/dashboard-datasource-insights/
+description: Understand how your dashboards and data sources are used
+keywords:
+  - grafana
+  - usage-insights
+  - enterprise
+title: Dashboard and data source insights
+weight: 200
+---
 
 # Dashboard and data source insights
 
diff --git a/docs/sources/enterprise/usage-insights/export-logs.md b/docs/sources/enterprise/usage-insights/export-logs.md
index 53ad13afc47..dcd7cef2316 100644
--- a/docs/sources/enterprise/usage-insights/export-logs.md
+++ b/docs/sources/enterprise/usage-insights/export-logs.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/usage-insights/export-logs/"]
-description = "Export logs of usage insights"
-keywords = ["grafana", "export", "usage-insights", "enterprise"]
-title = "Export logs of usage insights"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/usage-insights/export-logs/
+description: Export logs of usage insights
+keywords:
+  - grafana
+  - export
+  - usage-insights
+  - enterprise
+title: Export logs of usage insights
+weight: 500
+---
 
 # Export logs of usage insights
 
diff --git a/docs/sources/enterprise/usage-insights/improved-search.md b/docs/sources/enterprise/usage-insights/improved-search.md
index 399e9ec0cb6..14b873be8c7 100644
--- a/docs/sources/enterprise/usage-insights/improved-search.md
+++ b/docs/sources/enterprise/usage-insights/improved-search.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/usage-insights/improved-search/"]
-description = "Sort dashboards by using insights data"
-keywords = ["grafana", "search", "sort", "enterprise"]
-title = "Sort dashboards by using insights data"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/usage-insights/improved-search/
+description: Sort dashboards by using insights data
+keywords:
+  - grafana
+  - search
+  - sort
+  - enterprise
+title: Sort dashboards by using insights data
+weight: 400
+---
 
 # Sort dashboards by using insights data
 
diff --git a/docs/sources/enterprise/usage-insights/presence-indicator.md b/docs/sources/enterprise/usage-insights/presence-indicator.md
index 44e1603a65e..a84f0245839 100644
--- a/docs/sources/enterprise/usage-insights/presence-indicator.md
+++ b/docs/sources/enterprise/usage-insights/presence-indicator.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/usage-insights/presence-indicator/"]
-description = "Know who is looking at the same dashboard as you are"
-keywords = ["grafana", "presence-indicator", "enterprise"]
-title = "Presence indicator"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/usage-insights/presence-indicator/
+description: Know who is looking at the same dashboard as you are
+keywords:
+  - grafana
+  - presence-indicator
+  - enterprise
+title: Presence indicator
+weight: 300
+---
 
 # Presence indicator
 
diff --git a/docs/sources/enterprise/vault.md b/docs/sources/enterprise/vault.md
index 49e86a76e44..de6a7574096 100644
--- a/docs/sources/enterprise/vault.md
+++ b/docs/sources/enterprise/vault.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/vault/"]
-description = ""
-keywords = ["grafana", "vault", "configuration"]
-title = "Vault"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/vault/
+description: ''
+keywords:
+  - grafana
+  - vault
+  - configuration
+title: Vault
+weight: 1200
+---
 
 # Vault integration
 
diff --git a/docs/sources/enterprise/white-labeling.md b/docs/sources/enterprise/white-labeling.md
index 1eac3352f51..61620ab30f9 100644
--- a/docs/sources/enterprise/white-labeling.md
+++ b/docs/sources/enterprise/white-labeling.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/enterprise/white-labeling/"]
-description = "Change the look of Grafana to match your corporate brand"
-keywords = ["grafana", "white-labeling", "enterprise"]
-title = "White labeling"
-weight = 1300
-+++
+---
+aliases:
+  - /docs/grafana/latest/enterprise/white-labeling/
+description: Change the look of Grafana to match your corporate brand
+keywords:
+  - grafana
+  - white-labeling
+  - enterprise
+title: White labeling
+weight: 1300
+---
 
 # White labeling
 
diff --git a/docs/sources/explore/_index.md b/docs/sources/explore/_index.md
index 80270c3defa..2fe14d8ba69 100644
--- a/docs/sources/explore/_index.md
+++ b/docs/sources/explore/_index.md
@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/explore/", "/docs/grafana/latest/features/explore/"]
-keywords = ["explore", "loki", "logs"]
-title = "Explore"
-weight = 90
-+++
+---
+aliases:
+  - /docs/grafana/latest/explore/
+  - /docs/grafana/latest/features/explore/
+keywords:
+  - explore
+  - loki
+  - logs
+title: Explore
+weight: 90
+---
 
 # Explore
 
diff --git a/docs/sources/explore/explore-inspector.md b/docs/sources/explore/explore-inspector.md
index 52a06c0cd12..2a19daab3e6 100644
--- a/docs/sources/explore/explore-inspector.md
+++ b/docs/sources/explore/explore-inspector.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/explore/explore-inspector/"]
-title = "Inspector in Explore"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/explore/explore-inspector/
+title: Inspector in Explore
+weight: 400
+---
 
 # Inspector in Explore
 
diff --git a/docs/sources/explore/logs-integration.md b/docs/sources/explore/logs-integration.md
index ee7983b0ca4..6b40d8c10bd 100644
--- a/docs/sources/explore/logs-integration.md
+++ b/docs/sources/explore/logs-integration.md
@@ -1,10 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/explore/logs-integration/"]
-description = "Logs in Explore"
-keywords = ["explore", "logs"]
-title = "Logs in Explore"
-weight = 15
-+++
+---
+aliases:
+  - /docs/grafana/latest/explore/logs-integration/
+description: Logs in Explore
+keywords:
+  - explore
+  - logs
+title: Logs in Explore
+weight: 15
+---
 
 # Logs in Explore
 
diff --git a/docs/sources/explore/query-management.md b/docs/sources/explore/query-management.md
index 9cbb1492d0b..c7d454c214b 100644
--- a/docs/sources/explore/query-management.md
+++ b/docs/sources/explore/query-management.md
@@ -1,9 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/explore/query-management/"]
-keywords = ["explore", "loki", "logs"]
-title = "Query management"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/explore/query-management/
+keywords:
+  - explore
+  - loki
+  - logs
+title: Query management
+weight: 10
+---
 
 # Query management in Explore
 
diff --git a/docs/sources/explore/trace-integration.md b/docs/sources/explore/trace-integration.md
index ba513ea69a3..e6ff9207274 100644
--- a/docs/sources/explore/trace-integration.md
+++ b/docs/sources/explore/trace-integration.md
@@ -1,10 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/explore/trace-integration/"]
-description = "Tracing in Explore"
-keywords = ["explore", "trace"]
-title = "Tracing in Explore"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/explore/trace-integration/
+description: Tracing in Explore
+keywords:
+  - explore
+  - trace
+title: Tracing in Explore
+weight: 20
+---
 
 # Tracing in Explore
 
diff --git a/docs/sources/getting-started/_index.md b/docs/sources/getting-started/_index.md
index 96fd0c3e151..383ca9aeac2 100644
--- a/docs/sources/getting-started/_index.md
+++ b/docs/sources/getting-started/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/getting-started/", "/docs/grafana/latest/guides/what-is-grafana/"]
-title = "Getting started"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/getting-started/
+  - /docs/grafana/latest/guides/what-is-grafana/
+title: Getting started
+weight: 10
+---
 
 # Getting started
 
diff --git a/docs/sources/getting-started/getting-started-influxdb.md b/docs/sources/getting-started/getting-started-influxdb.md
index d4e12b29981..64dc85fa0ee 100644
--- a/docs/sources/getting-started/getting-started-influxdb.md
+++ b/docs/sources/getting-started/getting-started-influxdb.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/getting-started/getting-started-influxdb/"]
-description = "Guide for getting started with Grafana and InfluxDB"
-keywords = ["grafana", "intro", "guide", "started"]
-title = "With Grafana and InfluxDB"
-weight = 250
-+++
+---
+aliases:
+  - /docs/grafana/latest/getting-started/getting-started-influxdb/
+description: Guide for getting started with Grafana and InfluxDB
+keywords:
+  - grafana
+  - intro
+  - guide
+  - started
+title: With Grafana and InfluxDB
+weight: 250
+---
 
 # Getting started with Grafana and InfluxDB
 
diff --git a/docs/sources/getting-started/getting-started-prometheus.md b/docs/sources/getting-started/getting-started-prometheus.md
index fa8b93374bf..5158f5f9ae3 100644
--- a/docs/sources/getting-started/getting-started-prometheus.md
+++ b/docs/sources/getting-started/getting-started-prometheus.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/getting-started/getting-started-prometheus/", "/docs/grafana/latest/guides/getting_started/", "/docs/grafana/latest/guides/gettingstarted/"]
-description = "Guide for getting started with Grafana and Prometheus"
-keywords = ["grafana", "intro", "guide", "started"]
-title = "With Grafana and Prometheus"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/getting-started/getting-started-prometheus/
+  - /docs/grafana/latest/guides/getting_started/
+  - /docs/grafana/latest/guides/gettingstarted/
+description: Guide for getting started with Grafana and Prometheus
+keywords:
+  - grafana
+  - intro
+  - guide
+  - started
+title: With Grafana and Prometheus
+weight: 300
+---
 
 # Getting started with Grafana and Prometheus
 
diff --git a/docs/sources/getting-started/getting-started-sql.md b/docs/sources/getting-started/getting-started-sql.md
index a3892ab4d68..cdb587fe257 100644
--- a/docs/sources/getting-started/getting-started-sql.md
+++ b/docs/sources/getting-started/getting-started-sql.md
@@ -1,10 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/getting-started/getting-started-sql/", "/docs/grafana/latest/guides/getting_started/", "/docs/grafana/latest/guides/gettingstarted/"]
-description = "Guide for getting started with Grafana and MS SQL Server"
-draft = true
-keywords = ["grafana", "intro", "guide", "started", "SQL", "MSSQL"]
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/getting-started/getting-started-sql/
+  - /docs/grafana/latest/guides/getting_started/
+  - /docs/grafana/latest/guides/gettingstarted/
+description: Guide for getting started with Grafana and MS SQL Server
+draft: true
+keywords:
+  - grafana
+  - intro
+  - guide
+  - started
+  - SQL
+  - MSSQL
+weight: 400
+---
 
 # Getting started with Grafana and MS SQL Server
 
diff --git a/docs/sources/getting-started/getting-started.md b/docs/sources/getting-started/getting-started.md
index 71790400e99..860e47699e0 100644
--- a/docs/sources/getting-started/getting-started.md
+++ b/docs/sources/getting-started/getting-started.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/getting-started/getting-started/", "/docs/grafana/latest/guides/getting_started/", "/docs/grafana/latest/guides/gettingstarted/"]
-description = "Guide for getting started with Grafana"
-keywords = ["grafana", "intro", "guide", "started"]
-title = "With Grafana"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/getting-started/getting-started/
+  - /docs/grafana/latest/guides/getting_started/
+  - /docs/grafana/latest/guides/gettingstarted/
+description: Guide for getting started with Grafana
+keywords:
+  - grafana
+  - intro
+  - guide
+  - started
+title: With Grafana
+weight: 200
+---
 
 # Getting started with Grafana
 
diff --git a/docs/sources/image-rendering/_index.md b/docs/sources/image-rendering/_index.md
index 5c3103d5863..4b293b79495 100644
--- a/docs/sources/image-rendering/_index.md
+++ b/docs/sources/image-rendering/_index.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/image_rendering/", "/docs/grafana/latest/image-rendering/"]
-description = "Image rendering"
-keywords = ["grafana", "image", "rendering", "plugin"]
-title = "Image rendering"
-weight = 55
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/image_rendering/
+  - /docs/grafana/latest/image-rendering/
+description: Image rendering
+keywords:
+  - grafana
+  - image
+  - rendering
+  - plugin
+title: Image rendering
+weight: 55
+---
 
 # Image rendering
 
diff --git a/docs/sources/image-rendering/monitoring.md b/docs/sources/image-rendering/monitoring.md
index 3a65683fdd9..33c1331d95a 100644
--- a/docs/sources/image-rendering/monitoring.md
+++ b/docs/sources/image-rendering/monitoring.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/image-rendering/monitoring/"]
-description = "Image rendering monitoring"
-keywords = ["grafana", "image", "rendering", "plugin", "monitoring"]
-title = "Monitoring the image renderer"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/image-rendering/monitoring/
+description: Image rendering monitoring
+keywords:
+  - grafana
+  - image
+  - rendering
+  - plugin
+  - monitoring
+title: Monitoring the image renderer
+weight: 100
+---
 
 # Monitoring the image renderer
 
diff --git a/docs/sources/image-rendering/troubleshooting.md b/docs/sources/image-rendering/troubleshooting.md
index f339d366334..d8f272892ee 100644
--- a/docs/sources/image-rendering/troubleshooting.md
+++ b/docs/sources/image-rendering/troubleshooting.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/image-rendering/troubleshooting/"]
-description = "Image rendering troubleshooting"
-keywords = ["grafana", "image", "rendering", "plugin", "troubleshooting"]
-title = "Troubleshooting"
-weight = 115
-+++
+---
+aliases:
+  - /docs/grafana/latest/image-rendering/troubleshooting/
+description: Image rendering troubleshooting
+keywords:
+  - grafana
+  - image
+  - rendering
+  - plugin
+  - troubleshooting
+title: Troubleshooting
+weight: 115
+---
 
 # Troubleshoot image rendering
 
diff --git a/docs/sources/installation/_index.md b/docs/sources/installation/_index.md
index 508bc51d683..b5b3714c7c2 100644
--- a/docs/sources/installation/_index.md
+++ b/docs/sources/installation/_index.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/install/", "/docs/grafana/latest/installation/", "/docs/grafana/latest/installation/installation/", "/docs/grafana/v2.1/installation/install/"]
-description = "Installation guide for Grafana"
-keywords = ["grafana", "installation", "documentation"]
-title = "Installation"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/install/
+  - /docs/grafana/latest/installation/
+  - /docs/grafana/latest/installation/installation/
+  - /docs/grafana/v2.1/installation/install/
+description: Installation guide for Grafana
+keywords:
+  - grafana
+  - installation
+  - documentation
+title: Installation
+weight: 30
+---
 
 # Install Grafana
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 4a326be3a73..8fbd4b0b8a1 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/installation/debian/", "/docs/grafana/latest/installation/installation/debian/"]
-description = "Install guide for Grafana on Debian or Ubuntu"
-keywords = ["grafana", "installation", "documentation"]
-title = "Install on Debian/Ubuntu"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/debian/
+  - /docs/grafana/latest/installation/installation/debian/
+description: Install guide for Grafana on Debian or Ubuntu
+keywords:
+  - grafana
+  - installation
+  - documentation
+title: Install on Debian/Ubuntu
+weight: 200
+---
 
 # Install on Debian or Ubuntu
 
diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md
index bedf5671416..bd1f8e72cf8 100644
--- a/docs/sources/installation/docker.md
+++ b/docs/sources/installation/docker.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/installation/docker/"]
-description = "Guide for running Grafana using Docker"
-keywords = ["grafana", "configuration", "documentation", "docker"]
-title = "Run Grafana Docker image"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/docker/
+description: Guide for running Grafana using Docker
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - docker
+title: Run Grafana Docker image
+weight: 600
+---
 
 # Run Grafana Docker image
 
diff --git a/docs/sources/installation/kubernetes.md b/docs/sources/installation/kubernetes.md
index e1889eec737..aa47fbf0c57 100644
--- a/docs/sources/installation/kubernetes.md
+++ b/docs/sources/installation/kubernetes.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/installation/kubernetes/"]
-description = "Guide for deploying Grafana on Kubernetes"
-keywords = ["grafana", "configuration", "documentation", "kubernetes"]
-title = "Deploy Grafana on Kubernetes"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/kubernetes/
+description: Guide for deploying Grafana on Kubernetes
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - kubernetes
+title: Deploy Grafana on Kubernetes
+weight: 700
+---
 
 ## Deploy Grafana on Kubernetes
 
diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md
index 12c0536d136..b766c18c6da 100644
--- a/docs/sources/installation/mac.md
+++ b/docs/sources/installation/mac.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/installation/mac/"]
-description = "Installing Grafana on macOS"
-keywords = ["grafana", "configuration", "documentation", "mac", "homebrew", "osx"]
-title = "Install on macOS"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/mac/
+description: Installing Grafana on macOS
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - mac
+  - homebrew
+  - osx
+title: Install on macOS
+weight: 500
+---
 
 # Install on macOS
 
diff --git a/docs/sources/installation/requirements.md b/docs/sources/installation/requirements.md
index b6e64b9c6e5..3939f5f7f88 100644
--- a/docs/sources/installation/requirements.md
+++ b/docs/sources/installation/requirements.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/installation/requirements/"]
-description = "Requirements for Grafana"
-keywords = ["grafana", "installation", "documentation"]
-title = "Requirements"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/requirements/
+description: Requirements for Grafana
+keywords:
+  - grafana
+  - installation
+  - documentation
+title: Requirements
+weight: 100
+---
 
 # Grafana requirements
 
diff --git a/docs/sources/installation/restart-grafana.md b/docs/sources/installation/restart-grafana.md
index 93f337559e3..08366246b33 100644
--- a/docs/sources/installation/restart-grafana.md
+++ b/docs/sources/installation/restart-grafana.md
@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/installation/restart-grafana/"]
-description = "Instructions for restarting Grafana"
-keywords = ["grafana", "restart", "documentation"]
-title = "Restart Grafana"
-weight = 750
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/restart-grafana/
+description: Instructions for restarting Grafana
+keywords:
+  - grafana
+  - restart
+  - documentation
+title: Restart Grafana
+weight: 750
+---
 
 # Restart Grafana
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 5a159abb3ef..4e09a724adf 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/installation/installation/rpm/", "/docs/grafana/latest/installation/rpm/"]
-description = "Grafana Installation guide for RPM-based Linux, such as Centos, Fedora, OpenSuse, and Red Hat."
-keywords = ["grafana", "installation", "documentation", "centos", "fedora", "opensuse", "redhat"]
-title = "Install on RPM-based Linux"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/installation/rpm/
+  - /docs/grafana/latest/installation/rpm/
+description: Grafana Installation guide for RPM-based Linux, such as Centos, Fedora,
+  OpenSuse, and Red Hat.
+keywords:
+  - grafana
+  - installation
+  - documentation
+  - centos
+  - fedora
+  - opensuse
+  - redhat
+title: Install on RPM-based Linux
+weight: 300
+---
 
 # Install on RPM-based Linux (CentOS, Fedora, OpenSuse, Red Hat)
 
diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md
index fb0d2dc4aa5..edf6136c704 100644
--- a/docs/sources/installation/upgrading.md
+++ b/docs/sources/installation/upgrading.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/installation/upgrading/"]
-description = "Guide for upgrading Grafana"
-keywords = ["grafana", "configuration", "documentation", "upgrade"]
-title = "Upgrade Grafana"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/upgrading/
+description: Guide for upgrading Grafana
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+title: Upgrade Grafana
+weight: 700
+---
 
 # Upgrade Grafana
 
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index b3cea37beae..5d0ec6d47dd 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/installation/windows/"]
-description = "Install Grafana on Windows"
-keywords = ["grafana", "configuration", "documentation", "windows"]
-title = "Install on Windows"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/installation/windows/
+description: Install Grafana on Windows
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - windows
+title: Install on Windows
+weight: 400
+---
 
 # Install on Windows
 
diff --git a/docs/sources/introduction/_index.md b/docs/sources/introduction/_index.md
index cb0d76e9ae9..510b142b772 100644
--- a/docs/sources/introduction/_index.md
+++ b/docs/sources/introduction/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/guides/what-is-grafana/", "/docs/grafana/latest/introduction/"]
-title = "Introduction to Grafana"
-weight = 5
-+++
+---
+aliases:
+  - /docs/grafana/latest/guides/what-is-grafana/
+  - /docs/grafana/latest/introduction/
+title: Introduction to Grafana
+weight: 5
+---
 
 # Introduction to Grafana
 
diff --git a/docs/sources/introduction/oss-details.md b/docs/sources/introduction/oss-details.md
index d00befee8d7..cd4452e388b 100644
--- a/docs/sources/introduction/oss-details.md
+++ b/docs/sources/introduction/oss-details.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/guides/what-is-grafana/", "/docs/grafana/latest/introduction/oss-details/"]
-title = "What is Grafana OSS"
-weight = 5
-+++
+---
+aliases:
+  - /docs/grafana/latest/guides/what-is-grafana/
+  - /docs/grafana/latest/introduction/oss-details/
+title: What is Grafana OSS
+weight: 5
+---
 
 # What is Grafana OSS
 
diff --git a/docs/sources/linking/_index.md b/docs/sources/linking/_index.md
index 8bfd10751e2..ca0cd9bca0c 100644
--- a/docs/sources/linking/_index.md
+++ b/docs/sources/linking/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/linking/"]
-title = "Linking"
-weight = 120
-+++
+---
+aliases:
+  - /docs/grafana/latest/linking/
+title: Linking
+weight: 120
+---
 
 # Linking overview
 
diff --git a/docs/sources/linking/dashboard-links.md b/docs/sources/linking/dashboard-links.md
index 7e494d9cbee..09c64200adb 100644
--- a/docs/sources/linking/dashboard-links.md
+++ b/docs/sources/linking/dashboard-links.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/linking/dashboard-links/"]
-description = ""
-keywords = ["grafana", "linking", "create links", "link dashboards", "navigate"]
-title = "Dashboard links"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/linking/dashboard-links/
+description: ''
+keywords:
+  - grafana
+  - linking
+  - create links
+  - link dashboards
+  - navigate
+title: Dashboard links
+weight: 200
+---
 
 # Dashboard links
 
diff --git a/docs/sources/linking/data-link-variables.md b/docs/sources/linking/data-link-variables.md
index 41b09cfe6eb..ee776cf2f38 100644
--- a/docs/sources/linking/data-link-variables.md
+++ b/docs/sources/linking/data-link-variables.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/linking/data-link-variables/", "/docs/grafana/latest/variables/url-variables/", "/docs/grafana/latest/variables/variable-types/url-variables/"]
-keywords = ["grafana", "url variables", "documentation", "variables", "data link"]
-title = "URL variables"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/linking/data-link-variables/
+  - /docs/grafana/latest/variables/url-variables/
+  - /docs/grafana/latest/variables/variable-types/url-variables/
+keywords:
+  - grafana
+  - url variables
+  - documentation
+  - variables
+  - data link
+title: URL variables
+weight: 400
+---
 
 # Data link variables
 
diff --git a/docs/sources/linking/data-links.md b/docs/sources/linking/data-links.md
index 5821fe01e5a..6d4743904ba 100644
--- a/docs/sources/linking/data-links.md
+++ b/docs/sources/linking/data-links.md
@@ -1,8 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/linking/data-links/", "/docs/grafana/latest/reference/datalinks/"]
-keywords = ["grafana", "data links", "documentation", "playlist"]
-title = "Data links"
-+++
+---
+aliases:
+  - /docs/grafana/latest/linking/data-links/
+  - /docs/grafana/latest/reference/datalinks/
+keywords:
+  - grafana
+  - data links
+  - documentation
+  - playlist
+title: Data links
+---
 
 # Data links
 
diff --git a/docs/sources/linking/linking-overview.md b/docs/sources/linking/linking-overview.md
index c0686aa98ac..ee71c614aff 100644
--- a/docs/sources/linking/linking-overview.md
+++ b/docs/sources/linking/linking-overview.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/features/navigation-links/", "/docs/grafana/latest/linking/linking-overview/"]
-keywords = ["grafana", "linking", "create links", "link panels", "link dashboards", "navigate"]
-title = "Linking overview"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/navigation-links/
+  - /docs/grafana/latest/linking/linking-overview/
+keywords:
+  - grafana
+  - linking
+  - create links
+  - link panels
+  - link dashboards
+  - navigate
+title: Linking overview
+weight: 100
+---
 
 # Linking overview
 
diff --git a/docs/sources/linking/panel-links.md b/docs/sources/linking/panel-links.md
index a0b93640130..e8db8824661 100644
--- a/docs/sources/linking/panel-links.md
+++ b/docs/sources/linking/panel-links.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/navigation-links/", "/docs/grafana/latest/linking/panel-links/"]
-description = ""
-keywords = ["grafana", "linking", "create links", "link panels", "link dashboards", "navigate"]
-title = "Panel links"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/navigation-links/
+  - /docs/grafana/latest/linking/panel-links/
+description: ''
+keywords:
+  - grafana
+  - linking
+  - create links
+  - link panels
+  - link dashboards
+  - navigate
+title: Panel links
+weight: 300
+---
 
 # Panel links
 
diff --git a/docs/sources/live/set-up-grafana-live.md b/docs/sources/live/set-up-grafana-live.md
index cffa2a5b8d6..357ba666279 100644
--- a/docs/sources/live/set-up-grafana-live.md
+++ b/docs/sources/live/set-up-grafana-live.md
@@ -1,16 +1,15 @@
 ---
-title: 'Set up Grafana Live'
-menuTitle: 'Set up Grafana Live'
-description: 'Grafana Live is a real-time messaging engine that pushes event data to a frontend when an event occurs.'
 aliases:
-  [
-    '/docs/grafana/latest/live/live-feature-overview/',
-    '/docs/grafana/latest/live/',
-    '/docs/grafana/latest/live/configure-grafana-live/',
-    '/docs/grafana/latest/live/live-channel/',
-    '/docs/grafana/latest/live/live-ha-setup/',
-    '/docs/grafana/latest/live/set-up-grafana-live/',
-  ]
+  - /docs/grafana/latest/live/live-feature-overview/
+  - /docs/grafana/latest/live/
+  - /docs/grafana/latest/live/configure-grafana-live/
+  - /docs/grafana/latest/live/live-channel/
+  - /docs/grafana/latest/live/live-ha-setup/
+  - /docs/grafana/latest/live/set-up-grafana-live/
+description: Grafana Live is a real-time messaging engine that pushes event data to
+  a frontend when an event occurs.
+menuTitle: Set up Grafana Live
+title: Set up Grafana Live
 weight: 115
 ---
 
diff --git a/docs/sources/old-alerting/_index.md b/docs/sources/old-alerting/_index.md
index 262b7adbb08..80cd70e4791 100644
--- a/docs/sources/old-alerting/_index.md
+++ b/docs/sources/old-alerting/_index.md
@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/old-alerting/"]
-draft = true
-title = "Legacy Grafana Alerts"
-weight = 114
-+++
+---
+aliases:
+  - /docs/grafana/latest/old-alerting/
+draft: true
+title: Legacy Grafana Alerts
+weight: 114
+---
 
 # Legacy Grafana alerts
 
diff --git a/docs/sources/old-alerting/add-notification-template.md b/docs/sources/old-alerting/add-notification-template.md
index cad18d63dc7..fdbf5369096 100644
--- a/docs/sources/old-alerting/add-notification-template.md
+++ b/docs/sources/old-alerting/add-notification-template.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/add-notification-template/", "/docs/grafana/latest/old-alerting/add-notification-template/"]
-draft = true
-keywords = ["grafana", "documentation", "alerting", "alerts", "notification", "templating"]
-title = "Alert notification templating"
-weight = 110
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/add-notification-template/
+  - /docs/grafana/latest/old-alerting/add-notification-template/
+draft: true
+keywords:
+  - grafana
+  - documentation
+  - alerting
+  - alerts
+  - notification
+  - templating
+title: Alert notification templating
+weight: 110
+---
 
 # Alert notification templating
 
diff --git a/docs/sources/old-alerting/create-alerts.md b/docs/sources/old-alerting/create-alerts.md
index 55ce84691c8..98f31f734bb 100644
--- a/docs/sources/old-alerting/create-alerts.md
+++ b/docs/sources/old-alerting/create-alerts.md
@@ -1,11 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/create-alerts/", "/docs/grafana/latest/old-alerting/create-alerts/"]
-description = "Configure alert rules"
-draft = true
-keywords = ["grafana", "alerting", "guide", "rules"]
-title = "Create alerts"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/create-alerts/
+  - /docs/grafana/latest/old-alerting/create-alerts/
+description: Configure alert rules
+draft: true
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+title: Create alerts
+weight: 200
+---
 
 # Create alerts
 
diff --git a/docs/sources/old-alerting/notifications.md b/docs/sources/old-alerting/notifications.md
index e2d8e449fd0..cf2e213777b 100644
--- a/docs/sources/old-alerting/notifications.md
+++ b/docs/sources/old-alerting/notifications.md
@@ -1,11 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/notifications/", "/docs/grafana/latest/old-alerting/notifications/"]
-description = "Alerting notifications guide"
-draft = true
-keywords = ["Grafana", "alerting", "guide", "notifications"]
-title = "Alert notifications"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/notifications/
+  - /docs/grafana/latest/old-alerting/notifications/
+description: Alerting notifications guide
+draft: true
+keywords:
+  - Grafana
+  - alerting
+  - guide
+  - notifications
+title: Alert notifications
+weight: 100
+---
 
 # Alert notifications
 
diff --git a/docs/sources/old-alerting/pause-an-alert-rule.md b/docs/sources/old-alerting/pause-an-alert-rule.md
index 76d6e32af9a..db049f98ba5 100644
--- a/docs/sources/old-alerting/pause-an-alert-rule.md
+++ b/docs/sources/old-alerting/pause-an-alert-rule.md
@@ -1,11 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/pause-an-alert-rule/", "/docs/grafana/latest/old-alerting/pause-an-alert-rule/"]
-description = "Pause an existing alert rule"
-draft = true
-keywords = ["grafana", "alerting", "guide", "rules", "view"]
-title = "Pause alert rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/pause-an-alert-rule/
+  - /docs/grafana/latest/old-alerting/pause-an-alert-rule/
+description: Pause an existing alert rule
+draft: true
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - view
+title: Pause alert rule
+weight: 400
+---
 
 # Pause an alert rule
 
diff --git a/docs/sources/old-alerting/troubleshoot-alerts.md b/docs/sources/old-alerting/troubleshoot-alerts.md
index 5aa2c493f3a..719f6aac881 100644
--- a/docs/sources/old-alerting/troubleshoot-alerts.md
+++ b/docs/sources/old-alerting/troubleshoot-alerts.md
@@ -1,11 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/troubleshoot-alerts/", "/docs/grafana/latest/old-alerting/troubleshoot-alerts/"]
-description = "Troubleshoot alert rules"
-draft = true
-keywords = ["grafana", "alerting", "guide", "rules", "troubleshoot"]
-title = "Troubleshoot alerts"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/troubleshoot-alerts/
+  - /docs/grafana/latest/old-alerting/troubleshoot-alerts/
+description: Troubleshoot alert rules
+draft: true
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - troubleshoot
+title: Troubleshoot alerts
+weight: 500
+---
 
 # Troubleshoot alerts
 
diff --git a/docs/sources/old-alerting/view-alerts.md b/docs/sources/old-alerting/view-alerts.md
index 08c12673903..b600402d9c1 100644
--- a/docs/sources/old-alerting/view-alerts.md
+++ b/docs/sources/old-alerting/view-alerts.md
@@ -1,11 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/view-alerts/", "/docs/grafana/latest/old-alerting/view-alerts/"]
-description = "View existing alert rules"
-draft = true
-keywords = ["grafana", "alerting", "guide", "rules", "view"]
-title = "View alerts"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/view-alerts/
+  - /docs/grafana/latest/old-alerting/view-alerts/
+description: View existing alert rules
+draft: true
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - view
+title: View alerts
+weight: 400
+---
 
 # View existing alert rules
 
diff --git a/docs/sources/panels/_index.md b/docs/sources/panels/_index.md
index 33c63d8110f..6ff9bf7d93a 100644
--- a/docs/sources/panels/_index.md
+++ b/docs/sources/panels/_index.md
@@ -1,9 +1,12 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/panels/", "/docs/grafana/latest/panels/", "/docs/sources/panels/"]
-description = "Panels"
-title = "Panels"
-weight = 72
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/panels/
+  - /docs/grafana/latest/panels/
+  - /docs/sources/panels/
+description: Panels
+title: Panels
+weight: 72
+---
 
 # About Grafana panels
 
diff --git a/docs/sources/panels/add-panels-dynamically/_index.md b/docs/sources/panels/add-panels-dynamically/_index.md
index 2b8cab26f66..d7c20e7ce19 100644
--- a/docs/sources/panels/add-panels-dynamically/_index.md
+++ b/docs/sources/panels/add-panels-dynamically/_index.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/panels/add-panels-dynamically/", "/docs/grafana/latest/panels/repeat-panels-or-rows/", "/docs/sources/panels/add-panels-dynamically/"]
-keywords = ["dynamic", "variable", "panel"]
-title = "Enable template variables to add panels dynamically"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/add-panels-dynamically/
+  - /docs/grafana/latest/panels/repeat-panels-or-rows/
+  - /docs/sources/panels/add-panels-dynamically/
+keywords:
+  - dynamic
+  - variable
+  - panel
+title: Enable template variables to add panels dynamically
+weight: 800
+---
 
 # Enable template variables to add panels dynamically
 
diff --git a/docs/sources/panels/add-panels-dynamically/about-repeating-panels-rows.md b/docs/sources/panels/add-panels-dynamically/about-repeating-panels-rows.md
index 42b436c6597..c2f8ff94ca4 100644
--- a/docs/sources/panels/add-panels-dynamically/about-repeating-panels-rows.md
+++ b/docs/sources/panels/add-panels-dynamically/about-repeating-panels-rows.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/add-panels-dynamically/about-repeating-panels-rows/", "/docs/sources/panels/add-panels-dynamically/about-repeating-panels-rows/"]
-title = "About repeating panels or rows"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/add-panels-dynamically/about-repeating-panels-rows/
+  - /docs/sources/panels/add-panels-dynamically/about-repeating-panels-rows/
+title: About repeating panels or rows
+weight: 10
+---
 
 # About repeating panels and rows
 
diff --git a/docs/sources/panels/add-panels-dynamically/configure-repeating-panels.md b/docs/sources/panels/add-panels-dynamically/configure-repeating-panels.md
index 7da31954724..bf326fe56cc 100644
--- a/docs/sources/panels/add-panels-dynamically/configure-repeating-panels.md
+++ b/docs/sources/panels/add-panels-dynamically/configure-repeating-panels.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-panels/", "/docs/sources/panels/add-panels-dynamically/configure-repeating-panels/"]
-title = "Configure repeating panels"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-panels/
+  - /docs/sources/panels/add-panels-dynamically/configure-repeating-panels/
+title: Configure repeating panels
+weight: 20
+---
 
 # Configure repeating panels
 
diff --git a/docs/sources/panels/add-panels-dynamically/configure-repeating-rows.md b/docs/sources/panels/add-panels-dynamically/configure-repeating-rows.md
index f871eafc56d..0032abb5942 100644
--- a/docs/sources/panels/add-panels-dynamically/configure-repeating-rows.md
+++ b/docs/sources/panels/add-panels-dynamically/configure-repeating-rows.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-rows/", "/docs/sources/panels/add-panels-dynamically/configure-repeating-rows/"]
-title = "Configure repeating rows"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-rows/
+  - /docs/sources/panels/add-panels-dynamically/configure-repeating-rows/
+title: Configure repeating rows
+weight: 30
+---
 
 # Configure repeating rows
 
diff --git a/docs/sources/panels/calculation-types.md b/docs/sources/panels/calculation-types.md
index b5dc6102a6d..342c0cc9b1d 100644
--- a/docs/sources/panels/calculation-types.md
+++ b/docs/sources/panels/calculation-types.md
@@ -1,8 +1,12 @@
-+++
-aliases = ["/docs/grafana/latest/panels/calculation-types/", "/docs/grafana/latest/panels/calculations-list/", "/docs/grafana/latest/panels/reference-calculation-types/", "/docs/sources/panels/reference-calculation-types/"]
-title = "Calculation types"
-weight = 1100
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/calculation-types/
+  - /docs/grafana/latest/panels/calculations-list/
+  - /docs/grafana/latest/panels/reference-calculation-types/
+  - /docs/sources/panels/reference-calculation-types/
+title: Calculation types
+weight: 1100
+---
 
 # Reference: Calculation types
 
diff --git a/docs/sources/panels/format-data/_index.md b/docs/sources/panels/format-data/_index.md
index dbd9259c654..aa02d556864 100644
--- a/docs/sources/panels/format-data/_index.md
+++ b/docs/sources/panels/format-data/_index.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/", "/docs/grafana/latest/panels/value-mappings/", "/docs/sources/panels/format-data/"]
-title = "Format data using value mapping"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/
+  - /docs/grafana/latest/panels/value-mappings/
+  - /docs/sources/panels/format-data/
+title: Format data using value mapping
+weight: 600
+---
 
 # Format data using value mapping
 
diff --git a/docs/sources/panels/format-data/about-value-mapping.md b/docs/sources/panels/format-data/about-value-mapping.md
index c25589540e9..b249364e506 100644
--- a/docs/sources/panels/format-data/about-value-mapping.md
+++ b/docs/sources/panels/format-data/about-value-mapping.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/about-value-mapping/", "/docs/sources/panels/format-data/about-value-mapping/"]
-title = "About value mapping"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/about-value-mapping/
+  - /docs/sources/panels/format-data/about-value-mapping/
+title: About value mapping
+weight: 10
+---
 
 # About value mapping
 
diff --git a/docs/sources/panels/format-data/edit-value-mapping.md b/docs/sources/panels/format-data/edit-value-mapping.md
index 81933c78a9e..e3826a3c288 100644
--- a/docs/sources/panels/format-data/edit-value-mapping.md
+++ b/docs/sources/panels/format-data/edit-value-mapping.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/edit-value-mapping/", "/docs/sources/panels/format-data/edit-value-mapping/"]
-title = "Edit a value mapping"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/edit-value-mapping/
+  - /docs/sources/panels/format-data/edit-value-mapping/
+title: Edit a value mapping
+weight: 60
+---
 
 # Edit a value mapping
 
diff --git a/docs/sources/panels/format-data/map-a-range.md b/docs/sources/panels/format-data/map-a-range.md
index 9db57b69cdd..f660183e40f 100644
--- a/docs/sources/panels/format-data/map-a-range.md
+++ b/docs/sources/panels/format-data/map-a-range.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/map-a-range/", "/docs/sources/panels/format-data/map-a-range/"]
-title = "Map a range"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/map-a-range/
+  - /docs/sources/panels/format-data/map-a-range/
+title: Map a range
+weight: 30
+---
 
 # Map a range
 
diff --git a/docs/sources/panels/format-data/map-a-regular-expression.md b/docs/sources/panels/format-data/map-a-regular-expression.md
index 99da7e9490d..0d3d6426dd8 100644
--- a/docs/sources/panels/format-data/map-a-regular-expression.md
+++ b/docs/sources/panels/format-data/map-a-regular-expression.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/map-a-regular-expression/", "/docs/sources/panels/format-data/map-a-regular-expression/"]
-title = "Map a regular expression"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/map-a-regular-expression/
+  - /docs/sources/panels/format-data/map-a-regular-expression/
+title: Map a regular expression
+weight: 40
+---
 
 # Map a regular expression
 
diff --git a/docs/sources/panels/format-data/map-a-special-value.md b/docs/sources/panels/format-data/map-a-special-value.md
index 9983eb72310..183c91b851f 100644
--- a/docs/sources/panels/format-data/map-a-special-value.md
+++ b/docs/sources/panels/format-data/map-a-special-value.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/map-a-special-value/", "/docs/sources/panels/format-data/map-a-special-value/"]
-title = "Map a special value"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/map-a-special-value/
+  - /docs/sources/panels/format-data/map-a-special-value/
+title: Map a special value
+weight: 50
+---
 
 # Map a special value
 
diff --git a/docs/sources/panels/format-data/map-a-value.md b/docs/sources/panels/format-data/map-a-value.md
index 83c36651c72..8a74b6cc2bd 100644
--- a/docs/sources/panels/format-data/map-a-value.md
+++ b/docs/sources/panels/format-data/map-a-value.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/format-data/map-a-value/", "/docs/sources/panels/format-data/map-a-value/"]
-title = "Map a value"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/format-data/map-a-value/
+  - /docs/sources/panels/format-data/map-a-value/
+title: Map a value
+weight: 20
+---
 
 # Map a value
 
diff --git a/docs/sources/panels/library-panels/_index.md b/docs/sources/panels/library-panels/_index.md
index aebc09f8a32..7e35d457ecf 100644
--- a/docs/sources/panels/library-panels/_index.md
+++ b/docs/sources/panels/library-panels/_index.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/", "/docs/grafana/latest/panels/panel-library/", "/docs/sources/panels/library-panels/"]
-title = "Create reusable Grafana panels"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/
+  - /docs/grafana/latest/panels/panel-library/
+  - /docs/sources/panels/library-panels/
+title: Create reusable Grafana panels
+weight: 700
+---
 
 # Create reusable Grafana panels
 
diff --git a/docs/sources/panels/library-panels/about-library-panels.md b/docs/sources/panels/library-panels/about-library-panels.md
index 1a8f7a2b1dd..5a1bd2c905a 100644
--- a/docs/sources/panels/library-panels/about-library-panels.md
+++ b/docs/sources/panels/library-panels/about-library-panels.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/about-library-panels/", "/docs/sources/panels/library-panels/about-library-panels/"]
-title = "About Grafana library panels"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/about-library-panels/
+  - /docs/sources/panels/library-panels/about-library-panels/
+title: About Grafana library panels
+weight: 10
+---
 
 # About Grafana panel libraries
 
diff --git a/docs/sources/panels/library-panels/add-library-panel.md b/docs/sources/panels/library-panels/add-library-panel.md
index 010d2545050..041a11dbc38 100644
--- a/docs/sources/panels/library-panels/add-library-panel.md
+++ b/docs/sources/panels/library-panels/add-library-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/add-library-panel/", "/docs/sources/panels/library-panels/add-library-panel/"]
-title = "Add a Grafana library panel to a dashboard"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/add-library-panel/
+  - /docs/sources/panels/library-panels/add-library-panel/
+title: Add a Grafana library panel to a dashboard
+weight: 30
+---
 
 # Add a Grafana library panel to a dashboard
 
diff --git a/docs/sources/panels/library-panels/create-library-panel.md b/docs/sources/panels/library-panels/create-library-panel.md
index 92e4cc3c588..9f856d52a9c 100644
--- a/docs/sources/panels/library-panels/create-library-panel.md
+++ b/docs/sources/panels/library-panels/create-library-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/create-library-panel/", "/docs/sources/panels/library-panels/create-library-panel/"]
-title = "Create a Grafana library panel"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/create-library-panel/
+  - /docs/sources/panels/library-panels/create-library-panel/
+title: Create a Grafana library panel
+weight: 20
+---
 
 # Create a Grafana library panel
 
diff --git a/docs/sources/panels/library-panels/delete-library-panel.md b/docs/sources/panels/library-panels/delete-library-panel.md
index e8213f53a0f..2d799887449 100644
--- a/docs/sources/panels/library-panels/delete-library-panel.md
+++ b/docs/sources/panels/library-panels/delete-library-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/delete-library-panel/", "/docs/sources/panels/library-panels/delete-library-panel/"]
-title = "Delete a Grafana library panel"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/delete-library-panel/
+  - /docs/sources/panels/library-panels/delete-library-panel/
+title: Delete a Grafana library panel
+weight: 60
+---
 
 # Delete a Grafana library panel
 
diff --git a/docs/sources/panels/library-panels/manage-library-panel.md b/docs/sources/panels/library-panels/manage-library-panel.md
index 6222639f040..08d63f5aee8 100644
--- a/docs/sources/panels/library-panels/manage-library-panel.md
+++ b/docs/sources/panels/library-panels/manage-library-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/manage-library-panel/", "/docs/sources/panels/library-panels/manage-library-panel/"]
-title = "Manage Grafana library panels"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/manage-library-panel/
+  - /docs/sources/panels/library-panels/manage-library-panel/
+title: Manage Grafana library panels
+weight: 40
+---
 
 # Manage Grafana library panels
 
diff --git a/docs/sources/panels/library-panels/unlink-library-panel.md b/docs/sources/panels/library-panels/unlink-library-panel.md
index abd7c44c362..06173090d11 100644
--- a/docs/sources/panels/library-panels/unlink-library-panel.md
+++ b/docs/sources/panels/library-panels/unlink-library-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/library-panels/unlink-library-panel/", "/docs/sources/panels/library-panels/unlink-library-panel/"]
-title = "Unlink a Grafana library panel"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/library-panels/unlink-library-panel/
+  - /docs/sources/panels/library-panels/unlink-library-panel/
+title: Unlink a Grafana library panel
+weight: 50
+---
 
 # Unlink a Grafana library panel
 
diff --git a/docs/sources/panels/override-field-values/_index.md b/docs/sources/panels/override-field-values/_index.md
index 0fd419a7ec6..c4bde5b26a3 100644
--- a/docs/sources/panels/override-field-values/_index.md
+++ b/docs/sources/panels/override-field-values/_index.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/panels/field-overrides/", "/docs/grafana/latest/panels/override-field-values/", "/docs/sources/panels/override-field-values/"]
-title = "Override field values"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/field-overrides/
+  - /docs/grafana/latest/panels/override-field-values/
+  - /docs/sources/panels/override-field-values/
+title: Override field values
+weight: 400
+---
 
 # Override field values
 
diff --git a/docs/sources/panels/override-field-values/about-field-overrides.md b/docs/sources/panels/override-field-values/about-field-overrides.md
index 29fe9da15e1..ba345dd9e9c 100644
--- a/docs/sources/panels/override-field-values/about-field-overrides.md
+++ b/docs/sources/panels/override-field-values/about-field-overrides.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/override-field-values/about-field-overrides/", "/docs/sources/panels/override-field-values/about-field-overrides/"]
-title = "About field overrides"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/override-field-values/about-field-overrides/
+  - /docs/sources/panels/override-field-values/about-field-overrides/
+title: About field overrides
+weight: 10
+---
 
 # About field overrides
 
diff --git a/docs/sources/panels/override-field-values/add-a-field-override.md b/docs/sources/panels/override-field-values/add-a-field-override.md
index 64857fd825f..a1cc7167a70 100644
--- a/docs/sources/panels/override-field-values/add-a-field-override.md
+++ b/docs/sources/panels/override-field-values/add-a-field-override.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/override-field-values/add-a-field-override/", "/docs/sources/panels/override-field-values/add-a-field-override/"]
-title = "Add a field override"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/override-field-values/add-a-field-override/
+  - /docs/sources/panels/override-field-values/add-a-field-override/
+title: Add a field override
+weight: 30
+---
 
 # Add a field override
 
diff --git a/docs/sources/panels/override-field-values/delete-a-field-override.md b/docs/sources/panels/override-field-values/delete-a-field-override.md
index 1e35aea0f31..c214374213a 100644
--- a/docs/sources/panels/override-field-values/delete-a-field-override.md
+++ b/docs/sources/panels/override-field-values/delete-a-field-override.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/override-field-values/delete-a-field-override/", "/docs/sources/panels/override-field-values/delete-a-field-override/"]
-title = "Delete a field override"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/override-field-values/delete-a-field-override/
+  - /docs/sources/panels/override-field-values/delete-a-field-override/
+title: Delete a field override
+weight: 50
+---
 
 # Delete a field override
 
diff --git a/docs/sources/panels/override-field-values/edit-field-override.md b/docs/sources/panels/override-field-values/edit-field-override.md
index bcb380403fe..cecfd3a583f 100644
--- a/docs/sources/panels/override-field-values/edit-field-override.md
+++ b/docs/sources/panels/override-field-values/edit-field-override.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/override-field-values/edit-field-override/", "/docs/sources/panels/override-field-values/edit-field-override/"]
-title = "Edit a field overrides"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/override-field-values/edit-field-override/
+  - /docs/sources/panels/override-field-values/edit-field-override/
+title: Edit a field overrides
+weight: 40
+---
 
 # Edit a field override
 
diff --git a/docs/sources/panels/override-field-values/view-field-override.md b/docs/sources/panels/override-field-values/view-field-override.md
index 70f9ef2a650..d7ecfae17c8 100644
--- a/docs/sources/panels/override-field-values/view-field-override.md
+++ b/docs/sources/panels/override-field-values/view-field-override.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/override-field-values/view-field-override/", "/docs/sources/panels/override-field-values/view-field-override/"]
-title = "View field overrides"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/override-field-values/view-field-override/
+  - /docs/sources/panels/override-field-values/view-field-override/
+title: View field overrides
+weight: 20
+---
 
 # View field overrides
 
diff --git a/docs/sources/panels/query-a-data-source/_index.md b/docs/sources/panels/query-a-data-source/_index.md
index 2fd11529214..40f2b205b7c 100644
--- a/docs/sources/panels/query-a-data-source/_index.md
+++ b/docs/sources/panels/query-a-data-source/_index.md
@@ -1,8 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/panels/expressions/", "/docs/grafana/latest/panels/inspect-panel/", "/docs/grafana/latest/panels/queries/", "/docs/grafana/latest/panels/query-a-data-source/", "/docs/grafana/latest/panels/share-query-results/", "/docs/sources/panels/query-a-data-source/_index/"]
-title = "Query a data source"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/expressions/
+  - /docs/grafana/latest/panels/inspect-panel/
+  - /docs/grafana/latest/panels/queries/
+  - /docs/grafana/latest/panels/query-a-data-source/
+  - /docs/grafana/latest/panels/share-query-results/
+  - /docs/sources/panels/query-a-data-source/_index/
+title: Query a data source
+weight: 200
+---
 
 # Query a data source
 
diff --git a/docs/sources/panels/query-a-data-source/about-queries.md b/docs/sources/panels/query-a-data-source/about-queries.md
index f3dd392bb6f..f59246cbf65 100644
--- a/docs/sources/panels/query-a-data-source/about-queries.md
+++ b/docs/sources/panels/query-a-data-source/about-queries.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/about-queries/", "/docs/sources/panels/query-a-data-source/about-queries/"]
-title = "About queries"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/about-queries/
+  - /docs/sources/panels/query-a-data-source/about-queries/
+title: About queries
+weight: 10
+---
 
 # About queries
 
diff --git a/docs/sources/panels/query-a-data-source/add-a-query.md b/docs/sources/panels/query-a-data-source/add-a-query.md
index e00229cb851..93cc3978279 100644
--- a/docs/sources/panels/query-a-data-source/add-a-query.md
+++ b/docs/sources/panels/query-a-data-source/add-a-query.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/add-a-query/", "/docs/sources/panels/query-a-data-source/add-a-query/"]
-title = "Add a query"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/add-a-query/
+  - /docs/sources/panels/query-a-data-source/add-a-query/
+title: Add a query
+weight: 30
+---
 
 # Add a query
 
diff --git a/docs/sources/panels/query-a-data-source/download-raw-query-results.md b/docs/sources/panels/query-a-data-source/download-raw-query-results.md
index fd43e9ccd18..85d1f5cdad5 100644
--- a/docs/sources/panels/query-a-data-source/download-raw-query-results.md
+++ b/docs/sources/panels/query-a-data-source/download-raw-query-results.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/download-raw-query-results/", "/docs/sources/panels/query-a-data-source/download-raw-query-results/"]
-title = "Download raw query results"
-weight = 70
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/download-raw-query-results/
+  - /docs/sources/panels/query-a-data-source/download-raw-query-results/
+title: Download raw query results
+weight: 70
+---
 
 # Download raw query results
 
diff --git a/docs/sources/panels/query-a-data-source/inspect-query-performance.md b/docs/sources/panels/query-a-data-source/inspect-query-performance.md
index 01d44021484..bfece2faf3d 100644
--- a/docs/sources/panels/query-a-data-source/inspect-query-performance.md
+++ b/docs/sources/panels/query-a-data-source/inspect-query-performance.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/inspect-query-performance/", "/docs/sources/panels/query-a-data-source/inspect-query-performance/"]
-title = "Inspect query performance"
-weight = 80
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/inspect-query-performance/
+  - /docs/sources/panels/query-a-data-source/inspect-query-performance/
+title: Inspect query performance
+weight: 80
+---
 
 # Inspect query performance
 
diff --git a/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md b/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md
index 452a5ea8b99..e542369b186 100644
--- a/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md
+++ b/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/inspect-request-and-response-data/", "/docs/sources/panels/query-a-data-source/inspect-request-and-response-data/"]
-title = "Inspect query request and response data"
-weight = 90
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/inspect-request-and-response-data/
+  - /docs/sources/panels/query-a-data-source/inspect-request-and-response-data/
+title: Inspect query request and response data
+weight: 90
+---
 
 # Inspect query request and response data
 
diff --git a/docs/sources/panels/query-a-data-source/manage-queries.md b/docs/sources/panels/query-a-data-source/manage-queries.md
index 27236ac3729..b87c75bfcde 100644
--- a/docs/sources/panels/query-a-data-source/manage-queries.md
+++ b/docs/sources/panels/query-a-data-source/manage-queries.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/manage-queries/", "/docs/sources/panels/query-a-data-source/manage-queries/"]
-title = "Manage queries"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/manage-queries/
+  - /docs/sources/panels/query-a-data-source/manage-queries/
+title: Manage queries
+weight: 50
+---
 
 # Manage queries
 
diff --git a/docs/sources/panels/query-a-data-source/navigate-query-tab.md b/docs/sources/panels/query-a-data-source/navigate-query-tab.md
index c78303e84fc..d10c1982ace 100644
--- a/docs/sources/panels/query-a-data-source/navigate-query-tab.md
+++ b/docs/sources/panels/query-a-data-source/navigate-query-tab.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/navigate-query-tab/", "/docs/sources/panels/query-a-data-source/navigate-query-tab/"]
-title = "Navigate the query tab"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/navigate-query-tab/
+  - /docs/sources/panels/query-a-data-source/navigate-query-tab/
+title: Navigate the query tab
+weight: 20
+---
 
 # Navigate the query tab
 
diff --git a/docs/sources/panels/query-a-data-source/share-query.md b/docs/sources/panels/query-a-data-source/share-query.md
index a28fbbda4b0..1aee1fae4fd 100644
--- a/docs/sources/panels/query-a-data-source/share-query.md
+++ b/docs/sources/panels/query-a-data-source/share-query.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/share-query/", "/docs/sources/panels/query-a-data-source/share-query/"]
-title = "Share query results with another panel"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/share-query/
+  - /docs/sources/panels/query-a-data-source/share-query/
+title: Share query results with another panel
+weight: 60
+---
 
 # Share query results with another panel
 
diff --git a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md
index 8e93cd06bfa..f8518964015 100644
--- a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md
+++ b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/", "/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/"]
-title = "Use expressions to manipulate data"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/
+  - /docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/
+title: Use expressions to manipulate data
+weight: 40
+---
 
 # Use expressions to manipulate data
 
diff --git a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md
index d3e70d08a26..d7a3e5e8d6a 100644
--- a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md
+++ b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/", "/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/"]
-title = "About expressions"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/
+  - /docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/
+title: About expressions
+weight: 10
+---
 
 # About expressions
 
diff --git a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md
index 784f77d71cd..8cd0bfbbd8c 100644
--- a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md
+++ b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression/", "/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression/"]
-title = "Write an expression"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression/
+  - /docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression/
+title: Write an expression
+weight: 20
+---
 
 # Write an expression
 
diff --git a/docs/sources/panels/query-options.md b/docs/sources/panels/query-options.md
index 8ed869be197..66a22a92465 100644
--- a/docs/sources/panels/query-options.md
+++ b/docs/sources/panels/query-options.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/panels/query-options/", "/docs/grafana/latest/panels/reference-query-options/", "/docs/sources/panels/reference-query-options/"]
-title = "Query options"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/query-options/
+  - /docs/grafana/latest/panels/reference-query-options/
+  - /docs/sources/panels/reference-query-options/
+title: Query options
+weight: 900
+---
 
 # Reference: Query options
 
diff --git a/docs/sources/panels/standard-field-definitions.md b/docs/sources/panels/standard-field-definitions.md
index 312005443f5..34fdd253a7a 100644
--- a/docs/sources/panels/standard-field-definitions.md
+++ b/docs/sources/panels/standard-field-definitions.md
@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/panels/reference-standard-field-definitions/", "/docs/grafana/latest/panels/standard-field-definitions/", "/docs/sources/panels/reference-standard-field-definitions/"]
-title = "Standard field definitions"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/reference-standard-field-definitions/
+  - /docs/grafana/latest/panels/standard-field-definitions/
+  - /docs/sources/panels/reference-standard-field-definitions/
+title: Standard field definitions
+weight: 1200
+---
 
 # Reference: Standard field definitions
 
diff --git a/docs/sources/panels/transform-data/_index.md b/docs/sources/panels/transform-data/_index.md
index 46b1b7d8956..fdd7afdd77f 100644
--- a/docs/sources/panels/transform-data/_index.md
+++ b/docs/sources/panels/transform-data/_index.md
@@ -1,8 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/panels/transform-data/", "/docs/grafana/latest/panels/transformations/", "/docs/grafana/latest/panels/transformations/apply-transformations/", "/docs/grafana/latest/panels/transformations/config-from-query/", "/docs/grafana/latest/panels/transformations/rows-to-fields/", "/docs/sources/panels/transform-data/"]
-title = "Transform data"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/transform-data/
+  - /docs/grafana/latest/panels/transformations/
+  - /docs/grafana/latest/panels/transformations/apply-transformations/
+  - /docs/grafana/latest/panels/transformations/config-from-query/
+  - /docs/grafana/latest/panels/transformations/rows-to-fields/
+  - /docs/sources/panels/transform-data/
+title: Transform data
+weight: 500
+---
 
 # Transform data
 
diff --git a/docs/sources/panels/transform-data/about-transformation.md b/docs/sources/panels/transform-data/about-transformation.md
index ca814f06663..291d841e345 100644
--- a/docs/sources/panels/transform-data/about-transformation.md
+++ b/docs/sources/panels/transform-data/about-transformation.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/transform-data/about-transformation/", "/docs/sources/panels/transform-data/about-transformation/"]
-title = "About transformations"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/transform-data/about-transformation/
+  - /docs/sources/panels/transform-data/about-transformation/
+title: About transformations
+weight: 10
+---
 
 # About transformations
 
diff --git a/docs/sources/panels/transform-data/add-transformation-to-data.md b/docs/sources/panels/transform-data/add-transformation-to-data.md
index f5af584c5eb..a5a1c04979c 100644
--- a/docs/sources/panels/transform-data/add-transformation-to-data.md
+++ b/docs/sources/panels/transform-data/add-transformation-to-data.md
@@ -1,8 +1,12 @@
-+++
-aliases = ["/docs/grafana/latest/panels/transform-data/add-transformation-to-data/", "/docs/grafana/latest/panels/transform-data/apply-transformation-to-data/", "/docs/sources/panels/transform-data/add-transformation-to-data/", "/docs/sources/panels/transform-data/apply-transformation-to-data/"]
-title = "Add a transformation to data"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/transform-data/add-transformation-to-data/
+  - /docs/grafana/latest/panels/transform-data/apply-transformation-to-data/
+  - /docs/sources/panels/transform-data/add-transformation-to-data/
+  - /docs/sources/panels/transform-data/apply-transformation-to-data/
+title: Add a transformation to data
+weight: 20
+---
 
 # Add a transformation function to data
 
diff --git a/docs/sources/panels/transform-data/debug-transformation.md b/docs/sources/panels/transform-data/debug-transformation.md
index 3e0de08ac11..c809580bb46 100644
--- a/docs/sources/panels/transform-data/debug-transformation.md
+++ b/docs/sources/panels/transform-data/debug-transformation.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/transform-data/debug-transformation/", "/docs/sources/panels/transform-data/debug-transformation/"]
-title = "Debug a transformation"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/transform-data/debug-transformation/
+  - /docs/sources/panels/transform-data/debug-transformation/
+title: Debug a transformation
+weight: 30
+---
 
 # Debug a transformation
 
diff --git a/docs/sources/panels/transform-data/delete-transformation.md b/docs/sources/panels/transform-data/delete-transformation.md
index 4543afbeb16..e0819287e0c 100644
--- a/docs/sources/panels/transform-data/delete-transformation.md
+++ b/docs/sources/panels/transform-data/delete-transformation.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/transform-data/delete-transformation/", "/docs/sources/panels/transform-data/delete-transformation/"]
-title = "Delete a transformation"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/transform-data/delete-transformation/
+  - /docs/sources/panels/transform-data/delete-transformation/
+title: Delete a transformation
+weight: 40
+---
 
 # Delete a transformation
 
diff --git a/docs/sources/panels/transform-data/transformation-functions.md b/docs/sources/panels/transform-data/transformation-functions.md
index d11a16a741e..310edb1fc5f 100644
--- a/docs/sources/panels/transform-data/transformation-functions.md
+++ b/docs/sources/panels/transform-data/transformation-functions.md
@@ -1,8 +1,12 @@
-+++
-aliases = ["/docs/grafana/latest/panels/reference-transformation-functions/", "/docs/grafana/latest/panels/transform-data/transformation-functions/", "/docs/grafana/latest/panels/transformations/types-options/", "/docs/sources/panels/reference-transformation-functions/"]
-title = "Transformation functions"
-weight = 1000
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/reference-transformation-functions/
+  - /docs/grafana/latest/panels/transform-data/transformation-functions/
+  - /docs/grafana/latest/panels/transformations/types-options/
+  - /docs/sources/panels/reference-transformation-functions/
+title: Transformation functions
+weight: 1000
+---
 
 # Reference: Transformation functions
 
diff --git a/docs/sources/panels/working-with-panels/_index.md b/docs/sources/panels/working-with-panels/_index.md
index 995003c52d4..858d0521d42 100644
--- a/docs/sources/panels/working-with-panels/_index.md
+++ b/docs/sources/panels/working-with-panels/_index.md
@@ -1,8 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/panels/add-a-panel/", "/docs/grafana/latest/panels/legend-options/", "/docs/grafana/latest/panels/panel-editor/", "/docs/grafana/latest/panels/panel-options/", "/docs/grafana/latest/panels/standard-options/", "/docs/grafana/latest/panels/working-with-panels/", "/docs/sources/panels/working-with-panels/"]
-title = "Working with Grafana panels"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/add-a-panel/
+  - /docs/grafana/latest/panels/legend-options/
+  - /docs/grafana/latest/panels/panel-editor/
+  - /docs/grafana/latest/panels/panel-options/
+  - /docs/grafana/latest/panels/standard-options/
+  - /docs/grafana/latest/panels/working-with-panels/
+  - /docs/sources/panels/working-with-panels/
+title: Working with Grafana panels
+weight: 100
+---
 
 # Working with Grafana panels
 
diff --git a/docs/sources/panels/working-with-panels/add-link-to-panel.md b/docs/sources/panels/working-with-panels/add-link-to-panel.md
index 04d9b24fd52..66da1ea5e4c 100644
--- a/docs/sources/panels/working-with-panels/add-link-to-panel.md
+++ b/docs/sources/panels/working-with-panels/add-link-to-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/add-link-to-panel/", "/docs/sources/panels/working-with-panels/add-link-to-panel/"]
-title = "Add a link to a panel"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/add-link-to-panel/
+  - /docs/sources/panels/working-with-panels/add-link-to-panel/
+title: Add a link to a panel
+weight: 60
+---
 
 # Add a link to a panel
 
diff --git a/docs/sources/panels/working-with-panels/add-panel.md b/docs/sources/panels/working-with-panels/add-panel.md
index 0629dee8fa7..05d80a5c0e0 100644
--- a/docs/sources/panels/working-with-panels/add-panel.md
+++ b/docs/sources/panels/working-with-panels/add-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/add-panel/", "/docs/sources/panels/working-with-panels/add-panel/"]
-title = "Add a panel to a dashboard"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/add-panel/
+  - /docs/sources/panels/working-with-panels/add-panel/
+title: Add a panel to a dashboard
+weight: 20
+---
 
 # Add a panel to a dashboard
 
diff --git a/docs/sources/panels/working-with-panels/add-title-and-description.md b/docs/sources/panels/working-with-panels/add-title-and-description.md
index 39be901b3ab..324e9fd6db4 100644
--- a/docs/sources/panels/working-with-panels/add-title-and-description.md
+++ b/docs/sources/panels/working-with-panels/add-title-and-description.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/add-title-and-description/", "/docs/sources/panels/working-with-panels/add-title-and-description/"]
-title = "Add a title and description to a panel"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/add-title-and-description/
+  - /docs/sources/panels/working-with-panels/add-title-and-description/
+title: Add a title and description to a panel
+weight: 30
+---
 
 # Add a title and description to a panel
 
diff --git a/docs/sources/panels/working-with-panels/apply-color-to-series.md b/docs/sources/panels/working-with-panels/apply-color-to-series.md
index 4e3902b48bc..ea29194c87e 100644
--- a/docs/sources/panels/working-with-panels/apply-color-to-series.md
+++ b/docs/sources/panels/working-with-panels/apply-color-to-series.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/apply-color-to-series/", "/docs/sources/panels/working-with-panels/apply-color-to-series/"]
-title = "Apply color to series and fields"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/apply-color-to-series/
+  - /docs/sources/panels/working-with-panels/apply-color-to-series/
+title: Apply color to series and fields
+weight: 50
+---
 
 # Apply color to series and fields
 
diff --git a/docs/sources/panels/working-with-panels/configure-legend.md b/docs/sources/panels/working-with-panels/configure-legend.md
index 89f119803dc..49e5e7bbd07 100644
--- a/docs/sources/panels/working-with-panels/configure-legend.md
+++ b/docs/sources/panels/working-with-panels/configure-legend.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/configure-legend/", "/docs/sources/panels/working-with-panels/configure-legend/"]
-title = "Configure a legend"
-weight = 70
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/configure-legend/
+  - /docs/sources/panels/working-with-panels/configure-legend/
+title: Configure a legend
+weight: 70
+---
 
 # Configure a legend
 
diff --git a/docs/sources/panels/working-with-panels/download-query-results.md b/docs/sources/panels/working-with-panels/download-query-results.md
index 524a6f3bf84..812d2a181ce 100644
--- a/docs/sources/panels/working-with-panels/download-query-results.md
+++ b/docs/sources/panels/working-with-panels/download-query-results.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/download-query-results/", "/docs/sources/panels/working-with-panels/download-query-results/"]
-title = "Download query results"
-weight = 110
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/download-query-results/
+  - /docs/sources/panels/working-with-panels/download-query-results/
+title: Download query results
+weight: 110
+---
 
 # Download query results
 
diff --git a/docs/sources/panels/working-with-panels/format-standard-fields.md b/docs/sources/panels/working-with-panels/format-standard-fields.md
index 48971fa92a6..0c6c34c1066 100644
--- a/docs/sources/panels/working-with-panels/format-standard-fields.md
+++ b/docs/sources/panels/working-with-panels/format-standard-fields.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/format-standard-fields/", "/docs/sources/panels/working-with-panels/format-standard-fields/"]
-title = "Format a standard field"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/format-standard-fields/
+  - /docs/sources/panels/working-with-panels/format-standard-fields/
+title: Format a standard field
+weight: 40
+---
 
 # Format a standard field
 
diff --git a/docs/sources/panels/working-with-panels/navigate-inspector-panel.md b/docs/sources/panels/working-with-panels/navigate-inspector-panel.md
index 21f50e74fe1..f61c499c1a3 100644
--- a/docs/sources/panels/working-with-panels/navigate-inspector-panel.md
+++ b/docs/sources/panels/working-with-panels/navigate-inspector-panel.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/navigate-inspector-panel/", "/docs/sources/panels/working-with-panels/navigate-inspector-panel/"]
-title = "Navigate the Grafana Inspector panel"
-weight = 90
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/navigate-inspector-panel/
+  - /docs/sources/panels/working-with-panels/navigate-inspector-panel/
+title: Navigate the Grafana Inspector panel
+weight: 90
+---
 
 # Navigate the Grafana Inspector panel
 
diff --git a/docs/sources/panels/working-with-panels/navigate-panel-editor.md b/docs/sources/panels/working-with-panels/navigate-panel-editor.md
index aff5b4f3774..ba89626877e 100644
--- a/docs/sources/panels/working-with-panels/navigate-panel-editor.md
+++ b/docs/sources/panels/working-with-panels/navigate-panel-editor.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/navigate-panel-editor/", "/docs/sources/panels/working-with-panels/navigate-panel-editor/"]
-title = "Navigate the Grafana panel editor"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/navigate-panel-editor/
+  - /docs/sources/panels/working-with-panels/navigate-panel-editor/
+title: Navigate the Grafana panel editor
+weight: 10
+---
 
 # Navigate the Grafana panel editor
 
diff --git a/docs/sources/panels/working-with-panels/organize-dashboard.md b/docs/sources/panels/working-with-panels/organize-dashboard.md
index 02465b252f5..8c615242727 100644
--- a/docs/sources/panels/working-with-panels/organize-dashboard.md
+++ b/docs/sources/panels/working-with-panels/organize-dashboard.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/organize-dashboard/", "/docs/sources/panels/working-with-panels/organize-dashboard/"]
-title = "Organize a dashboard"
-weight = 80
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/organize-dashboard/
+  - /docs/sources/panels/working-with-panels/organize-dashboard/
+title: Organize a dashboard
+weight: 80
+---
 
 # Organize a dashboard
 
diff --git a/docs/sources/panels/working-with-panels/view-json-model.md b/docs/sources/panels/working-with-panels/view-json-model.md
index 8e7afff81a0..a576cff4895 100644
--- a/docs/sources/panels/working-with-panels/view-json-model.md
+++ b/docs/sources/panels/working-with-panels/view-json-model.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/working-with-panels/view-json-model/", "/docs/sources/panels/working-with-panels/view-json-model/"]
-title = "View a panel JSON model"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/view-json-model/
+  - /docs/sources/panels/working-with-panels/view-json-model/
+title: View a panel JSON model
+weight: 100
+---
 
 # View a panel JSON model
 
diff --git a/docs/sources/plugins/_index.md b/docs/sources/plugins/_index.md
index 15f607fdcfb..0566d20224a 100644
--- a/docs/sources/plugins/_index.md
+++ b/docs/sources/plugins/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/plugins/"]
-title = "Plugins"
-weight = 160
-+++
+---
+aliases:
+  - /docs/grafana/latest/plugins/
+title: Plugins
+weight: 160
+---
 
 # Plugins
 
diff --git a/docs/sources/plugins/catalog.md b/docs/sources/plugins/catalog.md
index 231e5eb226a..5df069f0dd0 100644
--- a/docs/sources/plugins/catalog.md
+++ b/docs/sources/plugins/catalog.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/plugins/catalog/"]
-title = "Plugin catalog"
-weight = 1
-+++
+---
+aliases:
+  - /docs/grafana/latest/plugins/catalog/
+title: Plugin catalog
+weight: 1
+---
 
 # Plugin catalog
 
diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md
index 56342b803df..206e35b2b98 100644
--- a/docs/sources/plugins/installation.md
+++ b/docs/sources/plugins/installation.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/plugins/installation/"]
-title = "Install plugins"
-weight = 1
-+++
+---
+aliases:
+  - /docs/grafana/latest/plugins/installation/
+title: Install plugins
+weight: 1
+---
 
 # Install Grafana plugins
 
diff --git a/docs/sources/plugins/plugin-signatures.md b/docs/sources/plugins/plugin-signatures.md
index caa406e8e40..d473d1a3da9 100644
--- a/docs/sources/plugins/plugin-signatures.md
+++ b/docs/sources/plugins/plugin-signatures.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/plugins/plugin-signature-verification/", "/docs/grafana/latest/plugins/plugin-signatures/"]
-title = "Plugin signatures"
-type = "docs"
-+++
+---
+aliases:
+  - /docs/grafana/latest/plugins/plugin-signature-verification/
+  - /docs/grafana/latest/plugins/plugin-signatures/
+title: Plugin signatures
+type: docs
+---
 
 # Plugin signatures
 
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index b773f705a1c..efc34bb3fd5 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/"]
-title = "Release notes"
-weight = 10000
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/
+title: Release notes
+weight: 10000
+---
 
 # Release notes
 
diff --git a/docs/sources/release-notes/release-notes-7-3-0.md b/docs/sources/release-notes/release-notes-7-3-0.md
index 28196a06dfe..fbd41fe243c 100644
--- a/docs/sources/release-notes/release-notes-7-3-0.md
+++ b/docs/sources/release-notes/release-notes-7-3-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-0/"]
-title = "Release notes for Grafana 7.3.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-0/
+title: Release notes for Grafana 7.3.0
+---
 
 <!-- Auto generated do not edit -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-1.md b/docs/sources/release-notes/release-notes-7-3-1.md
index c508591d700..34f059fd314 100644
--- a/docs/sources/release-notes/release-notes-7-3-1.md
+++ b/docs/sources/release-notes/release-notes-7-3-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-1/"]
-title = "Release notes for Grafana 7.3.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-1/
+title: Release notes for Grafana 7.3.1
+---
 
 <!-- Auto generated do not edit -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-10.md b/docs/sources/release-notes/release-notes-7-3-10.md
index 63cb399d80a..2911b5c0711 100644
--- a/docs/sources/release-notes/release-notes-7-3-10.md
+++ b/docs/sources/release-notes/release-notes-7-3-10.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-10/"]
-title = "Release notes for Grafana 7.3.10"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-10/
+title: Release notes for Grafana 7.3.10
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-2.md b/docs/sources/release-notes/release-notes-7-3-2.md
index 5c21b426a92..deac211b8b7 100644
--- a/docs/sources/release-notes/release-notes-7-3-2.md
+++ b/docs/sources/release-notes/release-notes-7-3-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-2/"]
-title = "Release notes for Grafana 7.3.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-2/
+title: Release notes for Grafana 7.3.2
+---
 
 <!-- Auto generated do not edit -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-3.md b/docs/sources/release-notes/release-notes-7-3-3.md
index ef90dbfbdbf..319c5cce5d9 100644
--- a/docs/sources/release-notes/release-notes-7-3-3.md
+++ b/docs/sources/release-notes/release-notes-7-3-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-3/"]
-title = "Release notes for Grafana 7.3.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-3/
+title: Release notes for Grafana 7.3.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-4.md b/docs/sources/release-notes/release-notes-7-3-4.md
index 7fc37b347e2..9201b92898a 100644
--- a/docs/sources/release-notes/release-notes-7-3-4.md
+++ b/docs/sources/release-notes/release-notes-7-3-4.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-4/"]
-title = "Release notes for Grafana 7.3.4"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-4/
+title: Release notes for Grafana 7.3.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-5.md b/docs/sources/release-notes/release-notes-7-3-5.md
index 2d58b758fca..916404750de 100644
--- a/docs/sources/release-notes/release-notes-7-3-5.md
+++ b/docs/sources/release-notes/release-notes-7-3-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-5/"]
-title = "Release notes for Grafana 7.3.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-5/
+title: Release notes for Grafana 7.3.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-6.md b/docs/sources/release-notes/release-notes-7-3-6.md
index 642676f4e44..eb89c772902 100644
--- a/docs/sources/release-notes/release-notes-7-3-6.md
+++ b/docs/sources/release-notes/release-notes-7-3-6.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-6/"]
-title = "Release notes for Grafana 7.3.6"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-6/
+title: Release notes for Grafana 7.3.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-3-7.md b/docs/sources/release-notes/release-notes-7-3-7.md
index 87a20434abf..942a1b19ffd 100644
--- a/docs/sources/release-notes/release-notes-7-3-7.md
+++ b/docs/sources/release-notes/release-notes-7-3-7.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-3-7/"]
-title = "Release notes for Grafana 7.3.7"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-3-7/
+title: Release notes for Grafana 7.3.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-4-0.md b/docs/sources/release-notes/release-notes-7-4-0.md
index c8e5532026d..264294b3167 100644
--- a/docs/sources/release-notes/release-notes-7-4-0.md
+++ b/docs/sources/release-notes/release-notes-7-4-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-4-0/"]
-title = "Release notes for Grafana 7.4.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-4-0/
+title: Release notes for Grafana 7.4.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-4-1.md b/docs/sources/release-notes/release-notes-7-4-1.md
index b83575e6acd..288e2535585 100644
--- a/docs/sources/release-notes/release-notes-7-4-1.md
+++ b/docs/sources/release-notes/release-notes-7-4-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-4-1/"]
-title = "Release notes for Grafana 7.4.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-4-1/
+title: Release notes for Grafana 7.4.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-4-2.md b/docs/sources/release-notes/release-notes-7-4-2.md
index 8367f83fa1b..ea2bb8bfaea 100644
--- a/docs/sources/release-notes/release-notes-7-4-2.md
+++ b/docs/sources/release-notes/release-notes-7-4-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-4-2/"]
-title = "Release notes for Grafana 7.4.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-4-2/
+title: Release notes for Grafana 7.4.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-4-3.md b/docs/sources/release-notes/release-notes-7-4-3.md
index 4d9c5369e35..7e07bfe1b9e 100644
--- a/docs/sources/release-notes/release-notes-7-4-3.md
+++ b/docs/sources/release-notes/release-notes-7-4-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-4-3/"]
-title = "Release notes for Grafana 7.4.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-4-3/
+title: Release notes for Grafana 7.4.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-4-5.md b/docs/sources/release-notes/release-notes-7-4-5.md
index c6a22de30e8..88dacac1dcb 100644
--- a/docs/sources/release-notes/release-notes-7-4-5.md
+++ b/docs/sources/release-notes/release-notes-7-4-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-4-5/"]
-title = "Release notes for Grafana 7.4.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-4-5/
+title: Release notes for Grafana 7.4.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-0-beta1.md b/docs/sources/release-notes/release-notes-7-5-0-beta1.md
index 6c1da4a0299..9d4ed27b3a6 100644
--- a/docs/sources/release-notes/release-notes-7-5-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-7-5-0-beta1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-0-beta1/"]
-title = "Release notes for Grafana 7.5.0-beta1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-0-beta1/
+title: Release notes for Grafana 7.5.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-0-beta2.md b/docs/sources/release-notes/release-notes-7-5-0-beta2.md
index 77c4d3534c4..5eb32436515 100644
--- a/docs/sources/release-notes/release-notes-7-5-0-beta2.md
+++ b/docs/sources/release-notes/release-notes-7-5-0-beta2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-0-beta2/"]
-title = "Release notes for Grafana 7.5.0-beta2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-0-beta2/
+title: Release notes for Grafana 7.5.0-beta2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-0.md b/docs/sources/release-notes/release-notes-7-5-0.md
index d244841dc83..1af41313179 100644
--- a/docs/sources/release-notes/release-notes-7-5-0.md
+++ b/docs/sources/release-notes/release-notes-7-5-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-0/"]
-title = "Release notes for Grafana 7.5.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-0/
+title: Release notes for Grafana 7.5.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-1.md b/docs/sources/release-notes/release-notes-7-5-1.md
index fa349d37211..89c0165b90d 100644
--- a/docs/sources/release-notes/release-notes-7-5-1.md
+++ b/docs/sources/release-notes/release-notes-7-5-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-1/"]
-title = "Release notes for Grafana 7.5.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-1/
+title: Release notes for Grafana 7.5.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-10.md b/docs/sources/release-notes/release-notes-7-5-10.md
index 2e53731daee..9de611faea5 100644
--- a/docs/sources/release-notes/release-notes-7-5-10.md
+++ b/docs/sources/release-notes/release-notes-7-5-10.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-10/"]
-title = "Release notes for Grafana 7.5.10"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-10/
+title: Release notes for Grafana 7.5.10
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-11.md b/docs/sources/release-notes/release-notes-7-5-11.md
index 4169dc35682..696ed760aff 100644
--- a/docs/sources/release-notes/release-notes-7-5-11.md
+++ b/docs/sources/release-notes/release-notes-7-5-11.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-11/"]
-title = "Release notes for Grafana 7.5.11"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-11/
+title: Release notes for Grafana 7.5.11
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-12.md b/docs/sources/release-notes/release-notes-7-5-12.md
index 058e0b30a0b..ce5909b0b69 100644
--- a/docs/sources/release-notes/release-notes-7-5-12.md
+++ b/docs/sources/release-notes/release-notes-7-5-12.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-12/"]
-title = "Release notes for Grafana 7.5.12"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-12/
+title: Release notes for Grafana 7.5.12
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-13.md b/docs/sources/release-notes/release-notes-7-5-13.md
index 9bc0fa86774..aedaae6e2c2 100644
--- a/docs/sources/release-notes/release-notes-7-5-13.md
+++ b/docs/sources/release-notes/release-notes-7-5-13.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-13/"]
-title = "Release notes for Grafana 7.5.13"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-13/
+title: Release notes for Grafana 7.5.13
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-15.md b/docs/sources/release-notes/release-notes-7-5-15.md
index fc939d7f72c..2ee4401990f 100644
--- a/docs/sources/release-notes/release-notes-7-5-15.md
+++ b/docs/sources/release-notes/release-notes-7-5-15.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-15/"]
-title = "Release notes for Grafana 7.5.15"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-15/
+title: Release notes for Grafana 7.5.15
+---
 
 # Release notes for Grafana 7.5.15
 
diff --git a/docs/sources/release-notes/release-notes-7-5-2.md b/docs/sources/release-notes/release-notes-7-5-2.md
index 4ca78051518..36da2f309c7 100644
--- a/docs/sources/release-notes/release-notes-7-5-2.md
+++ b/docs/sources/release-notes/release-notes-7-5-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-2/"]
-title = "Release notes for Grafana 7.5.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-2/
+title: Release notes for Grafana 7.5.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-3.md b/docs/sources/release-notes/release-notes-7-5-3.md
index 7c7575ec0a4..0ebe05c8e2c 100644
--- a/docs/sources/release-notes/release-notes-7-5-3.md
+++ b/docs/sources/release-notes/release-notes-7-5-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-3/"]
-title = "Release notes for Grafana 7.5.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-3/
+title: Release notes for Grafana 7.5.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-4.md b/docs/sources/release-notes/release-notes-7-5-4.md
index 62eec035800..3bfaa30a064 100644
--- a/docs/sources/release-notes/release-notes-7-5-4.md
+++ b/docs/sources/release-notes/release-notes-7-5-4.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-4/"]
-title = "Release notes for Grafana 7.5.4"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-4/
+title: Release notes for Grafana 7.5.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-5.md b/docs/sources/release-notes/release-notes-7-5-5.md
index 0419bc4d385..3d11d2d0550 100644
--- a/docs/sources/release-notes/release-notes-7-5-5.md
+++ b/docs/sources/release-notes/release-notes-7-5-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-5/"]
-title = "Release notes for Grafana 7.5.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-5/
+title: Release notes for Grafana 7.5.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-6.md b/docs/sources/release-notes/release-notes-7-5-6.md
index 29359394195..d9f28076f14 100644
--- a/docs/sources/release-notes/release-notes-7-5-6.md
+++ b/docs/sources/release-notes/release-notes-7-5-6.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-6/"]
-title = "Release notes for Grafana 7.5.6"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-6/
+title: Release notes for Grafana 7.5.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-7.md b/docs/sources/release-notes/release-notes-7-5-7.md
index d1f8018dd59..eb2e4b7eaea 100644
--- a/docs/sources/release-notes/release-notes-7-5-7.md
+++ b/docs/sources/release-notes/release-notes-7-5-7.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-7/"]
-title = "Release notes for Grafana 7.5.7"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-7/
+title: Release notes for Grafana 7.5.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-8.md b/docs/sources/release-notes/release-notes-7-5-8.md
index aa8fab3e0d6..558cbb6f16d 100644
--- a/docs/sources/release-notes/release-notes-7-5-8.md
+++ b/docs/sources/release-notes/release-notes-7-5-8.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-8/"]
-title = "Release notes for Grafana 7.5.8"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-8/
+title: Release notes for Grafana 7.5.8
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-7-5-9.md b/docs/sources/release-notes/release-notes-7-5-9.md
index 835a6e9535c..067585d0000 100644
--- a/docs/sources/release-notes/release-notes-7-5-9.md
+++ b/docs/sources/release-notes/release-notes-7-5-9.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-7-5-9/"]
-title = "Release notes for Grafana 7.5.9"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-7-5-9/
+title: Release notes for Grafana 7.5.9
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta1.md b/docs/sources/release-notes/release-notes-8-0-0-beta1.md
index 2e936eed885..575c58df022 100644
--- a/docs/sources/release-notes/release-notes-8-0-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-0-0-beta1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-0-beta1/"]
-title = "Release notes for Grafana 8.0.0-beta1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-0-beta1/
+title: Release notes for Grafana 8.0.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta2.md b/docs/sources/release-notes/release-notes-8-0-0-beta2.md
index df009b34312..3537f0207c9 100644
--- a/docs/sources/release-notes/release-notes-8-0-0-beta2.md
+++ b/docs/sources/release-notes/release-notes-8-0-0-beta2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-0-beta2/"]
-title = "Release notes for Grafana 8.0.0-beta2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-0-beta2/
+title: Release notes for Grafana 8.0.0-beta2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta3.md b/docs/sources/release-notes/release-notes-8-0-0-beta3.md
index 3942bfec1ea..b3f6f95d202 100644
--- a/docs/sources/release-notes/release-notes-8-0-0-beta3.md
+++ b/docs/sources/release-notes/release-notes-8-0-0-beta3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-0-beta3/"]
-title = "Release notes for Grafana 8.0.0-beta3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-0-beta3/
+title: Release notes for Grafana 8.0.0-beta3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-0.md b/docs/sources/release-notes/release-notes-8-0-0.md
index ae340ebee4d..9d55ddc696c 100644
--- a/docs/sources/release-notes/release-notes-8-0-0.md
+++ b/docs/sources/release-notes/release-notes-8-0-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-0/"]
-title = "Release notes for Grafana 8.0.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-0/
+title: Release notes for Grafana 8.0.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-1.md b/docs/sources/release-notes/release-notes-8-0-1.md
index bea4b1a7377..33134bfb0fc 100644
--- a/docs/sources/release-notes/release-notes-8-0-1.md
+++ b/docs/sources/release-notes/release-notes-8-0-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-1/"]
-title = "Release notes for Grafana 8.0.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-1/
+title: Release notes for Grafana 8.0.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-2.md b/docs/sources/release-notes/release-notes-8-0-2.md
index 905e3f0eb49..eb1f7ca5117 100644
--- a/docs/sources/release-notes/release-notes-8-0-2.md
+++ b/docs/sources/release-notes/release-notes-8-0-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-2/"]
-title = "Release notes for Grafana 8.0.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-2/
+title: Release notes for Grafana 8.0.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-3.md b/docs/sources/release-notes/release-notes-8-0-3.md
index b0c588f8347..a09f610584f 100644
--- a/docs/sources/release-notes/release-notes-8-0-3.md
+++ b/docs/sources/release-notes/release-notes-8-0-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-3/"]
-title = "Release notes for Grafana 8.0.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-3/
+title: Release notes for Grafana 8.0.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-4.md b/docs/sources/release-notes/release-notes-8-0-4.md
index be7dcfb32aa..8a81795b4b2 100644
--- a/docs/sources/release-notes/release-notes-8-0-4.md
+++ b/docs/sources/release-notes/release-notes-8-0-4.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-4/"]
-title = "Release notes for Grafana 8.0.4"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-4/
+title: Release notes for Grafana 8.0.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-5.md b/docs/sources/release-notes/release-notes-8-0-5.md
index 4ceb0c57575..81695de8436 100644
--- a/docs/sources/release-notes/release-notes-8-0-5.md
+++ b/docs/sources/release-notes/release-notes-8-0-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-5/"]
-title = "Release notes for Grafana 8.0.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-5/
+title: Release notes for Grafana 8.0.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-6.md b/docs/sources/release-notes/release-notes-8-0-6.md
index 713b356c752..70d82510f69 100644
--- a/docs/sources/release-notes/release-notes-8-0-6.md
+++ b/docs/sources/release-notes/release-notes-8-0-6.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-6/"]
-title = "Release notes for Grafana 8.0.6"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-6/
+title: Release notes for Grafana 8.0.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-0-7.md b/docs/sources/release-notes/release-notes-8-0-7.md
index 4e62083bfc1..867dc7efaaa 100644
--- a/docs/sources/release-notes/release-notes-8-0-7.md
+++ b/docs/sources/release-notes/release-notes-8-0-7.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-0-7/"]
-title = "Release notes for Grafana 8.0.7"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-0-7/
+title: Release notes for Grafana 8.0.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-0-beta1.md b/docs/sources/release-notes/release-notes-8-1-0-beta1.md
index 16b88d80b65..9d18c2d371b 100644
--- a/docs/sources/release-notes/release-notes-8-1-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-1-0-beta1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-0-beta1/"]
-title = "Release notes for Grafana 8.1.0-beta1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-0-beta1/
+title: Release notes for Grafana 8.1.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-0-beta2.md b/docs/sources/release-notes/release-notes-8-1-0-beta2.md
index c79ca28989f..93449985783 100644
--- a/docs/sources/release-notes/release-notes-8-1-0-beta2.md
+++ b/docs/sources/release-notes/release-notes-8-1-0-beta2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-0-beta2/"]
-title = "Release notes for Grafana 8.1.0-beta2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-0-beta2/
+title: Release notes for Grafana 8.1.0-beta2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-0-beta3.md b/docs/sources/release-notes/release-notes-8-1-0-beta3.md
index 0bba933564c..9b787bce3ab 100644
--- a/docs/sources/release-notes/release-notes-8-1-0-beta3.md
+++ b/docs/sources/release-notes/release-notes-8-1-0-beta3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-0-beta3/"]
-title = "Release notes for Grafana 8.1.0-beta3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-0-beta3/
+title: Release notes for Grafana 8.1.0-beta3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-0.md b/docs/sources/release-notes/release-notes-8-1-0.md
index 41ebe20bd9f..79e2cd18c38 100644
--- a/docs/sources/release-notes/release-notes-8-1-0.md
+++ b/docs/sources/release-notes/release-notes-8-1-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-0/"]
-title = "Release notes for Grafana 8.1.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-0/
+title: Release notes for Grafana 8.1.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-1.md b/docs/sources/release-notes/release-notes-8-1-1.md
index b467e784828..37fd61e6c17 100644
--- a/docs/sources/release-notes/release-notes-8-1-1.md
+++ b/docs/sources/release-notes/release-notes-8-1-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-1/"]
-title = "Release notes for Grafana 8.1.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-1/
+title: Release notes for Grafana 8.1.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-2.md b/docs/sources/release-notes/release-notes-8-1-2.md
index 410523737dd..d603be55d37 100644
--- a/docs/sources/release-notes/release-notes-8-1-2.md
+++ b/docs/sources/release-notes/release-notes-8-1-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-2/"]
-title = "Release notes for Grafana 8.1.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-2/
+title: Release notes for Grafana 8.1.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-3.md b/docs/sources/release-notes/release-notes-8-1-3.md
index e3416c004ef..ac9195f6b54 100644
--- a/docs/sources/release-notes/release-notes-8-1-3.md
+++ b/docs/sources/release-notes/release-notes-8-1-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-3/"]
-title = "Release notes for Grafana 8.1.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-3/
+title: Release notes for Grafana 8.1.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-4.md b/docs/sources/release-notes/release-notes-8-1-4.md
index 6f1e7e24f29..39d9a97e419 100644
--- a/docs/sources/release-notes/release-notes-8-1-4.md
+++ b/docs/sources/release-notes/release-notes-8-1-4.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-4/"]
-title = "Release notes for Grafana 8.1.4"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-4/
+title: Release notes for Grafana 8.1.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-5.md b/docs/sources/release-notes/release-notes-8-1-5.md
index ffcfcf35e00..89bc8433dc8 100644
--- a/docs/sources/release-notes/release-notes-8-1-5.md
+++ b/docs/sources/release-notes/release-notes-8-1-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-5/"]
-title = "Release notes for Grafana 8.1.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-5/
+title: Release notes for Grafana 8.1.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-6.md b/docs/sources/release-notes/release-notes-8-1-6.md
index 2ad4ffd7432..3552f54eede 100644
--- a/docs/sources/release-notes/release-notes-8-1-6.md
+++ b/docs/sources/release-notes/release-notes-8-1-6.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-6/"]
-title = "Release notes for Grafana 8.1.6"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-6/
+title: Release notes for Grafana 8.1.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-7.md b/docs/sources/release-notes/release-notes-8-1-7.md
index d7cbfb41023..ab3d83e0f9a 100644
--- a/docs/sources/release-notes/release-notes-8-1-7.md
+++ b/docs/sources/release-notes/release-notes-8-1-7.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-7/"]
-title = "Release notes for Grafana 8.1.7"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-7/
+title: Release notes for Grafana 8.1.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-1-8.md b/docs/sources/release-notes/release-notes-8-1-8.md
index f77652aa432..dc7cd936edf 100644
--- a/docs/sources/release-notes/release-notes-8-1-8.md
+++ b/docs/sources/release-notes/release-notes-8-1-8.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-1-8/"]
-title = "Release notes for Grafana 8.1.8"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-1-8/
+title: Release notes for Grafana 8.1.8
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-0-beta1.md b/docs/sources/release-notes/release-notes-8-2-0-beta1.md
index 7469f7b4ccc..2cb0419bb96 100644
--- a/docs/sources/release-notes/release-notes-8-2-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-2-0-beta1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-0-beta1/"]
-title = "Release notes for Grafana 8.2.0-beta1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-0-beta1/
+title: Release notes for Grafana 8.2.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-0-beta2.md b/docs/sources/release-notes/release-notes-8-2-0-beta2.md
index 74adee723e6..46eb5050b81 100644
--- a/docs/sources/release-notes/release-notes-8-2-0-beta2.md
+++ b/docs/sources/release-notes/release-notes-8-2-0-beta2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-0-beta2/"]
-title = "Release notes for Grafana 8.2.0-beta2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-0-beta2/
+title: Release notes for Grafana 8.2.0-beta2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-0.md b/docs/sources/release-notes/release-notes-8-2-0.md
index 4513de999b4..2ee72e73ca4 100644
--- a/docs/sources/release-notes/release-notes-8-2-0.md
+++ b/docs/sources/release-notes/release-notes-8-2-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-0/"]
-title = "Release notes for Grafana 8.2.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-0/
+title: Release notes for Grafana 8.2.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-1.md b/docs/sources/release-notes/release-notes-8-2-1.md
index d1a419ab338..07dfd6dd33b 100644
--- a/docs/sources/release-notes/release-notes-8-2-1.md
+++ b/docs/sources/release-notes/release-notes-8-2-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-1/"]
-title = "Release notes for Grafana 8.2.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-1/
+title: Release notes for Grafana 8.2.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-2.md b/docs/sources/release-notes/release-notes-8-2-2.md
index fcfb8203279..526f5761245 100644
--- a/docs/sources/release-notes/release-notes-8-2-2.md
+++ b/docs/sources/release-notes/release-notes-8-2-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-2/"]
-title = "Release notes for Grafana 8.2.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-2/
+title: Release notes for Grafana 8.2.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-3.md b/docs/sources/release-notes/release-notes-8-2-3.md
index 121fb348db6..65de6a479e3 100644
--- a/docs/sources/release-notes/release-notes-8-2-3.md
+++ b/docs/sources/release-notes/release-notes-8-2-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-3/"]
-title = "Release notes for Grafana 8.2.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-3/
+title: Release notes for Grafana 8.2.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-4.md b/docs/sources/release-notes/release-notes-8-2-4.md
index 52af12afe3d..3295bb09be5 100644
--- a/docs/sources/release-notes/release-notes-8-2-4.md
+++ b/docs/sources/release-notes/release-notes-8-2-4.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-4/"]
-title = "Release notes for Grafana 8.2.4"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-4/
+title: Release notes for Grafana 8.2.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-5.md b/docs/sources/release-notes/release-notes-8-2-5.md
index 8be8bde4466..83cdaa52f7f 100644
--- a/docs/sources/release-notes/release-notes-8-2-5.md
+++ b/docs/sources/release-notes/release-notes-8-2-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-5/"]
-title = "Release notes for Grafana 8.2.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-5/
+title: Release notes for Grafana 8.2.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-6.md b/docs/sources/release-notes/release-notes-8-2-6.md
index 0b9d60823f3..30b0f8fdbc8 100644
--- a/docs/sources/release-notes/release-notes-8-2-6.md
+++ b/docs/sources/release-notes/release-notes-8-2-6.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-6/"]
-title = "Release notes for Grafana 8.2.6"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-6/
+title: Release notes for Grafana 8.2.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-2-7.md b/docs/sources/release-notes/release-notes-8-2-7.md
index fb516ad95a6..41889816f45 100644
--- a/docs/sources/release-notes/release-notes-8-2-7.md
+++ b/docs/sources/release-notes/release-notes-8-2-7.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-2-7/"]
-title = "Release notes for Grafana 8.2.7"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-2-7/
+title: Release notes for Grafana 8.2.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-0-beta1.md b/docs/sources/release-notes/release-notes-8-3-0-beta1.md
index 42d6ee5c474..005f46a6110 100644
--- a/docs/sources/release-notes/release-notes-8-3-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-3-0-beta1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-0-beta1/"]
-title = "Release notes for Grafana 8.3.0-beta1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-0-beta1/
+title: Release notes for Grafana 8.3.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-0-beta2.md b/docs/sources/release-notes/release-notes-8-3-0-beta2.md
index 074eb2659fe..fa148d686c5 100644
--- a/docs/sources/release-notes/release-notes-8-3-0-beta2.md
+++ b/docs/sources/release-notes/release-notes-8-3-0-beta2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-0-beta2/"]
-title = "Release notes for Grafana 8.3.0-beta2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-0-beta2/
+title: Release notes for Grafana 8.3.0-beta2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-0.md b/docs/sources/release-notes/release-notes-8-3-0.md
index d54e7d7f021..5d6f89e8f45 100644
--- a/docs/sources/release-notes/release-notes-8-3-0.md
+++ b/docs/sources/release-notes/release-notes-8-3-0.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-0/"]
-title = "Release notes for Grafana 8.3.0"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-0/
+title: Release notes for Grafana 8.3.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-1.md b/docs/sources/release-notes/release-notes-8-3-1.md
index df7871cf227..b81e2ea4c12 100644
--- a/docs/sources/release-notes/release-notes-8-3-1.md
+++ b/docs/sources/release-notes/release-notes-8-3-1.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-1/"]
-title = "Release notes for Grafana 8.3.1"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-1/
+title: Release notes for Grafana 8.3.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-2.md b/docs/sources/release-notes/release-notes-8-3-2.md
index 30de7207e48..fbef2cbe78b 100644
--- a/docs/sources/release-notes/release-notes-8-3-2.md
+++ b/docs/sources/release-notes/release-notes-8-3-2.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-2/"]
-title = "Release notes for Grafana 8.3.2"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-2/
+title: Release notes for Grafana 8.3.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-3.md b/docs/sources/release-notes/release-notes-8-3-3.md
index 21876e9fdac..49ce9619d91 100644
--- a/docs/sources/release-notes/release-notes-8-3-3.md
+++ b/docs/sources/release-notes/release-notes-8-3-3.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-3/"]
-title = "Release notes for Grafana 8.3.3"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-3/
+title: Release notes for Grafana 8.3.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-4.md b/docs/sources/release-notes/release-notes-8-3-4.md
index ef33f71925f..75ad4f5eeec 100644
--- a/docs/sources/release-notes/release-notes-8-3-4.md
+++ b/docs/sources/release-notes/release-notes-8-3-4.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-4/"]
-title = "Release notes for Grafana 8.3.4"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-4/
+title: Release notes for Grafana 8.3.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-5.md b/docs/sources/release-notes/release-notes-8-3-5.md
index 6fa717a8de5..bad3dfeab4f 100644
--- a/docs/sources/release-notes/release-notes-8-3-5.md
+++ b/docs/sources/release-notes/release-notes-8-3-5.md
@@ -1,10 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-5/"]
-title = "Release notes for Grafana 8.3.5"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-5/
+title: Release notes for Grafana 8.3.5
+---
 
 # Release notes for Grafana 8.3.5
 
diff --git a/docs/sources/release-notes/release-notes-8-3-6.md b/docs/sources/release-notes/release-notes-8-3-6.md
index 3041aa2af50..0fe48979fd6 100644
--- a/docs/sources/release-notes/release-notes-8-3-6.md
+++ b/docs/sources/release-notes/release-notes-8-3-6.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-6/"]
-hide_menu = true
-title = "Release notes for Grafana 8.3.6"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-6/
+hide_menu: true
+title: Release notes for Grafana 8.3.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-3-7.md b/docs/sources/release-notes/release-notes-8-3-7.md
index 14aa73cc72d..4960d7a642f 100644
--- a/docs/sources/release-notes/release-notes-8-3-7.md
+++ b/docs/sources/release-notes/release-notes-8-3-7.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-3-7/"]
-hide_menu = true
-title = "Release notes for Grafana 8.3.7"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-3-7/
+hide_menu: true
+title: Release notes for Grafana 8.3.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-0-beta1.md b/docs/sources/release-notes/release-notes-8-4-0-beta1.md
index a86e9f4de74..a42d02c34de 100644
--- a/docs/sources/release-notes/release-notes-8-4-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-4-0-beta1.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-0-beta1/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.0-beta1"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-0-beta1/
+hide_menu: true
+title: Release notes for Grafana 8.4.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-0.md b/docs/sources/release-notes/release-notes-8-4-0.md
index 65d4ac814b6..c36fbfeff24 100644
--- a/docs/sources/release-notes/release-notes-8-4-0.md
+++ b/docs/sources/release-notes/release-notes-8-4-0.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-0/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.0"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-0/
+hide_menu: true
+title: Release notes for Grafana 8.4.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-1.md b/docs/sources/release-notes/release-notes-8-4-1.md
index ca076490932..7fc8112ec9d 100644
--- a/docs/sources/release-notes/release-notes-8-4-1.md
+++ b/docs/sources/release-notes/release-notes-8-4-1.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-1/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.1"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-1/
+hide_menu: true
+title: Release notes for Grafana 8.4.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-2.md b/docs/sources/release-notes/release-notes-8-4-2.md
index 86f306ba935..7ee5e08c0ca 100644
--- a/docs/sources/release-notes/release-notes-8-4-2.md
+++ b/docs/sources/release-notes/release-notes-8-4-2.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-2/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.2"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-2/
+hide_menu: true
+title: Release notes for Grafana 8.4.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-3.md b/docs/sources/release-notes/release-notes-8-4-3.md
index b0a580ed4a2..c4521f3eadd 100644
--- a/docs/sources/release-notes/release-notes-8-4-3.md
+++ b/docs/sources/release-notes/release-notes-8-4-3.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-3/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.3"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-3/
+hide_menu: true
+title: Release notes for Grafana 8.4.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-4.md b/docs/sources/release-notes/release-notes-8-4-4.md
index 201f9c649b4..a9c10e8d371 100644
--- a/docs/sources/release-notes/release-notes-8-4-4.md
+++ b/docs/sources/release-notes/release-notes-8-4-4.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-4/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.4"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-4/
+hide_menu: true
+title: Release notes for Grafana 8.4.4
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-5.md b/docs/sources/release-notes/release-notes-8-4-5.md
index 13948030ad8..a3849b08011 100644
--- a/docs/sources/release-notes/release-notes-8-4-5.md
+++ b/docs/sources/release-notes/release-notes-8-4-5.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-5/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.5"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-5/
+hide_menu: true
+title: Release notes for Grafana 8.4.5
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-6.md b/docs/sources/release-notes/release-notes-8-4-6.md
index 75abc48d02a..660e679236c 100644
--- a/docs/sources/release-notes/release-notes-8-4-6.md
+++ b/docs/sources/release-notes/release-notes-8-4-6.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-6/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.6"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-6/
+hide_menu: true
+title: Release notes for Grafana 8.4.6
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-4-7.md b/docs/sources/release-notes/release-notes-8-4-7.md
index c2f8bb876bc..565f843bb04 100644
--- a/docs/sources/release-notes/release-notes-8-4-7.md
+++ b/docs/sources/release-notes/release-notes-8-4-7.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-4-7/"]
-hide_menu = true
-title = "Release notes for Grafana 8.4.7"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-4-7/
+hide_menu: true
+title: Release notes for Grafana 8.4.7
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-5-0-beta1.md b/docs/sources/release-notes/release-notes-8-5-0-beta1.md
index 3020e22d0da..e5f09a3e03d 100644
--- a/docs/sources/release-notes/release-notes-8-5-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-5-0-beta1.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-5-0-beta1/"]
-hide_menu = true
-title = "Release notes for Grafana 8.5.0-beta1"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-5-0-beta1/
+hide_menu: true
+title: Release notes for Grafana 8.5.0-beta1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-5-0.md b/docs/sources/release-notes/release-notes-8-5-0.md
index 5641e252140..3a7449518d4 100644
--- a/docs/sources/release-notes/release-notes-8-5-0.md
+++ b/docs/sources/release-notes/release-notes-8-5-0.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-5-0/"]
-hide_menu = true
-title = "Release notes for Grafana 8.5.0"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-5-0/
+hide_menu: true
+title: Release notes for Grafana 8.5.0
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-5-1.md b/docs/sources/release-notes/release-notes-8-5-1.md
index c8b832479de..a6c3944a4c7 100644
--- a/docs/sources/release-notes/release-notes-8-5-1.md
+++ b/docs/sources/release-notes/release-notes-8-5-1.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-5-1/"]
-hide_menu = true
-title = "Release notes for Grafana 8.5.1"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-5-1/
+hide_menu: true
+title: Release notes for Grafana 8.5.1
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-5-2.md b/docs/sources/release-notes/release-notes-8-5-2.md
index ccd4bff19a4..57f9502beaa 100644
--- a/docs/sources/release-notes/release-notes-8-5-2.md
+++ b/docs/sources/release-notes/release-notes-8-5-2.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-8-5-2/"]
-hide_menu = true
-title = "Release notes for Grafana 8.5.2"
-+++
+---
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-8-5-2/
+hide_menu: true
+title: Release notes for Grafana 8.5.2
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-8-5-3.md b/docs/sources/release-notes/release-notes-8-5-3.md
index 0a3ba52b03b..e1cf44deacd 100644
--- a/docs/sources/release-notes/release-notes-8-5-3.md
+++ b/docs/sources/release-notes/release-notes-8-5-3.md
@@ -1,7 +1,7 @@
-+++
-title = "Release notes for Grafana 8.5.3"
-hide_menu = true
-+++
+---
+hide_menu: true
+title: Release notes for Grafana 8.5.3
+---
 
 <!-- Auto generated by update changelog github action -->
 
diff --git a/docs/sources/release-notes/release-notes-v7-4-2.md b/docs/sources/release-notes/release-notes-v7-4-2.md
index 3db6a4bcaab..8588c9574fc 100644
--- a/docs/sources/release-notes/release-notes-v7-4-2.md
+++ b/docs/sources/release-notes/release-notes-v7-4-2.md
@@ -1,9 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/release-notes/release-notes-v7-4-2/"]
-title = "undefined"
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/release-notes/release-notes-v7-4-2/
+title: undefined
+---
 
 <!-- Auto generated by update changelog github action -->
diff --git a/docs/sources/sharing/_index.md b/docs/sources/sharing/_index.md
index 72ab4323cf4..fcd23f797ac 100644
--- a/docs/sources/sharing/_index.md
+++ b/docs/sources/sharing/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/sharing/"]
-title = "Sharing"
-weight = 85
-+++
+---
+aliases:
+  - /docs/grafana/latest/sharing/
+title: Sharing
+weight: 85
+---
 
 # Sharing dashboards and panels
 
diff --git a/docs/sources/sharing/playlists.md b/docs/sources/sharing/playlists.md
index 49767ee0067..40f25816670 100644
--- a/docs/sources/sharing/playlists.md
+++ b/docs/sources/sharing/playlists.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/sharing/playlists/"]
-draft = "true"
-keywords = ["grafana", "dashboard", "documentation", "playlist"]
-title = "Playlists"
-weight = 4
-+++
+---
+aliases:
+  - /docs/grafana/latest/sharing/playlists/
+draft: 'true'
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - playlist
+title: Playlists
+weight: 4
+---
 
 # Playlists
 
diff --git a/docs/sources/sharing/share-dashboard.md b/docs/sources/sharing/share-dashboard.md
index 7d84d0dbaad..f63458857b9 100644
--- a/docs/sources/sharing/share-dashboard.md
+++ b/docs/sources/sharing/share-dashboard.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/share-dashboard/", "/docs/grafana/latest/reference/share_dashboard/", "/docs/grafana/latest/sharing/share-dashboard/"]
-keywords = ["grafana", "dashboard", "documentation", "sharing"]
-title = "Share a dashboard"
-weight = 6
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/share-dashboard/
+  - /docs/grafana/latest/reference/share_dashboard/
+  - /docs/grafana/latest/sharing/share-dashboard/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - sharing
+title: Share a dashboard
+weight: 6
+---
 
 # Share a dashboard
 
diff --git a/docs/sources/sharing/share-panel.md b/docs/sources/sharing/share-panel.md
index e9f70cb60af..f3a5e5312cd 100644
--- a/docs/sources/sharing/share-panel.md
+++ b/docs/sources/sharing/share-panel.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/dashboards/share-dashboard/", "/docs/grafana/latest/reference/share_panel/", "/docs/grafana/latest/sharing/share-panel/"]
-keywords = ["grafana", "dashboard", "documentation", "sharing", "library panel"]
-title = "Share a panel"
-weight = 6
-+++
+---
+aliases:
+  - /docs/grafana/latest/dashboards/share-dashboard/
+  - /docs/grafana/latest/reference/share_panel/
+  - /docs/grafana/latest/sharing/share-panel/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - sharing
+  - library panel
+title: Share a panel
+weight: 6
+---
 
 # Share a panel
 
diff --git a/docs/sources/troubleshooting/_index.md b/docs/sources/troubleshooting/_index.md
index 351480ee94b..ef90cf5e4e2 100644
--- a/docs/sources/troubleshooting/_index.md
+++ b/docs/sources/troubleshooting/_index.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/troubleshooting/"]
-description = "Guide to troubleshooting Grafana problems"
-keywords = ["grafana", "troubleshooting", "documentation", "guide"]
-title = "Troubleshooting"
-weight = 180
-+++
+---
+aliases:
+  - /docs/grafana/latest/troubleshooting/
+description: Guide to troubleshooting Grafana problems
+keywords:
+  - grafana
+  - troubleshooting
+  - documentation
+  - guide
+title: Troubleshooting
+weight: 180
+---
 
 # Troubleshooting
 
diff --git a/docs/sources/troubleshooting/diagnostics.md b/docs/sources/troubleshooting/diagnostics.md
index 1deb881ae49..6981387b535 100644
--- a/docs/sources/troubleshooting/diagnostics.md
+++ b/docs/sources/troubleshooting/diagnostics.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/troubleshooting/diagnostics/"]
-title = "Enable diagnostics"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/troubleshooting/diagnostics/
+title: Enable diagnostics
+weight: 200
+---
 
 # Enable diagnostics
 
diff --git a/docs/sources/troubleshooting/troubleshoot-dashboards.md b/docs/sources/troubleshooting/troubleshoot-dashboards.md
index cb63c2621ba..8b99bd5481d 100644
--- a/docs/sources/troubleshooting/troubleshoot-dashboards.md
+++ b/docs/sources/troubleshooting/troubleshoot-dashboards.md
@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/troubleshooting/troubleshoot-dashboards/"]
-description = "Guide to troubleshooting Grafana dashboards"
-keywords = ["grafana", "troubleshooting", "documentation", "dashboards"]
-title = "Troubleshoot dashboards"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/troubleshooting/troubleshoot-dashboards/
+description: Guide to troubleshooting Grafana dashboards
+keywords:
+  - grafana
+  - troubleshooting
+  - documentation
+  - dashboards
+title: Troubleshoot dashboards
+weight: 100
+---
 
 # Troubleshoot dashboards
 
diff --git a/docs/sources/troubleshooting/troubleshoot-queries.md b/docs/sources/troubleshooting/troubleshoot-queries.md
index 7b96721e625..19561882e57 100644
--- a/docs/sources/troubleshooting/troubleshoot-queries.md
+++ b/docs/sources/troubleshooting/troubleshoot-queries.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/troubleshooting/troubleshoot-queries/"]
-description = "Guide to troubleshooting Grafana queries"
-keywords = ["grafana", "troubleshooting", "documentation", "guide", "queries"]
-title = "Troubleshoot queries"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/troubleshooting/troubleshoot-queries/
+description: Guide to troubleshooting Grafana queries
+keywords:
+  - grafana
+  - troubleshooting
+  - documentation
+  - guide
+  - queries
+title: Troubleshoot queries
+weight: 400
+---
 
 # Troubleshoot queries
 
diff --git a/docs/sources/variables/_index.md b/docs/sources/variables/_index.md
index 8bd7dbdb38c..7b368d1e573 100644
--- a/docs/sources/variables/_index.md
+++ b/docs/sources/variables/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/variables/"]
-title = "Templates and variables"
-weight = 130
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/
+title: Templates and variables
+weight: 130
+---
 
 # Templates and variables
 
diff --git a/docs/sources/variables/advanced-variable-format-options.md b/docs/sources/variables/advanced-variable-format-options.md
index 7971133d4af..fb0097974b7 100644
--- a/docs/sources/variables/advanced-variable-format-options.md
+++ b/docs/sources/variables/advanced-variable-format-options.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/variables/advanced-variable-format-options/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"]
-title = "Advanced variable format options"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/advanced-variable-format-options/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+title: Advanced variable format options
+weight: 600
+---
 
 # Advanced variable format options
 
diff --git a/docs/sources/variables/filter-variables-with-regex.md b/docs/sources/variables/filter-variables-with-regex.md
index 8f731e6e086..1a1836e5c85 100644
--- a/docs/sources/variables/filter-variables-with-regex.md
+++ b/docs/sources/variables/filter-variables-with-regex.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/variables/filter-variables-with-regex/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"]
-title = "Filter variables with regex"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/filter-variables-with-regex/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+title: Filter variables with regex
+weight: 700
+---
 
 # Filter variables with regex
 
diff --git a/docs/sources/variables/formatting-multi-value-variables.md b/docs/sources/variables/formatting-multi-value-variables.md
index 7eb4ec853ea..c597e9763ca 100644
--- a/docs/sources/variables/formatting-multi-value-variables.md
+++ b/docs/sources/variables/formatting-multi-value-variables.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/variables/formatting-multi-value-variables/"]
-title = "Multi-value variables"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/formatting-multi-value-variables/
+title: Multi-value variables
+weight: 600
+---
 
 # Multi-value variables
 
diff --git a/docs/sources/variables/inspect-variable.md b/docs/sources/variables/inspect-variable.md
index d123ca2d393..92fc5157626 100644
--- a/docs/sources/variables/inspect-variable.md
+++ b/docs/sources/variables/inspect-variable.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/reference/templating/", "/docs/grafana/latest/variables/inspect-variable/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"]
-title = "Inspect variables"
-weight = 125
-+++
+---
+aliases:
+  - /docs/grafana/latest/reference/templating/
+  - /docs/grafana/latest/variables/inspect-variable/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+title: Inspect variables
+weight: 125
+---
 
 # Inspect variables and their dependencies
 
diff --git a/docs/sources/variables/manage-variable.md b/docs/sources/variables/manage-variable.md
index b89919cd5a8..8f1db798c5b 100644
--- a/docs/sources/variables/manage-variable.md
+++ b/docs/sources/variables/manage-variable.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/reference/templating/", "/docs/grafana/latest/variables/manage-variable/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"]
-title = "Manage variables"
-weight = 120
-+++
+---
+aliases:
+  - /docs/grafana/latest/reference/templating/
+  - /docs/grafana/latest/variables/manage-variable/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+title: Manage variables
+weight: 120
+---
 
 # Manage variables
 
diff --git a/docs/sources/variables/syntax.md b/docs/sources/variables/syntax.md
index ac2715b3cbe..702610c1811 100644
--- a/docs/sources/variables/syntax.md
+++ b/docs/sources/variables/syntax.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/reference/templating/", "/docs/grafana/latest/variables/syntax/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"]
-title = "Variable syntax"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/reference/templating/
+  - /docs/grafana/latest/variables/syntax/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+title: Variable syntax
+weight: 100
+---
 
 # Variable syntax
 
diff --git a/docs/sources/variables/variable-examples.md b/docs/sources/variables/variable-examples.md
index 1e52a28e1d4..bd3cd3e24e9 100644
--- a/docs/sources/variables/variable-examples.md
+++ b/docs/sources/variables/variable-examples.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/variables/variable-examples/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"]
-title = "Variable examples"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/variable-examples/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+title: Variable examples
+weight: 200
+---
 
 # Variable examples
 
diff --git a/docs/sources/variables/variable-selection-options.md b/docs/sources/variables/variable-selection-options.md
index f13c418955e..85278f0f6ce 100644
--- a/docs/sources/variables/variable-selection-options.md
+++ b/docs/sources/variables/variable-selection-options.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/variables/variable-selection-options/"]
-title = "Variable selection options"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/variable-selection-options/
+title: Variable selection options
+weight: 400
+---
 
 # Configure variable selection options
 
diff --git a/docs/sources/variables/variable-types/_index.md b/docs/sources/variables/variable-types/_index.md
index 7901935a35e..8c6d857a2d7 100644
--- a/docs/sources/variables/variable-types/_index.md
+++ b/docs/sources/variables/variable-types/_index.md
@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/variables/variable-types/"]
-title = "Add variables"
-weight = 140
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/variable-types/
+title: Add variables
+weight: 140
+---
 
 # Variables types
 
diff --git a/docs/sources/variables/variable-types/add-ad-hoc-filters.md b/docs/sources/variables/variable-types/add-ad-hoc-filters.md
index 89c42b046b7..eae0c5971f1 100644
--- a/docs/sources/variables/variable-types/add-ad-hoc-filters.md
+++ b/docs/sources/variables/variable-types/add-ad-hoc-filters.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-ad-hoc-filters/", "/docs/grafana/latest/variables/variable-types/add-ad-hoc-filters/"]
-title = "Add ad hoc filters"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-ad-hoc-filters/
+  - /docs/grafana/latest/variables/variable-types/add-ad-hoc-filters/
+title: Add ad hoc filters
+weight: 700
+---
 
 # Add ad hoc filters
 
diff --git a/docs/sources/variables/variable-types/add-constant-variable.md b/docs/sources/variables/variable-types/add-constant-variable.md
index c24f074a205..769b9d1b088 100644
--- a/docs/sources/variables/variable-types/add-constant-variable.md
+++ b/docs/sources/variables/variable-types/add-constant-variable.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-constant-variable/", "/docs/grafana/latest/variables/variable-types/add-constant-variable/"]
-title = "Add a constant variable"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-constant-variable/
+  - /docs/grafana/latest/variables/variable-types/add-constant-variable/
+title: Add a constant variable
+weight: 400
+---
 
 # Add a constant variable
 
diff --git a/docs/sources/variables/variable-types/add-custom-variable.md b/docs/sources/variables/variable-types/add-custom-variable.md
index e53117874d0..9ae4b0be964 100644
--- a/docs/sources/variables/variable-types/add-custom-variable.md
+++ b/docs/sources/variables/variable-types/add-custom-variable.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-custom-variable/", "/docs/grafana/latest/variables/variable-types/add-custom-variable/"]
-title = "Add a custom variable"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-custom-variable/
+  - /docs/grafana/latest/variables/variable-types/add-custom-variable/
+title: Add a custom variable
+weight: 200
+---
 
 # Add a custom variable
 
diff --git a/docs/sources/variables/variable-types/add-data-source-variable.md b/docs/sources/variables/variable-types/add-data-source-variable.md
index 9ff1f427da5..fbdc1f66e2c 100644
--- a/docs/sources/variables/variable-types/add-data-source-variable.md
+++ b/docs/sources/variables/variable-types/add-data-source-variable.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-data-source-variable/", "/docs/grafana/latest/variables/variable-types/add-data-source-variable/"]
-title = "Add a data source variable"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-data-source-variable/
+  - /docs/grafana/latest/variables/variable-types/add-data-source-variable/
+title: Add a data source variable
+weight: 500
+---
 
 # Add a data source variable
 
diff --git a/docs/sources/variables/variable-types/add-interval-variable.md b/docs/sources/variables/variable-types/add-interval-variable.md
index fdb979d2f0b..09adec49a67 100644
--- a/docs/sources/variables/variable-types/add-interval-variable.md
+++ b/docs/sources/variables/variable-types/add-interval-variable.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-interval-variable/", "/docs/grafana/latest/variables/variable-types/add-interval-variable/"]
-title = "Add an interval variable"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-interval-variable/
+  - /docs/grafana/latest/variables/variable-types/add-interval-variable/
+title: Add an interval variable
+weight: 600
+---
 
 # Add an interval variable
 
diff --git a/docs/sources/variables/variable-types/add-query-variable.md b/docs/sources/variables/variable-types/add-query-variable.md
index 231c2775f20..6df4261a139 100644
--- a/docs/sources/variables/variable-types/add-query-variable.md
+++ b/docs/sources/variables/variable-types/add-query-variable.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-query-variable/", "/docs/grafana/latest/variables/variable-types/add-query-variable/"]
-title = "Add a query variable"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-query-variable/
+  - /docs/grafana/latest/variables/variable-types/add-query-variable/
+title: Add a query variable
+weight: 100
+---
 
 # Add a query variable
 
diff --git a/docs/sources/variables/variable-types/add-text-box-variable.md b/docs/sources/variables/variable-types/add-text-box-variable.md
index aebf66ca84c..10218374055 100644
--- a/docs/sources/variables/variable-types/add-text-box-variable.md
+++ b/docs/sources/variables/variable-types/add-text-box-variable.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/variables/add-text-box-variable/", "/docs/grafana/latest/variables/variable-types/add-text-box-variable/"]
-title = "Add a text box variable"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/add-text-box-variable/
+  - /docs/grafana/latest/variables/variable-types/add-text-box-variable/
+title: Add a text box variable
+weight: 300
+---
 
 # Add a text box variable
 
diff --git a/docs/sources/variables/variable-types/chained-variables.md b/docs/sources/variables/variable-types/chained-variables.md
index f504bebdaf0..22d63f6f26f 100644
--- a/docs/sources/variables/variable-types/chained-variables.md
+++ b/docs/sources/variables/variable-types/chained-variables.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/variables/chained-variables/", "/docs/grafana/latest/variables/variable-types/chained-variables/"]
-keywords = ["grafana", "templating", "variable", "nested", "chained", "linked"]
-title = "Chained variables"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/chained-variables/
+  - /docs/grafana/latest/variables/variable-types/chained-variables/
+keywords:
+  - grafana
+  - templating
+  - variable
+  - nested
+  - chained
+  - linked
+title: Chained variables
+weight: 800
+---
 
 # Chained variables
 
diff --git a/docs/sources/variables/variable-types/global-variables.md b/docs/sources/variables/variable-types/global-variables.md
index 9b365fd2d9f..59b8ff00260 100644
--- a/docs/sources/variables/variable-types/global-variables.md
+++ b/docs/sources/variables/variable-types/global-variables.md
@@ -1,9 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/variables/global-variables/", "/docs/grafana/latest/variables/variable-types/global-variables/"]
-keywords = ["grafana", "templating", "documentation", "guide", "template", "variable", "global", "standard"]
-title = "Global variables"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/variables/global-variables/
+  - /docs/grafana/latest/variables/variable-types/global-variables/
+keywords:
+  - grafana
+  - templating
+  - documentation
+  - guide
+  - template
+  - variable
+  - global
+  - standard
+title: Global variables
+weight: 900
+---
 
 # Global variables
 
diff --git a/docs/sources/visualizations/_index.md b/docs/sources/visualizations/_index.md
index 3c6d813f925..4e1435d2f2d 100644
--- a/docs/sources/visualizations/_index.md
+++ b/docs/sources/visualizations/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/", "/docs/grafana/latest/visualizations/"]
-title = "Visualizations"
-weight = 75
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/
+  - /docs/grafana/latest/visualizations/
+title: Visualizations
+weight: 75
+---
 
 # Visualization panels
 
diff --git a/docs/sources/visualizations/alert-list-panel.md b/docs/sources/visualizations/alert-list-panel.md
index ecf8e012f89..9d5f1838cae 100644
--- a/docs/sources/visualizations/alert-list-panel.md
+++ b/docs/sources/visualizations/alert-list-panel.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/alertlist/", "/docs/grafana/latest/panels/visualizations/alert-list-panel/", "/docs/grafana/latest/reference/alertlist/", "/docs/grafana/latest/visualizations/alert-list-panel/"]
-keywords = ["grafana", "alert list", "documentation", "panel", "alertlist"]
-title = "Alert list"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/alertlist/
+  - /docs/grafana/latest/panels/visualizations/alert-list-panel/
+  - /docs/grafana/latest/reference/alertlist/
+  - /docs/grafana/latest/visualizations/alert-list-panel/
+keywords:
+  - grafana
+  - alert list
+  - documentation
+  - panel
+  - alertlist
+title: Alert list
+weight: 100
+---
 
 # Alert list
 
diff --git a/docs/sources/visualizations/annotations.md b/docs/sources/visualizations/annotations.md
index 6e2278151a4..10ee3a9629b 100644
--- a/docs/sources/visualizations/annotations.md
+++ b/docs/sources/visualizations/annotations.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/anotations/", "/docs/grafana/latest/panels/visualizations/annotations/", "/docs/grafana/latest/visualizations/annotations/"]
-description = "Annotations visualization documentation"
-keywords = ["grafana", "Annotations", "panel", "documentation"]
-title = "Annotations"
-weight = 105
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/anotations/
+  - /docs/grafana/latest/panels/visualizations/annotations/
+  - /docs/grafana/latest/visualizations/annotations/
+description: Annotations visualization documentation
+keywords:
+  - grafana
+  - Annotations
+  - panel
+  - documentation
+title: Annotations
+weight: 105
+---
 
 # Annotations
 
diff --git a/docs/sources/visualizations/bar-chart.md b/docs/sources/visualizations/bar-chart.md
index ffde7970a24..775223c2ab7 100644
--- a/docs/sources/visualizations/bar-chart.md
+++ b/docs/sources/visualizations/bar-chart.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/bar-chart/", "/docs/grafana/latest/visualizations/bar-chart/"]
-description = "Bar chart visualization"
-keywords = ["grafana", "docs", "bar chart", "panel", "barchart"]
-title = "Bar chart"
-weight = 170
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/bar-chart/
+  - /docs/grafana/latest/visualizations/bar-chart/
+description: Bar chart visualization
+keywords:
+  - grafana
+  - docs
+  - bar chart
+  - panel
+  - barchart
+title: Bar chart
+weight: 170
+---
 
 # Bar chart
 
diff --git a/docs/sources/visualizations/bar-gauge-panel.md b/docs/sources/visualizations/bar-gauge-panel.md
index 839cc4a707c..0ec91785145 100644
--- a/docs/sources/visualizations/bar-gauge-panel.md
+++ b/docs/sources/visualizations/bar-gauge-panel.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/bar_gauge/", "/docs/grafana/latest/panels/visualizations/bar-gauge-panel/", "/docs/grafana/latest/visualizations/bar-gauge-panel/"]
-description = "Bar gauge panel options"
-keywords = ["grafana", "bar", "bar gauge"]
-title = "Bar gauge"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/bar_gauge/
+  - /docs/grafana/latest/panels/visualizations/bar-gauge-panel/
+  - /docs/grafana/latest/visualizations/bar-gauge-panel/
+description: Bar gauge panel options
+keywords:
+  - grafana
+  - bar
+  - bar gauge
+title: Bar gauge
+weight: 200
+---
 
 # Bar gauge
 
diff --git a/docs/sources/visualizations/candlestick.md b/docs/sources/visualizations/candlestick.md
index b25c76ba398..8208781452b 100644
--- a/docs/sources/visualizations/candlestick.md
+++ b/docs/sources/visualizations/candlestick.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/candlestick/", "/docs/grafana/latest/panels/visualizations/candlestick/", "/docs/grafana/latest/visualizations/candlestick/"]
-description = "Candlestick visualization documentation"
-keywords = ["grafana", "Candlestick", "OHLC", "panel", "documentation"]
-title = "Candlestick"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/candlestick/
+  - /docs/grafana/latest/panels/visualizations/candlestick/
+  - /docs/grafana/latest/visualizations/candlestick/
+description: Candlestick visualization documentation
+keywords:
+  - grafana
+  - Candlestick
+  - OHLC
+  - panel
+  - documentation
+title: Candlestick
+weight: 600
+---
 
 # Candlestick
 
diff --git a/docs/sources/visualizations/dashboard-list-panel.md b/docs/sources/visualizations/dashboard-list-panel.md
index 609a445b2f0..1f1f20da420 100644
--- a/docs/sources/visualizations/dashboard-list-panel.md
+++ b/docs/sources/visualizations/dashboard-list-panel.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/dashlist/", "/docs/grafana/latest/panels/visualizations/dashboard-list-panel/", "/docs/grafana/latest/reference/dashlist/", "/docs/grafana/latest/visualizations/dashboard-list-panel/"]
-keywords = ["grafana", "dashboard list", "documentation", "panel", "dashlist"]
-title = "Dashboard list"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/dashlist/
+  - /docs/grafana/latest/panels/visualizations/dashboard-list-panel/
+  - /docs/grafana/latest/reference/dashlist/
+  - /docs/grafana/latest/visualizations/dashboard-list-panel/
+keywords:
+  - grafana
+  - dashboard list
+  - documentation
+  - panel
+  - dashlist
+title: Dashboard list
+weight: 300
+---
 
 # Dashboard list
 
diff --git a/docs/sources/visualizations/gauge-panel.md b/docs/sources/visualizations/gauge-panel.md
index 3fe08b33c0c..6ca0b7470f4 100644
--- a/docs/sources/visualizations/gauge-panel.md
+++ b/docs/sources/visualizations/gauge-panel.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/gauge/", "/docs/grafana/latest/panels/visualizations/gauge-panel/", "/docs/grafana/latest/visualizations/gauge-panel/"]
-description = "Gauge panel docs"
-keywords = ["grafana", "gauge", "gauge panel"]
-title = "Gauge"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/gauge/
+  - /docs/grafana/latest/panels/visualizations/gauge-panel/
+  - /docs/grafana/latest/visualizations/gauge-panel/
+description: Gauge panel docs
+keywords:
+  - grafana
+  - gauge
+  - gauge panel
+title: Gauge
+weight: 400
+---
 
 # Gauge
 
diff --git a/docs/sources/visualizations/geomap.md b/docs/sources/visualizations/geomap.md
index 72c9623a313..56d38ecc220 100644
--- a/docs/sources/visualizations/geomap.md
+++ b/docs/sources/visualizations/geomap.md
@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/geomap/", "/docs/grafana/latest/panels/visualizations/geomap/", "/docs/grafana/latest/visualizations/geomap/"]
-description = "Geomap visualization documentation"
-keywords = ["grafana", "Geomap", "panel", "documentation"]
-title = "Geomap"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/geomap/
+  - /docs/grafana/latest/panels/visualizations/geomap/
+  - /docs/grafana/latest/visualizations/geomap/
+description: Geomap visualization documentation
+keywords:
+  - grafana
+  - Geomap
+  - panel
+  - documentation
+title: Geomap
+weight: 600
+---
 
 # Geomap
 
diff --git a/docs/sources/visualizations/graph-panel.md b/docs/sources/visualizations/graph-panel.md
index 49a7fa159b1..4fbb88db7a4 100644
--- a/docs/sources/visualizations/graph-panel.md
+++ b/docs/sources/visualizations/graph-panel.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/graph/", "/docs/grafana/latest/panels/visualizations/graph-panel/", "/docs/grafana/latest/reference/graph/", "/docs/grafana/latest/visualizations/graph-panel/"]
-keywords = ["grafana", "graph panel", "documentation", "guide", "graph"]
-title = "Graph (old)"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/graph/
+  - /docs/grafana/latest/panels/visualizations/graph-panel/
+  - /docs/grafana/latest/reference/graph/
+  - /docs/grafana/latest/visualizations/graph-panel/
+keywords:
+  - grafana
+  - graph panel
+  - documentation
+  - guide
+  - graph
+title: Graph (old)
+weight: 500
+---
 
 # Graph panel (old)
 
diff --git a/docs/sources/visualizations/heatmap.md b/docs/sources/visualizations/heatmap.md
index 0423c505dc4..2775f6c92e3 100644
--- a/docs/sources/visualizations/heatmap.md
+++ b/docs/sources/visualizations/heatmap.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/heatmap/", "/docs/grafana/latest/visualizations/heatmap/"]
-description = "Heatmap visualization documentation"
-keywords = ["grafana", "heatmap", "panel", "documentation"]
-title = "Heatmap"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/heatmap/
+  - /docs/grafana/latest/visualizations/heatmap/
+description: Heatmap visualization documentation
+keywords:
+  - grafana
+  - heatmap
+  - panel
+  - documentation
+title: Heatmap
+weight: 600
+---
 
 # Heatmap
 
diff --git a/docs/sources/visualizations/histogram.md b/docs/sources/visualizations/histogram.md
index 674d039f11b..fdcd6322e36 100644
--- a/docs/sources/visualizations/histogram.md
+++ b/docs/sources/visualizations/histogram.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/histogram/", "/docs/grafana/latest/panels/visualizations/histogram/", "/docs/grafana/latest/visualizations/histogram/"]
-description = "Histogram visualization"
-keywords = ["grafana", "docs", "bar chart", "panel", "barchart"]
-title = "Histogram"
-weight = 605
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/histogram/
+  - /docs/grafana/latest/panels/visualizations/histogram/
+  - /docs/grafana/latest/visualizations/histogram/
+description: Histogram visualization
+keywords:
+  - grafana
+  - docs
+  - bar chart
+  - panel
+  - barchart
+title: Histogram
+weight: 605
+---
 
 # Histogram
 
diff --git a/docs/sources/visualizations/logs-panel.md b/docs/sources/visualizations/logs-panel.md
index b287ccf6826..69d583d46b2 100644
--- a/docs/sources/visualizations/logs-panel.md
+++ b/docs/sources/visualizations/logs-panel.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/logs/", "/docs/grafana/latest/panels/visualizations/logs-panel/", "/docs/grafana/latest/reference/logs/", "/docs/grafana/latest/visualizations/logs-panel/"]
-keywords = ["grafana", "dashboard", "documentation", "panels", "logs panel"]
-title = "Logs panel"
-weight = 700
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/logs/
+  - /docs/grafana/latest/panels/visualizations/logs-panel/
+  - /docs/grafana/latest/reference/logs/
+  - /docs/grafana/latest/visualizations/logs-panel/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - panels
+  - logs panel
+title: Logs panel
+weight: 700
+---
 
 # Logs panel
 
diff --git a/docs/sources/visualizations/news-panel.md b/docs/sources/visualizations/news-panel.md
index 70093d275fd..29576c048eb 100644
--- a/docs/sources/visualizations/news-panel.md
+++ b/docs/sources/visualizations/news-panel.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/news-graph/", "/docs/grafana/latest/visualizations/news-panel/"]
-keywords = ["grafana", "news", "documentation", "panels", "news panel"]
-title = "News"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/news-graph/
+  - /docs/grafana/latest/visualizations/news-panel/
+keywords:
+  - grafana
+  - news
+  - documentation
+  - panels
+  - news panel
+title: News
+weight: 800
+---
 
 ## News
 
diff --git a/docs/sources/visualizations/node-graph.md b/docs/sources/visualizations/node-graph.md
index f1002a1787c..9ec5cb8dcc7 100644
--- a/docs/sources/visualizations/node-graph.md
+++ b/docs/sources/visualizations/node-graph.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/node-graph/", "/docs/grafana/latest/visualizations/node-graph/"]
-keywords = ["grafana", "dashboard", "documentation", "panels", "node graph", "directed graph"]
-title = "Node graph"
-weight = 850
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/node-graph/
+  - /docs/grafana/latest/visualizations/node-graph/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - panels
+  - node graph
+  - directed graph
+title: Node graph
+weight: 850
+---
 
 # Node graph panel
 
diff --git a/docs/sources/visualizations/pie-chart-panel.md b/docs/sources/visualizations/pie-chart-panel.md
index 917bb9141d9..1507f6c144a 100644
--- a/docs/sources/visualizations/pie-chart-panel.md
+++ b/docs/sources/visualizations/pie-chart-panel.md
@@ -1,9 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/pie-chart-pane/", "/docs/grafana/latest/visualizations/pie-chart-panel/"]
-keywords = ["grafana", "pie chart"]
-title = "Pie chart"
-weight = 850
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/pie-chart-pane/
+  - /docs/grafana/latest/visualizations/pie-chart-panel/
+keywords:
+  - grafana
+  - pie chart
+title: Pie chart
+weight: 850
+---
 
 # Pie chart
 
diff --git a/docs/sources/visualizations/stat-panel.md b/docs/sources/visualizations/stat-panel.md
index 472766168d6..0c54e31f4aa 100644
--- a/docs/sources/visualizations/stat-panel.md
+++ b/docs/sources/visualizations/stat-panel.md
@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/singlestat/", "/docs/grafana/latest/features/panels/stat/", "/docs/grafana/latest/panels/visualizations/stat-panel/", "/docs/grafana/latest/reference/singlestat/", "/docs/grafana/latest/visualizations/stat-panel/"]
-description = "Stat panel documentation"
-keywords = ["grafana", "docs", "stat panel"]
-title = "Stat"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/singlestat/
+  - /docs/grafana/latest/features/panels/stat/
+  - /docs/grafana/latest/panels/visualizations/stat-panel/
+  - /docs/grafana/latest/reference/singlestat/
+  - /docs/grafana/latest/visualizations/stat-panel/
+description: Stat panel documentation
+keywords:
+  - grafana
+  - docs
+  - stat panel
+title: Stat
+weight: 900
+---
 
 # Stat
 
diff --git a/docs/sources/visualizations/state-timeline.md b/docs/sources/visualizations/state-timeline.md
index 5ebfa74d026..7bdb13597d6 100644
--- a/docs/sources/visualizations/state-timeline.md
+++ b/docs/sources/visualizations/state-timeline.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/state-timeline/", "/docs/grafana/latest/visualizations/state-timeline/"]
-description = "State timeline visualization"
-keywords = ["grafana", "docs", "state timeline", "panel"]
-title = "State timeline"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/state-timeline/
+  - /docs/grafana/latest/visualizations/state-timeline/
+description: State timeline visualization
+keywords:
+  - grafana
+  - docs
+  - state timeline
+  - panel
+title: State timeline
+weight: 900
+---
 
 # State timeline
 
diff --git a/docs/sources/visualizations/status-history.md b/docs/sources/visualizations/status-history.md
index 324e3a71e9b..1076808d58a 100644
--- a/docs/sources/visualizations/status-history.md
+++ b/docs/sources/visualizations/status-history.md
@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/status-history/", "/docs/grafana/latest/visualizations/status-history/"]
-description = "Status history visualization"
-keywords = ["grafana", "docs", "status history", "panel"]
-title = "Status history"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/status-history/
+  - /docs/grafana/latest/visualizations/status-history/
+description: Status history visualization
+keywords:
+  - grafana
+  - docs
+  - status history
+  - panel
+title: Status history
+weight: 900
+---
 
 # Status history
 
diff --git a/docs/sources/visualizations/table/_index.md b/docs/sources/visualizations/table/_index.md
index 49e20a3e38f..5edbe5a5e52 100644
--- a/docs/sources/visualizations/table/_index.md
+++ b/docs/sources/visualizations/table/_index.md
@@ -1,9 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/table_panel/", "/docs/grafana/latest/reference/table/", "/docs/grafana/latest/visualizations/table/", "/docs/grafana/next/panels/visualizations/table/table-field-options/"]
-keywords = ["grafana", "dashboard", "documentation", "panels", "table panel"]
-title = "Table"
-weight = 1000
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/table_panel/
+  - /docs/grafana/latest/reference/table/
+  - /docs/grafana/latest/visualizations/table/
+  - /docs/grafana/next/panels/visualizations/table/table-field-options/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - panels
+  - table panel
+title: Table
+weight: 1000
+---
 
 # Table
 
diff --git a/docs/sources/visualizations/table/filter-table-columns.md b/docs/sources/visualizations/table/filter-table-columns.md
index 13ec04bba68..064529673c4 100644
--- a/docs/sources/visualizations/table/filter-table-columns.md
+++ b/docs/sources/visualizations/table/filter-table-columns.md
@@ -1,9 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/table_panel/", "/docs/grafana/latest/panels/visualizations/table/filter-table-columns/", "/docs/grafana/latest/reference/table/", "/docs/grafana/latest/visualizations/table/filter-table-columns/", "/docs/grafana/next/panels/visualizations/table/table-field-options/"]
-keywords = ["grafana", "table options", "documentation", "format tables", "table filter", "filter columns"]
-title = "Filter table columns"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/table_panel/
+  - /docs/grafana/latest/panels/visualizations/table/filter-table-columns/
+  - /docs/grafana/latest/reference/table/
+  - /docs/grafana/latest/visualizations/table/filter-table-columns/
+  - /docs/grafana/next/panels/visualizations/table/table-field-options/
+keywords:
+  - grafana
+  - table options
+  - documentation
+  - format tables
+  - table filter
+  - filter columns
+title: Filter table columns
+weight: 600
+---
 
 # Filter table columns
 
diff --git a/docs/sources/visualizations/text-panel.md b/docs/sources/visualizations/text-panel.md
index 8128099fe1d..07a98c680d3 100644
--- a/docs/sources/visualizations/text-panel.md
+++ b/docs/sources/visualizations/text-panel.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/text/", "/docs/grafana/latest/panels/visualizations/text-panel/", "/docs/grafana/latest/reference/alertlist/", "/docs/grafana/latest/visualizations/text-panel/"]
-keywords = ["grafana", "text", "documentation", "panel"]
-title = "Text"
-weight = 1100
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/text/
+  - /docs/grafana/latest/panels/visualizations/text-panel/
+  - /docs/grafana/latest/reference/alertlist/
+  - /docs/grafana/latest/visualizations/text-panel/
+keywords:
+  - grafana
+  - text
+  - documentation
+  - panel
+title: Text
+weight: 1100
+---
 
 # Text
 
diff --git a/docs/sources/visualizations/time-series/_index.md b/docs/sources/visualizations/time-series/_index.md
index 0cad322c280..b4d5b0428a2 100644
--- a/docs/sources/visualizations/time-series/_index.md
+++ b/docs/sources/visualizations/time-series/_index.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/", "/docs/grafana/latest/visualizations/time-series/"]
-keywords = ["grafana", "graph panel", "time series panel", "documentation", "guide", "graph"]
-title = "Time series"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/
+  - /docs/grafana/latest/visualizations/time-series/
+keywords:
+  - grafana
+  - graph panel
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: Time series
+weight: 1200
+---
 
 # Time series
 
diff --git a/docs/sources/visualizations/time-series/annotate-time-series.md b/docs/sources/visualizations/time-series/annotate-time-series.md
index 5d207da4430..4484cea2625 100644
--- a/docs/sources/visualizations/time-series/annotate-time-series.md
+++ b/docs/sources/visualizations/time-series/annotate-time-series.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/annotate-time-series/", "/docs/grafana/latest/visualizations/time-series/annotate-time-series/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph", "annotations"]
-title = "Annotate time series"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/annotate-time-series/
+  - /docs/grafana/latest/visualizations/time-series/annotate-time-series/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+  - annotations
+title: Annotate time series
+weight: 100
+---
 
 # Annotate time series
 
diff --git a/docs/sources/visualizations/time-series/change-axis-display.md b/docs/sources/visualizations/time-series/change-axis-display.md
index b7f97f64acc..a59157c62bc 100644
--- a/docs/sources/visualizations/time-series/change-axis-display.md
+++ b/docs/sources/visualizations/time-series/change-axis-display.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/change-axis-display/", "/docs/grafana/latest/visualizations/time-series/change-axis-display/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph"]
-title = "Change axis display"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/change-axis-display/
+  - /docs/grafana/latest/visualizations/time-series/change-axis-display/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: Change axis display
+weight: 400
+---
 
 # Change axis display
 
diff --git a/docs/sources/visualizations/time-series/graph-color-scheme.md b/docs/sources/visualizations/time-series/graph-color-scheme.md
index 68fa9b5fa54..311923c82a4 100644
--- a/docs/sources/visualizations/time-series/graph-color-scheme.md
+++ b/docs/sources/visualizations/time-series/graph-color-scheme.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/graph-color-scheme/", "/docs/grafana/latest/visualizations/time-series/graph-color-scheme/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph"]
-title = "Graph and color schemes "
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/graph-color-scheme/
+  - /docs/grafana/latest/visualizations/time-series/graph-color-scheme/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: 'Graph and color schemes '
+weight: 400
+---
 
 {{< figure src="/static/img/docs/v73/color_scheme_dropdown.png" max-width="350px" caption="Color scheme" class="pull-right" >}}
 
diff --git a/docs/sources/visualizations/time-series/graph-time-series-as-bars.md b/docs/sources/visualizations/time-series/graph-time-series-as-bars.md
index 1e31864caeb..41116db1218 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-as-bars.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-as-bars.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-bars/", "/docs/grafana/latest/visualizations/time-series/graph-time-series-as-bars/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph"]
-title = "Graph time series as bars"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-bars/
+  - /docs/grafana/latest/visualizations/time-series/graph-time-series-as-bars/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: Graph time series as bars
+weight: 200
+---
 
 # Graph time series as bars
 
diff --git a/docs/sources/visualizations/time-series/graph-time-series-as-lines.md b/docs/sources/visualizations/time-series/graph-time-series-as-lines.md
index 04e713e5e36..3de1cda08c1 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-as-lines.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-as-lines.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-lines/", "/docs/grafana/latest/visualizations/time-series/graph-time-series-as-lines/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph"]
-title = "Graph time series as lines"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-lines/
+  - /docs/grafana/latest/visualizations/time-series/graph-time-series-as-lines/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: Graph time series as lines
+weight: 200
+---
 
 # Graph time series as lines
 
diff --git a/docs/sources/visualizations/time-series/graph-time-series-as-points.md b/docs/sources/visualizations/time-series/graph-time-series-as-points.md
index eae84fa648b..f3a631486c7 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-as-points.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-as-points.md
@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-points/", "/docs/grafana/latest/visualizations/time-series/graph-time-series-as-points/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph"]
-title = "Graph time series as points"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-points/
+  - /docs/grafana/latest/visualizations/time-series/graph-time-series-as-points/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: Graph time series as points
+weight: 300
+---
 
 # Graph time series as points
 
diff --git a/docs/sources/visualizations/time-series/graph-time-series-stacking.md b/docs/sources/visualizations/time-series/graph-time-series-stacking.md
index 6c857fd1491..09685ae6b63 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-stacking.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-stacking.md
@@ -1,9 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/features/panels/histogram/", "/docs/grafana/latest/panels/visualizations/time-series/graph-time-series-stacking/", "/docs/grafana/latest/visualizations/time-series/graph-time-series-stacking/"]
-keywords = ["grafana", "time series panel", "documentation", "guide", "graph"]
-title = "Graph stacked time series"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/features/panels/histogram/
+  - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-stacking/
+  - /docs/grafana/latest/visualizations/time-series/graph-time-series-stacking/
+keywords:
+  - grafana
+  - time series panel
+  - documentation
+  - guide
+  - graph
+title: Graph stacked time series
+weight: 400
+---
 
 # Graph stacked time series
 
diff --git a/docs/sources/visualizations/traces.md b/docs/sources/visualizations/traces.md
index 1d84c235c12..a3099086bc3 100644
--- a/docs/sources/visualizations/traces.md
+++ b/docs/sources/visualizations/traces.md
@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/visualizations/traces/"]
-keywords = ["grafana", "dashboard", "documentation", "panels", "traces"]
-title = "Traces"
-weight = 850
-+++
+---
+aliases:
+  - /docs/grafana/latest/visualizations/traces/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - panels
+  - traces
+title: Traces
+weight: 850
+---
 
 # Traces panel
 
diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md
index f315e852118..0cbebc88aaf 100644
--- a/docs/sources/whatsnew/_index.md
+++ b/docs/sources/whatsnew/_index.md
@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/guides/", "/docs/grafana/latest/whatsnew/"]
-title = "What's new"
-weight = 1
-+++
+---
+aliases:
+  - /docs/grafana/latest/guides/
+  - /docs/grafana/latest/whatsnew/
+title: What's new
+weight: 1
+---
 
 # What's new Grafana
 
diff --git a/docs/sources/whatsnew/whats-new-in-v2-0.md b/docs/sources/whatsnew/whats-new-in-v2-0.md
index 2026f0c1242..ad6dab1fc8c 100644
--- a/docs/sources/whatsnew/whats-new-in-v2-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v2-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v2/", "/docs/grafana/latest/whatsnew/whats-new-in-v2-0/"]
-description = "Feature and improvement highlights for Grafana v2.0"
-keywords = ["grafana", "new", "documentation", "2.0", "release notes"]
-title = "What's new in Grafana v2.0"
-weight = -1
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v2/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v2-0/
+description: Feature and improvement highlights for Grafana v2.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '2.0'
+  - release notes
+title: What's new in Grafana v2.0
+weight: -1
+---
 
 # What's new in Grafana v2.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v2-1.md b/docs/sources/whatsnew/whats-new-in-v2-1.md
index a6dae7548c3..043e4e4910b 100644
--- a/docs/sources/whatsnew/whats-new-in-v2-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v2-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v2-1/"]
-description = "Feature and improvement highlights for Grafana v2.1"
-keywords = ["grafana", "new", "documentation", "2.1", "release notes"]
-title = "What's new in Grafana v2.1"
-weight = -2
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v2-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v2-1/
+description: Feature and improvement highlights for Grafana v2.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '2.1'
+  - release notes
+title: What's new in Grafana v2.1
+weight: -2
+---
 
 # What's new in Grafana v2.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v2-5.md b/docs/sources/whatsnew/whats-new-in-v2-5.md
index 57784d297a0..599e1fbff75 100644
--- a/docs/sources/whatsnew/whats-new-in-v2-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v2-5.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-5/", "/docs/grafana/latest/whatsnew/whats-new-in-v2-5/"]
-description = "Feature and improvement highlights for Grafana v2.5"
-keywords = ["grafana", "new", "documentation", "2.5", "release notes"]
-title = "What's new in Grafana v2.5"
-weight = -3
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v2-5/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v2-5/
+description: Feature and improvement highlights for Grafana v2.5
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '2.5'
+  - release notes
+title: What's new in Grafana v2.5
+weight: -3
+---
 
 # What's new in Grafana v2.5
 
diff --git a/docs/sources/whatsnew/whats-new-in-v2-6.md b/docs/sources/whatsnew/whats-new-in-v2-6.md
index b221c0f2c5a..880ee853bf5 100644
--- a/docs/sources/whatsnew/whats-new-in-v2-6.md
+++ b/docs/sources/whatsnew/whats-new-in-v2-6.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-6/", "/docs/grafana/latest/whatsnew/whats-new-in-v2-6/"]
-description = "Feature and improvement highlights for Grafana v2.6"
-keywords = ["grafana", "new", "documentation", "2.6", "release notes"]
-title = "What's new in Grafana v2.6"
-weight = -4
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v2-6/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v2-6/
+description: Feature and improvement highlights for Grafana v2.6
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '2.6'
+  - release notes
+title: What's new in Grafana v2.6
+weight: -4
+---
 
 # What's new in Grafana v2.6
 
diff --git a/docs/sources/whatsnew/whats-new-in-v3-0.md b/docs/sources/whatsnew/whats-new-in-v3-0.md
index d45239e7bcd..a0bb5c8a1e9 100644
--- a/docs/sources/whatsnew/whats-new-in-v3-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v3-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v3/", "/docs/grafana/latest/whatsnew/whats-new-in-v3-0/"]
-description = "Feature and improvement highlights for Grafana v3.0"
-keywords = ["grafana", "new", "documentation", "3.0", "release notes"]
-title = "What's new in Grafana v3.0"
-weight = -5
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v3/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v3-0/
+description: Feature and improvement highlights for Grafana v3.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '3.0'
+  - release notes
+title: What's new in Grafana v3.0
+weight: -5
+---
 
 # What's new in Grafana v3.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v3-1.md b/docs/sources/whatsnew/whats-new-in-v3-1.md
index dab47a0cf1f..ba9c07cfbf7 100644
--- a/docs/sources/whatsnew/whats-new-in-v3-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v3-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v3-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v3-1/"]
-description = "Feature and improvement highlights for Grafana v3.1"
-keywords = ["grafana", "new", "documentation", "3.1", "release notes"]
-title = "What's new in Grafana v3.1"
-weight = -6
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v3-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v3-1/
+description: Feature and improvement highlights for Grafana v3.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '3.1'
+  - release notes
+title: What's new in Grafana v3.1
+weight: -6
+---
 
 # What's new in Grafana v3.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-0.md b/docs/sources/whatsnew/whats-new-in-v4-0.md
index a179eb5d0cf..8d175914f15 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-0/"]
-description = "Feature and improvement highlights for Grafana v4.0"
-keywords = ["grafana", "new", "documentation", "4.0", "release notes"]
-title = "What's new in Grafana v4.0"
-weight = -7
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-0/
+description: Feature and improvement highlights for Grafana v4.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '4.0'
+  - release notes
+title: What's new in Grafana v4.0
+weight: -7
+---
 
 # What's new in Grafana v4.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-1.md b/docs/sources/whatsnew/whats-new-in-v4-1.md
index 5fb00253adf..da51f5185bb 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-1/"]
-description = "Feature and improvement highlights for Grafana v4.1"
-keywords = ["grafana", "new", "documentation", "4.1.0", "release notes"]
-title = "What's new in Grafana v4.1"
-weight = -8
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-1/
+description: Feature and improvement highlights for Grafana v4.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - 4.1.0
+  - release notes
+title: What's new in Grafana v4.1
+weight: -8
+---
 
 ## What's new in Grafana v4.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-2.md b/docs/sources/whatsnew/whats-new-in-v4-2.md
index 9f4b51012a8..f9edad7d673 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-2.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-2/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-2/"]
-description = "Feature and improvement highlights for Grafana v4.2"
-keywords = ["grafana", "new", "documentation", "4.2.0", "release notes"]
-title = "What's new in Grafana v4.2"
-weight = -9
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4-2/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-2/
+description: Feature and improvement highlights for Grafana v4.2
+keywords:
+  - grafana
+  - new
+  - documentation
+  - 4.2.0
+  - release notes
+title: What's new in Grafana v4.2
+weight: -9
+---
 
 ## What's new in Grafana v4.2
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-3.md b/docs/sources/whatsnew/whats-new-in-v4-3.md
index b5e56f4aa66..00ce76ba40c 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-3.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-3/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-3/"]
-description = "Feature and improvement highlights for Grafana v4.3"
-keywords = ["grafana", "new", "documentation", "4.3.0", "release notes"]
-title = "What's new in Grafana v4.3"
-weight = -10
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4-3/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-3/
+description: Feature and improvement highlights for Grafana v4.3
+keywords:
+  - grafana
+  - new
+  - documentation
+  - 4.3.0
+  - release notes
+title: What's new in Grafana v4.3
+weight: -10
+---
 
 ## What's new in Grafana v4.3
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-4.md b/docs/sources/whatsnew/whats-new-in-v4-4.md
index d9f4336ef7c..e2bc015c9ae 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-4.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-4/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-4/"]
-description = "Feature and improvement highlights for Grafana v4.4"
-keywords = ["grafana", "new", "documentation", "4.4.0", "release notes"]
-title = "What's new in Grafana v4.4"
-weight = -11
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4-4/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-4/
+description: Feature and improvement highlights for Grafana v4.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - 4.4.0
+  - release notes
+title: What's new in Grafana v4.4
+weight: -11
+---
 
 ## What's new in Grafana v4.4
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-5.md b/docs/sources/whatsnew/whats-new-in-v4-5.md
index 08acfb4ccc3..d62a0c88fdc 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-5.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-5/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-5/"]
-description = "Feature and improvement highlights for Grafana v4.5"
-keywords = ["grafana", "new", "documentation", "4.5", "release notes"]
-title = "What's new in Grafana v4.5"
-weight = -12
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4-5/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-5/
+description: Feature and improvement highlights for Grafana v4.5
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '4.5'
+  - release notes
+title: What's new in Grafana v4.5
+weight: -12
+---
 
 # What's new in Grafana v4.5
 
diff --git a/docs/sources/whatsnew/whats-new-in-v4-6.md b/docs/sources/whatsnew/whats-new-in-v4-6.md
index 067b6d1e6d3..b45d5fd879f 100644
--- a/docs/sources/whatsnew/whats-new-in-v4-6.md
+++ b/docs/sources/whatsnew/whats-new-in-v4-6.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-6/", "/docs/grafana/latest/whatsnew/whats-new-in-v4-6/"]
-description = "Feature and improvement highlights for Grafana v4.6"
-keywords = ["grafana", "new", "documentation", "4.6", "release notes"]
-title = "What's new in Grafana v4.6"
-weight = -13
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v4-6/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v4-6/
+description: Feature and improvement highlights for Grafana v4.6
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '4.6'
+  - release notes
+title: What's new in Grafana v4.6
+weight: -13
+---
 
 # What's new in Grafana v4.6
 
diff --git a/docs/sources/whatsnew/whats-new-in-v5-0.md b/docs/sources/whatsnew/whats-new-in-v5-0.md
index 4c87bad3d13..0a18a40c869 100644
--- a/docs/sources/whatsnew/whats-new-in-v5-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v5-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v5/", "/docs/grafana/latest/whatsnew/whats-new-in-v5-0/"]
-description = "Feature and improvement highlights for Grafana v5.0"
-keywords = ["grafana", "new", "documentation", "5.0", "release notes"]
-title = "What's new in Grafana v5.0"
-weight = -14
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v5/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v5-0/
+description: Feature and improvement highlights for Grafana v5.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '5.0'
+  - release notes
+title: What's new in Grafana v5.0
+weight: -14
+---
 
 # What's new in Grafana v5.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v5-1.md b/docs/sources/whatsnew/whats-new-in-v5-1.md
index c7d541729e0..5cbed8052af 100644
--- a/docs/sources/whatsnew/whats-new-in-v5-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v5-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v5-1/"]
-description = "Feature and improvement highlights for Grafana v5.1"
-keywords = ["grafana", "new", "documentation", "5.1", "release notes"]
-title = "What's new in Grafana v5.1"
-weight = -15
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v5-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v5-1/
+description: Feature and improvement highlights for Grafana v5.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '5.1'
+  - release notes
+title: What's new in Grafana v5.1
+weight: -15
+---
 
 # What's new in Grafana v5.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v5-2.md b/docs/sources/whatsnew/whats-new-in-v5-2.md
index 00803eb95a6..37847ba8837 100644
--- a/docs/sources/whatsnew/whats-new-in-v5-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v5-2.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-2/", "/docs/grafana/latest/whatsnew/whats-new-in-v5-2/"]
-description = "Feature and improvement highlights for Grafana v5.2"
-keywords = ["grafana", "new", "documentation", "5.2", "release notes"]
-title = "What's new in Grafana v5.2"
-weight = -16
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v5-2/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v5-2/
+description: Feature and improvement highlights for Grafana v5.2
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '5.2'
+  - release notes
+title: What's new in Grafana v5.2
+weight: -16
+---
 
 # What's new in Grafana v5.2
 
diff --git a/docs/sources/whatsnew/whats-new-in-v5-3.md b/docs/sources/whatsnew/whats-new-in-v5-3.md
index b2c29110c16..e2a616ce83b 100644
--- a/docs/sources/whatsnew/whats-new-in-v5-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v5-3.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-3/", "/docs/grafana/latest/whatsnew/whats-new-in-v5-3/"]
-description = "Feature and improvement highlights for Grafana v5.3"
-keywords = ["grafana", "new", "documentation", "5.3", "release notes"]
-title = "What's new in Grafana v5.3"
-weight = -17
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v5-3/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v5-3/
+description: Feature and improvement highlights for Grafana v5.3
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '5.3'
+  - release notes
+title: What's new in Grafana v5.3
+weight: -17
+---
 
 # What's new in Grafana v5.3
 
diff --git a/docs/sources/whatsnew/whats-new-in-v5-4.md b/docs/sources/whatsnew/whats-new-in-v5-4.md
index 1e39f542403..6d1892dd4af 100644
--- a/docs/sources/whatsnew/whats-new-in-v5-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v5-4.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-4/", "/docs/grafana/latest/whatsnew/whats-new-in-v5-4/"]
-description = "Feature and improvement highlights for Grafana v5.4"
-keywords = ["grafana", "new", "documentation", "5.4", "release notes"]
-title = "What's new in Grafana v5.4"
-weight = -18
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v5-4/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v5-4/
+description: Feature and improvement highlights for Grafana v5.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '5.4'
+  - release notes
+title: What's new in Grafana v5.4
+weight: -18
+---
 
 # What's new in Grafana v5.4
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-0.md b/docs/sources/whatsnew/whats-new-in-v6-0.md
index 9267720317e..c60c326f868 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-0/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-0/"]
-description = "Feature and improvement highlights for Grafana v6.0"
-keywords = ["grafana", "new", "documentation", "6.0", "release notes"]
-title = "What's new in Grafana v6.0"
-weight = -19
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-0/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-0/
+description: Feature and improvement highlights for Grafana v6.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.0'
+  - release notes
+title: What's new in Grafana v6.0
+weight: -19
+---
 
 # What's new in Grafana v6.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-1.md b/docs/sources/whatsnew/whats-new-in-v6-1.md
index 5ab71fda931..425840eb327 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-1/"]
-description = "Feature and improvement highlights for Grafana v6.1"
-keywords = ["grafana", "new", "documentation", "6.1", "release notes"]
-title = "What's new in Grafana v6.1"
-weight = -20
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-1/
+description: Feature and improvement highlights for Grafana v6.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.1'
+  - release notes
+title: What's new in Grafana v6.1
+weight: -20
+---
 
 # What's new in Grafana v6.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-2.md b/docs/sources/whatsnew/whats-new-in-v6-2.md
index a144ef4fb2c..64e0833155c 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-2.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-2/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-2/"]
-description = "Feature and improvement highlights for Grafana v6.2"
-keywords = ["grafana", "new", "documentation", "6.2", "release notes"]
-title = "What's new in Grafana v6.2"
-weight = -21
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-2/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-2/
+description: Feature and improvement highlights for Grafana v6.2
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.2'
+  - release notes
+title: What's new in Grafana v6.2
+weight: -21
+---
 
 # What's new in Grafana v6.2
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-3.md b/docs/sources/whatsnew/whats-new-in-v6-3.md
index 35692ba02d3..e19524f6fbe 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-3.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-3/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-3/"]
-description = "Feature and improvement highlights for Grafana v6.3"
-keywords = ["grafana", "new", "documentation", "6.3", "release notes"]
-title = "What's new in Grafana v6.3"
-weight = -22
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-3/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-3/
+description: Feature and improvement highlights for Grafana v6.3
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.3'
+  - release notes
+title: What's new in Grafana v6.3
+weight: -22
+---
 
 # What's new in Grafana v6.3
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-4.md b/docs/sources/whatsnew/whats-new-in-v6-4.md
index 6b65500e615..69e5f3ed3f6 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-4.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-4/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-4/"]
-description = "Feature and improvement highlights for Grafana v6.4"
-keywords = ["grafana", "new", "documentation", "6.4", "release notes"]
-title = "What's new in Grafana v6.4"
-weight = -23
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-4/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-4/
+description: Feature and improvement highlights for Grafana v6.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.4'
+  - release notes
+title: What's new in Grafana v6.4
+weight: -23
+---
 
 # What's new in Grafana v6.4
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-5.md b/docs/sources/whatsnew/whats-new-in-v6-5.md
index 9821984e542..6240925bd41 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-5.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-5/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-5/"]
-description = "Feature and improvement highlights for Grafana v6.5"
-keywords = ["grafana", "new", "documentation", "6.5", "release notes"]
-title = "What's new in Grafana v6.5"
-weight = -24
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-5/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-5/
+description: Feature and improvement highlights for Grafana v6.5
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.5'
+  - release notes
+title: What's new in Grafana v6.5
+weight: -24
+---
 
 # What's new in Grafana v6.5
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-6.md b/docs/sources/whatsnew/whats-new-in-v6-6.md
index c743f1ef2a3..cf10090f845 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-6.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-6.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-6/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-6/"]
-description = "Feature and improvement highlights for Grafana v6.6"
-keywords = ["grafana", "new", "documentation", "6.6", "release notes"]
-title = "What's new in Grafana v6.6"
-weight = -25
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-6/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-6/
+description: Feature and improvement highlights for Grafana v6.6
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.6'
+  - release notes
+title: What's new in Grafana v6.6
+weight: -25
+---
 
 # What's new in Grafana v6.6
 
diff --git a/docs/sources/whatsnew/whats-new-in-v6-7.md b/docs/sources/whatsnew/whats-new-in-v6-7.md
index f6c97ec47f8..954e38fbbec 100644
--- a/docs/sources/whatsnew/whats-new-in-v6-7.md
+++ b/docs/sources/whatsnew/whats-new-in-v6-7.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-7/", "/docs/grafana/latest/whatsnew/whats-new-in-v6-7/"]
-description = "Feature and improvement highlights for Grafana v6.7"
-keywords = ["grafana", "new", "documentation", "6.7", "release notes"]
-title = "What's New in Grafana v6.7"
-weight = -26
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v6-7/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v6-7/
+description: Feature and improvement highlights for Grafana v6.7
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '6.7'
+  - release notes
+title: What's New in Grafana v6.7
+weight: -26
+---
 
 # What's new in Grafana v6.7
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-0.md b/docs/sources/whatsnew/whats-new-in-v7-0.md
index 00af4f8f768..e4165bbf46f 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-0/", "/docs/grafana/latest/whatsnew/whats-new-in-v7-0/"]
-description = "Feature and improvement highlights for Grafana v7"
-keywords = ["grafana", "new", "documentation", "7.0", "release notes"]
-title = "What's New in Grafana v7.0"
-weight = -27
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v7-0/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v7-0/
+description: Feature and improvement highlights for Grafana v7
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '7.0'
+  - release notes
+title: What's New in Grafana v7.0
+weight: -27
+---
 
 # What's new in Grafana v7.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-1.md b/docs/sources/whatsnew/whats-new-in-v7-1.md
index ade84484629..263da09b24c 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v7-1/"]
-description = "Feature and improvement highlights for Grafana v7.1"
-keywords = ["grafana", "new", "documentation", "7.1", "release notes"]
-title = "What's New in Grafana v7.1"
-weight = -28
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v7-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v7-1/
+description: Feature and improvement highlights for Grafana v7.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '7.1'
+  - release notes
+title: What's New in Grafana v7.1
+weight: -28
+---
 
 # What's new in Grafana v7.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-2.md b/docs/sources/whatsnew/whats-new-in-v7-2.md
index c6e2a2eb5ee..6e746ccbf25 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-2.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-2/", "/docs/grafana/latest/whatsnew/whats-new-in-v7-2/"]
-description = "Feature and improvement highlights for Grafana v7.2"
-keywords = ["grafana", "new", "documentation", "7.2", "release notes"]
-title = "What's New in Grafana v7.2"
-weight = -29
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v7-2/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v7-2/
+description: Feature and improvement highlights for Grafana v7.2
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '7.2'
+  - release notes
+title: What's New in Grafana v7.2
+weight: -29
+---
 
 # What's new in Grafana v7.2
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-3.md b/docs/sources/whatsnew/whats-new-in-v7-3.md
index 04968d96234..b435b83b3f8 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-3.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-3/", "/docs/grafana/latest/whatsnew/whats-new-in-v7-3/"]
-description = "Feature and improvement highlights for Grafana v7.3"
-keywords = ["grafana", "new", "documentation", "7.3", "release notes"]
-title = "What's New in Grafana v7.3"
-weight = -30
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v7-3/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v7-3/
+description: Feature and improvement highlights for Grafana v7.3
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '7.3'
+  - release notes
+title: What's New in Grafana v7.3
+weight: -30
+---
 
 # What's new in Grafana v7.3
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-4.md b/docs/sources/whatsnew/whats-new-in-v7-4.md
index 86a4c31c21c..735dd5f2a10 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-4.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-4/", "/docs/grafana/latest/whatsnew/whats-new-in-v7-4/"]
-description = "Feature and improvement highlights for Grafana v7.4"
-keywords = ["grafana", "new", "documentation", "7.4", "release notes"]
-title = "What's New in Grafana v7.4"
-weight = -31
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v7-4/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v7-4/
+description: Feature and improvement highlights for Grafana v7.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '7.4'
+  - release notes
+title: What's New in Grafana v7.4
+weight: -31
+---
 
 # What's new in Grafana v7.4
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md
index 9256310888e..920a0b67331 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-5.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-5/", "/docs/grafana/latest/whatsnew/whats-new-in-v7-5/"]
-description = "Feature and improvement highlights for Grafana v7.5"
-keywords = ["grafana", "new", "documentation", "7.5", "release notes"]
-title = "What's new in Grafana v7.5"
-weight = -32
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v7-5/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v7-5/
+description: Feature and improvement highlights for Grafana v7.5
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '7.5'
+  - release notes
+title: What's new in Grafana v7.5
+weight: -32
+---
 
 # What’s new in Grafana v7.5
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-0.md b/docs/sources/whatsnew/whats-new-in-v8-0.md
index a78b1a98013..4d10b2d8df3 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v8-0/", "/docs/grafana/latest/whatsnew/whats-new-in-v8-0/"]
-description = "Feature and improvement highlights for Grafana v8.0"
-keywords = ["grafana", "new", "documentation", "8.0", "release notes"]
-title = "What's new in Grafana v8.0"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v8-0/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v8-0/
+description: Feature and improvement highlights for Grafana v8.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '8.0'
+  - release notes
+title: What's new in Grafana v8.0
+weight: -33
+---
 
 # What’s new in Grafana v8.0
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-1.md b/docs/sources/whatsnew/whats-new-in-v8-1.md
index 170f2e14fb4..167a3a43806 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-1.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v8-1/", "/docs/grafana/latest/whatsnew/whats-new-in-v8-1/"]
-description = "Feature and improvement highlights for Grafana v8.1"
-keywords = ["grafana", "new", "documentation", "8.1", "release notes"]
-title = "What's new in Grafana v8.1"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v8-1/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v8-1/
+description: Feature and improvement highlights for Grafana v8.1
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '8.1'
+  - release notes
+title: What's new in Grafana v8.1
+weight: -33
+---
 
 # What’s new in Grafana v8.1
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-2.md b/docs/sources/whatsnew/whats-new-in-v8-2.md
index 93dca060563..5717519ff30 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-2.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v8-2/", "/docs/grafana/latest/whatsnew/whats-new-in-v8-2/"]
-description = "Feature and improvement highlights for Grafana v8.2"
-keywords = ["grafana", "new", "documentation", "8.2", "release notes"]
-title = "What's new in Grafana v8.2"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v8-2/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v8-2/
+description: Feature and improvement highlights for Grafana v8.2
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '8.2'
+  - release notes
+title: What's new in Grafana v8.2
+weight: -33
+---
 
 # What’s new in Grafana v8.2
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-3.md b/docs/sources/whatsnew/whats-new-in-v8-3.md
index a258bb9fbe0..31e86ab89b5 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-3.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v8-3/", "/docs/grafana/latest/whatsnew/whats-new-in-v8-3/"]
-description = "Feature and improvement highlights for Grafana v8.3"
-keywords = ["grafana", "new", "documentation", "8.3", "release notes"]
-title = "What's new in Grafana v8.3"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v8-3/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v8-3/
+description: Feature and improvement highlights for Grafana v8.3
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '8.3'
+  - release notes
+title: What's new in Grafana v8.3
+weight: -33
+---
 
 # What’s new in Grafana v8.3
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-4.md b/docs/sources/whatsnew/whats-new-in-v8-4.md
index cfa1aa905a6..45ba5fdbb4c 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-4.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v8-4/", "/docs/grafana/latest/whatsnew/whats-new-in-v8-4/"]
-description = "Feature and improvement highlights for Grafana v8.4"
-keywords = ["grafana", "new", "documentation", "8.4", "release notes"]
-title = "What's new in Grafana v8.4"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v8-4/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v8-4/
+description: Feature and improvement highlights for Grafana v8.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '8.4'
+  - release notes
+title: What's new in Grafana v8.4
+weight: -33
+---
 
 # What’s new in Grafana v8.4
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-5.md b/docs/sources/whatsnew/whats-new-in-v8-5.md
index 0187dd18e58..96b19a7deac 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-5.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v8-5/", "/docs/grafana/latest/whatsnew/whats-new-in-v8-5/"]
-description = "Feature and improvement highlights for Grafana v8.5"
-keywords = ["grafana", "new", "documentation", "8.5", "release notes"]
-title = "What's new in Grafana v8.5"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v8-5/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v8-5/
+description: Feature and improvement highlights for Grafana v8.5
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '8.5'
+  - release notes
+title: What's new in Grafana v8.5
+weight: -33
+---
 
 # What’s new in Grafana v8.5
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index b14ab428565..1fc5e981bcd 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -1,13 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/guides/whats-new-in-v9-0/", "/docs/grafana/latest/whatsnew/whats-new-in-v9-0/"]
-description = "Feature and improvement highlights for Grafana v9.0"
-keywords = ["grafana", "new", "documentation", "9.0", "release notes"]
-title = "What's new in Grafana v9.0"
-weight = -33
-
-[_build]
-  list = false
-+++
+---
+_build:
+  list: false
+aliases:
+  - /docs/grafana/latest/guides/whats-new-in-v9-0/
+  - /docs/grafana/latest/whatsnew/whats-new-in-v9-0/
+description: Feature and improvement highlights for Grafana v9.0
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '9.0'
+  - release notes
+title: What's new in Grafana v9.0
+weight: -33
+---
 
 # What’s new in Grafana v9.0 ((beta))
 

From 7e4327d254424a3ef8a83cf34d58a107f4349571 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 17:06:52 -0400
Subject: [PATCH 065/103] Alerting: Endpoints for provisioning mute timings
 (#49635) (#49735)

* Add validator for mute timing and make it provisionable

* Add tests to ensure prometheus validators are running and errors are propagated

* Internal API for manipulating mute timings

* Define and generate API layer

* Wire up generated code

* Implement API handlers

* Tests for golang layer

* Fix reference bug

* Fix linter and auth tests

* Resolve semantic errors and regenerate

* Remove pointless comment

* Extract out provisioning path param keys, simplify

* Expected number of paths

(cherry picked from commit 909ebcf979514f43798893759cb00762d0b90c44)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
---
 pkg/services/ngalert/api/api_provisioning.go  |  64 +++-
 pkg/services/ngalert/api/authorization.go     |   5 +-
 .../ngalert/api/forked_provisioning.go        |  12 +
 .../api/generated_base_api_provisioning.go    |  53 ++++
 pkg/services/ngalert/api/tooling/api.json     |  34 +-
 .../api/tooling/definitions/alertmanager.go   |  14 +
 .../definitions/alertmanager_validation.go    |  46 +++
 .../alertmanager_validation_test.go           | 110 +++++++
 .../definitions/provisioning_mute_timings.go  |  48 ++-
 .../definitions/provisioning_templates.go     |  36 ---
 pkg/services/ngalert/api/tooling/post.json    | 132 ++++++--
 pkg/services/ngalert/api/tooling/spec.json    | 128 ++++++--
 .../ngalert/provisioning/mute_timings.go      | 161 +++++++++-
 .../ngalert/provisioning/mute_timings_test.go | 292 ++++++++++++++++++
 14 files changed, 1003 insertions(+), 132 deletions(-)

diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go
index 3bcd608b906..1edcb98d555 100644
--- a/pkg/services/ngalert/api/api_provisioning.go
+++ b/pkg/services/ngalert/api/api_provisioning.go
@@ -16,6 +16,9 @@ import (
 	"github.com/grafana/grafana/pkg/web"
 )
 
+const namePathParam = ":name"
+const idPathParam = ":ID"
+
 type ProvisioningSrv struct {
 	log                 log.Logger
 	policies            NotificationPolicyService
@@ -43,7 +46,10 @@ type NotificationPolicyService interface {
 }
 
 type MuteTimingService interface {
-	GetMuteTimings(ctx context.Context, orgID int64) ([]apimodels.MuteTiming, error)
+	GetMuteTimings(ctx context.Context, orgID int64) ([]apimodels.MuteTimeInterval, error)
+	CreateMuteTiming(ctx context.Context, mt apimodels.MuteTimeInterval, orgID int64) (*apimodels.MuteTimeInterval, error)
+	UpdateMuteTiming(ctx context.Context, mt apimodels.MuteTimeInterval, orgID int64) (*apimodels.MuteTimeInterval, error)
+	DeleteMuteTiming(ctx context.Context, name string, orgID int64) error
 }
 
 func (srv *ProvisioningSrv) RouteGetPolicyTree(c *models.ReqContext) response.Response {
@@ -91,7 +97,7 @@ func (srv *ProvisioningSrv) RoutePostContactPoint(c *models.ReqContext, cp apimo
 }
 
 func (srv *ProvisioningSrv) RoutePutContactPoint(c *models.ReqContext, cp apimodels.EmbeddedContactPoint) response.Response {
-	id := web.Params(c.Req)[":ID"]
+	id := pathParam(c, idPathParam)
 	cp.UID = id
 	err := srv.contactPointService.UpdateContactPoint(c.Req.Context(), c.OrgId, cp, alerting_models.ProvenanceAPI)
 	if err != nil {
@@ -101,7 +107,7 @@ func (srv *ProvisioningSrv) RoutePutContactPoint(c *models.ReqContext, cp apimod
 }
 
 func (srv *ProvisioningSrv) RouteDeleteContactPoint(c *models.ReqContext) response.Response {
-	cpID := web.Params(c.Req)[":ID"]
+	cpID := pathParam(c, idPathParam)
 	err := srv.contactPointService.DeleteContactPoint(c.Req.Context(), c.OrgId, cpID)
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
@@ -122,19 +128,19 @@ func (srv *ProvisioningSrv) RouteGetTemplates(c *models.ReqContext) response.Res
 }
 
 func (srv *ProvisioningSrv) RouteGetTemplate(c *models.ReqContext) response.Response {
-	id := web.Params(c.Req)[":name"]
+	name := pathParam(c, namePathParam)
 	templates, err := srv.templates.GetTemplates(c.Req.Context(), c.OrgId)
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
-	if tmpl, ok := templates[id]; ok {
-		return response.JSON(http.StatusOK, apimodels.MessageTemplate{Name: id, Template: tmpl})
+	if tmpl, ok := templates[name]; ok {
+		return response.JSON(http.StatusOK, apimodels.MessageTemplate{Name: name, Template: tmpl})
 	}
 	return response.Empty(http.StatusNotFound)
 }
 
 func (srv *ProvisioningSrv) RoutePutTemplate(c *models.ReqContext, body apimodels.MessageTemplateContent) response.Response {
-	name := web.Params(c.Req)[":name"]
+	name := pathParam(c, namePathParam)
 	tmpl := apimodels.MessageTemplate{
 		Name:       name,
 		Template:   body.Template,
@@ -151,7 +157,7 @@ func (srv *ProvisioningSrv) RoutePutTemplate(c *models.ReqContext, body apimodel
 }
 
 func (srv *ProvisioningSrv) RouteDeleteTemplate(c *models.ReqContext) response.Response {
-	name := web.Params(c.Req)[":name"]
+	name := pathParam(c, namePathParam)
 	err := srv.templates.DeleteTemplate(c.Req.Context(), c.OrgId, name)
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
@@ -160,7 +166,7 @@ func (srv *ProvisioningSrv) RouteDeleteTemplate(c *models.ReqContext) response.R
 }
 
 func (srv *ProvisioningSrv) RouteGetMuteTiming(c *models.ReqContext) response.Response {
-	name := web.Params(c.Req)[":name"]
+	name := pathParam(c, namePathParam)
 	timings, err := srv.muteTimings.GetMuteTimings(c.Req.Context(), c.OrgId)
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
@@ -180,3 +186,43 @@ func (srv *ProvisioningSrv) RouteGetMuteTimings(c *models.ReqContext) response.R
 	}
 	return response.JSON(http.StatusOK, timings)
 }
+
+func (srv *ProvisioningSrv) RoutePostMuteTiming(c *models.ReqContext, mt apimodels.MuteTimeInterval) response.Response {
+	created, err := srv.muteTimings.CreateMuteTiming(c.Req.Context(), mt, c.OrgId)
+	if err != nil {
+		if errors.Is(err, provisioning.ErrValidation) {
+			return ErrResp(http.StatusBadRequest, err, "")
+		}
+		return ErrResp(http.StatusInternalServerError, err, "")
+	}
+	return response.JSON(http.StatusCreated, created)
+}
+
+func (srv *ProvisioningSrv) RoutePutMuteTiming(c *models.ReqContext, mt apimodels.MuteTimeInterval) response.Response {
+	name := pathParam(c, namePathParam)
+	mt.Name = name
+	updated, err := srv.muteTimings.UpdateMuteTiming(c.Req.Context(), mt, c.OrgId)
+	if err != nil {
+		if errors.Is(err, provisioning.ErrValidation) {
+			return ErrResp(http.StatusBadRequest, err, "")
+		}
+		return ErrResp(http.StatusInternalServerError, err, "")
+	}
+	if updated == nil {
+		return response.Empty(http.StatusNotFound)
+	}
+	return response.JSON(http.StatusAccepted, updated)
+}
+
+func (srv *ProvisioningSrv) RouteDeleteMuteTiming(c *models.ReqContext) response.Response {
+	name := pathParam(c, namePathParam)
+	err := srv.muteTimings.DeleteMuteTiming(c.Req.Context(), name, c.OrgId)
+	if err != nil {
+		return ErrResp(http.StatusInternalServerError, err, "")
+	}
+	return response.JSON(http.StatusNoContent, nil)
+}
+
+func pathParam(c *models.ReqContext, param string) string {
+	return web.Params(c.Req)[param]
+}
diff --git a/pkg/services/ngalert/api/authorization.go b/pkg/services/ngalert/api/authorization.go
index 70ff0034dd3..dc6725d0efc 100644
--- a/pkg/services/ngalert/api/authorization.go
+++ b/pkg/services/ngalert/api/authorization.go
@@ -192,7 +192,10 @@ func (api *API) authorize(method, path string) web.Handler {
 		http.MethodPut + "/api/provisioning/contact-points/{ID}",
 		http.MethodDelete + "/api/provisioning/contact-points/{ID}",
 		http.MethodPut + "/api/provisioning/templates/{name}",
-		http.MethodDelete + "/api/provisioning/templates/{name}":
+		http.MethodDelete + "/api/provisioning/templates/{name}",
+		http.MethodPost + "/api/provisioning/mute-timings",
+		http.MethodPut + "/api/provisioning/mute-timings/{name}",
+		http.MethodDelete + "/api/provisioning/mute-timings/{name}":
 		return middleware.ReqEditorRole
 	}
 
diff --git a/pkg/services/ngalert/api/forked_provisioning.go b/pkg/services/ngalert/api/forked_provisioning.go
index 6705c5ba176..297147e7e65 100644
--- a/pkg/services/ngalert/api/forked_provisioning.go
+++ b/pkg/services/ngalert/api/forked_provisioning.go
@@ -66,3 +66,15 @@ func (f *ForkedProvisioningApi) forkRouteGetMuteTiming(ctx *models.ReqContext) r
 func (f *ForkedProvisioningApi) forkRouteGetMuteTimings(ctx *models.ReqContext) response.Response {
 	return f.svc.RouteGetMuteTimings(ctx)
 }
+
+func (f *ForkedProvisioningApi) forkRoutePostMuteTiming(ctx *models.ReqContext, mt apimodels.MuteTimeInterval) response.Response {
+	return f.svc.RoutePostMuteTiming(ctx, mt)
+}
+
+func (f *ForkedProvisioningApi) forkRoutePutMuteTiming(ctx *models.ReqContext, mt apimodels.MuteTimeInterval) response.Response {
+	return f.svc.RoutePutMuteTiming(ctx, mt)
+}
+
+func (f *ForkedProvisioningApi) forkRouteDeleteMuteTiming(ctx *models.ReqContext) response.Response {
+	return f.svc.RouteDeleteMuteTiming(ctx)
+}
diff --git a/pkg/services/ngalert/api/generated_base_api_provisioning.go b/pkg/services/ngalert/api/generated_base_api_provisioning.go
index 66881649af6..edde8b0afd1 100644
--- a/pkg/services/ngalert/api/generated_base_api_provisioning.go
+++ b/pkg/services/ngalert/api/generated_base_api_provisioning.go
@@ -21,6 +21,7 @@ import (
 
 type ProvisioningApiForkingService interface {
 	RouteDeleteContactpoints(*models.ReqContext) response.Response
+	RouteDeleteMuteTiming(*models.ReqContext) response.Response
 	RouteDeleteTemplate(*models.ReqContext) response.Response
 	RouteGetContactpoints(*models.ReqContext) response.Response
 	RouteGetMuteTiming(*models.ReqContext) response.Response
@@ -29,7 +30,9 @@ type ProvisioningApiForkingService interface {
 	RouteGetTemplate(*models.ReqContext) response.Response
 	RouteGetTemplates(*models.ReqContext) response.Response
 	RoutePostContactpoints(*models.ReqContext) response.Response
+	RoutePostMuteTiming(*models.ReqContext) response.Response
 	RoutePutContactpoint(*models.ReqContext) response.Response
+	RoutePutMuteTiming(*models.ReqContext) response.Response
 	RoutePutPolicyTree(*models.ReqContext) response.Response
 	RoutePutTemplate(*models.ReqContext) response.Response
 }
@@ -38,6 +41,10 @@ func (f *ForkedProvisioningApi) RouteDeleteContactpoints(ctx *models.ReqContext)
 	return f.forkRouteDeleteContactpoints(ctx)
 }
 
+func (f *ForkedProvisioningApi) RouteDeleteMuteTiming(ctx *models.ReqContext) response.Response {
+	return f.forkRouteDeleteMuteTiming(ctx)
+}
+
 func (f *ForkedProvisioningApi) RouteDeleteTemplate(ctx *models.ReqContext) response.Response {
 	return f.forkRouteDeleteTemplate(ctx)
 }
@@ -74,6 +81,14 @@ func (f *ForkedProvisioningApi) RoutePostContactpoints(ctx *models.ReqContext) r
 	return f.forkRoutePostContactpoints(ctx, conf)
 }
 
+func (f *ForkedProvisioningApi) RoutePostMuteTiming(ctx *models.ReqContext) response.Response {
+	conf := apimodels.MuteTimeInterval{}
+	if err := web.Bind(ctx.Req, &conf); err != nil {
+		return response.Error(http.StatusBadRequest, "bad request data", err)
+	}
+	return f.forkRoutePostMuteTiming(ctx, conf)
+}
+
 func (f *ForkedProvisioningApi) RoutePutContactpoint(ctx *models.ReqContext) response.Response {
 	conf := apimodels.EmbeddedContactPoint{}
 	if err := web.Bind(ctx.Req, &conf); err != nil {
@@ -82,6 +97,14 @@ func (f *ForkedProvisioningApi) RoutePutContactpoint(ctx *models.ReqContext) res
 	return f.forkRoutePutContactpoint(ctx, conf)
 }
 
+func (f *ForkedProvisioningApi) RoutePutMuteTiming(ctx *models.ReqContext) response.Response {
+	conf := apimodels.MuteTimeInterval{}
+	if err := web.Bind(ctx.Req, &conf); err != nil {
+		return response.Error(http.StatusBadRequest, "bad request data", err)
+	}
+	return f.forkRoutePutMuteTiming(ctx, conf)
+}
+
 func (f *ForkedProvisioningApi) RoutePutPolicyTree(ctx *models.ReqContext) response.Response {
 	conf := apimodels.Route{}
 	if err := web.Bind(ctx.Req, &conf); err != nil {
@@ -110,6 +133,16 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApiForkingServi
 				m,
 			),
 		)
+		group.Delete(
+			toMacaronPath("/api/provisioning/mute-timings/{name}"),
+			api.authorize(http.MethodDelete, "/api/provisioning/mute-timings/{name}"),
+			metrics.Instrument(
+				http.MethodDelete,
+				"/api/provisioning/mute-timings/{name}",
+				srv.RouteDeleteMuteTiming,
+				m,
+			),
+		)
 		group.Delete(
 			toMacaronPath("/api/provisioning/templates/{name}"),
 			api.authorize(http.MethodDelete, "/api/provisioning/templates/{name}"),
@@ -190,6 +223,16 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApiForkingServi
 				m,
 			),
 		)
+		group.Post(
+			toMacaronPath("/api/provisioning/mute-timings"),
+			api.authorize(http.MethodPost, "/api/provisioning/mute-timings"),
+			metrics.Instrument(
+				http.MethodPost,
+				"/api/provisioning/mute-timings",
+				srv.RoutePostMuteTiming,
+				m,
+			),
+		)
 		group.Put(
 			toMacaronPath("/api/provisioning/contact-points/{ID}"),
 			api.authorize(http.MethodPut, "/api/provisioning/contact-points/{ID}"),
@@ -200,6 +243,16 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApiForkingServi
 				m,
 			),
 		)
+		group.Put(
+			toMacaronPath("/api/provisioning/mute-timings/{name}"),
+			api.authorize(http.MethodPut, "/api/provisioning/mute-timings/{name}"),
+			metrics.Instrument(
+				http.MethodPut,
+				"/api/provisioning/mute-timings/{name}",
+				srv.RoutePutMuteTiming,
+				m,
+			),
+		)
 		group.Put(
 			toMacaronPath("/api/provisioning/policies"),
 			api.authorize(http.MethodPut, "/api/provisioning/policies"),
diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json
index dc8dd4dc60b..fd722d9ef11 100644
--- a/pkg/services/ngalert/api/tooling/api.json
+++ b/pkg/services/ngalert/api/tooling/api.json
@@ -1439,26 +1439,9 @@
    "type": "object",
    "x-go-package": "github.com/prometheus/alertmanager/config"
   },
-  "MuteTiming": {
-   "properties": {
-    "name": {
-     "type": "string",
-     "x-go-name": "Name"
-    },
-    "time_intervals": {
-     "items": {
-      "$ref": "#/definitions/TimeInterval"
-     },
-     "type": "array",
-     "x-go-name": "TimeIntervals"
-    }
-   },
-   "type": "object",
-   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-  },
   "MuteTimings": {
    "items": {
-    "$ref": "#/definitions/MuteTiming"
+    "$ref": "#/definitions/MuteTimeInterval"
    },
    "type": "array",
    "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -3392,7 +3375,6 @@
    "type": "array"
   },
   "gettableSilence": {
-   "description": "GettableSilence gettable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3444,7 +3426,9 @@
     "status",
     "updatedAt"
    ],
-   "type": "object"
+   "type": "object",
+   "x-go-name": "GettableSilence",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "gettableSilences": {
    "items": {
@@ -3581,6 +3565,7 @@
    "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "postableSilence": {
+   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3620,11 +3605,10 @@
     "matchers",
     "startsAt"
    ],
-   "type": "object",
-   "x-go-name": "PostableSilence",
-   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+   "type": "object"
   },
   "receiver": {
+   "description": "Receiver receiver",
    "properties": {
     "name": {
      "description": "name",
@@ -3635,9 +3619,7 @@
    "required": [
     "name"
    ],
-   "type": "object",
-   "x-go-name": "Receiver",
-   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
+   "type": "object"
   },
   "silence": {
    "description": "Silence silence",
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
index 7b525a07478..fa27afd52f3 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
@@ -850,6 +850,20 @@ func checkTimeInterval(r *Route, timeIntervals map[string]struct{}) error {
 	return nil
 }
 
+// swagger:model
+type MuteTimeInterval struct {
+	config.MuteTimeInterval
+	Provenance models.Provenance `json:"provenance,omitempty"`
+}
+
+func (mt *MuteTimeInterval) ResourceType() string {
+	return "muteTimeInterval"
+}
+
+func (mt *MuteTimeInterval) ResourceID() string {
+	return mt.MuteTimeInterval.Name
+}
+
 type PostableApiAlertingConfig struct {
 	Config `yaml:",inline"`
 
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
index a4a205d155d..5b6365ea412 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
@@ -2,9 +2,13 @@ package definitions
 
 import (
 	"fmt"
+	"html/template"
+	"regexp"
+	"strings"
 	"time"
 
 	"github.com/prometheus/common/model"
+	"gopkg.in/yaml.v3"
 )
 
 // Validate normalizes a possibly nested Route r, and returns errors if r is invalid.
@@ -52,6 +56,37 @@ func (r *Route) validateChild() error {
 	return nil
 }
 
+func (t *MessageTemplate) Validate() error {
+	if t.Name == "" {
+		return fmt.Errorf("template must have a name")
+	}
+	if t.Template == "" {
+		return fmt.Errorf("template must have content")
+	}
+
+	_, err := template.New("").Parse(t.Template)
+	if err != nil {
+		return fmt.Errorf("invalid template: %w", err)
+	}
+
+	content := strings.TrimSpace(t.Template)
+	found, err := regexp.MatchString(`\{\{\s*define`, content)
+	if err != nil {
+		return fmt.Errorf("failed to match regex: %w", err)
+	}
+	if !found {
+		lines := strings.Split(content, "\n")
+		for i, s := range lines {
+			lines[i] = "  " + s
+		}
+		content = strings.Join(lines, "\n")
+		content = fmt.Sprintf("{{ define \"%s\" }}\n%s\n{{ end }}", t.Name, content)
+	}
+	t.Template = content
+
+	return nil
+}
+
 // Validate normalizes a Route r, and returns errors if r is an invalid root route. Root routes must satisfy a few additional conditions.
 func (r *Route) Validate() error {
 	if len(r.Receiver) == 0 {
@@ -65,3 +100,14 @@ func (r *Route) Validate() error {
 	}
 	return r.validateChild()
 }
+
+func (mt *MuteTimeInterval) Validate() error {
+	s, err := yaml.Marshal(mt.MuteTimeInterval)
+	if err != nil {
+		return err
+	}
+	if err = yaml.Unmarshal(s, &(mt.MuteTimeInterval)); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go
index 5cc40ec9410..d0d3de03719 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go
@@ -3,6 +3,8 @@ package definitions
 import (
 	"testing"
 
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/timeinterval"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 )
@@ -255,3 +257,111 @@ func TestValidateRoutes(t *testing.T) {
 		}
 	})
 }
+
+func TestValidateMuteTimeInterval(t *testing.T) {
+	type testCase struct {
+		desc   string
+		mti    MuteTimeInterval
+		expMsg string
+	}
+
+	t.Run("valid interval", func(t *testing.T) {
+		cases := []testCase{
+			{
+				desc: "nil intervals",
+				mti: MuteTimeInterval{
+					MuteTimeInterval: config.MuteTimeInterval{
+						Name: "interval",
+					},
+				},
+			},
+			{
+				desc: "empty intervals",
+				mti: MuteTimeInterval{
+					MuteTimeInterval: config.MuteTimeInterval{
+						Name:          "interval",
+						TimeIntervals: []timeinterval.TimeInterval{},
+					},
+				},
+			},
+			{
+				desc: "blank interval",
+				mti: MuteTimeInterval{
+					MuteTimeInterval: config.MuteTimeInterval{
+						Name: "interval",
+						TimeIntervals: []timeinterval.TimeInterval{
+							{},
+						},
+					},
+				},
+			},
+			{
+				desc: "simple",
+				mti: MuteTimeInterval{
+					MuteTimeInterval: config.MuteTimeInterval{
+						Name: "interval",
+						TimeIntervals: []timeinterval.TimeInterval{
+							{
+								Weekdays: []timeinterval.WeekdayRange{
+									{
+										InclusiveRange: timeinterval.InclusiveRange{
+											Begin: 1,
+											End:   2,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		}
+
+		for _, c := range cases {
+			t.Run(c.desc, func(t *testing.T) {
+				err := c.mti.Validate()
+
+				require.NoError(t, err)
+			})
+		}
+	})
+
+	t.Run("invalid interval", func(t *testing.T) {
+		cases := []testCase{
+			{
+				desc:   "empty",
+				mti:    MuteTimeInterval{},
+				expMsg: "missing name",
+			},
+			{
+				desc: "empty",
+				mti: MuteTimeInterval{
+					MuteTimeInterval: config.MuteTimeInterval{
+						Name: "interval",
+						TimeIntervals: []timeinterval.TimeInterval{
+							{
+								Weekdays: []timeinterval.WeekdayRange{
+									{
+										InclusiveRange: timeinterval.InclusiveRange{
+											Begin: -1,
+											End:   7,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				expMsg: "unable to convert -1 into weekday",
+			},
+		}
+
+		for _, c := range cases {
+			t.Run(c.desc, func(t *testing.T) {
+				err := c.mti.Validate()
+
+				require.ErrorContains(t, err, c.expMsg)
+			})
+		}
+	})
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
index c5720206e82..761fec0f9f5 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
@@ -1,7 +1,5 @@
 package definitions
 
-import prometheus "github.com/prometheus/alertmanager/config"
-
 // swagger:route GET /api/provisioning/mute-timings provisioning RouteGetMuteTimings
 //
 // Get all the mute timings.
@@ -15,20 +13,52 @@ import prometheus "github.com/prometheus/alertmanager/config"
 // Get a mute timing.
 //
 //     Responses:
-//       200: MuteTiming
+//       200: MuteTimeInterval
 //       400: ValidationError
 
-// swagger:model
-type MuteTiming struct {
-	prometheus.MuteTimeInterval
-}
+// swagger:route POST /api/provisioning/mute-timings provisioning RoutePostMuteTiming
+//
+// Create a new mute timing.
+//
+//     Consumes:
+//     - application/json
+//
+//     Responses:
+//       201: MuteTimeInterval
+//       400: ValidationError
+
+// swagger:route PUT /api/provisioning/mute-timings/{name} provisioning RoutePutMuteTiming
+//
+// Replace an existing mute timing.
+//
+//     Consumes:
+//     - application/json
+//
+//     Responses:
+//       200: MuteTimeInterval
+//       400: ValidationError
+
+// swagger:route DELETE /api/provisioning/mute-timings/{name} provisioning RouteDeleteMuteTiming
+//
+// Delete a mute timing.
+//
+//     Responses:
+//       204: Ack
+
+// swagger:route
 
 // swagger:model
-type MuteTimings []MuteTiming
+type MuteTimings []MuteTimeInterval
 
-// swagger:parameters RouteGetTemplate RouteGetMuteTiming
+// swagger:parameters RouteGetTemplate RouteGetMuteTiming RoutePutMuteTiming RouteDeleteMuteTiming
 type RouteGetMuteTimingParam struct {
 	// Template Name
 	// in:path
 	Name string `json:"name"`
 }
+
+// swagger:parameters RoutePostMuteTiming RoutePutMuteTiming
+type MuteTimingPayload struct {
+	// in:body
+	Body MuteTimeInterval
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
index 8ec4210721f..479f192c6be 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
@@ -1,11 +1,6 @@
 package definitions
 
 import (
-	"fmt"
-	"html/template"
-	"regexp"
-	"strings"
-
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
@@ -77,34 +72,3 @@ func (t *MessageTemplate) ResourceType() string {
 func (t *MessageTemplate) ResourceID() string {
 	return t.Name
 }
-
-func (t *MessageTemplate) Validate() error {
-	if t.Name == "" {
-		return fmt.Errorf("template must have a name")
-	}
-	if t.Template == "" {
-		return fmt.Errorf("template must have content")
-	}
-
-	_, err := template.New("").Parse(t.Template)
-	if err != nil {
-		return fmt.Errorf("invalid template: %w", err)
-	}
-
-	content := strings.TrimSpace(t.Template)
-	found, err := regexp.MatchString(`\{\{\s*define`, content)
-	if err != nil {
-		return fmt.Errorf("failed to match regex: %w", err)
-	}
-	if !found {
-		lines := strings.Split(content, "\n")
-		for i, s := range lines {
-			lines[i] = "  " + s
-		}
-		content = strings.Join(lines, "\n")
-		content = fmt.Sprintf("{{ define \"%s\" }}\n%s\n{{ end }}", t.Name, content)
-	}
-	t.Template = content
-
-	return nil
-}
diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json
index a3c445e9374..a4b6a1cae67 100644
--- a/pkg/services/ngalert/api/tooling/post.json
+++ b/pkg/services/ngalert/api/tooling/post.json
@@ -1439,26 +1439,9 @@
    "type": "object",
    "x-go-package": "github.com/prometheus/alertmanager/config"
   },
-  "MuteTiming": {
-   "properties": {
-    "name": {
-     "type": "string",
-     "x-go-name": "Name"
-    },
-    "time_intervals": {
-     "items": {
-      "$ref": "#/definitions/TimeInterval"
-     },
-     "type": "array",
-     "x-go-name": "TimeIntervals"
-    }
-   },
-   "type": "object",
-   "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-  },
   "MuteTimings": {
    "items": {
-    "$ref": "#/definitions/MuteTiming"
+    "$ref": "#/definitions/MuteTimeInterval"
    },
    "type": "array",
    "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -3196,11 +3179,12 @@
    "type": "object"
   },
   "alertGroups": {
-   "description": "AlertGroups alert groups",
    "items": {
     "$ref": "#/definitions/alertGroup"
    },
-   "type": "array"
+   "type": "array",
+   "x-go-name": "AlertGroups",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "alertStatus": {
    "description": "AlertStatus alert status",
@@ -3445,11 +3429,12 @@
    "type": "object"
   },
   "gettableSilences": {
-   "description": "GettableSilences gettable silences",
    "items": {
     "$ref": "#/definitions/gettableSilence"
    },
-   "type": "array"
+   "type": "array",
+   "x-go-name": "GettableSilences",
+   "x-go-package": "github.com/prometheus/alertmanager/api/v2/models"
   },
   "labelSet": {
    "additionalProperties": {
@@ -5005,9 +4990,67 @@
     "tags": [
      "provisioning"
     ]
+   },
+   "post": {
+    "consumes": [
+     "application/json"
+    ],
+    "operationId": "RoutePostMuteTiming",
+    "parameters": [
+     {
+      "in": "body",
+      "name": "Body",
+      "schema": {
+       "$ref": "#/definitions/MuteTimeInterval"
+      }
+     }
+    ],
+    "responses": {
+     "201": {
+      "description": "MuteTimeInterval",
+      "schema": {
+       "$ref": "#/definitions/MuteTimeInterval"
+      }
+     },
+     "400": {
+      "description": "ValidationError",
+      "schema": {
+       "$ref": "#/definitions/ValidationError"
+      }
+     }
+    },
+    "summary": "Create a new mute timing.",
+    "tags": [
+     "provisioning"
+    ]
    }
   },
   "/api/provisioning/mute-timings/{name}": {
+   "delete": {
+    "operationId": "RouteDeleteMuteTiming",
+    "parameters": [
+     {
+      "description": "Template Name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string",
+      "x-go-name": "Name"
+     }
+    ],
+    "responses": {
+     "204": {
+      "description": "Ack",
+      "schema": {
+       "$ref": "#/definitions/Ack"
+      }
+     }
+    },
+    "summary": "Delete a mute timing.",
+    "tags": [
+     "provisioning"
+    ]
+   },
    "get": {
     "operationId": "RouteGetMuteTiming",
     "parameters": [
@@ -5022,9 +5065,9 @@
     ],
     "responses": {
      "200": {
-      "description": "MuteTiming",
+      "description": "MuteTimeInterval",
       "schema": {
-       "$ref": "#/definitions/MuteTiming"
+       "$ref": "#/definitions/MuteTimeInterval"
       }
      },
      "400": {
@@ -5038,6 +5081,47 @@
     "tags": [
      "provisioning"
     ]
+   },
+   "put": {
+    "consumes": [
+     "application/json"
+    ],
+    "operationId": "RoutePutMuteTiming",
+    "parameters": [
+     {
+      "description": "Template Name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string",
+      "x-go-name": "Name"
+     },
+     {
+      "in": "body",
+      "name": "Body",
+      "schema": {
+       "$ref": "#/definitions/MuteTimeInterval"
+      }
+     }
+    ],
+    "responses": {
+     "200": {
+      "description": "MuteTimeInterval",
+      "schema": {
+       "$ref": "#/definitions/MuteTimeInterval"
+      }
+     },
+     "400": {
+      "description": "ValidationError",
+      "schema": {
+       "$ref": "#/definitions/ValidationError"
+      }
+     }
+    },
+    "summary": "Replace an existing mute timing.",
+    "tags": [
+     "provisioning"
+    ]
    }
   },
   "/api/provisioning/policies": {
diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json
index d10fd315e2e..eaec39f99c5 100644
--- a/pkg/services/ngalert/api/tooling/spec.json
+++ b/pkg/services/ngalert/api/tooling/spec.json
@@ -1274,6 +1274,39 @@
             }
           }
         }
+      },
+      "post": {
+        "consumes": [
+          "application/json"
+        ],
+        "tags": [
+          "provisioning"
+        ],
+        "summary": "Create a new mute timing.",
+        "operationId": "RoutePostMuteTiming",
+        "parameters": [
+          {
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "MuteTimeInterval",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
+          },
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
+          }
+        }
       }
     },
     "/api/provisioning/mute-timings/{name}": {
@@ -1295,9 +1328,9 @@
         ],
         "responses": {
           "200": {
-            "description": "MuteTiming",
+            "description": "MuteTimeInterval",
             "schema": {
-              "$ref": "#/definitions/MuteTiming"
+              "$ref": "#/definitions/MuteTimeInterval"
             }
           },
           "400": {
@@ -1307,6 +1340,72 @@
             }
           }
         }
+      },
+      "put": {
+        "consumes": [
+          "application/json"
+        ],
+        "tags": [
+          "provisioning"
+        ],
+        "summary": "Replace an existing mute timing.",
+        "operationId": "RoutePutMuteTiming",
+        "parameters": [
+          {
+            "type": "string",
+            "x-go-name": "Name",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "MuteTimeInterval",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
+          },
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "provisioning"
+        ],
+        "summary": "Delete a mute timing.",
+        "operationId": "RouteDeleteMuteTiming",
+        "parameters": [
+          {
+            "type": "string",
+            "x-go-name": "Name",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
+          }
+        }
       }
     },
     "/api/provisioning/policies": {
@@ -3544,27 +3643,10 @@
       },
       "x-go-package": "github.com/prometheus/alertmanager/config"
     },
-    "MuteTiming": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "x-go-name": "Name"
-        },
-        "time_intervals": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/TimeInterval"
-          },
-          "x-go-name": "TimeIntervals"
-        }
-      },
-      "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-    },
     "MuteTimings": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/MuteTiming"
+        "$ref": "#/definitions/MuteTimeInterval"
       },
       "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
     },
@@ -5302,11 +5384,12 @@
       "$ref": "#/definitions/alertGroup"
     },
     "alertGroups": {
-      "description": "AlertGroups alert groups",
       "type": "array",
       "items": {
         "$ref": "#/definitions/alertGroup"
       },
+      "x-go-name": "AlertGroups",
+      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models",
       "$ref": "#/definitions/alertGroups"
     },
     "alertStatus": {
@@ -5555,11 +5638,12 @@
       "$ref": "#/definitions/gettableSilence"
     },
     "gettableSilences": {
-      "description": "GettableSilences gettable silences",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableSilence"
       },
+      "x-go-name": "GettableSilences",
+      "x-go-package": "github.com/prometheus/alertmanager/api/v2/models",
       "$ref": "#/definitions/gettableSilences"
     },
     "labelSet": {
diff --git a/pkg/services/ngalert/provisioning/mute_timings.go b/pkg/services/ngalert/provisioning/mute_timings.go
index a2f08683d70..0df16beada4 100644
--- a/pkg/services/ngalert/provisioning/mute_timings.go
+++ b/pkg/services/ngalert/provisioning/mute_timings.go
@@ -2,9 +2,12 @@ package provisioning
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/prometheus/alertmanager/config"
 )
 
 type MuteTimingService struct {
@@ -23,19 +26,167 @@ func NewMuteTimingService(config AMConfigStore, prov ProvisioningStore, xact Tra
 	}
 }
 
-func (m *MuteTimingService) GetMuteTimings(ctx context.Context, orgID int64) ([]definitions.MuteTiming, error) {
-	rev, err := getLastConfiguration(ctx, orgID, m.config)
+// GetMuteTimings returns a slice of all mute timings within the specified org.
+func (svc *MuteTimingService) GetMuteTimings(ctx context.Context, orgID int64) ([]definitions.MuteTimeInterval, error) {
+	rev, err := getLastConfiguration(ctx, orgID, svc.config)
 	if err != nil {
 		return nil, err
 	}
 
 	if rev.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
-		return []definitions.MuteTiming{}, nil
+		return []definitions.MuteTimeInterval{}, nil
 	}
 
-	result := make([]definitions.MuteTiming, 0, len(rev.cfg.AlertmanagerConfig.MuteTimeIntervals))
+	result := make([]definitions.MuteTimeInterval, 0, len(rev.cfg.AlertmanagerConfig.MuteTimeIntervals))
 	for _, interval := range rev.cfg.AlertmanagerConfig.MuteTimeIntervals {
-		result = append(result, definitions.MuteTiming{MuteTimeInterval: interval})
+		result = append(result, definitions.MuteTimeInterval{MuteTimeInterval: interval})
 	}
 	return result, nil
 }
+
+// CreateMuteTiming adds a new mute timing within the specified org. The created mute timing is returned.
+func (svc *MuteTimingService) CreateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (*definitions.MuteTimeInterval, error) {
+	if err := mt.Validate(); err != nil {
+		return nil, fmt.Errorf("%w: %s", ErrValidation, err.Error())
+	}
+
+	revision, err := getLastConfiguration(ctx, orgID, svc.config)
+	if err != nil {
+		return nil, err
+	}
+
+	if revision.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
+		revision.cfg.AlertmanagerConfig.MuteTimeIntervals = []config.MuteTimeInterval{}
+	}
+	for _, existing := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
+		if mt.Name == existing.Name {
+			return nil, fmt.Errorf("%w: %s", ErrValidation, "a mute timing with this name already exists")
+		}
+	}
+	revision.cfg.AlertmanagerConfig.MuteTimeIntervals = append(revision.cfg.AlertmanagerConfig.MuteTimeIntervals, mt.MuteTimeInterval)
+
+	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
+	if err != nil {
+		return nil, err
+	}
+	cmd := models.SaveAlertmanagerConfigurationCmd{
+		AlertmanagerConfiguration: string(serialized),
+		ConfigurationVersion:      revision.version,
+		FetchedConfigurationHash:  revision.concurrencyToken,
+		Default:                   false,
+		OrgID:                     orgID,
+	}
+	err = svc.xact.InTransaction(ctx, func(ctx context.Context) error {
+		err = svc.config.UpdateAlertmanagerConfiguration(ctx, &cmd)
+		if err != nil {
+			return err
+		}
+		err = svc.prov.SetProvenance(ctx, &mt, orgID, mt.Provenance)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &mt, nil
+}
+
+// UpdateMuteTiming replaces an existing mute timing within the specified org. The replaced mute timing is returned. If the mute timing does not exist, nil is returned and no action is taken.
+func (svc *MuteTimingService) UpdateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (*definitions.MuteTimeInterval, error) {
+	if err := mt.Validate(); err != nil {
+		return nil, fmt.Errorf("%w: %s", ErrValidation, err.Error())
+	}
+
+	revision, err := getLastConfiguration(ctx, orgID, svc.config)
+	if err != nil {
+		return nil, err
+	}
+
+	if revision.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
+		return nil, nil
+	}
+	updated := false
+	for i, existing := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
+		if mt.Name == existing.Name {
+			revision.cfg.AlertmanagerConfig.MuteTimeIntervals[i] = mt.MuteTimeInterval
+			updated = true
+			break
+		}
+	}
+	if !updated {
+		return nil, nil
+	}
+
+	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
+	if err != nil {
+		return nil, err
+	}
+	cmd := models.SaveAlertmanagerConfigurationCmd{
+		AlertmanagerConfiguration: string(serialized),
+		ConfigurationVersion:      revision.version,
+		FetchedConfigurationHash:  revision.concurrencyToken,
+		Default:                   false,
+		OrgID:                     orgID,
+	}
+	err = svc.xact.InTransaction(ctx, func(ctx context.Context) error {
+		err = svc.config.UpdateAlertmanagerConfiguration(ctx, &cmd)
+		if err != nil {
+			return err
+		}
+		err = svc.prov.SetProvenance(ctx, &mt, orgID, mt.Provenance)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &mt, err
+}
+
+// DeleteMuteTiming deletes the mute timing with the given name in the given org. If the mute timing does not exist, no error is returned.
+func (svc *MuteTimingService) DeleteMuteTiming(ctx context.Context, name string, orgID int64) error {
+	revision, err := getLastConfiguration(ctx, orgID, svc.config)
+	if err != nil {
+		return err
+	}
+
+	if revision.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
+		return nil
+	}
+	for i, existing := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
+		if name == existing.Name {
+			intervals := revision.cfg.AlertmanagerConfig.MuteTimeIntervals
+			revision.cfg.AlertmanagerConfig.MuteTimeIntervals = append(intervals[:i], intervals[i+1:]...)
+		}
+	}
+
+	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
+	if err != nil {
+		return err
+	}
+	cmd := models.SaveAlertmanagerConfigurationCmd{
+		AlertmanagerConfiguration: string(serialized),
+		ConfigurationVersion:      revision.version,
+		FetchedConfigurationHash:  revision.concurrencyToken,
+		Default:                   false,
+		OrgID:                     orgID,
+	}
+	return svc.xact.InTransaction(ctx, func(ctx context.Context) error {
+		err = svc.config.UpdateAlertmanagerConfiguration(ctx, &cmd)
+		if err != nil {
+			return err
+		}
+		target := definitions.MuteTimeInterval{MuteTimeInterval: config.MuteTimeInterval{Name: name}}
+		err := svc.prov.DeleteProvenance(ctx, &target, orgID)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+}
diff --git a/pkg/services/ngalert/provisioning/mute_timings_test.go b/pkg/services/ngalert/provisioning/mute_timings_test.go
index 6a1a9be329c..9a6b6e90853 100644
--- a/pkg/services/ngalert/provisioning/mute_timings_test.go
+++ b/pkg/services/ngalert/provisioning/mute_timings_test.go
@@ -6,7 +6,9 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/prometheus/alertmanager/config"
 	mock "github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
@@ -74,6 +76,288 @@ func TestMuteTimingService(t *testing.T) {
 			require.ErrorContains(t, err, "no alertmanager configuration")
 		})
 	})
+
+	t.Run("creating mute timings", func(t *testing.T) {
+		t.Run("rejects mute timings that fail validation", func(t *testing.T) {
+			sut := createMuteTimingSvcSut()
+			timing := definitions.MuteTimeInterval{
+				MuteTimeInterval: config.MuteTimeInterval{
+					Name: "",
+				},
+			}
+
+			_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+
+			require.ErrorIs(t, err, ErrValidation)
+		})
+
+		t.Run("propagates errors", func(t *testing.T) {
+			t.Run("when unable to read config", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed"))
+
+				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+
+				require.Error(t, err)
+			})
+
+			t.Run("when config is invalid", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: brokenConfig,
+					})
+
+				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "failed to deserialize")
+			})
+
+			t.Run("when no AM config in current org", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(nil)
+
+				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "no alertmanager configuration")
+			})
+
+			t.Run("when provenance fails to save", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: configWithMuteTimings,
+					})
+				sut.config.(*MockAMConfigStore).EXPECT().saveSucceeds()
+				sut.prov.(*MockProvisioningStore).EXPECT().
+					SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed to save provenance"))
+
+				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "failed to save provenance")
+			})
+
+			t.Run("when AM config fails to save", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: configWithMuteTimings,
+					})
+				sut.config.(*MockAMConfigStore).EXPECT().
+					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed to save config"))
+				sut.prov.(*MockProvisioningStore).EXPECT().saveSucceeds()
+
+				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "failed to save config")
+			})
+		})
+	})
+
+	t.Run("updating mute timings", func(t *testing.T) {
+		t.Run("rejects mute timings that fail validation", func(t *testing.T) {
+			sut := createMuteTimingSvcSut()
+			timing := definitions.MuteTimeInterval{
+				MuteTimeInterval: config.MuteTimeInterval{
+					Name: "",
+				},
+			}
+
+			_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+			require.ErrorIs(t, err, ErrValidation)
+		})
+
+		t.Run("returns nil if timing does not exist", func(t *testing.T) {
+			sut := createMuteTimingSvcSut()
+			timing := createMuteTiming()
+			timing.Name = "does not exist"
+			sut.config.(*MockAMConfigStore).EXPECT().
+				getsConfig(models.AlertConfiguration{
+					AlertmanagerConfiguration: configWithMuteTimings,
+				})
+			sut.config.(*MockAMConfigStore).EXPECT().saveSucceeds()
+			sut.prov.(*MockProvisioningStore).EXPECT().saveSucceeds()
+
+			updated, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+			require.NoError(t, err)
+			require.Nil(t, updated)
+		})
+
+		t.Run("propagates errors", func(t *testing.T) {
+			t.Run("when unable to read config", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				timing.Name = "asdf"
+				sut.config.(*MockAMConfigStore).EXPECT().
+					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed"))
+
+				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+				require.Error(t, err)
+			})
+
+			t.Run("when config is invalid", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				timing.Name = "asdf"
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: brokenConfig,
+					})
+
+				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "failed to deserialize")
+			})
+
+			t.Run("when no AM config in current org", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				timing.Name = "asdf"
+				sut.config.(*MockAMConfigStore).EXPECT().
+					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(nil)
+
+				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "no alertmanager configuration")
+			})
+
+			t.Run("when provenance fails to save", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				timing.Name = "asdf"
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: configWithMuteTimings,
+					})
+				sut.config.(*MockAMConfigStore).EXPECT().saveSucceeds()
+				sut.prov.(*MockProvisioningStore).EXPECT().
+					SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed to save provenance"))
+
+				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "failed to save provenance")
+			})
+
+			t.Run("when AM config fails to save", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				timing := createMuteTiming()
+				timing.Name = "asdf"
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: configWithMuteTimings,
+					})
+				sut.config.(*MockAMConfigStore).EXPECT().
+					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed to save config"))
+				sut.prov.(*MockProvisioningStore).EXPECT().saveSucceeds()
+
+				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+
+				require.ErrorContains(t, err, "failed to save config")
+			})
+		})
+	})
+
+	t.Run("deleting mute timings", func(t *testing.T) {
+		t.Run("returns nil if timing does not exist", func(t *testing.T) {
+			sut := createMuteTimingSvcSut()
+			sut.config.(*MockAMConfigStore).EXPECT().
+				getsConfig(models.AlertConfiguration{
+					AlertmanagerConfiguration: configWithMuteTimings,
+				})
+			sut.config.(*MockAMConfigStore).EXPECT().saveSucceeds()
+			sut.prov.(*MockProvisioningStore).EXPECT().saveSucceeds()
+
+			err := sut.DeleteMuteTiming(context.Background(), "does not exist", 1)
+
+			require.NoError(t, err)
+		})
+
+		t.Run("propagates errors", func(t *testing.T) {
+			t.Run("when unable to read config", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed"))
+
+				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+
+				require.Error(t, err)
+			})
+
+			t.Run("when config is invalid", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: brokenConfig,
+					})
+
+				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+
+				require.ErrorContains(t, err, "failed to deserialize")
+			})
+
+			t.Run("when no AM config in current org", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(nil)
+
+				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+
+				require.ErrorContains(t, err, "no alertmanager configuration")
+			})
+
+			t.Run("when provenance fails to save", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: configWithMuteTimings,
+					})
+				sut.config.(*MockAMConfigStore).EXPECT().saveSucceeds()
+				sut.prov.(*MockProvisioningStore).EXPECT().
+					DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed to save provenance"))
+
+				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+
+				require.ErrorContains(t, err, "failed to save provenance")
+			})
+
+			t.Run("when AM config fails to save", func(t *testing.T) {
+				sut := createMuteTimingSvcSut()
+				sut.config.(*MockAMConfigStore).EXPECT().
+					getsConfig(models.AlertConfiguration{
+						AlertmanagerConfiguration: configWithMuteTimings,
+					})
+				sut.config.(*MockAMConfigStore).EXPECT().
+					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
+					Return(fmt.Errorf("failed to save config"))
+				sut.prov.(*MockProvisioningStore).EXPECT().saveSucceeds()
+
+				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+
+				require.ErrorContains(t, err, "failed to save config")
+			})
+		})
+	})
 }
 
 func createMuteTimingSvcSut() *MuteTimingService {
@@ -85,6 +369,14 @@ func createMuteTimingSvcSut() *MuteTimingService {
 	}
 }
 
+func createMuteTiming() definitions.MuteTimeInterval {
+	return definitions.MuteTimeInterval{
+		MuteTimeInterval: config.MuteTimeInterval{
+			Name: "interval",
+		},
+	}
+}
+
 var configWithMuteTimings = `
 {
 	"template_files": {

From 9f3ade947280c228fca5a66bbe04e8c06423ed5f Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 20:09:43 -0400
Subject: [PATCH 066/103]  Canvas: Fix element placement UX (#49665) (#49727)

---
 public/app/features/canvas/runtime/element.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/features/canvas/runtime/element.tsx b/public/app/features/canvas/runtime/element.tsx
index 4c03faec006..ed597533358 100644
--- a/public/app/features/canvas/runtime/element.tsx
+++ b/public/app/features/canvas/runtime/element.tsx
@@ -201,13 +201,13 @@ export class ElementState implements LayerElement {
     }
 
     const relativeTop =
-      elementContainer && parentContainer ? Math.abs(Math.round(elementContainer.top - parentContainer.top)) : 0;
+      elementContainer && parentContainer ? Math.round(elementContainer.top - parentContainer.top) : 0;
     const relativeBottom =
-      elementContainer && parentContainer ? Math.abs(Math.round(elementContainer.bottom - parentContainer.bottom)) : 0;
+      elementContainer && parentContainer ? Math.round(parentContainer.bottom - elementContainer.bottom) : 0;
     const relativeLeft =
-      elementContainer && parentContainer ? Math.abs(Math.round(elementContainer.left - parentContainer.left)) : 0;
+      elementContainer && parentContainer ? Math.round(elementContainer.left - parentContainer.left) : 0;
     const relativeRight =
-      elementContainer && parentContainer ? Math.abs(Math.round(elementContainer.right - parentContainer.right)) : 0;
+      elementContainer && parentContainer ? Math.round(parentContainer.right - elementContainer.right) : 0;
 
     const placement = {} as Placement;
 

From afa40190d4f446a3842fdf4ee263d5f7e77fa4a5 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 20:30:58 -0400
Subject: [PATCH 067/103] SearchV2: improve searcher API, and include a
 fallback SQL based implementation (#49535) (#49746)

(cherry picked from commit a641949a05448869922cdbc15a6a55da971a785f)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 pkg/services/searchV2/bluge.go                |  21 --
 .../search/components/DashboardListPage.tsx   |   3 +-
 .../search/components/DashboardSearch.tsx     |   2 +-
 .../search/page/components/ActionRow.tsx      |   4 +-
 .../search/page/components/FolderSection.tsx  |  15 +-
 .../search/page/components/FolderView.tsx     |  19 +-
 .../search/page/components/SearchView.tsx     |   1 +
 .../search/page/components/columns.tsx        |   7 +-
 .../search/page/components/sorting.ts         |  37 ----
 public/app/features/search/service/bluge.ts   |  56 ++++-
 .../app/features/search/service/searcher.ts   |   8 +-
 public/app/features/search/service/sql.ts     | 198 ++++++++++++++++++
 public/app/features/search/service/types.ts   |   6 +-
 13 files changed, 282 insertions(+), 95 deletions(-)
 delete mode 100644 public/app/features/search/page/components/sorting.ts
 create mode 100644 public/app/features/search/service/sql.ts

diff --git a/pkg/services/searchV2/bluge.go b/pkg/services/searchV2/bluge.go
index d4c16ea1761..e3e542efc83 100644
--- a/pkg/services/searchV2/bluge.go
+++ b/pkg/services/searchV2/bluge.go
@@ -295,27 +295,6 @@ func doSearchQuery(ctx context.Context, logger log.Logger, reader *bluge.Reader,
 	response := &backend.DataResponse{}
 	header := &customMeta{}
 
-	// Folder listing structure.
-	idx := strings.Index(q.Query, ":")
-	if idx > 0 {
-		key := q.Query[0:idx]
-		val := q.Query[idx+1:]
-		if key == "list" {
-			q.Limit = 1000
-			q.Query = ""
-			q.Location = ""
-			q.Explain = false
-			q.SkipLocation = true
-			q.Facet = nil
-			if val == "root" || val == "" {
-				q.Kind = []string{string(entityKindFolder)}
-			} else {
-				q.Location = val
-				q.Kind = []string{string(entityKindDashboard)}
-			}
-		}
-	}
-
 	hasConstraints := false
 	fullQuery := bluge.NewBooleanQuery()
 	fullQuery.AddMust(newPermissionFilter(filter, logger))
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index ffb8219067e..3ececc199ca 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -46,8 +46,7 @@ export const DashboardListPage: FC<Props> = memo(({ navModel, match, location })
 
   return (
     <Page navModel={value?.pageNavModel ?? navModel}>
-      {/*Todo: remove the false to test, or when we feel confident with thsi approach */}
-      {Boolean(config.featureToggles.panelTitleSearch && !window.location.search?.includes('index=sql')) ? (
+      {Boolean(config.featureToggles.panelTitleSearch) ? (
         <Page.Contents
           isLoading={loading}
           className={css`
diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx
index 065ce775f38..b38c7bec8f4 100644
--- a/public/app/features/search/components/DashboardSearch.tsx
+++ b/public/app/features/search/components/DashboardSearch.tsx
@@ -20,7 +20,7 @@ export interface Props {
 }
 
 export default function DashboardSearch({ onCloseSearch }: Props) {
-  if (config.featureToggles.panelTitleSearch && !window.location.search?.includes('index=sql')) {
+  if (config.featureToggles.panelTitleSearch) {
     // TODO: "folder:current" ????
     return <DashbaordSearchNEW onCloseSearch={onCloseSearch} />;
   }
diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index 7c309c11cff..091a057d2a2 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -9,8 +9,6 @@ import { TagFilter, TermCount } from 'app/core/components/TagFilter/TagFilter';
 
 import { DashboardQuery, SearchLayout } from '../../types';
 
-import { getSortOptions } from './sorting';
-
 export const layoutOptions = [
   { value: SearchLayout.Folders, icon: 'folder', ariaLabel: 'View by folders' },
   { value: SearchLayout.List, icon: 'list-ul', ariaLabel: 'View as list' },
@@ -26,6 +24,7 @@ interface Props {
   onStarredFilterChange?: (event: FormEvent<HTMLInputElement>) => void;
   onTagFilterChange: (tags: string[]) => void;
   getTagOptions: () => Promise<TermCount[]>;
+  getSortOptions: () => Promise<SelectableValue[]>;
   onDatasourceChange: (ds?: string) => void;
   query: DashboardQuery;
   showStarredFilter?: boolean;
@@ -54,6 +53,7 @@ export const ActionRow: FC<Props> = ({
   onStarredFilterChange = () => {},
   onTagFilterChange,
   getTagOptions,
+  getSortOptions,
   onDatasourceChange,
   query,
   showStarredFilter,
diff --git a/public/app/features/search/page/components/FolderSection.tsx b/public/app/features/search/page/components/FolderSection.tsx
index 39b508b17ab..167cc37afbc 100644
--- a/public/app/features/search/page/components/FolderSection.tsx
+++ b/public/app/features/search/page/components/FolderSection.tsx
@@ -3,9 +3,7 @@ import React, { FC } from 'react';
 import { useAsync, useLocalStorage } from 'react-use';
 
 import { GrafanaTheme } from '@grafana/data';
-import { getBackendSrv } from '@grafana/runtime';
 import { Card, Checkbox, CollapsableSection, Icon, Spinner, stylesFactory, useTheme } from '@grafana/ui';
-import impressionSrv from 'app/core/services/impression_srv';
 import { getSectionStorageKey } from 'app/features/search/utils';
 import { useUniqueId } from 'app/plugins/datasource/influxdb/components/useUniqueId';
 
@@ -58,23 +56,14 @@ export const FolderSection: FC<SectionHeaderProps> = ({
       location: section.uid,
       sort: 'name_sort',
     };
-    if (section.title === 'Starred') {
+    if (section.itemsUIDs) {
       query = {
         uid: section.itemsUIDs, // array of UIDs
       };
       folderUid = undefined;
       folderTitle = undefined;
-    } else if (section.title === 'Recent') {
-      const ids = impressionSrv.getDashboardOpened();
-      const uids = await getBackendSrv().get(`/api/dashboards/ids/${ids.slice(0, 30).join(',')}`);
-      if (uids?.length) {
-        query = {
-          uid: uids,
-        };
-      }
-      folderUid = undefined;
-      folderTitle = undefined;
     }
+
     const raw = await getGrafanaSearcher().search({ ...query, tags });
     const v = raw.view.map(
       (item) =>
diff --git a/public/app/features/search/page/components/FolderView.tsx b/public/app/features/search/page/components/FolderView.tsx
index 1ba64cffc0e..32d2efc458e 100644
--- a/public/app/features/search/page/components/FolderView.tsx
+++ b/public/app/features/search/page/components/FolderView.tsx
@@ -6,6 +6,8 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { getBackendSrv } from '@grafana/runtime';
 import { Spinner, useStyles2 } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
+import impressionSrv from 'app/core/services/impression_srv';
 
 import { GENERAL_FOLDER_UID } from '../../constants';
 import { getGrafanaSearcher } from '../../service';
@@ -23,11 +25,20 @@ export const FolderView = ({ selection, selectionToggle, onTagSelected, tags, hi
   const results = useAsync(async () => {
     const folders: DashboardSection[] = [];
     if (!hidePseudoFolders) {
-      const stars = await getBackendSrv().get('api/user/stars');
-      if (stars.length > 0) {
-        folders.push({ title: 'Starred', icon: 'star', kind: 'query-star', uid: '__starred', itemsUIDs: stars });
+      if (contextSrv.isSignedIn) {
+        const stars = await getBackendSrv().get('api/user/stars');
+        if (stars.length > 0) {
+          folders.push({ title: 'Starred', icon: 'star', kind: 'query-star', uid: '__starred', itemsUIDs: stars });
+        }
+      }
+
+      const ids = impressionSrv.getDashboardOpened();
+      if (ids.length) {
+        const itemsUIDs = await getBackendSrv().get(`/api/dashboards/ids/${ids.slice(0, 30).join(',')}`);
+        if (itemsUIDs.length) {
+          folders.push({ title: 'Recent', icon: 'clock', kind: 'query-recent', uid: '__recent', itemsUIDs });
+        }
       }
-      folders.push({ title: 'Recent', icon: 'clock', kind: 'query-recent', uid: '__recent' });
     }
     folders.push({ title: 'General', url: '/dashboards', kind: 'folder', uid: GENERAL_FOLDER_UID });
 
diff --git a/public/app/features/search/page/components/SearchView.tsx b/public/app/features/search/page/components/SearchView.tsx
index 43f540bf4ee..45e0ac95f3a 100644
--- a/public/app/features/search/page/components/SearchView.tsx
+++ b/public/app/features/search/page/components/SearchView.tsx
@@ -205,6 +205,7 @@ export const SearchView = ({ showManage, folderDTO, queryText, hidePseudoFolders
           onSortChange={onSortChange}
           onTagFilterChange={onTagFilterChange}
           getTagOptions={getTagOptions}
+          getSortOptions={getGrafanaSearcher().getSortOptions}
           onDatasourceChange={onDatasourceChange}
           query={query}
         />
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index 2fd1c2860e9..b13f716db4b 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -3,7 +3,7 @@ import { isNumber } from 'lodash';
 import React from 'react';
 import SVG from 'react-inlinesvg';
 
-import { Field } from '@grafana/data';
+import { Field, getFieldDisplayName } from '@grafana/data';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 import { Checkbox, Icon, IconButton, IconName, TagList } from '@grafana/ui';
 
@@ -11,7 +11,6 @@ import { QueryResponse, SearchResultMeta } from '../../service';
 import { SelectionChecker, SelectionToggle } from '../selection';
 
 import { TableColumn } from './SearchResultsTable';
-import { getSortFieldDisplayName } from './sorting';
 
 const TYPE_COLUMN_WIDTH = 250;
 const DATASOURCE_COLUMN_WIDTH = 200;
@@ -172,7 +171,7 @@ export const generateColumns = (
 
   if (sortField) {
     columns.push({
-      Header: () => <div className={styles.sortedHeader}>{getSortFieldDisplayName(sortField.name)}</div>,
+      Header: () => <div className={styles.sortedHeader}>{getFieldDisplayName(sortField)}</div>,
       Cell: (p) => {
         let value = sortField.values.get(p.row.index);
         try {
@@ -182,7 +181,7 @@ export const generateColumns = (
         } catch {}
         return (
           <div {...p.cellProps} className={styles.sortedItems}>
-            {value}
+            {`${value}`}
           </div>
         );
       },
diff --git a/public/app/features/search/page/components/sorting.ts b/public/app/features/search/page/components/sorting.ts
deleted file mode 100644
index 0046d1b2b55..00000000000
--- a/public/app/features/search/page/components/sorting.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { SelectableValue } from '@grafana/data';
-import { config } from '@grafana/runtime';
-
-// Enterprise only sort field values for dashboards
-const sortFields = [
-  { name: 'views_total', display: 'Views total' },
-  { name: 'views_last_30_days', display: 'Views 30 days' },
-  { name: 'errors_total', display: 'Errors total' },
-  { name: 'errors_last_30_days', display: 'Errors 30 days' },
-];
-
-// This should eventually be filled by an API call, but hardcoded is a good start
-export async function getSortOptions(): Promise<SelectableValue[]> {
-  const opts: SelectableValue[] = [
-    { value: 'name_sort', label: 'Alphabetically (A-Z)' },
-    { value: '-name_sort', label: 'Alphabetically (Z-A)' },
-  ];
-
-  if (config.licenseInfo.enabledFeatures.analytics) {
-    for (const sf of sortFields) {
-      opts.push({ value: `-${sf.name}`, label: `${sf.display} (most)` });
-      opts.push({ value: `${sf.name}`, label: `${sf.display} (least)` });
-    }
-  }
-
-  return opts;
-}
-
-/** Given the internal field name, this gives a reasonable display name for the table colum header */
-export function getSortFieldDisplayName(name: string) {
-  for (const sf of sortFields) {
-    if (sf.name === name) {
-      return sf.display;
-    }
-  }
-  return name;
-}
diff --git a/public/app/features/search/service/bluge.ts b/public/app/features/search/service/bluge.ts
index 27814551442..38886ba369b 100644
--- a/public/app/features/search/service/bluge.ts
+++ b/public/app/features/search/service/bluge.ts
@@ -1,6 +1,6 @@
 import { lastValueFrom } from 'rxjs';
 
-import { ArrayVector, DataFrame, DataFrameView, getDisplayProcessor } from '@grafana/data';
+import { ArrayVector, DataFrame, DataFrameView, getDisplayProcessor, SelectableValue } from '@grafana/data';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 import { TermCount } from 'app/core/components/TagFilter/TagFilter';
 import { GrafanaDatasource } from 'app/plugins/datasource/grafana/datasource';
@@ -16,10 +16,6 @@ export class BlugeSearcher implements GrafanaSearcher {
     return doSearchQuery(query);
   }
 
-  async list(location: string): Promise<QueryResponse> {
-    return doSearchQuery({ query: `list:${location ?? ''}` });
-  }
-
   async tags(query: SearchQuery): Promise<TermCount[]> {
     const ds = (await getDataSourceSrv().get('-- Grafana --')) as GrafanaDatasource;
     const target = {
@@ -46,12 +42,29 @@ export class BlugeSearcher implements GrafanaSearcher {
     }
     return [];
   }
+
+  // This should eventually be filled by an API call, but hardcoded is a good start
+  getSortOptions(): Promise<SelectableValue[]> {
+    const opts: SelectableValue[] = [
+      { value: 'name_sort', label: 'Alphabetically (A-Z)' },
+      { value: '-name_sort', label: 'Alphabetically (Z-A)' },
+    ];
+
+    if (config.licenseInfo.enabledFeatures.analytics) {
+      for (const sf of sortFields) {
+        opts.push({ value: `-${sf.name}`, label: `${sf.display} (most)` });
+        opts.push({ value: `${sf.name}`, label: `${sf.display} (least)` });
+      }
+    }
+
+    return Promise.resolve(opts);
+  }
 }
 
 const firstPageSize = 50;
 const nextPageSizes = 100;
 
-export async function doSearchQuery(query: SearchQuery): Promise<QueryResponse> {
+async function doSearchQuery(query: SearchQuery): Promise<QueryResponse> {
   const ds = (await getDataSourceSrv().get('-- Grafana --')) as GrafanaDatasource;
   const target = {
     ...query,
@@ -84,8 +97,19 @@ export async function doSearchQuery(query: SearchQuery): Promise<QueryResponse>
 
   const meta = first.meta.custom as SearchResultMeta;
   if (!meta.locationInfo) {
-    meta.locationInfo = {};
+    meta.locationInfo = {}; // always set it so we can append
   }
+
+  // Set the field name to a better display name
+  if (meta.sortBy?.length) {
+    const field = first.fields.find((f) => f.name === meta.sortBy);
+    if (field) {
+      const name = getSortFieldDisplayName(field.name);
+      meta.sortBy = name;
+      field.name = name; // make it look nicer
+    }
+  }
+
   const view = new DataFrameView<DashboardQueryResult>(first);
   return {
     totalRows: meta.count ?? first.length,
@@ -146,3 +170,21 @@ function getTermCountsFrom(frame: DataFrame): TermCount[] {
   }
   return counts;
 }
+
+// Enterprise only sort field values for dashboards
+const sortFields = [
+  { name: 'views_total', display: 'Views total' },
+  { name: 'views_last_30_days', display: 'Views 30 days' },
+  { name: 'errors_total', display: 'Errors total' },
+  { name: 'errors_last_30_days', display: 'Errors 30 days' },
+];
+
+/** Given the internal field name, this gives a reasonable display name for the table colum header */
+function getSortFieldDisplayName(name: string) {
+  for (const sf of sortFields) {
+    if (sf.name === name) {
+      return sf.display;
+    }
+  }
+  return name;
+}
diff --git a/public/app/features/search/service/searcher.ts b/public/app/features/search/service/searcher.ts
index ff6675339d6..c61ed5bc552 100644
--- a/public/app/features/search/service/searcher.ts
+++ b/public/app/features/search/service/searcher.ts
@@ -1,11 +1,17 @@
+import { config } from '@grafana/runtime';
+
 import { BlugeSearcher } from './bluge';
+import { SQLSearcher } from './sql';
 import { GrafanaSearcher } from './types';
 
 let searcher: GrafanaSearcher | undefined = undefined;
 
 export function getGrafanaSearcher(): GrafanaSearcher {
   if (!searcher) {
-    searcher = new BlugeSearcher();
+    const useBluge =
+      config.featureToggles.panelTitleSearch && // set in system configs
+      window.location.search.indexOf('index=sql') < 0; // or URL override
+    searcher = useBluge ? new BlugeSearcher() : new SQLSearcher();
   }
   return searcher!;
 }
diff --git a/public/app/features/search/service/sql.ts b/public/app/features/search/service/sql.ts
new file mode 100644
index 00000000000..96e68ac6946
--- /dev/null
+++ b/public/app/features/search/service/sql.ts
@@ -0,0 +1,198 @@
+import { ArrayVector, DataFrame, DataFrameView, FieldType, getDisplayProcessor, SelectableValue } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { TermCount } from 'app/core/components/TagFilter/TagFilter';
+import { backendSrv } from 'app/core/services/backend_srv';
+
+import { DashboardSearchHit } from '../types';
+
+import { LocationInfo } from './types';
+
+import { DashboardQueryResult, GrafanaSearcher, QueryResponse, SearchQuery } from '.';
+
+interface APIQuery {
+  query?: string;
+  tag?: string[];
+  limit?: number;
+  page?: number;
+  type?: string;
+  // DashboardIds []int64
+  folderIds?: number[];
+  sort?: string;
+
+  // NEW!!!! TODO TODO: needs backend support?
+  dashboardUIDs?: string[];
+}
+
+// Internal object to hold folderId
+interface LocationInfoEXT extends LocationInfo {
+  folderId?: number;
+}
+
+export class SQLSearcher implements GrafanaSearcher {
+  locationInfo: Record<string, LocationInfoEXT> = {
+    general: {
+      kind: 'folder',
+      name: 'General',
+      url: '/dashboards',
+      folderId: 0,
+    },
+  }; // share location info with everyone
+
+  async search(query: SearchQuery): Promise<QueryResponse> {
+    if (query.facet?.length) {
+      throw 'facets not supported!';
+    }
+    const q: APIQuery = {
+      limit: 1000, // 1k max values
+      tag: query.tags,
+      sort: query.sort,
+    };
+
+    if (query.query === '*') {
+      if (query.kind?.length === 1 && query.kind[0] === 'folder') {
+        q.type = 'dash-folder';
+      }
+    } else if (query.query?.length) {
+      q.query = query.query;
+    }
+
+    if (query.uid) {
+      q.query = query.uid.join(', '); // TODO! this will return nothing
+      q.dashboardUIDs = query.uid;
+    } else if (query.location?.length) {
+      let info = this.locationInfo[query.location];
+      if (!info) {
+        // This will load all folder folders
+        await this.doAPIQuery({ type: 'dash-folder', limit: 999 });
+        info = this.locationInfo[query.location];
+      }
+      q.folderIds = [info.folderId ?? 0];
+    }
+    return this.doAPIQuery(q);
+  }
+
+  // returns the appropriate sorting options
+  async getSortOptions(): Promise<SelectableValue[]> {
+    // {
+    //   "sortOptions": [
+    //     {
+    //       "description": "Sort results in an alphabetically ascending order",
+    //       "displayName": "Alphabetically (A–Z)",
+    //       "meta": "",
+    //       "name": "alpha-asc"
+    //     },
+    //     {
+    //       "description": "Sort results in an alphabetically descending order",
+    //       "displayName": "Alphabetically (Z–A)",
+    //       "meta": "",
+    //       "name": "alpha-desc"
+    //     }
+    //   ]
+    // }
+    const opts = await backendSrv.get('/api/search/sorting');
+    return opts.sortOptions.map((v: any) => ({
+      value: v.name,
+      label: v.displayName,
+    }));
+  }
+
+  // NOTE: the bluge query will find tags within the current results, the SQL based one does not
+  async tags(query: SearchQuery): Promise<TermCount[]> {
+    const terms = (await backendSrv.get('/api/dashboards/tags')) as TermCount[];
+    return terms.sort((a, b) => b.count - a.count);
+  }
+
+  async doAPIQuery(query: APIQuery): Promise<QueryResponse> {
+    const rsp = (await backendSrv.get('/api/search', query)) as DashboardSearchHit[];
+
+    // Field values (columnar)
+    const kind: string[] = [];
+    const name: string[] = [];
+    const uid: string[] = [];
+    const url: string[] = [];
+    const tags: string[][] = [];
+    const location: string[] = [];
+    const sortBy: number[] = [];
+    let sortMetaName: string | undefined;
+
+    for (let hit of rsp) {
+      const k = hit.type === 'dash-folder' ? 'folder' : 'dashboard';
+      kind.push(k);
+      name.push(hit.title);
+      uid.push(hit.uid!);
+      url.push(hit.url);
+      tags.push(hit.tags);
+      sortBy.push(hit.sortMeta!);
+
+      let v = hit.folderUid;
+      if (!v && k === 'dashboard') {
+        v = 'general';
+      }
+      location.push(v!);
+
+      if (hit.sortMetaName?.length) {
+        sortMetaName = hit.sortMetaName;
+      }
+
+      if (hit.folderUid && hit.folderTitle) {
+        this.locationInfo[hit.folderUid] = {
+          kind: 'folder',
+          name: hit.folderTitle,
+          url: hit.folderUrl!,
+          folderId: hit.folderId,
+        };
+      } else if (k === 'folder') {
+        this.locationInfo[hit.uid!] = {
+          kind: k,
+          name: hit.title!,
+          url: hit.url,
+          folderId: hit.id,
+        };
+      }
+    }
+
+    const data: DataFrame = {
+      fields: [
+        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector(kind) },
+        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(name) },
+        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(uid) },
+        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(url) },
+        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector(tags) },
+        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector(location) },
+      ],
+      length: name.length,
+      meta: {
+        custom: {
+          count: name.length,
+          max_score: 1,
+          locationInfo: this.locationInfo,
+        },
+      },
+    };
+
+    // Add enterprise sort fields as a field in the frame
+    if (sortMetaName?.length && sortBy.length) {
+      data.meta!.custom!.sortBy = sortMetaName;
+      data.fields.push({
+        name: sortMetaName, // Used in display
+        type: FieldType.number,
+        config: {},
+        values: new ArrayVector(sortBy),
+      });
+    }
+
+    for (const field of data.fields) {
+      field.display = getDisplayProcessor({ field, theme: config.theme2 });
+    }
+
+    const view = new DataFrameView<DashboardQueryResult>(data);
+    return {
+      totalRows: data.length,
+      view,
+
+      // Paging not supported with this version
+      loadMoreItems: async (startIndex: number, stopIndex: number): Promise<void> => {},
+      isItemLoaded: (index: number): boolean => true,
+    };
+  }
+}
diff --git a/public/app/features/search/service/types.ts b/public/app/features/search/service/types.ts
index adff98d3467..1b0d79b9d2a 100644
--- a/public/app/features/search/service/types.ts
+++ b/public/app/features/search/service/types.ts
@@ -1,4 +1,4 @@
-import { DataFrameView } from '@grafana/data';
+import { DataFrameView, SelectableValue } from '@grafana/data';
 import { TermCount } from 'app/core/components/TagFilter/TagFilter';
 
 export interface FacetField {
@@ -32,7 +32,6 @@ export interface DashboardQueryResult {
   tags: string[];
   location: string; // url that can be split
   ds_uid: string[];
-  score?: number;
 }
 
 export interface LocationInfo {
@@ -45,6 +44,7 @@ export interface SearchResultMeta {
   count: number;
   max_score: number;
   locationInfo: Record<string, LocationInfo>;
+  sortBy?: string;
 }
 
 export interface QueryResponse {
@@ -62,6 +62,6 @@ export interface QueryResponse {
 
 export interface GrafanaSearcher {
   search: (query: SearchQuery) => Promise<QueryResponse>;
-  list: (location: string) => Promise<QueryResponse>;
   tags: (query: SearchQuery) => Promise<TermCount[]>;
+  getSortOptions: () => Promise<SelectableValue[]>;
 }

From 6054bd0e2c52e8b1227ab11ddc72520d7521c013 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 26 May 2022 22:46:15 -0400
Subject: [PATCH 068/103] Alerting: Add tests for Slack Notifier Image Upload
 (#49669) (#49747)

Tests that file bytes are correctly read from storage when an image is
available without a URL. Tests that not found and success cases are both
handled.

(cherry picked from commit d5a327f43d18759c0f895ed1542b3302e541317a)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
---
 .../ngalert/notifier/channels/slack_test.go   | 198 +++++++++++++++++-
 .../ngalert/notifier/channels/testing.go      |  14 ++
 2 files changed, 204 insertions(+), 8 deletions(-)

diff --git a/pkg/services/ngalert/notifier/channels/slack_test.go b/pkg/services/ngalert/notifier/channels/slack_test.go
index 95e7d3db1ec..82fc387a986 100644
--- a/pkg/services/ngalert/notifier/channels/slack_test.go
+++ b/pkg/services/ngalert/notifier/channels/slack_test.go
@@ -7,10 +7,12 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/setting"
@@ -24,17 +26,45 @@ import (
 func TestSlackNotifier(t *testing.T) {
 	tmpl := templateForTests(t)
 
+	// Create our temporary image file.
+	f, err := os.CreateTemp("", "ngalert-images-example*.png")
+	if err != nil {
+		panic("Temp file error!")
+	}
+	defer func() { _ = os.Remove(f.Name()) }()
+
+	fakeImageStore := &fakeImageStore{
+		Images: []*models.Image{
+			{
+				Token: "test-with-url",
+				URL:   "https://www.example.com/image.jpg",
+			},
+			{
+				Token: "test-with-path-not-found",
+				Path:  "usr/home/nouser/noway.jpg",
+			},
+			{
+				Token: "test-with-path-found",
+				Path:  f.Name(), // Has the full path because of how CreateTemp works.
+			},
+		},
+	}
+
+	_, _ = f.Write([]byte("test image"))
+	_ = f.Close()
+
 	externalURL, err := url.Parse("http://localhost")
 	require.NoError(t, err)
 	tmpl.ExternalURL = externalURL
 
 	cases := []struct {
-		name         string
-		settings     string
-		alerts       []*types.Alert
-		expMsg       *slackMessage
-		expInitError string
-		expMsgError  error
+		name          string
+		settings      string
+		alerts        []*types.Alert
+		expMsg        *slackMessage
+		expInitError  string
+		expMsgError   error
+		expWebhookURL string
 	}{
 		{
 			name: "Correct config with one alert",
@@ -106,6 +136,114 @@ func TestSlackNotifier(t *testing.T) {
 			},
 			expMsgError: nil,
 		},
+		{
+			name: "Image URL in alert appears in slack message",
+			settings: `{
+				"token": "1234",
+				"recipient": "#testchannel",
+				"icon_emoji": ":emoji:"
+			}`,
+			alerts: []*types.Alert{
+				{
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-with-url"},
+					},
+				},
+			},
+			expMsg: &slackMessage{
+				Channel:   "#testchannel",
+				Username:  "Grafana",
+				IconEmoji: ":emoji:",
+				Attachments: []attachment{
+					{
+						Title:      "[FIRING:1]  (val1)",
+						TitleLink:  "http://localhost/alerting/list",
+						Text:       "**Firing**\n\nValue: [no value]\nLabels:\n - alertname = alert1\n - lbl1 = val1\nAnnotations:\n - ann1 = annv1\nSilence: http://localhost/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1\nDashboard: http://localhost/d/abcd\nPanel: http://localhost/d/abcd?viewPanel=efgh\n",
+						Fallback:   "[FIRING:1]  (val1)",
+						Fields:     nil,
+						Footer:     "Grafana v" + setting.BuildVersion,
+						FooterIcon: "https://grafana.com/assets/img/fav32.png",
+						Color:      "#D63232",
+						Ts:         0,
+						ImageURL:   "https://www.example.com/image.jpg",
+					},
+				},
+			},
+			expMsgError: nil,
+		},
+		{
+			name: "Image URL with path but no file creates message with no error",
+			settings: `{
+				"token": "1234",
+				"image_upload_url": "https://www.webhook.com",
+				"recipient": "#testchannel",
+				"icon_emoji": ":emoji:"
+			}`,
+			alerts: []*types.Alert{
+				{
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-with-path-not-found"},
+					},
+				},
+			},
+			expMsg: &slackMessage{
+				Channel:   "#testchannel",
+				Username:  "Grafana",
+				IconEmoji: ":emoji:",
+				Attachments: []attachment{
+					{
+						Title:      "[FIRING:1]  (val1)",
+						TitleLink:  "http://localhost/alerting/list",
+						Text:       "**Firing**\n\nValue: [no value]\nLabels:\n - alertname = alert1\n - lbl1 = val1\nAnnotations:\n - ann1 = annv1\nSilence: http://localhost/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1\nDashboard: http://localhost/d/abcd\nPanel: http://localhost/d/abcd?viewPanel=efgh\n",
+						Fallback:   "[FIRING:1]  (val1)",
+						Fields:     nil,
+						Footer:     "Grafana v" + setting.BuildVersion,
+						FooterIcon: "https://grafana.com/assets/img/fav32.png",
+						Color:      "#D63232",
+						Ts:         0,
+					},
+				},
+			},
+			expMsgError: nil,
+		},
+		{
+			name: "Image URL with path and file creates message and uploads image",
+			settings: `{
+				"token": "1234",
+				"recipient": "#testchannel",
+				"icon_emoji": ":emoji:"
+			}`,
+			alerts: []*types.Alert{
+				{
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-with-path-found"},
+					},
+				},
+			},
+			expMsg: &slackMessage{
+				Channel:   "#testchannel",
+				Username:  "Grafana",
+				IconEmoji: ":emoji:",
+				Attachments: []attachment{
+					{
+						Title:      "[FIRING:1]  (val1)",
+						TitleLink:  "http://localhost/alerting/list",
+						Text:       "**Firing**\n\nValue: [no value]\nLabels:\n - alertname = alert1\n - lbl1 = val1\nAnnotations:\n - ann1 = annv1\nSilence: http://localhost/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1\nDashboard: http://localhost/d/abcd\nPanel: http://localhost/d/abcd?viewPanel=efgh\n",
+						Fallback:   "[FIRING:1]  (val1)",
+						Fields:     nil,
+						Footer:     "Grafana v" + setting.BuildVersion,
+						FooterIcon: "https://grafana.com/assets/img/fav32.png",
+						Color:      "#D63232",
+						Ts:         0,
+					},
+				},
+			},
+			expMsgError:   nil,
+			expWebhookURL: SlackImageAPIEndpoint,
+		},
 		{
 			name: "Correct config with multiple alerts and template",
 			settings: `{
@@ -196,6 +334,43 @@ func TestSlackNotifier(t *testing.T) {
 			},
 			expMsgError: nil,
 		},
+		{
+			name: "Custom image upload URL",
+			settings: `{
+				"token": "1234",
+				"recipient": "#testchannel",
+				"icon_emoji": ":emoji:",
+				"imageUploadUrl": "https://custom-domain.upload"
+			}`,
+			alerts: []*types.Alert{
+				{
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-with-path-found"},
+					},
+				},
+			},
+			expMsg: &slackMessage{
+				Channel:   "#testchannel",
+				Username:  "Grafana",
+				IconEmoji: ":emoji:",
+				Attachments: []attachment{
+					{
+						Title:      "[FIRING:1]  (val1)",
+						TitleLink:  "http://localhost/alerting/list",
+						Text:       "**Firing**\n\nValue: [no value]\nLabels:\n - alertname = alert1\n - lbl1 = val1\nAnnotations:\n - ann1 = annv1\nSilence: http://localhost/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1\nDashboard: http://localhost/d/abcd\nPanel: http://localhost/d/abcd?viewPanel=efgh\n",
+						Fallback:   "[FIRING:1]  (val1)",
+						Fields:     nil,
+						Footer:     "Grafana v" + setting.BuildVersion,
+						FooterIcon: "https://grafana.com/assets/img/fav32.png",
+						Color:      "#D63232",
+						Ts:         0,
+					},
+				},
+			},
+			expMsgError:   nil,
+			expWebhookURL: "https://custom-domain.upload",
+		},
 	}
 
 	for _, c := range cases {
@@ -206,6 +381,8 @@ func TestSlackNotifier(t *testing.T) {
 
 			secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 			decryptFn := secretsService.GetDecryptedValue
+			notificationService := mockNotificationService()
+
 			fc := FactoryConfig{
 				Config: &NotificationChannelConfig{
 					Name:           "slack_testing",
@@ -213,8 +390,9 @@ func TestSlackNotifier(t *testing.T) {
 					Settings:       settingsJSON,
 					SecureSettings: secureSettings,
 				},
-				ImageStore:          &UnavailableImageStore{},
-				NotificationService: mockNotificationService(),
+				ImageStore: fakeImageStore,
+				// TODO: allow changing the associated values for different tests.
+				NotificationService: notificationService,
 				DecryptFunc:         decryptFn,
 			}
 
@@ -271,6 +449,10 @@ func TestSlackNotifier(t *testing.T) {
 			require.NoError(t, err)
 
 			require.JSONEq(t, string(expBody), body)
+
+			// If we should have sent to the webhook, the mock notification service
+			// will have a record of it.
+			require.Equal(t, c.expWebhookURL, notificationService.Webhook.Url)
 		})
 	}
 }
diff --git a/pkg/services/ngalert/notifier/channels/testing.go b/pkg/services/ngalert/notifier/channels/testing.go
index 3fac1346bc6..9afc3aa6156 100644
--- a/pkg/services/ngalert/notifier/channels/testing.go
+++ b/pkg/services/ngalert/notifier/channels/testing.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/models"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
 // mockTimeNow replaces function timeNow to return constant time.
@@ -48,3 +49,16 @@ func (ns *notificationServiceMock) SendEmailCommandHandler(ctx context.Context,
 }
 
 func mockNotificationService() *notificationServiceMock { return &notificationServiceMock{} }
+
+type fakeImageStore struct {
+	Images []*ngmodels.Image
+}
+
+func (f *fakeImageStore) GetImage(ctx context.Context, token string) (*ngmodels.Image, error) {
+	for _, img := range f.Images {
+		if img.Token == token {
+			return img, nil
+		}
+	}
+	return nil, ngmodels.ErrImageNotFound
+}

From e2a60b86f20b6761f475904b8c88050e1aa1835a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 27 May 2022 08:17:27 -0400
Subject: [PATCH 069/103] Loki: Fix unwrap parsing (#49732) (#49752)

(cherry picked from commit 745b101d41337b49a214ea0556456ba63441e991)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---
 package.json                                  |  2 +-
 .../loki/querybuilder/parsing.test.ts         | 44 ++++++++++++++++++
 .../datasource/loki/querybuilder/parsing.ts   | 45 ++++++++++++-------
 yarn.lock                                     | 10 ++---
 4 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index c8ed7d144a1..6c7227825ee 100644
--- a/package.json
+++ b/package.json
@@ -253,7 +253,7 @@
     "@grafana/e2e-selectors": "workspace:*",
     "@grafana/experimental": "^0.0.2-canary.30",
     "@grafana/google-sdk": "0.0.3",
-    "@grafana/lezer-logql": "^0.0.11",
+    "@grafana/lezer-logql": "^0.0.12",
     "@grafana/runtime": "workspace:*",
     "@grafana/schema": "workspace:*",
     "@grafana/slate-react": "0.22.10-grafana",
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts b/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts
index 51201da9d36..ca0fbaee3c3 100644
--- a/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts
@@ -220,6 +220,50 @@ describe('buildVisualQueryFromString', () => {
     );
   });
 
+  it('parses query with with unwrap and error filter', () => {
+    expect(
+      buildVisualQueryFromString('sum_over_time({app="frontend"} | logfmt | unwrap duration | __error__="" [1m])')
+    ).toEqual(
+      noErrors({
+        labels: [
+          {
+            op: '=',
+            value: 'frontend',
+            label: 'app',
+          },
+        ],
+        operations: [
+          { id: 'logfmt', params: [] },
+          { id: 'unwrap', params: ['duration'] },
+          { id: '__label_filter_no_errors', params: [] },
+          { id: 'sum_over_time', params: ['1m'] },
+        ],
+      })
+    );
+  });
+
+  it('parses query with with unwrap and label filter', () => {
+    expect(
+      buildVisualQueryFromString('sum_over_time({app="frontend"} | logfmt | unwrap duration | label="value" [1m])')
+    ).toEqual(
+      noErrors({
+        labels: [
+          {
+            op: '=',
+            value: 'frontend',
+            label: 'app',
+          },
+        ],
+        operations: [
+          { id: 'logfmt', params: [] },
+          { id: 'unwrap', params: ['duration'] },
+          { id: '__label_filter', params: ['label', '=', 'value'] },
+          { id: 'sum_over_time', params: ['1m'] },
+        ],
+      })
+    );
+  });
+
   it('returns error for query with unwrap and conversion operation', () => {
     const context = buildVisualQueryFromString(
       'sum_over_time({app="frontend"} | logfmt | unwrap duration(label) [5m])'
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsing.ts b/public/app/plugins/datasource/loki/querybuilder/parsing.ts
index 39b38c0f848..f46bb546d4c 100644
--- a/public/app/plugins/datasource/loki/querybuilder/parsing.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/parsing.ts
@@ -120,7 +120,7 @@ export function handleExpression(expr: string, node: SyntaxNode, context: Contex
     }
 
     case 'UnwrapExpr': {
-      const { operation, error } = getUnwrap(expr, node);
+      const { operation, error } = handleUnwrapExpr(expr, node, context);
       if (operation) {
         visQuery.operations.push(operation);
       }
@@ -297,25 +297,40 @@ function getLabelFormat(expr: string, node: SyntaxNode): QueryBuilderOperation {
   };
 }
 
-function getUnwrap(expr: string, node: SyntaxNode): { operation?: QueryBuilderOperation; error?: string } {
-  // Check for nodes not supported in visual builder and return error
-  if (node.getChild('ConvOp')) {
+function handleUnwrapExpr(
+  expr: string,
+  node: SyntaxNode,
+  context: Context
+): { operation?: QueryBuilderOperation; error?: string } {
+  const unwrapExprChild = node.getChild('UnwrapExpr');
+  const labelFilterChild = node.getChild('LabelFilter');
+  const unwrapChild = node.getChild('Unwrap');
+
+  if (unwrapExprChild) {
+    handleExpression(expr, unwrapExprChild, context);
+  }
+
+  if (labelFilterChild) {
+    handleExpression(expr, labelFilterChild, context);
+  }
+
+  if (unwrapChild) {
+    if (unwrapChild?.nextSibling?.type.name === 'ConvOp') {
+      return {
+        error: 'Unwrap with conversion operator not supported in query builder',
+      };
+    }
+
     return {
-      error: 'Unwrap with conversion operator not supported in query builder',
+      operation: {
+        id: 'unwrap',
+        params: [getString(expr, unwrapChild?.nextSibling)],
+      },
     };
   }
 
-  const id = 'unwrap';
-  const string = getString(expr, node.getChild('Identifier'));
-
-  return {
-    operation: {
-      id,
-      params: [string],
-    },
-  };
+  return {};
 }
-
 function handleRangeAggregation(expr: string, node: SyntaxNode, context: Context) {
   const nameNode = node.getChild('RangeOp');
   const funcName = getString(expr, nameNode);
diff --git a/yarn.lock b/yarn.lock
index 274511cbb51..7899f442819 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4011,14 +4011,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/lezer-logql@npm:^0.0.11":
-  version: 0.0.11
-  resolution: "@grafana/lezer-logql@npm:0.0.11"
+"@grafana/lezer-logql@npm:^0.0.12":
+  version: 0.0.12
+  resolution: "@grafana/lezer-logql@npm:0.0.12"
   dependencies:
     lezer: ^0.13.5
   peerDependencies:
     "@lezer/lr": ^0.15.8
-  checksum: 0427e59528ea5092e53a70b9b6be37b0ed29ca4c0ddf452cc192f8bd14d21a725ba1959b2e33e7567b42e4d0391cff4e4f36c249d7099a157d0f1e9093ba64e4
+  checksum: d28780b41a97b69a427390ef746e09a131e6a151be0894763e5cfe26fa16ae37fa5fe7409ea956f5e29974a5966162318a51bcd47422e9a3e609ca43340bbdcb
   languageName: node
   linkType: hard
 
@@ -19715,7 +19715,7 @@ __metadata:
     "@grafana/eslint-config": 3.0.0
     "@grafana/experimental": ^0.0.2-canary.30
     "@grafana/google-sdk": 0.0.3
-    "@grafana/lezer-logql": ^0.0.11
+    "@grafana/lezer-logql": ^0.0.12
     "@grafana/runtime": "workspace:*"
     "@grafana/schema": "workspace:*"
     "@grafana/slate-react": 0.22.10-grafana

From 5d23308a22b3fa7c0f9abc898c8476c395ca92c3 Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Fri, 27 May 2022 13:37:37 -0400
Subject: [PATCH 070/103] Docs: Refactor contact points section of alerting
 docs (#49758)

* Initial commit

* weight adjustments

* Checkin changes.

(cherry picked from commit f5a3ac855df3cae0e684db393b84dfb21aba9c90)
---
 docs/sources/alerting/about-alerting.md       |  33 +++
 .../sources/alerting/contact-points/_index.md | 202 +-----------------
 .../contact-points/create-contact-point.md    |  31 +++
 .../contact-points/delete-contact-point.md    |  26 +++
 .../edit-alertmanager-config.md               |  26 +++
 .../contact-points/edit-contact-point.md      |  24 +++
 .../message-templating/_index.md              |  87 +-------
 .../create-message-template.md                |  32 +++
 .../delete-message-template.md                |  24 +++
 .../edit-message-template.md                  |  24 +++
 .../example-template-functions.md             | 126 +++++++++++
 .../message-templating/example-template.md    |  67 ++++++
 .../message-templating/template-data.md       |   1 +
 .../message-templating/template-functions.md  |   1 +
 .../contact-points/notifiers/_index.md        |  41 ++++
 .../notifiers/webhook-notifier.md             | 137 ++++++++++++
 .../contact-points/test-contact-point.md      |  26 +++
 .../alert-rules/alert-rule-types.md           |   2 +-
 18 files changed, 629 insertions(+), 281 deletions(-)
 create mode 100644 docs/sources/alerting/about-alerting.md
 create mode 100644 docs/sources/alerting/contact-points/create-contact-point.md
 create mode 100644 docs/sources/alerting/contact-points/delete-contact-point.md
 create mode 100644 docs/sources/alerting/contact-points/edit-alertmanager-config.md
 create mode 100644 docs/sources/alerting/contact-points/edit-contact-point.md
 create mode 100644 docs/sources/alerting/contact-points/message-templating/create-message-template.md
 create mode 100644 docs/sources/alerting/contact-points/message-templating/delete-message-template.md
 create mode 100644 docs/sources/alerting/contact-points/message-templating/edit-message-template.md
 create mode 100644 docs/sources/alerting/contact-points/message-templating/example-template-functions.md
 create mode 100644 docs/sources/alerting/contact-points/message-templating/example-template.md
 create mode 100644 docs/sources/alerting/contact-points/notifiers/_index.md
 create mode 100644 docs/sources/alerting/contact-points/notifiers/webhook-notifier.md
 create mode 100644 docs/sources/alerting/contact-points/test-contact-point.md

diff --git a/docs/sources/alerting/about-alerting.md b/docs/sources/alerting/about-alerting.md
new file mode 100644
index 00000000000..66c02f01902
--- /dev/null
+++ b/docs/sources/alerting/about-alerting.md
@@ -0,0 +1,33 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/about-alerting/
+description: A quick overview of Grafana alerting
+keywords:
+  - grafana
+  - alerting
+  - overview
+  - concepts
+  - basics
+title: About Grafana alerting
+weight: 100
+---
+
+# About Grafana alerting
+
+Grafana Alerting consists of several individual concepts that are at the core of a flexible and powerful alerting engine.
+
+This topic explains how to create [alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}}), their relationship with [alert instances]({{< relref "./fundamentals/alert-rules/alert-instances.md" >}}) and the various alert rule [states and transitions]({{< relref "./fundamentals/state-and-health.md" >}}), [notification policies]({{< relref "./notifications/_index.md" >}}) and [contact points]({{< relref "./contact-points/_index.md" >}}).
+
+These three individual concepts are the minimum necessities to successfully create alerts and receive notifications.
+
+We will also touch on various other concepts such as [silences]({{< relref "./silences/_index.md" >}}) and [mute timings]({{< relref "./notifications/mute-timings.md" >}}) to more granularly manage alert notifications, [role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) to limit access and manage permissions and additional advanced topics such as [external alertmanagers]({{< relref "./fundamentals/alertmanager.md#add-a-new-external-alertmanager" >}}) and [high availability]({{< relref "./high-availability/_index.md" >}}).
+
+## Overview
+
+{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram.jpg" caption="Grafana alerting overview" >}}
+
+As shown in the diagram above, Grafana alerting uses [labels]({{< relref "./fundamentals/annotation-label/how-to-use-labels.md" >}}) to match an alert rule and its instances to a specific notification policy. This concept of labels and label matching is important and is also used in [silences]({{< relref "./silences/_index.md" >}}).
+
+Each notification policy specifies a set of [label matchers]({{< relref "./fundamentals/annotation-label/labels-and-label-matchers.md" >}}) to indicate what alerts they are responsible for.
+
+A notification policy has a [contact point]({{< relref "./contact-points/_index.md" >}}) assigned to it that consists of one or more [notifiers]({{< relref "./contact-points/_index.md#list-of-notifiers-supported-by-grafana" >}}).
diff --git a/docs/sources/alerting/contact-points/_index.md b/docs/sources/alerting/contact-points/_index.md
index 75ebf9bfd09..cf78e0dd760 100644
--- a/docs/sources/alerting/contact-points/_index.md
+++ b/docs/sources/alerting/contact-points/_index.md
@@ -20,199 +20,11 @@ Use contact points to define how your contacts are notified when an alert fires.
 
 You can configure Grafana managed contact points as well as contact points for an [external Alertmanager data source]({{< relref "../../datasources/alertmanager.md" >}}). For more information, see [Alertmanager]({{< relref "../fundamentals/alertmanager.md" >}}).
 
-## Add a contact point
+Before you begin, see [About Grafana alerting]({{< relref "../about-alerting.md" >}}) which explains the various components of Grafana alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/_index.md" >}}) of Grafana alerting.
 
-1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **Contact points** to open the page listing existing contact points.
-1. Click **New contact point**.
-1. From the **Alertmanager** dropdown, select an Alertmanager. By default, Grafana Alertmanager is selected.
-1. In **Name**, enter a descriptive name for the contact point.
-1. From **Contact point type**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
-1. Some contact point types, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point type.
-1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
-1. To add another contact point type, click **New contact point type** and repeat steps 6 through 8.
-1. Click **Save contact point** to save your changes.
-
-## Edit a contact point
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. Find the contact point to edit, then click **Edit** (pen icon).
-1. Make any changes and click **Save contact point**.
-
-## Test a contact point
-
-For Grafana managed contact points, you can send a test notification which helps verify a contact point is configured correctly.
-
-To send a test notification:
-
-1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Contact** points.
-1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed.
-1. Click **Test** (paper airplane icon) to open the contact point testing modal.
-1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
-1. Click **Send test notification** to fire the alert.
-
-## Delete a contact point
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. Find the contact point to delete, then click **Delete** (trash icon).
-1. In the confirmation dialog, click **Yes, delete**.
-
-> **Note:** You cannot delete contact points that are in use by a notification policy. You will have to either delete the [notification policy]({{< relref "../notifications/_index.md" >}}) or update it to use another contact point.
-
-## Edit Alertmanager global config
-
-To edit global configuration options for an external Alertmanager, like SMTP server, that is used by default for all email contact types:
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. From the **Alertmanager** drop-down, select an external Alertmanager data source.
-1. Click the **Edit global config** option.
-1. Add global configuration settings.
-1. Click **Save global config** to save your changes.
-
-> **Note** This option is available only for external Alertmanagers. You can configure some global options for Grafana contact types, like email settings, via [Grafana configuration]({{< relref "../../administration/configuration.md" >}}).
-
-## List of notifiers supported by Grafana
-
-| Name                                          | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
-| --------------------------------------------- | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
-| [DingDing](#dingdingdingtalk)                 | `dingding`                | Supported            | N/A                                                                                                      |
-| [Discord](#discord)                           | `discord`                 | Supported            | N/A                                                                                                      |
-| [Email](#email)                               | `email`                   | Supported            | Supported                                                                                                |
-| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | Supported            | N/A                                                                                                      |
-| [Kafka](#kafka)                               | `kafka`                   | Supported            | N/A                                                                                                      |
-| Line                                          | `line`                    | Supported            | N/A                                                                                                      |
-| Microsoft Teams                               | `teams`                   | Supported            | N/A                                                                                                      |
-| [Opsgenie](#opsgenie)                         | `opsgenie`                | Supported            | Supported                                                                                                |
-| [Pagerduty](#pagerduty)                       | `pagerduty`               | Supported            | Supported                                                                                                |
-| Prometheus Alertmanager                       | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
-| [Pushover](#pushover)                         | `pushover`                | Supported            | Supported                                                                                                |
-| Sensu                                         | `sensu`                   | Supported            | N/A                                                                                                      |
-| [Sensu Go](#sensu-go)                         | `sensugo`                 | Supported            | N/A                                                                                                      |
-| [Slack](#slack)                               | `slack`                   | Supported            | Supported                                                                                                |
-| Telegram                                      | `telegram`                | Supported            | N/A                                                                                                      |
-| Threema                                       | `threema`                 | Supported            | N/A                                                                                                      |
-| VictorOps                                     | `victorops`               | Supported            | Supported                                                                                                |
-| [Webhook](#webhook)                           | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
-| [WeCom](#wecom)                               | `wecom`                   | Supported            | N/A                                                                                                      |
-| [Zenduty](#zenduty)                           | `webhook`                 | Supported            | N/A                                                                                                      |
-
-### Webhook
-
-Example JSON body:
-
-```json
-{
-  "receiver": "My Super Webhook",
-  "status": "firing",
-  "orgId": 1,
-  "alerts": [
-    {
-      "status": "firing",
-      "labels": {
-        "alertname": "High memory usage",
-        "team": "blue",
-        "zone": "us-1"
-      },
-      "annotations": {
-        "description": "The system has high memory usage",
-        "runbook_url": "https://myrunbook.com/runbook/1234",
-        "summary": "This alert was triggered for zone us-1"
-      },
-      "startsAt": "2021-10-12T09:51:03.157076+02:00",
-      "endsAt": "0001-01-01T00:00:00Z",
-      "generatorURL": "https://play.grafana.org/alerting/1afz29v7z/edit",
-      "fingerprint": "c6eadffa33fcdf37",
-      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1",
-      "dashboardURL": "",
-      "panelURL": "",
-      "valueString": "[ metric='' labels={} value=14151.331895396988 ]"
-    },
-    {
-      "status": "firing",
-      "labels": {
-        "alertname": "High CPU usage",
-        "team": "blue",
-        "zone": "eu-1"
-      },
-      "annotations": {
-        "description": "The system has high CPU usage",
-        "runbook_url": "https://myrunbook.com/runbook/1234",
-        "summary": "This alert was triggered for zone eu-1"
-      },
-      "startsAt": "2021-10-12T09:56:03.157076+02:00",
-      "endsAt": "0001-01-01T00:00:00Z",
-      "generatorURL": "https://play.grafana.org/alerting/d1rdpdv7k/edit",
-      "fingerprint": "bc97ff14869b13e3",
-      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1",
-      "dashboardURL": "",
-      "panelURL": "",
-      "valueString": "[ metric='' labels={} value=47043.702386305304 ]"
-    }
-  ],
-  "groupLabels": {},
-  "commonLabels": {
-    "team": "blue"
-  },
-  "commonAnnotations": {},
-  "externalURL": "https://play.grafana.org/",
-  "version": "1",
-  "groupKey": "{}:{}",
-  "truncatedAlerts": 0,
-  "title": "[FIRING:2]  (blue)",
-  "state": "alerting",
-  "message": "**Firing**\n\nLabels:\n - alertname = T2\n - team = blue\n - zone = us-1\nAnnotations:\n - description = This is the alert rule checking the second system\n - runbook_url = https://myrunbook.com\n - summary = This is my summary\nSource: https://play.grafana.org/alerting/1afz29v7z/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1\n\nLabels:\n - alertname = T1\n - team = blue\n - zone = eu-1\nAnnotations:\nSource: https://play.grafana.org/alerting/d1rdpdv7k/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1\n"
-}
-```
-
-### Webhook fields
-
-#### Body
-
-| Key               | Type                      | Description                                                                     |
-| ----------------- | ------------------------- | ------------------------------------------------------------------------------- |
-| receiver          | string                    | Name of the webhook                                                             |
-| status            | string                    | Current status of the alert, `firing` or `resolved`                             |
-| orgId             | number                    | ID of the organization related to the payload                                   |
-| alerts            | array of [alerts](#alert) | Alerts that are triggering                                                      |
-| groupLabels       | object                    | Labels that are used for grouping, map of string keys to string values          |
-| commonLabels      | object                    | Labels that all alarms have in common, map of string keys to string values      |
-| commonAnnotations | object                    | Annotations that all alarms have in common, map of string keys to string values |
-| externalURL       | string                    | External URL to the Grafana instance sending this webhook                       |
-| version           | string                    | Version of the payload                                                          |
-| groupKey          | string                    | Key that is used for grouping                                                   |
-| truncatedAlerts   | number                    | Number of alerts that were truncated                                            |
-| title             | string                    | **Will be deprecated soon**                                                     |
-| state             | string                    | **Will be deprecated soon**                                                     |
-| message           | string                    | **Will be deprecated soon**                                                     |
-
-#### Alert
-
-| Key          | Type   | Description                                                                        |
-| ------------ | ------ | ---------------------------------------------------------------------------------- |
-| status       | string | Current status of the alert, `firing` or `resolved`                                |
-| labels       | object | Labels that are part of this alert, map of string keys to string values            |
-| annotations  | object | Annotations that are part of this alert, map of string keys to string values       |
-| startsAt     | string | Start time of the alert                                                            |
-| endsAt       | string | End time of the alert, default value when not resolved is `0001-01-01T00:00:00Z`   |
-| valueString  | string | Values that triggered the current status                                           |
-| generatorURL | string | URL of the alert rule in the Grafana UI                                            |
-| fingerprint  | string | The labels fingerprint, alarms with the same labels will have the same fingerprint |
-| silenceURL   | string | URL to silence the alert rule in the Grafana UI                                    |
-| dashboardURL | string | **Will be deprecated soon**                                                        |
-| panelURL     | string | **Will be deprecated soon**                                                        |
-
-#### Removed fields related to dashboards
-
-Alerts are not coupled to dashboards anymore therefore the fields related to dashboards `dashboardId` and `panelId` have been removed.
-
-### WeCom
-
-WeCom contact points need a Webhook URL. These are obtained by setting up a WeCom robot on the corresponding group chat. To obtain a Webhook URL using the WeCom desktop Client please follow these steps:
-
-1. Click the "..." in the top right corner of a group chat that you want your alerts to be delivered to
-2. Click "Add Group Robot", select "New Robot" and give your robot a name. Click "Add Robot"
-3. There should be a Webhook URL in the panel.
-
-| Setting | Description        |
-| ------- | ------------------ |
-| Url     | WeCom webhook URL. |
+- [Create contact point]({{< relref "./create-contact-point.md" >}})
+- [Edit contact point]({{< relref "./edit-contact-point.md" >}})
+- [Test contact point]({{< relref "./test-contact-point.md" >}})
+- [Delete contact point]({{< relref "./delete-contact-point.md" >}})
+- [List of notifiers]({{< relref "./notifiers/_index.md" >}})
+- [Message templating]({{< relref "./message-templating/_index.md" >}})
diff --git a/docs/sources/alerting/contact-points/create-contact-point.md b/docs/sources/alerting/contact-points/create-contact-point.md
new file mode 100644
index 00000000000..a26a7bcc022
--- /dev/null
+++ b/docs/sources/alerting/contact-points/create-contact-point.md
@@ -0,0 +1,31 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Add contact point
+weight: 100
+---
+
+# Add a contact point
+
+Use contact points to define how your contacts are notified when an alert fires.
+
+To add a contact point
+
+1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
+1. Click **Contact points** to open the page listing existing contact points.
+1. Click **New contact point**.
+1. From the **Alertmanager** dropdown, select an Alertmanager. By default, Grafana Alertmanager is selected.
+1. In **Name**, enter a descriptive name for the contact point.
+1. From **Contact point type**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
+1. Some contact point types, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point type.
+1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
+1. To add another contact point type, click **New contact point type** and repeat steps 6 through 8.
+1. Click **Save contact point** to save your changes.
diff --git a/docs/sources/alerting/contact-points/delete-contact-point.md b/docs/sources/alerting/contact-points/delete-contact-point.md
new file mode 100644
index 00000000000..a898459bde3
--- /dev/null
+++ b/docs/sources/alerting/contact-points/delete-contact-point.md
@@ -0,0 +1,26 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Delete a contact point
+weight: 115
+---
+
+## Delete a contact point
+
+For Grafana managed contact points, you can send a test notification which helps verify a contact point is configured correctly.
+
+To delete a contact point
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. Find the contact point to delete, then click **Delete** (trash icon).
+1. In the confirmation dialog, click **Yes, delete**.
+
+> **Note:** You cannot delete contact points that are in use by a notification policy. You will have to either delete the [notification policy]({{< relref "../notifications/_index.md" >}}) or update it to use another contact point.
diff --git a/docs/sources/alerting/contact-points/edit-alertmanager-config.md b/docs/sources/alerting/contact-points/edit-alertmanager-config.md
new file mode 100644
index 00000000000..c94931986c1
--- /dev/null
+++ b/docs/sources/alerting/contact-points/edit-alertmanager-config.md
@@ -0,0 +1,26 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Edit contact point
+weight: 120
+---
+
+# Edit Alertmanager global config
+
+To edit global configuration options for an external Alertmanager, like SMTP server, that is used by default for all email contact types:
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. From the **Alertmanager** drop-down, select an external Alertmanager data source.
+1. Click the **Edit global config** option.
+1. Add global configuration settings.
+1. Click **Save global config** to save your changes.
+
+> **Note** This option is available only for external Alertmanagers. You can configure some global options for Grafana contact types, like email settings, via [Grafana configuration]({{< relref "../../administration/configuration.md" >}})
diff --git a/docs/sources/alerting/contact-points/edit-contact-point.md b/docs/sources/alerting/contact-points/edit-contact-point.md
new file mode 100644
index 00000000000..b0ae2db9925
--- /dev/null
+++ b/docs/sources/alerting/contact-points/edit-contact-point.md
@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Edit contact point
+weight: 105
+---
+
+# Edit a contact point
+
+Use contact points to define how your contacts are notified when an alert fires.
+
+To edit a contact point
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. Find the contact point to edit, then click **Edit** (pen icon).
+1. Make any changes and click **Save contact point**.
diff --git a/docs/sources/alerting/contact-points/message-templating/_index.md b/docs/sources/alerting/contact-points/message-templating/_index.md
index d7a267fa5c4..299b974f4cd 100644
--- a/docs/sources/alerting/contact-points/message-templating/_index.md
+++ b/docs/sources/alerting/contact-points/message-templating/_index.md
@@ -23,41 +23,11 @@ Since most of the contact point fields can be templated, you can create reusable
 
 The following example shows how to use default templates to render an alert message in Slack. The message title contains a count of alerts that are firing or were resolved. The message body lists the alerts and their status.
 
-<img  src="/static/img/docs/alerting/unified/contact-points-template-fields-8-0.png" width="450px">
+{{< figure src="/static/img/docs/alerting/unified/contact-points-template-fields-8-0.png" class="docs-image--no-shadow" max-width= "550px" caption="Default template" >}}
 
 The following example shows the use of a custom template within one of the contact point fields.
 
-<img  src="/static/img/docs/alerting/unified/contact-points-use-template-8-0.png" width="400px">
-
-### Create a message template
-
-> **Note:** Before Grafana v8.2, the configuration of the embedded Alertmanager was shared across organisations. Users of Grafana 8.0 and 8.1 are advised to use the new Grafana 8 alerts only if they have one organisation. Otherwise, silences for the Grafana managed alerts will be visible by all organizations.
-
-1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. From Alertmanager drop-down, select an external Alertmanager to create and manage templates for the external data source. Otherwise, keep the default option of Grafana.
-   {{< figure max-width="250px" src="/static/img/docs/alerting/unified/contact-points-select-am-8-0.gif" caption="Select Alertmanager" >}}
-1. Click **Add template**.
-1. In **Name**, add a descriptive name.
-1. In **Content**, add the content of the template.
-1. Click **Save template** button at the bottom of the page.
-   <img  src="/static/img/docs/alerting/unified/templates-create-8-0.png" width="600px">
-
-The `define` tag in the Content section assigns the template name. This tag is optional, and when omitted, the template name is derived from the **Name** field. When both are specified, it is a best practice to ensure that they are the same.
-
-### Edit a message template
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. In the Template table, find the template you want to edit, then click the **Edit** (pen icon).
-1. Make your changes, then click **Save template**.
-
-### Delete a message template
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. In the Template table, find the template you want to delete, then click the **Delete** (trash icon).
-1. In the confirmation dialog, click **Yes, delete** to delete the template.
-
-Use caution when deleting a template since Grafana does not prevent you from deleting templates that are in use.
+{{< figure src="/static/img/docs/alerting/unified/contact-points-use-template-8-0.png" class="docs-image--no-shadow" max-width= "550px" caption="Default template" >}}
 
 ### Nested templates
 
@@ -86,59 +56,6 @@ You can use any of the following built-in template options to embed custom templ
 | `default.message`       | Provides a formatted summary of firing and resolved alerts.   |
 | `teams.default.message` | Similar to `default.messsage`, formatted for Microsoft Teams. |
 
-### Example of a custom template
-
-Here's an example of how to use a custom template. You can also use the default template included in the setup.
-
-Step 1: Configure a template to render a single alert.
-
-```
-{{ define "myalert" }}
-  [{{.Status}}] {{ .Labels.alertname }}
-
-  Labels:
-  {{ range .Labels.SortedPairs }}
-    {{ .Name }}: {{ .Value }}
-  {{ end }}
-
-  {{ if gt (len .Annotations) 0 }}
-  Annotations:
-  {{ range .Annotations.SortedPairs }}
-    {{ .Name }}: {{ .Value }}
-  {{ end }}
-  {{ end }}
-
-  {{ if gt (len .SilenceURL ) 0 }}
-    Silence alert: {{ .SilenceURL }}
-  {{ end }}
-  {{ if gt (len .DashboardURL ) 0 }}
-    Go to dashboard: {{ .DashboardURL }}
-  {{ end }}
-{{ end }}
-```
-
-Step 2: Configure a template to render entire notification message.
-
-```
-{{ define "mymessage" }}
-  {{ if gt (len .Alerts.Firing) 0 }}
-    {{ len .Alerts.Firing }} firing:
-    {{ range .Alerts.Firing }} {{ template "myalert" .}} {{ end }}
-  {{ end }}
-  {{ if gt (len .Alerts.Resolved) 0 }}
-    {{ len .Alerts.Resolved }} resolved:
-    {{ range .Alerts.Resolved }} {{ template "myalert" .}} {{ end }}
-  {{ end }}
-{{ end }}
-```
-
-Step 3: Add `mymessage` in the notification message field.
-
-```
-Alert summary:
-{{ template "mymessage" . }}
-```
-
 ### HTML in message templates
 
 HTML in alerting message templates is escaped. We do not support rendering of HTML in the resulting notification.
diff --git a/docs/sources/alerting/contact-points/message-templating/create-message-template.md b/docs/sources/alerting/contact-points/message-templating/create-message-template.md
new file mode 100644
index 00000000000..9a143aa6754
--- /dev/null
+++ b/docs/sources/alerting/contact-points/message-templating/create-message-template.md
@@ -0,0 +1,32 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Create message template
+weight: 100
+---
+
+# Create a message template
+
+You can use message templates to customize notification messages for the contact point types.
+
+To create a message tempplate:
+
+1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
+2. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+3. From Alertmanager drop-down, select an external Alertmanager to create and manage templates for the external data source. Otherwise, keep the default option of Grafana.
+   {{< figure max-width="250px" src="/static/img/docs/alerting/unified/contact-points-select-am-8-0.gif" caption="Select Alertmanager" >}}
+4. Click **Add template**.
+5. In **Name**, add a descriptive name.
+6. In **Content**, add the content of the template.
+7. Click **Save template** button at the bottom of the page.
+   <img  src="/static/img/docs/alerting/unified/templates-create-8-0.png" width="600px">
+
+The `define` tag in the Content section assigns the template name. This tag is optional, and when omitted, the template name is derived from the **Name** field. When both are specified, it is a best practice to ensure that they are the same.
diff --git a/docs/sources/alerting/contact-points/message-templating/delete-message-template.md b/docs/sources/alerting/contact-points/message-templating/delete-message-template.md
new file mode 100644
index 00000000000..8bc78e32147
--- /dev/null
+++ b/docs/sources/alerting/contact-points/message-templating/delete-message-template.md
@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Delete message template
+weight: 110
+---
+
+# Edit a message template
+
+Message templates customize notification messages for the contact point types.
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. In the Template table, find the template you want to delete, then click the **Delete** (trash icon).
+1. In the confirmation dialog, click **Yes, delete** to delete the template.
+
+Use caution when deleting a template since Grafana does not prevent you from deleting templates that are in use.
diff --git a/docs/sources/alerting/contact-points/message-templating/edit-message-template.md b/docs/sources/alerting/contact-points/message-templating/edit-message-template.md
new file mode 100644
index 00000000000..f3cdf06eb0a
--- /dev/null
+++ b/docs/sources/alerting/contact-points/message-templating/edit-message-template.md
@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Edit message template
+weight: 100
+---
+
+# Edit a message template
+
+Message templates customize notification messages for the contact point types.
+
+To edit a message template
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. In the Template table, find the template you want to edit, then click the **Edit** (pen icon).
+1. Make your changes, then click **Save template**.
diff --git a/docs/sources/alerting/contact-points/message-templating/example-template-functions.md b/docs/sources/alerting/contact-points/message-templating/example-template-functions.md
new file mode 100644
index 00000000000..d9d5e87c76f
--- /dev/null
+++ b/docs/sources/alerting/contact-points/message-templating/example-template-functions.md
@@ -0,0 +1,126 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Examples of template functions
+weight: 130
+---
+
+# Examples of template functions
+
+## humanize
+
+**Template string** `{ humanize $value }`
+
+**Input** `1234567.0`
+
+**Expected** `1.235M`
+
+## humanize1024
+
+**TemplateString** `{ humanize1024 $value } `
+
+**Input** `1048576.0`
+
+**Expected** `1Mi`
+
+## humanizeDuration
+
+**TemplateString** `{ humanizeDuration $value }`
+
+**Input** `899.99`
+
+**Expected** `14m 59s`
+
+### humanizePercentage
+
+**TemplateString** `{ humanizePercentage $value }`
+
+**Input** `0.1234567`
+
+**Expected** `12.35%`
+
+## humanizeTimestamp
+
+**TemplateString** `{ $value | humanizeTimestamp }`
+
+**Input** `1435065584.128`
+
+**Expected** `2015-06-23 13:19:44.128 +0000 UTC`
+
+## title
+
+**TemplateString** `{ $value | title }`
+
+**Input** `aa bb CC`
+
+**Expected** `Aa Bb Cc`
+
+### toUpper
+
+**TemplateString** `{ $value | toUpper }`
+
+**Input** `aa bb CC`
+
+**Expected** `AA BB CC`
+
+### toLower
+
+**TemplateString** `{ $value | toLower }`
+
+**Input** `aA bB CC`
+
+**Expected** `aa bb cc`
+
+## match
+
+**TemplateString** `{ match "a+" $labels.instance }`
+
+**Input** `aa`
+
+**Expected** `true`
+
+## reReplaceAll
+
+**TemplateString** `{{ reReplaceAll "localhost:(.*)" "my.domain:$1" $labels.instance }}`
+
+**Input** `localhost:3000`
+
+**Expected** `my.domain:3000`
+
+### graphLink
+
+**TemplateString** `{{ graphLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}`
+
+**Expected** `/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":false,"range":true}]`
+
+### tableLink
+
+**TemplateString** `{{ tableLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}`
+
+**Expected** `/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":true,"range":false}]`
+
+## args
+
+**TemplateString** `{{define "x"}}{{.arg0}} {{.arg1}}{{end}}{{template "x" (args 1 "2")}}`
+
+**Expected** `1 2`
+
+## externalURL
+
+**TemplateString** `{ externalURL }`
+
+**Expected** `http://localhost/path/prefix`
+
+## pathPrefix
+
+**TemplateString** `{ pathPrefix }`
+
+**Expected** `/path/prefix`
diff --git a/docs/sources/alerting/contact-points/message-templating/example-template.md b/docs/sources/alerting/contact-points/message-templating/example-template.md
new file mode 100644
index 00000000000..ac1cfc3faa9
--- /dev/null
+++ b/docs/sources/alerting/contact-points/message-templating/example-template.md
@@ -0,0 +1,67 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Example message template
+weight: 115
+---
+
+# Example of a custom template
+
+Here's an example of how to use a custom template. You can also use the default template included in the setup.
+
+Step 1: Configure a template to render a single alert.
+
+```
+{{ define "myalert" }}
+  [{{.Status}}] {{ .Labels.alertname }}
+
+  Labels:
+  {{ range .Labels.SortedPairs }}
+    {{ .Name }}: {{ .Value }}
+  {{ end }}
+
+  {{ if gt (len .Annotations) 0 }}
+  Annotations:
+  {{ range .Annotations.SortedPairs }}
+    {{ .Name }}: {{ .Value }}
+  {{ end }}
+  {{ end }}
+
+  {{ if gt (len .SilenceURL ) 0 }}
+    Silence alert: {{ .SilenceURL }}
+  {{ end }}
+  {{ if gt (len .DashboardURL ) 0 }}
+    Go to dashboard: {{ .DashboardURL }}
+  {{ end }}
+{{ end }}
+```
+
+Step 2: Configure a template to render entire notification message.
+
+```
+{{ define "mymessage" }}
+  {{ if gt (len .Alerts.Firing) 0 }}
+    {{ len .Alerts.Firing }} firing:
+    {{ range .Alerts.Firing }} {{ template "myalert" .}} {{ end }}
+  {{ end }}
+  {{ if gt (len .Alerts.Resolved) 0 }}
+    {{ len .Alerts.Resolved }} resolved:
+    {{ range .Alerts.Resolved }} {{ template "myalert" .}} {{ end }}
+  {{ end }}
+{{ end }}
+```
+
+Step 3: Add `mymessage` in the notification message field.
+
+```
+Alert summary:
+{{ template "mymessage" . }}
+```
diff --git a/docs/sources/alerting/contact-points/message-templating/template-data.md b/docs/sources/alerting/contact-points/message-templating/template-data.md
index 31839d08be1..7f770f643da 100644
--- a/docs/sources/alerting/contact-points/message-templating/template-data.md
+++ b/docs/sources/alerting/contact-points/message-templating/template-data.md
@@ -9,6 +9,7 @@ keywords:
   - contact point
   - templating
 title: Template data
+weight: 120
 ---
 
 # Template data
diff --git a/docs/sources/alerting/contact-points/message-templating/template-functions.md b/docs/sources/alerting/contact-points/message-templating/template-functions.md
index 6b41a9da0ec..ee9801eaca3 100644
--- a/docs/sources/alerting/contact-points/message-templating/template-functions.md
+++ b/docs/sources/alerting/contact-points/message-templating/template-functions.md
@@ -9,6 +9,7 @@ keywords:
   - contact point
   - templating
 title: Template functions
+weight: 125
 ---
 
 # Template Functions
diff --git a/docs/sources/alerting/contact-points/notifiers/_index.md b/docs/sources/alerting/contact-points/notifiers/_index.md
new file mode 100644
index 00000000000..b1afff72833
--- /dev/null
+++ b/docs/sources/alerting/contact-points/notifiers/_index.md
@@ -0,0 +1,41 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: List of notifiers
+weight: 130
+---
+
+# List of supported notifiers
+
+The following table lists the notifiers (contact point types) supported by Grafana.
+
+| Name                                          | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
+| --------------------------------------------- | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
+| [DingDing](#dingdingdingtalk)                 | `dingding`                | Supported            | N/A                                                                                                      |
+| [Discord](#discord)                           | `discord`                 | Supported            | N/A                                                                                                      |
+| [Email](#email)                               | `email`                   | Supported            | Supported                                                                                                |
+| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | Supported            | N/A                                                                                                      |
+| [Kafka](#kafka)                               | `kafka`                   | Supported            | N/A                                                                                                      |
+| Line                                          | `line`                    | Supported            | N/A                                                                                                      |
+| Microsoft Teams                               | `teams`                   | Supported            | N/A                                                                                                      |
+| [Opsgenie](#opsgenie)                         | `opsgenie`                | Supported            | Supported                                                                                                |
+| [Pagerduty](#pagerduty)                       | `pagerduty`               | Supported            | Supported                                                                                                |
+| Prometheus Alertmanager                       | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
+| [Pushover](#pushover)                         | `pushover`                | Supported            | Supported                                                                                                |
+| Sensu                                         | `sensu`                   | Supported            | N/A                                                                                                      |
+| [Sensu Go](#sensu-go)                         | `sensugo`                 | Supported            | N/A                                                                                                      |
+| [Slack](#slack)                               | `slack`                   | Supported            | Supported                                                                                                |
+| Telegram                                      | `telegram`                | Supported            | N/A                                                                                                      |
+| Threema                                       | `threema`                 | Supported            | N/A                                                                                                      |
+| VictorOps                                     | `victorops`               | Supported            | Supported                                                                                                |
+| [Webhook](#webhook)                           | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
+| [WeCom](#wecom)                               | `wecom`                   | Supported            | N/A                                                                                                      |
+| [Zenduty](#zenduty)                           | `webhook`                 | Supported            | N/A                                                                                                      |
diff --git a/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md b/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md
new file mode 100644
index 00000000000..ea7876ea079
--- /dev/null
+++ b/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md
@@ -0,0 +1,137 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Webhook notifier
+weight: 105
+---
+
+### Webhook
+
+This topic helps you configure the Webhook notifier. It also discusses that [WeCom]({{< relref "./webhook-notifier/#wecom" >}}) contact points need a Webhook URL.
+
+Example JSON body:
+
+```json
+{
+  "receiver": "My Super Webhook",
+  "status": "firing",
+  "orgId": 1,
+  "alerts": [
+    {
+      "status": "firing",
+      "labels": {
+        "alertname": "High memory usage",
+        "team": "blue",
+        "zone": "us-1"
+      },
+      "annotations": {
+        "description": "The system has high memory usage",
+        "runbook_url": "https://myrunbook.com/runbook/1234",
+        "summary": "This alert was triggered for zone us-1"
+      },
+      "startsAt": "2021-10-12T09:51:03.157076+02:00",
+      "endsAt": "0001-01-01T00:00:00Z",
+      "generatorURL": "https://play.grafana.org/alerting/1afz29v7z/edit",
+      "fingerprint": "c6eadffa33fcdf37",
+      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1",
+      "dashboardURL": "",
+      "panelURL": "",
+      "valueString": "[ metric='' labels={} value=14151.331895396988 ]"
+    },
+    {
+      "status": "firing",
+      "labels": {
+        "alertname": "High CPU usage",
+        "team": "blue",
+        "zone": "eu-1"
+      },
+      "annotations": {
+        "description": "The system has high CPU usage",
+        "runbook_url": "https://myrunbook.com/runbook/1234",
+        "summary": "This alert was triggered for zone eu-1"
+      },
+      "startsAt": "2021-10-12T09:56:03.157076+02:00",
+      "endsAt": "0001-01-01T00:00:00Z",
+      "generatorURL": "https://play.grafana.org/alerting/d1rdpdv7k/edit",
+      "fingerprint": "bc97ff14869b13e3",
+      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1",
+      "dashboardURL": "",
+      "panelURL": "",
+      "valueString": "[ metric='' labels={} value=47043.702386305304 ]"
+    }
+  ],
+  "groupLabels": {},
+  "commonLabels": {
+    "team": "blue"
+  },
+  "commonAnnotations": {},
+  "externalURL": "https://play.grafana.org/",
+  "version": "1",
+  "groupKey": "{}:{}",
+  "truncatedAlerts": 0,
+  "title": "[FIRING:2]  (blue)",
+  "state": "alerting",
+  "message": "**Firing**\n\nLabels:\n - alertname = T2\n - team = blue\n - zone = us-1\nAnnotations:\n - description = This is the alert rule checking the second system\n - runbook_url = https://myrunbook.com\n - summary = This is my summary\nSource: https://play.grafana.org/alerting/1afz29v7z/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1\n\nLabels:\n - alertname = T1\n - team = blue\n - zone = eu-1\nAnnotations:\nSource: https://play.grafana.org/alerting/d1rdpdv7k/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1\n"
+}
+```
+
+### Webhook fields
+
+## Body
+
+| Key               | Type                      | Description                                                                     |
+| ----------------- | ------------------------- | ------------------------------------------------------------------------------- |
+| receiver          | string                    | Name of the webhook                                                             |
+| status            | string                    | Current status of the alert, `firing` or `resolved`                             |
+| orgId             | number                    | ID of the organization related to the payload                                   |
+| alerts            | array of [alerts](#alert) | Alerts that are triggering                                                      |
+| groupLabels       | object                    | Labels that are used for grouping, map of string keys to string values          |
+| commonLabels      | object                    | Labels that all alarms have in common, map of string keys to string values      |
+| commonAnnotations | object                    | Annotations that all alarms have in common, map of string keys to string values |
+| externalURL       | string                    | External URL to the Grafana instance sending this webhook                       |
+| version           | string                    | Version of the payload                                                          |
+| groupKey          | string                    | Key that is used for grouping                                                   |
+| truncatedAlerts   | number                    | Number of alerts that were truncated                                            |
+| title             | string                    | **Will be deprecated soon**                                                     |
+| state             | string                    | **Will be deprecated soon**                                                     |
+| message           | string                    | **Will be deprecated soon**                                                     |
+
+### Alert
+
+| Key          | Type   | Description                                                                        |
+| ------------ | ------ | ---------------------------------------------------------------------------------- |
+| status       | string | Current status of the alert, `firing` or `resolved`                                |
+| labels       | object | Labels that are part of this alert, map of string keys to string values            |
+| annotations  | object | Annotations that are part of this alert, map of string keys to string values       |
+| startsAt     | string | Start time of the alert                                                            |
+| endsAt       | string | End time of the alert, default value when not resolved is `0001-01-01T00:00:00Z`   |
+| valueString  | string | Values that triggered the current status                                           |
+| generatorURL | string | URL of the alert rule in the Grafana UI                                            |
+| fingerprint  | string | The labels fingerprint, alarms with the same labels will have the same fingerprint |
+| silenceURL   | string | URL to silence the alert rule in the Grafana UI                                    |
+| dashboardURL | string | **Will be deprecated soon**                                                        |
+| panelURL     | string | **Will be deprecated soon**                                                        |
+
+### Removed fields related to dashboards
+
+Alerts are not coupled to dashboards anymore therefore the fields related to dashboards `dashboardId` and `panelId` have been removed.
+
+## WeCom
+
+WeCom contact points need a Webhook URL. These are obtained by setting up a WeCom robot on the corresponding group chat. To obtain a Webhook URL using the WeCom desktop Client please follow these steps:
+
+1. Click the "..." in the top right corner of a group chat that you want your alerts to be delivered to
+2. Click "Add Group Robot", select "New Robot" and give your robot a name. Click "Add Robot"
+3. There should be a Webhook URL in the panel.
+
+| Setting | Description        |
+| ------- | ------------------ |
+| Url     | WeCom webhook URL. |
diff --git a/docs/sources/alerting/contact-points/test-contact-point.md b/docs/sources/alerting/contact-points/test-contact-point.md
new file mode 100644
index 00000000000..129b37ba524
--- /dev/null
+++ b/docs/sources/alerting/contact-points/test-contact-point.md
@@ -0,0 +1,26 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Test a contact point
+weight: 110
+---
+
+# Test a contact point
+
+For Grafana managed contact points, you can send a test notification which helps verify a contact point is configured correctly.
+
+To send a test notification:
+
+1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Contact** points.
+1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed.
+1. Click **Test** (paper airplane icon) to open the contact point testing modal.
+1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
+1. Click **Send test notification** to fire the alert.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
index 3a97e7a4a78..a0035a65f8d 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
@@ -16,7 +16,7 @@ Grafana supports several alert rule types, the following sections will explain t
 
 Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of your existing data sources.
 
-In additional to supporting any datasource you can also add additional [expressions]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md" >}}) to transform your data and express alert conditions.
+In additional to supporting any datasource you can also add additional [expressions]({{< relref "../../../panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md" >}}) to transform your data and express alert conditions.
 
 ## Mimir, Loki and Cortex rules
 

From 0b7e5aa9cf889dda8ba7c0595c4f266aef8cd004 Mon Sep 17 00:00:00 2001
From: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
Date: Sat, 28 May 2022 18:57:55 -0400
Subject: [PATCH 071/103] Docs: Update create alerting rules topics (#49764)
 (#49770)

* Updated topic on Grafana managed rule.

* Updated loki and mimir rules and recording rules topics

* Checkin changes.

* Fixed typo
---
 .../create-grafana-managed-rule.md            | 22 +++++++--------
 ...reate-mimir-loki-managed-recording-rule.md | 27 +++++++++++++++---
 .../create-mimir-loki-managed-rule.md         | 28 ++++++++-----------
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index e563c272125..f1485d38fae 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -15,34 +15,34 @@ weight: 400
 
 # Create a Grafana managed alerting rule
 
-Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fix thresholds. When these are executed, Grafana sends notifications to the contact point.
+Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fix thresholds. When these are executed, Grafana sends notifications to the contact point. For information on Grafana alerting, see [About Grafana alerting]({{< relref "../about-alerting.md" >}}) which explains the various components of Grafana alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/_index.md" >}}) of Grafana alerting.
 
 ## Add Grafana managed rule
 
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **New alert rule**.
-1. In Step 1, add the rule name, type, and storage location.
-   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
-   - From the **Rule type** drop-down, select **Grafana managed alert**.
-   - From the **Folder** drop-down, select the folder where you want to store the rule. If you do not select a folder, the rule is stored in the General folder. To create a new folder, click the drop-down and enter the new folder name.
-1. In Step 2, add queries and expressions to evaluate.
-   - Keep the default name or hover over and click the edit icon to change the name.
+1. Click **New alert rule**. The new alerting rule page opens where the Grafana managed alerts option is selected by default.
+1. In Step 1, add queries and expressions to evaluate, and then select the alert condition.
    - For queries, select a data source from the drop-down.
    - Add one or more [queries]({{< relref "../../panels/query-a-data-source/add-a-query.md" >}}) or [expressions]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md" >}}).
    - For each expression, select either **Classic condition** to create a single alert rule, or choose from **Math**, **Reduce**, **Resample** options to generate separate alert for each series. For details on these options, see [Single and multi dimensional rule](#single-and-multi-dimensional-rule).
    - Click **Run queries** to verify that the query is successful.
-1. In Step 3, add conditions.
+   - Next, select the query or expression for your alert condition.
+1. In Step 2, specify the alert evaluation interval.
    - From the **Condition** drop-down, select the query or expression to trigger the alert rule.
    - For **Evaluate every**, specify the frequency of evaluation. Must be a multiple of 10 seconds. For examples, `1m`, `30s`.
    - For **Evaluate for**, specify the duration for which the condition must be true before an alert fires.
-     > **Note:** Once a condition is breached, the alert goes into the Pending state. If the condition remains breached for the duration specified, the alert transitions to the Firing state, else it reverts back to the Normal state.
+     > **Note:** Once a condition is breached, the alert goes into the Pending state. If the condition remains breached for the duration specified, the alert transitions to the `Firing` state, otherwise it reverts back to the `Normal` state.
    - In **Configure no data and error handling**, configure alerting behavior in the absence of data. Use the guidelines in [No data and error handling](#no-data-and-error-handling).
    - Click **Preview alerts** to check the result of running the query at this moment. Preview excludes no data and error handling.
-1. In Step 4, add additional metadata associated with the rule.
+1. In Step 3, add the rule name, storage location, rule group, as well as additional metadata associated with the rule.
+   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+   - From the **Folder** drop-down, select the folder where you want to store the rule.
+   - For **Group**, specify a pre-defined group. Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
    - Add custom labels.
 1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+1. Next, create a [notification]({{< relref "../notifications/_index.md" >}}) for the rule.
 
 ### Single and multi dimensional rule
 
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
index 0ffba84fcb3..58a4ee34a52 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
@@ -21,16 +21,35 @@ You can create and manage recording rules for an external Grafana Mimir or Loki
 
 ## Before you begin
 
-For Grafana Mimir and Loki data sources to work with Grafana 8.0 alerting, enable the ruler API by configuring their respective services.
+- Verify that you have write permission to the Prometheus or Loki data source. Otherwise, you will not be able to create or update Grafana Mimir managed alerting rules.
 
-**Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
+- For Grafana Mimir and Loki data sources, enable the ruler API by configuring their respective services.
 
-**Grafana Mimir** - When configuring a Grafana Prometheus data source to point to Grafana Mimir, use the legacy `/api/prom` prefix, not `/prometheus`. Currently, we support only single-binary mode and you cannot provide a separate URL for the ruler API.
+  - **Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
 
-> **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings page and clear the **Manage alerts via Alerting UI** checkbox.
+  - **Grafana Mimir** - use the [legacy `/api/prom` prefix](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#path-prefixes), not `/prometheus`. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
+
+> **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
 
 ## Add a Grafana Mimir or Loki managed recording rule
 
+To create a Grafana Mimir or Loki managed recording rule
+
+1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
+1. Click **New alert rule**. The new alerting rule page opens where the **Grafana managed alert** option is selected by default.
+1. In Step 1, select **Mimir or Loki recording rule** option.
+   - Select your Loki or Prometheus data source, add the query to evaluate, and then select the alert condition.
+   - Enter a PromQL or LogQL expression. The rule fires if the evaluation result has at least one series with a value that is greater than 0. An alert is created for each series.
+1. In Step 2, add the rule name, namespace, rule group, as well as additional metadata associated with the rule.
+   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+   - From the **Namespace** drop-down, select an existing rule namespace. Otherwise, click Add new and enter a name to create a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group.md" >}}).
+   - From the **Group** drop-down, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create a new one. Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
+   - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
+   - Add Runbook URL, panel, dashboard, and alert IDs.
+   - Add custom labels.
+1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+1. Next, create a [notification]({{< relref "../notifications/_index.md" >}}) for the rule.
+
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
 1. Click **New alert rule**.
 1. In Step 1, add the rule name, type, and storage location.
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
index 3a28856c6f0..79f66448792 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -16,11 +16,11 @@ weight: 400
 
 # Create a Grafana Mimir or Loki managed alerting rule
 
-Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance.
+Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance that has ruler API enabled. For information on Grafana alerting, see [About Grafana alerting]({{< relref "../about-alerting.md" >}}) which explains the various components of Grafana alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/_index.md" >}}) of Grafana alerting.
 
 ## Before you begin
 
-- Verify that you have write permission to the Prometheus data source. Otherwise, you will not be able to create or update Grafana Mimir managed alerting rules.
+- Verify that you have write permission to the Prometheus or Loki data source. Otherwise, you will not be able to create or update Grafana Mimir managed alerting rules.
 
 - For Grafana Mimir and Loki data sources, enable the ruler API by configuring their respective services.
 
@@ -33,23 +33,19 @@ Grafana allows you to create alerting rules for an external Grafana Mimir or Lok
 ## Add a Grafana Mimir or Loki managed alerting rule
 
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **New alert rule**.
-1. In Step 1, add the rule name, type, and storage location.
-   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
-   - From the **Rule type** drop-down, select **Mimir / Loki managed alert**.
-   - From the **Select data source** drop-down, select an external Prometheus, an external Loki, or a Grafana Cloud data source.
-   - From the **Namespace** drop-down, select an existing rule namespace. Otherwise, click **Add new** and enter a name to create a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group.md" >}}).
-   - From the **Group** drop-down, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create a new one. Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
-     {{< figure src="/static/img/docs/alerting/unified/rule-edit-mimir-alert-type-8-0.png" max-width="550px" caption="Alert details" >}}
-1. In Step 2, add the query to evaluate.
-   - Enter a PromQL or LogQL expression. The rule fires if the evaluation result has at least one series with a value that is greater than 0. An alert is created for each series.
-     {{< figure src="/static/img/docs/alerting/unified/rule-edit-mimir-query-8-0.png" max-width="550px" caption="Alert details" >}}
-1. In Step 3, add conditions.
+1. Click **New alert rule**. The new alerting rule page opens where the Grafana managed alerts option is selected by default.
+1. In Step 1, select **Mimir or Loki alert** option.
+   - Next, select your Loki or Prometheus data source and add the query to evaluate.
+   - Enter a PromQL or LogQL expression to query. The rule fires if the evaluation result has at least one series with a value that is greater than 0. An alert is created for each series.
+1. In Step 2, specify the alert evaluation interval.
    - In the **For** text box, specify the duration for which the condition must be true before an alert fires. If you specify `5m`, the condition must be true for 5 minutes before the alert fires.
      > **Note:** Once a condition is met, the alert goes into the `Pending` state. If the condition remains active for the duration specified, the alert transitions to the `Firing` state, else it reverts to the `Normal` state.
-1. In Step 4, add additional metadata associated with the rule.
+1. In Step 3, add the rule name, namespace, rule group, as well as additional metadata associated with the rule.
+   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+   - From the **Namespace** drop-down, select an existing rule namespace. Otherwise, click **Add new** and enter a name to create a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group.md" >}}).
+   - From the **Group** drop-down, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create a new one. Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
    - Add custom labels.
-1. To evaluate the rule and see what alerts it would produce, click **Preview alerts**. It will display a list of alerts with state and value of for each one.
 1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+1. Next, create a [notification]({{< relref "../notifications/_index.md" >}}) for the rule.

From 30b77e97163262385f19b2c2772b1013fbfddfc9 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 01:58:02 -0400
Subject: [PATCH 072/103] PanelChrome: Fixes issue with padding not being
 applied as gridUnits (#49751) (#49780)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 7be5142164c8a9282cc7922b2ae3e534a2a8f426)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index 1b759ac826f..02875a6c2ea 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -79,7 +79,7 @@ const getContentStyle = (
   headerHeight: number,
   height: number
 ) => {
-  const chromePadding = padding === 'md' ? theme.components.panel.padding : 0;
+  const chromePadding = (padding === 'md' ? theme.components.panel.padding : 0) * theme.spacing.gridSize;
   const panelBorder = 1 * 2;
   const innerWidth = width - chromePadding * 2 - panelBorder;
   const innerHeight = height - headerHeight - chromePadding * 2 - panelBorder;

From 9370bad798f29cbb1c686ef2e4f144e92ce63e2e Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 05:20:04 -0400
Subject: [PATCH 073/103] Chore: Remove deprecated `surface` prop from
 IconButton (#49715) (#49745)

* Chore: Remove deprecated `surface` prop from IconButton

* Update component docs

(cherry picked from commit 3d8eda0132beff3ebc13f71c845bea4a6970c90a)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 .../src/components/Drawer/Drawer.tsx           |  3 ---
 .../src/components/IconButton/IconButton.mdx   |  2 +-
 .../src/components/IconButton/IconButton.tsx   |  4 ----
 .../grafana-ui/src/components/Modal/Modal.tsx  |  2 +-
 .../src/components/PageLayout/PageToolbar.tsx  |  1 -
 .../components/Layers/LayerDragDropList.tsx    |  2 --
 .../QueryOperationRow/QueryOperationAction.tsx |  1 -
 .../AddPanelWidget/AddPanelWidget.tsx          |  4 ++--
 .../AnnotationSettingsList.tsx                 | 16 ++--------------
 .../LinksSettings/LinkSettingsList.tsx         | 18 +++---------------
 .../TransformationsEditor.tsx                  |  2 --
 .../search/components/DashboardSearch.tsx      |  4 ++--
 .../OrganizeFieldsTransformerEditor.tsx        |  1 -
 .../components/QueryEditor/QueryEditorRow.tsx  |  2 --
 14 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 087cd720419..275ba48579a 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -96,7 +96,6 @@ export function Drawer({
                     name="angle-left"
                     size="xl"
                     onClick={() => setIsExpanded(true)}
-                    surface="header"
                     aria-label={selectors.components.Drawer.General.expand}
                   />
                 )}
@@ -105,7 +104,6 @@ export function Drawer({
                     name="angle-right"
                     size="xl"
                     onClick={() => setIsExpanded(false)}
-                    surface="header"
                     aria-label={selectors.components.Drawer.General.contract}
                   />
                 )}
@@ -113,7 +111,6 @@ export function Drawer({
                   name="times"
                   size="xl"
                   onClick={onClose}
-                  surface="header"
                   aria-label={selectors.components.Drawer.General.close}
                 />
               </div>
diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.mdx b/packages/grafana-ui/src/components/IconButton/IconButton.mdx
index 1d8490952a5..b40c53e0bdd 100644
--- a/packages/grafana-ui/src/components/IconButton/IconButton.mdx
+++ b/packages/grafana-ui/src/components/IconButton/IconButton.mdx
@@ -5,7 +5,7 @@ import { IconButton } from './IconButton';
 
 # IconButton
 
-This component looks like just an icon but behaves like a button. It fulfils an action when you click it and has hover and focus states. You can choose which icon size you would like to use. Watch out for where you place this icon, as the hover effect needs to be adjusted with the `surface` prop depending on where it is used.
+This component looks like just an icon but behaves like a button. It fulfils an action when you click it and has hover and focus states. You can choose which icon size you would like to use.
 
 `IconButton` is best used when an actual button would look out of place, for example when you want to place a solitary clickable icon next to text. An example where an `IconButton` is used in Grafana is the top left back arrow in the panel edit mode.
 
diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.tsx b/packages/grafana-ui/src/components/IconButton/IconButton.tsx
index 137dfe14369..53d727d6963 100644
--- a/packages/grafana-ui/src/components/IconButton/IconButton.tsx
+++ b/packages/grafana-ui/src/components/IconButton/IconButton.tsx
@@ -18,8 +18,6 @@ export interface Props extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   name: IconName;
   /** Icon size */
   size?: IconSize;
-  /** @deprecated */
-  surface?: SurfaceType;
   /** Type od the icon - mono or default */
   iconType?: IconType;
   /** Tooltip content to display on hover */
@@ -32,8 +30,6 @@ export interface Props extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   ariaLabel?: string;
 }
 
-type SurfaceType = 'dashboard' | 'panel' | 'header';
-
 export const IconButton = React.forwardRef<HTMLButtonElement, Props>(
   (
     {
diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/grafana-ui/src/components/Modal/Modal.tsx
index a3f6aeba5df..fc78c463c74 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.tsx
@@ -83,7 +83,7 @@ export function Modal(props: PropsWithChildren<Props>) {
               typeof title !== 'string' && title
             }
             <div className={styles.modalHeaderClose}>
-              <IconButton aria-label="Close dialogue" surface="header" name="times" size="xl" onClick={onDismiss} />
+              <IconButton aria-label="Close dialogue" name="times" size="xl" onClick={onDismiss} />
             </div>
           </div>
           <div className={cx(styles.modalContent, contentClassName)}>{children}</div>
diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx b/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
index 7fbc8336df9..a9d8032a693 100644
--- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
+++ b/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
@@ -73,7 +73,6 @@ export const PageToolbar: FC<Props> = React.memo(
               tooltip="Go back (Esc)"
               tooltipPlacement="bottom"
               size="xxl"
-              surface="dashboard"
               aria-label={selectors.components.BackButton.backArrow}
               onClick={onGoBack}
             />
diff --git a/public/app/core/components/Layers/LayerDragDropList.tsx b/public/app/core/components/Layers/LayerDragDropList.tsx
index 1b6c18c37bd..fe5c127f432 100644
--- a/public/app/core/components/Layers/LayerDragDropList.tsx
+++ b/public/app/core/components/Layers/LayerDragDropList.tsx
@@ -82,7 +82,6 @@ export const LayerDragDropList = <T extends LayerElement>({
                                 title={'Duplicate'}
                                 className={style.actionIcon}
                                 onClick={() => onDuplicate(element)}
-                                surface="header"
                               />
                             ) : null}
 
@@ -91,7 +90,6 @@ export const LayerDragDropList = <T extends LayerElement>({
                               title={'remove'}
                               className={cx(style.actionIcon, style.dragIcon)}
                               onClick={() => onDelete(element)}
-                              surface="header"
                             />
                           </>
                         )}
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
index 4c59c1ad952..5f77de0d21c 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
@@ -30,7 +30,6 @@ export const QueryOperationAction: React.FC<QueryOperationActionProps> = ({
         className={styles.icon}
         disabled={!!disabled}
         onClick={onClick}
-        surface="header"
         type="button"
         aria-label={selectors.components.QueryEditorRow.actionButton(title)}
       />
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index b3cc87dd168..89d1a6d06d2 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -212,7 +212,7 @@ const AddPanelWidgetHandle: React.FC<AddPanelWidgetHandleProps> = ({ children, o
     <div className={cx(styles.headerRow, 'grid-drag-handle')}>
       {onBack && (
         <div className={styles.backButton}>
-          <IconButton aria-label="Go back" name="arrow-left" onClick={onBack} surface="header" size="xl" />
+          <IconButton aria-label="Go back" name="arrow-left" onClick={onBack} size="xl" />
         </div>
       )}
       {!onBack && (
@@ -222,7 +222,7 @@ const AddPanelWidgetHandle: React.FC<AddPanelWidgetHandleProps> = ({ children, o
       )}
       {children && <span>{children}</span>}
       <div className="flex-grow-1" />
-      <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancel} surface="header" />
+      <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancel} />
     </div>
   );
 };
diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
index 0e59efeb395..7e911b5f8a8 100644
--- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
+++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
@@ -57,23 +57,11 @@ export const AnnotationSettingsList: React.FC<Props> = ({ dashboard, onNew, onEd
                   {dataSourceSrv.getInstanceSettings(annotation.datasource)?.name || annotation.datasource?.uid}
                 </td>
                 <td style={{ width: '1%' }}>
-                  {idx !== 0 && (
-                    <IconButton
-                      surface="header"
-                      name="arrow-up"
-                      aria-label="arrow-up"
-                      onClick={() => onMove(idx, -1)}
-                    />
-                  )}
+                  {idx !== 0 && <IconButton name="arrow-up" aria-label="arrow-up" onClick={() => onMove(idx, -1)} />}
                 </td>
                 <td style={{ width: '1%' }}>
                   {dashboard.annotations.list.length > 1 && idx !== dashboard.annotations.list.length - 1 ? (
-                    <IconButton
-                      surface="header"
-                      name="arrow-down"
-                      aria-label="arrow-down"
-                      onClick={() => onMove(idx, 1)}
-                    />
+                    <IconButton name="arrow-down" aria-label="arrow-down" onClick={() => onMove(idx, 1)} />
                   ) : null}
                 </td>
                 <td style={{ width: '1%' }}>
diff --git a/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx b/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
index 4db46c6143f..5da57c62171 100644
--- a/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
+++ b/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
@@ -73,27 +73,15 @@ export const LinkSettingsList: React.FC<LinkSettingsListProps> = ({ dashboard, o
                 </HorizontalGroup>
               </td>
               <td style={{ width: '1%' }}>
-                {idx !== 0 && (
-                  <IconButton
-                    surface="header"
-                    name="arrow-up"
-                    aria-label="arrow-up"
-                    onClick={() => moveLink(idx, -1)}
-                  />
-                )}
+                {idx !== 0 && <IconButton name="arrow-up" aria-label="arrow-up" onClick={() => moveLink(idx, -1)} />}
               </td>
               <td style={{ width: '1%' }}>
                 {links.length > 1 && idx !== links.length - 1 ? (
-                  <IconButton
-                    surface="header"
-                    name="arrow-down"
-                    aria-label="arrow-down"
-                    onClick={() => moveLink(idx, 1)}
-                  />
+                  <IconButton name="arrow-down" aria-label="arrow-down" onClick={() => moveLink(idx, 1)} />
                 ) : null}
               </td>
               <td style={{ width: '1%' }}>
-                <IconButton surface="header" aria-label="copy" name="copy" onClick={() => duplicateLink(link, idx)} />
+                <IconButton aria-label="copy" name="copy" onClick={() => duplicateLink(link, idx)} />
               </td>
               <td style={{ width: '1%' }}>
                 <DeleteButton
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
index 8e9c99230ed..40b8b297a43 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
@@ -233,7 +233,6 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
           {filtered.length} / {xforms.length} &nbsp;&nbsp;
           <IconButton
             name="times"
-            surface="header"
             onClick={() => {
               this.setState({ search: '' });
             }}
@@ -251,7 +250,6 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
       suffix = (
         <IconButton
           name="times"
-          surface="header"
           onClick={() => {
             this.setState({ showPicker: false });
           }}
diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx
index b38c7bec8f4..28405ea031d 100644
--- a/public/app/features/search/components/DashboardSearch.tsx
+++ b/public/app/features/search/components/DashboardSearch.tsx
@@ -56,7 +56,7 @@ function DashbaordSearchNEW({ onCloseSearch }: Props) {
           </div>
 
           <div className={styles.closeBtn}>
-            <IconButton name="times" surface="panel" onClick={onCloseSearch} size="xxl" tooltip="Close search" />
+            <IconButton name="times" onClick={onCloseSearch} size="xxl" tooltip="Close search" />
           </div>
         </div>
         <div className={styles.search}>
@@ -82,7 +82,7 @@ export const DashboardSearchOLD: FC<Props> = memo(({ onCloseSearch }) => {
         <div className={styles.searchField}>
           <SearchField query={query} onChange={onQueryChange} onKeyDown={onKeyDown} autoFocus clearable />
           <div className={styles.closeBtn}>
-            <IconButton name="times" surface="panel" onClick={onCloseSearch} size="xxl" tooltip="Close search" />
+            <IconButton name="times" onClick={onCloseSearch} size="xxl" tooltip="Close search" />
           </div>
         </div>
         <div className={styles.search}>
diff --git a/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
index 95eec6a6230..1365aaf58dc 100644
--- a/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
@@ -144,7 +144,6 @@ const DraggableFieldName: React.FC<DraggableFieldProps> = ({
                 className={styles.toggle}
                 size="md"
                 name={visible ? 'eye' : 'eye-slash'}
-                surface="header"
                 onClick={() => onToggleVisibility(fieldName, visible)}
               />
               <span className={styles.name} title={fieldName}>
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
index 155ed2942bc..0ee4faf69ae 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
@@ -31,7 +31,6 @@ export const QueryEditorRow = ({
               <IconButton
                 name={hidden ? 'eye-slash' : 'eye'}
                 onClick={onHideClick}
-                surface="header"
                 size="sm"
                 aria-pressed={hidden}
                 aria-label="hide metric"
@@ -40,7 +39,6 @@ export const QueryEditorRow = ({
             )}
             <IconButton
               name="trash-alt"
-              surface="header"
               size="sm"
               className={styles.icon}
               onClick={onRemoveClick || noop}

From c0d4512f4c176ad172ccd48adc97b54dcca671cd Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 05:43:15 -0400
Subject: [PATCH 074/103] Search: Fix overflow issue with folder view (#49723)
 (#49799)

(cherry picked from commit 17d01330083fdd3c252e5a65117af2a1d341f4dc)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 public/app/features/search/components/DashboardSearch.tsx | 7 +++++--
 public/app/features/search/page/components/FolderView.tsx | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx
index 28405ea031d..813f4329f63 100644
--- a/public/app/features/search/components/DashboardSearch.tsx
+++ b/public/app/features/search/components/DashboardSearch.tsx
@@ -22,12 +22,12 @@ export interface Props {
 export default function DashboardSearch({ onCloseSearch }: Props) {
   if (config.featureToggles.panelTitleSearch) {
     // TODO: "folder:current" ????
-    return <DashbaordSearchNEW onCloseSearch={onCloseSearch} />;
+    return <DashboardSearchNew onCloseSearch={onCloseSearch} />;
   }
   return <DashboardSearchOLD onCloseSearch={onCloseSearch} />;
 }
 
-function DashbaordSearchNEW({ onCloseSearch }: Props) {
+function DashboardSearchNew({ onCloseSearch }: Props) {
   const styles = useStyles2(getStyles);
   const { query, onQueryChange } = useSearchQuery({});
 
@@ -137,6 +137,8 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
       }
     `,
     container: css`
+      display: flex;
+      flex-direction: column;
       max-width: 1400px;
       margin: 0 auto;
       padding: ${theme.spacing(2)};
@@ -162,6 +164,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
     search: css`
       display: flex;
       flex-direction: column;
+      overflow: hidden;
       height: 100%;
       padding: ${theme.spacing(2, 0, 3, 0)};
     `,
diff --git a/public/app/features/search/page/components/FolderView.tsx b/public/app/features/search/page/components/FolderView.tsx
index 32d2efc458e..ee5c4a53a4b 100644
--- a/public/app/features/search/page/components/FolderView.tsx
+++ b/public/app/features/search/page/components/FolderView.tsx
@@ -108,7 +108,10 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: flex;
       flex-direction: column;
       background: ${theme.v1.colors.panelBg};
-      border-bottom: solid 1px ${theme.v1.colors.border2};
+
+      &:not(:last-child) {
+        border-bottom: solid 1px ${theme.v1.colors.border2};
+      }
     `,
     sectionItems: css`
       margin: 0 24px 0 32px;

From ba0beb859695e9d09fff48d7507e745505186cfb Mon Sep 17 00:00:00 2001
From: Vardan Torosyan <vardants@gmail.com>
Date: Mon, 30 May 2022 11:55:03 +0200
Subject: [PATCH 075/103] Quick Ugly Fix for Oauth not to make web_hack.go
 panic (#49653) (#49797)

---
 pkg/api/response/web_hack.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/api/response/web_hack.go b/pkg/api/response/web_hack.go
index c8d6e6a2063..0cb1ccdcc9a 100644
--- a/pkg/api/response/web_hack.go
+++ b/pkg/api/response/web_hack.go
@@ -42,7 +42,9 @@ func wrap_handler(h web.Handler) http.HandlerFunc {
 		return func(w http.ResponseWriter, r *http.Request) {
 			ctx := getReqCtx(r.Context())
 			res := handle(ctx)
-			res.WriteTo(ctx)
+			if res != nil {
+				res.WriteTo(ctx)
+			}
 		}
 	case handlerCtx:
 		return func(w http.ResponseWriter, r *http.Request) {

From f9be87ea17eb6bd4bd77d9d399b86143087d0320 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 07:07:57 -0400
Subject: [PATCH 076/103] add event tracking to navigation (#49800) (#49803)

(cherry picked from commit 309ad38fd603c9e7f39aa3ca6fffecebd0daf578)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 .../components/NavBar/Next/NavBarItem.tsx     | 15 ++--
 .../components/NavBar/Next/NavBarMenu.tsx     | 10 ++-
 .../components/NavBar/Next/NavBarNext.tsx     | 79 ++++++++++++-------
 public/app/core/components/NavBar/utils.ts    | 18 +++++
 4 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/public/app/core/components/NavBar/Next/NavBarItem.tsx b/public/app/core/components/NavBar/Next/NavBarItem.tsx
index 8abff2d09df..c0d6490d623 100644
--- a/public/app/core/components/NavBar/Next/NavBarItem.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarItem.tsx
@@ -54,15 +54,14 @@ const NavBarItem = ({
 
   const onNavigate = (item: NavModelItem) => {
     const { url, target, onClick } = item;
-    if (!url) {
-      onClick?.();
-      return;
-    }
+    onClick?.();
 
-    if (!target && url.startsWith('/')) {
-      locationService.push(locationUtil.stripBaseFromUrl(url));
-    } else {
-      window.open(url, target);
+    if (url) {
+      if (!target && url.startsWith('/')) {
+        locationService.push(locationUtil.stripBaseFromUrl(url));
+      } else {
+        window.open(url, target);
+      }
     }
   };
 
diff --git a/public/app/core/components/NavBar/Next/NavBarMenu.tsx b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
index 12c826aa3ca..750f86dd091 100644
--- a/public/app/core/components/NavBar/Next/NavBarMenu.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
@@ -7,6 +7,7 @@ import CSSTransition from 'react-transition-group/CSSTransition';
 import { useLocalStorage } from 'react-use';
 
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { CollapsableSection, CustomScrollbar, Icon, IconButton, IconName, useStyles2, useTheme2 } from '@grafana/ui';
 
 import { Branding } from '../../Branding/Branding';
@@ -64,7 +65,14 @@ export function NavBarMenu({ activeItem, isOpen, navItems, onClose, setMenuAnima
                 variant="secondary"
               />
             </div>
-            <NavBarToggle className={styles.menuCollapseIcon} isExpanded={isOpen} onClick={onClose} />
+            <NavBarToggle
+              className={styles.menuCollapseIcon}
+              isExpanded={isOpen}
+              onClick={() => {
+                reportInteraction('grafana_navigation_collapsed');
+                onClose();
+              }}
+            />
             <nav className={styles.content}>
               <CustomScrollbar hideHorizontalTrack>
                 <ul className={styles.itemList}>
diff --git a/public/app/core/components/NavBar/Next/NavBarNext.tsx b/public/app/core/components/NavBar/Next/NavBarNext.tsx
index 526cea4fd00..cd1f87d9c20 100644
--- a/public/app/core/components/NavBar/Next/NavBarNext.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarNext.tsx
@@ -6,7 +6,7 @@ import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2, NavModelItem, NavSection } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
+import { config, locationService, reportInteraction } from '@grafana/runtime';
 import { Icon, IconName, useTheme2 } from '@grafana/ui';
 import { Branding } from 'app/core/components/Branding/Branding';
 import { getKioskMode } from 'app/core/navigation/kiosk';
@@ -14,7 +14,14 @@ import { KioskMode, StoreState } from 'app/types';
 
 import { OrgSwitcher } from '../../OrgSwitcher';
 import { NavBarContext } from '../context';
-import { enrichConfigItems, getActiveItem, isMatchOrChildMatch, isSearchActive, SEARCH_ITEM_ID } from '../utils';
+import {
+  enrichConfigItems,
+  enrichWithInteractionTracking,
+  getActiveItem,
+  isMatchOrChildMatch,
+  isSearchActive,
+  SEARCH_ITEM_ID,
+} from '../utils';
 
 import NavBarItem from './NavBarItem';
 import { NavBarItemWithoutMenu } from './NavBarItemWithoutMenu';
@@ -27,21 +34,6 @@ const onOpenSearch = () => {
   locationService.partial({ search: 'open' });
 };
 
-const searchItem: NavModelItem = {
-  id: SEARCH_ITEM_ID,
-  onClick: onOpenSearch,
-  text: 'Search dashboards',
-  icon: 'search',
-};
-
-// Here we need to hack in a "home" NavModelItem since this is constructed in the frontend
-const homeItem: NavModelItem = {
-  id: 'home',
-  text: 'Home',
-  url: config.appSubUrl || '/',
-  icon: 'grafana',
-};
-
 export const NavBarNext = React.memo(() => {
   const navBarTree = useSelector((state: StoreState) => state.navBarTree);
   const theme = useTheme2();
@@ -49,23 +41,50 @@ export const NavBarNext = React.memo(() => {
   const location = useLocation();
   const kiosk = getKioskMode();
   const [showSwitcherModal, setShowSwitcherModal] = useState(false);
+  const [menuOpen, setMenuOpen] = useState(false);
+  const [menuAnimationInProgress, setMenuAnimationInProgress] = useState(false);
+  const [menuIdOpen, setMenuIdOpen] = useState<string | undefined>(undefined);
+
   const toggleSwitcherModal = () => {
     setShowSwitcherModal(!showSwitcherModal);
   };
-  const navTree = cloneDeep(navBarTree);
-  navTree.unshift(homeItem);
 
-  const coreItems = navTree.filter((item) => item.section === NavSection.Core);
-  const pluginItems = navTree.filter((item) => item.section === NavSection.Plugin);
+  // Here we need to hack in a "home" and "search" NavModelItem since this is constructed in the frontend
+  const searchItem: NavModelItem = enrichWithInteractionTracking(
+    {
+      id: SEARCH_ITEM_ID,
+      onClick: onOpenSearch,
+      text: 'Search dashboards',
+      icon: 'search',
+    },
+    menuOpen
+  );
+
+  const homeItem: NavModelItem = enrichWithInteractionTracking(
+    {
+      id: 'home',
+      text: 'Home',
+      url: config.appSubUrl || '/',
+      icon: 'grafana',
+    },
+    menuOpen
+  );
+
+  const navTree = cloneDeep(navBarTree);
+
+  const coreItems = navTree
+    .filter((item) => item.section === NavSection.Core)
+    .map((item) => enrichWithInteractionTracking(item, menuOpen));
+  const pluginItems = navTree
+    .filter((item) => item.section === NavSection.Plugin)
+    .map((item) => enrichWithInteractionTracking(item, menuOpen));
   const configItems = enrichConfigItems(
     navTree.filter((item) => item.section === NavSection.Config),
     location,
     toggleSwitcherModal
-  );
+  ).map((item) => enrichWithInteractionTracking(item, menuOpen));
+
   const activeItem = isSearchActive(location) ? searchItem : getActiveItem(navTree, location.pathname);
-  const [menuOpen, setMenuOpen] = useState(false);
-  const [menuAnimationInProgress, setMenuAnimationInProgress] = useState(false);
-  const [menuIdOpen, setMenuIdOpen] = useState<string | undefined>(undefined);
 
   if (kiosk !== KioskMode.Off) {
     return null;
@@ -88,16 +107,20 @@ export const NavBarNext = React.memo(() => {
             <NavBarToggle
               className={styles.menuExpandIcon}
               isExpanded={menuOpen}
-              onClick={() => setMenuOpen(!menuOpen)}
+              onClick={() => {
+                reportInteraction('grafana_navigation_expanded');
+                setMenuOpen(true);
+              }}
             />
 
             <NavBarMenuPortalContainer />
 
             <NavBarItemWithoutMenu
               elClassName={styles.grafanaLogoInner}
-              label="Home"
+              label={homeItem.text}
               className={styles.grafanaLogo}
               url={homeItem.url}
+              onClick={homeItem.onClick}
             >
               <Branding.MenuLogo />
             </NavBarItemWithoutMenu>
@@ -112,7 +135,7 @@ export const NavBarNext = React.memo(() => {
                   <NavBarItem
                     key={`${link.id}-${index}`}
                     isActive={isMatchOrChildMatch(link, activeItem)}
-                    link={{ ...link, subTitle: undefined, onClick: undefined }}
+                    link={{ ...link, subTitle: undefined }}
                   >
                     {link.icon && <Icon name={link.icon as IconName} size="xl" />}
                     {link.img && <img src={link.img} alt={`${link.text} logo`} />}
diff --git a/public/app/core/components/NavBar/utils.ts b/public/app/core/components/NavBar/utils.ts
index 83bc8705c44..af29773bca7 100644
--- a/public/app/core/components/NavBar/utils.ts
+++ b/public/app/core/components/NavBar/utils.ts
@@ -1,6 +1,7 @@
 import { Location } from 'history';
 
 import { NavModelItem, NavSection } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { getConfig } from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 
@@ -59,6 +60,7 @@ export const enrichConfigItems = (
       link.children = [
         ...getFooterLinks(),
         {
+          id: 'keyboard-shortcuts',
           text: 'Keyboard shortcuts',
           icon: 'keyboard',
           onClick: onOpenShortcuts,
@@ -70,6 +72,7 @@ export const enrichConfigItems = (
       link.children = [
         ...menuItems,
         {
+          id: 'switch-organization',
           text: 'Switch organization',
           icon: 'arrow-random',
           onClick: toggleOrgSwitcher,
@@ -80,6 +83,21 @@ export const enrichConfigItems = (
   return items;
 };
 
+export const enrichWithInteractionTracking = (item: NavModelItem, expandedState: boolean) => {
+  const onClick = item.onClick;
+  item.onClick = () => {
+    reportInteraction('grafana_navigation_item_clicked', {
+      path: item.url ?? item.id,
+      state: expandedState ? 'expanded' : 'collapsed',
+    });
+    onClick?.();
+  };
+  if (item.children) {
+    item.children = item.children.map((item) => enrichWithInteractionTracking(item, expandedState));
+  }
+  return item;
+};
+
 export const isMatchOrChildMatch = (itemToCheck: NavModelItem, searchItem?: NavModelItem) => {
   return Boolean(itemToCheck === searchItem || itemToCheck.children?.some((child) => child === searchItem));
 };

From e2f34a611cf253aeb8c011bd51cd32e72c3a8a66 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 07:15:05 -0400
Subject: [PATCH 077/103] cap mobile nav height (#49785) (#49804)

(cherry picked from commit 10680c1775f531056f5420c6f70dc9ffa7cfdedf)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 public/app/core/components/NavBar/Next/NavBarNext.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/core/components/NavBar/Next/NavBarNext.tsx b/public/app/core/components/NavBar/Next/NavBarNext.tsx
index cd1f87d9c20..f60dc4ce5f6 100644
--- a/public/app/core/components/NavBar/Next/NavBarNext.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarNext.tsx
@@ -210,6 +210,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     borderRight: `1px solid ${theme.colors.border.weak}`,
 
     [theme.breakpoints.down('md')]: {
+      height: theme.spacing(7),
       position: 'fixed',
       paddingTop: '0px',
       backgroundColor: 'inherit',

From 36ad4fa6773cc73afb04bafa65559b85ffa96e58 Mon Sep 17 00:00:00 2001
From: Isabella Siu <Isabella.siu@grafana.com>
Date: Mon, 30 May 2022 10:12:09 -0400
Subject: [PATCH 078/103] CloudWatch: Use scopedVars in expressions (#49178)
 (#49771)

* CloudWatch: Use scopedVars in expressions

* fix spec test

(cherry picked from commit b80934617b14477ca4ffde52edf3e286e65066e8)
---
 .../expressions/ExpressionDatasource.ts       |  2 +-
 .../datasource/cloudwatch/datasource.test.ts  | 24 +++++++++++++++++++
 .../datasource/cloudwatch/datasource.ts       |  8 +------
 .../cloudwatch/specs/datasource.test.ts       | 13 +++++++---
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/public/app/features/expressions/ExpressionDatasource.ts b/public/app/features/expressions/ExpressionDatasource.ts
index 096d8a988dc..5376e396377 100644
--- a/public/app/features/expressions/ExpressionDatasource.ts
+++ b/public/app/features/expressions/ExpressionDatasource.ts
@@ -43,7 +43,7 @@ export class ExpressionDatasourceApi extends DataSourceWithBackend<ExpressionQue
         return query;
       }
 
-      return ds?.interpolateVariablesInQueries([query], {})[0] as ExpressionQuery;
+      return ds?.interpolateVariablesInQueries([query], request.scopedVars)[0] as ExpressionQuery;
     });
 
     let sub = from(Promise.all(targets));
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/datasource.test.ts
index 3a906e69bbb..964a17a061d 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.test.ts
@@ -443,6 +443,30 @@ describe('datasource', () => {
     });
   });
 
+  describe('interpolateMetricsQueryVariables', () => {
+    it('interpolates dimensions correctly', () => {
+      const testQuery = {
+        id: 'a',
+        refId: 'a',
+        region: 'us-east-2',
+        namespace: '',
+        dimensions: { InstanceId: '$dimension' },
+      };
+      const ds = setupMockedDataSource({ variables: [dimensionVariable], mockGetVariableName: false });
+      const result = ds.datasource.interpolateMetricsQueryVariables(testQuery, {
+        dimension: { text: 'foo', value: 'foo' },
+      });
+      expect(result).toStrictEqual({
+        alias: '',
+        metricName: '',
+        namespace: '',
+        period: '',
+        sqlExpression: '',
+        dimensions: { InstanceId: ['foo'] },
+      });
+    });
+  });
+
   describe('convertMultiFiltersFormat', () => {
     const ds = setupMockedDataSource({ variables: [labelsVariable, dimensionVariable], mockGetVariableName: false });
     it('converts keys and values correctly', () => {
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 15761c0d7de..582d3016959 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -958,13 +958,7 @@ export class CloudWatchDatasource
       namespace: this.replace(query.namespace, scopedVars),
       period: this.replace(query.period, scopedVars),
       sqlExpression: this.replace(query.sqlExpression, scopedVars),
-      dimensions: Object.entries(query.dimensions ?? {}).reduce((prev, [key, value]) => {
-        if (Array.isArray(value)) {
-          return { ...prev, [key]: value };
-        }
-
-        return { ...prev, [this.replace(key, scopedVars)]: this.replace(value, scopedVars) };
-      }, {}),
+      dimensions: this.convertDimensionFormat(query.dimensions ?? {}, scopedVars),
     };
   }
 }
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
index df2004957bc..6855148d22a 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
@@ -585,7 +585,11 @@ describe('CloudWatchDatasource', () => {
     });
 
     it('should replace correct variables in CloudWatchMetricsQuery', () => {
-      const templateSrv: any = { replace: jest.fn(), getVariables: () => [] };
+      const templateSrv: any = {
+        replace: jest.fn(),
+        getVariables: () => [],
+        getVariableName: jest.fn((name: string) => name),
+      };
       const { ds } = getTestContext({ templateSrv });
       const variableName = 'someVar';
       const logQuery: CloudWatchMetricsQuery = {
@@ -608,9 +612,12 @@ describe('CloudWatchDatasource', () => {
 
       ds.interpolateVariablesInQueries([logQuery], {});
 
-      // We interpolate `expression`, `region`, `period`, `alias`, `metricName`, `nameSpace` and `dimensions` in CloudWatchMetricsQuery
+      // We interpolate `expression`, `region`, `period`, `alias`, `metricName`, and `nameSpace` in CloudWatchMetricsQuery
       expect(templateSrv.replace).toHaveBeenCalledWith(`$${variableName}`, {});
-      expect(templateSrv.replace).toHaveBeenCalledTimes(8);
+      expect(templateSrv.replace).toHaveBeenCalledTimes(7);
+
+      expect(templateSrv.getVariableName).toHaveBeenCalledWith(`$${variableName}`);
+      expect(templateSrv.getVariableName).toHaveBeenCalledTimes(1);
     });
   });
 

From fd8c11f51d9319521212d58521aae53692f99955 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 10:12:42 -0400
Subject: [PATCH 079/103] AzureMonitor: Document maximum returned records for
 Resource Graph (#49801) (#49828)

(cherry picked from commit aceb21815788f1924df5314af5d5ac3362e08cbe)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
---
 docs/sources/datasources/azuremonitor/_index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/sources/datasources/azuremonitor/_index.md b/docs/sources/datasources/azuremonitor/_index.md
index e0a935bc4ce..5528e2c3548 100644
--- a/docs/sources/datasources/azuremonitor/_index.md
+++ b/docs/sources/datasources/azuremonitor/_index.md
@@ -272,6 +272,10 @@ You can use Grafana macros when constructing a query. Use the macros in the wher
 
   If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the following value: `all`. If `$myVar` has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large "where..in" clause.
 
+### Working with large Azure resource data sets
+
+If a request exceeds the [maximum allowed value of records](https://docs.microsoft.com/en-us/azure/governance/resource-graph/concepts/work-with-data#paging-results), the result is paginated and only the first page of results are returned. You can use filters to reduce the amount of records returned under that value.
+
 ## Going further with Azure Monitor
 
 See the following topics to learn more about the Azure Monitor data source:

From 9a33b19662bd5a439f29202b2f90bc4de647d96e Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 10:21:04 -0400
Subject: [PATCH 080/103] RolePicker: Add extra offset for menu position
 (#49823) (#49831)

(cherry picked from commit a71e371877f2fe113461887409933360e6470d46)

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
---
 public/app/core/components/RolePicker/RolePicker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/core/components/RolePicker/RolePicker.tsx b/public/app/core/components/RolePicker/RolePicker.tsx
index d2fdba81cfc..439ddec4f8e 100644
--- a/public/app/core/components/RolePicker/RolePicker.tsx
+++ b/public/app/core/components/RolePicker/RolePicker.tsx
@@ -53,7 +53,7 @@ export const RolePicker = ({
     const { bottom, top } = dimensions;
     const distance = window.innerHeight - bottom;
     const offset = bottom - top + 10; // Add extra 10px to offset to account for border and outline
-    if (distance < MENU_MAX_HEIGHT) {
+    if (distance < MENU_MAX_HEIGHT + 20) {
       setOffset(offset);
     } else {
       setOffset(-offset);

From 64feb042066aa4271ad7add8722b442a8e1d59b5 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 10:24:33 -0400
Subject: [PATCH 081/103] Prometheus: Disable prometheusStreamingJSONParser by
 default (#49825) (#49832)

(cherry picked from commit b8563958bd11da22631e5fec513cf908c07b6d90)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
---
 pkg/services/featuremgmt/registry.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 1cf0cbd1983..e3040ac1270 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -236,7 +236,6 @@ var (
 			Name:        "prometheusStreamingJSONParser",
 			Description: "Enable streaming JSON parser for Prometheus datasource",
 			State:       FeatureStateBeta,
-			Expression:  "true", // Enabled by default
 		},
 		{
 			Name:            "validateDashboardsOnSave",

From c960454bd45ab1c0e361bac19882fb0f84083dce Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 10:30:11 -0400
Subject: [PATCH 082/103] AzureMonitor: migrate Logs+Arg QueryEditor to
 @grafana/experimental (#48978) (#49833)

* AzureMonitor: use @grafana/experimental for LogsQueryEditor

ref #48711

* AzureMonitor: migrate ArgQueryEditor to @grafana/experimental.

Change CodeEditor to 100% instead of 1000px to match LogsQueryEditor.

ref #48713

(cherry picked from commit 6554bbd70fdf86846525883acf68347651e8076b)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
---
 .../ArgQueryEditor/ArgQueryEditor.tsx         |  71 ++++++++---
 .../components/ArgQueryEditor/QueryField.tsx  |   2 +-
 .../LogsQueryEditor/LogsQueryEditor.tsx       | 119 +++++++++++++-----
 3 files changed, 140 insertions(+), 52 deletions(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/ArgQueryEditor.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/ArgQueryEditor.tsx
index cfc0dbba3f4..60ef2fde091 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/ArgQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/ArgQueryEditor.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
 
+import { EditorRows, EditorRow, EditorFieldGroup } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
 import { InlineFieldRow } from '@grafana/ui';
 
 import Datasource from '../../datasource';
@@ -8,7 +10,7 @@ import SubscriptionField from '../SubscriptionField';
 
 import QueryField from './QueryField';
 
-interface LogsQueryEditorProps {
+interface ArgQueryEditorProps {
   query: AzureMonitorQuery;
   datasource: Datasource;
   subscriptionId?: string;
@@ -18,7 +20,7 @@ interface LogsQueryEditorProps {
 }
 
 const ERROR_SOURCE = 'arg-subscriptions';
-const ArgQueryEditor: React.FC<LogsQueryEditorProps> = ({
+const ArgQueryEditor: React.FC<ArgQueryEditorProps> = ({
   query,
   datasource,
   subscriptionId,
@@ -52,12 +54,26 @@ const ArgQueryEditor: React.FC<LogsQueryEditorProps> = ({
       .catch((err) => setError(ERROR_SOURCE, err));
   }, [datasource, onChange, query, setError]);
 
-  return (
-    <div data-testid="azure-monitor-logs-query-editor">
-      <InlineFieldRow>
-        <SubscriptionField
-          multiSelect
-          subscriptions={subscriptions}
+  if (config.featureToggles.azureMonitorExperimentalUI) {
+    return (
+      <span data-testid="azure-monitor-arg-query-editor-with-experimental-ui">
+        <EditorRows>
+          <EditorRow>
+            <EditorFieldGroup>
+              <SubscriptionField
+                multiSelect
+                subscriptions={subscriptions}
+                query={query}
+                datasource={datasource}
+                subscriptionId={subscriptionId}
+                variableOptionGroup={variableOptionGroup}
+                onQueryChange={onChange}
+                setError={setError}
+              />
+            </EditorFieldGroup>
+          </EditorRow>
+        </EditorRows>
+        <QueryField
           query={query}
           datasource={datasource}
           subscriptionId={subscriptionId}
@@ -65,18 +81,35 @@ const ArgQueryEditor: React.FC<LogsQueryEditorProps> = ({
           onQueryChange={onChange}
           setError={setError}
         />
-      </InlineFieldRow>
+      </span>
+    );
+  } else {
+    return (
+      <div data-testid="azure-monitor-arg-query-editor">
+        <InlineFieldRow>
+          <SubscriptionField
+            multiSelect
+            subscriptions={subscriptions}
+            query={query}
+            datasource={datasource}
+            subscriptionId={subscriptionId}
+            variableOptionGroup={variableOptionGroup}
+            onQueryChange={onChange}
+            setError={setError}
+          />
+        </InlineFieldRow>
 
-      <QueryField
-        query={query}
-        datasource={datasource}
-        subscriptionId={subscriptionId}
-        variableOptionGroup={variableOptionGroup}
-        onQueryChange={onChange}
-        setError={setError}
-      />
-    </div>
-  );
+        <QueryField
+          query={query}
+          datasource={datasource}
+          subscriptionId={subscriptionId}
+          variableOptionGroup={variableOptionGroup}
+          onQueryChange={onChange}
+          setError={setError}
+        />
+      </div>
+    );
+  }
 };
 
 export default ArgQueryEditor;
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/QueryField.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/QueryField.tsx
index 9ce83b50797..4a88a301c7d 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/QueryField.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ArgQueryEditor/QueryField.tsx
@@ -23,7 +23,7 @@ const QueryField: React.FC<AzureQueryEditorFieldProps> = ({ query, onQueryChange
       value={query.azureResourceGraph?.query ?? ''}
       language="kusto"
       height={200}
-      width={1000}
+      width="100%"
       showMiniMap={false}
       onBlur={onChange}
       onSave={onChange}
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/LogsQueryEditor.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/LogsQueryEditor.tsx
index 1e77997c5c4..83d858ac5b6 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/LogsQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/LogsQueryEditor.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 
+import { EditorRows, EditorRow, EditorFieldGroup } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
 import { Alert } from '@grafana/ui';
 
 import Datasource from '../../datasource';
@@ -33,36 +35,78 @@ const LogsQueryEditor: React.FC<LogsQueryEditorProps> = ({
 }) => {
   const migrationError = useMigrations(datasource, query, onChange);
 
-  return (
-    <div data-testid="azure-monitor-logs-query-editor">
-      <ResourceField
-        query={query}
-        datasource={datasource}
-        subscriptionId={subscriptionId}
-        variableOptionGroup={variableOptionGroup}
-        onQueryChange={onChange}
-        setError={setError}
-        selectableEntryTypes={[
-          ResourceRowType.Subscription,
-          ResourceRowType.ResourceGroup,
-          ResourceRowType.Resource,
-          ResourceRowType.Variable,
-        ]}
-        setResource={setResource}
-        resourceUri={query.azureLogAnalytics?.resource}
-      />
+  if (config.featureToggles.azureMonitorExperimentalUI) {
+    return (
+      <span data-testid="azure-monitor-logs-query-editor-with-experimental-ui">
+        <EditorRows>
+          <EditorRow>
+            <EditorFieldGroup>
+              <ResourceField
+                query={query}
+                datasource={datasource}
+                subscriptionId={subscriptionId}
+                variableOptionGroup={variableOptionGroup}
+                onQueryChange={onChange}
+                setError={setError}
+                selectableEntryTypes={[
+                  ResourceRowType.Subscription,
+                  ResourceRowType.ResourceGroup,
+                  ResourceRowType.Resource,
+                  ResourceRowType.Variable,
+                ]}
+                setResource={setResource}
+                resourceUri={query.azureLogAnalytics?.resource}
+              />
+            </EditorFieldGroup>
+          </EditorRow>
+          <QueryField
+            query={query}
+            datasource={datasource}
+            subscriptionId={subscriptionId}
+            variableOptionGroup={variableOptionGroup}
+            onQueryChange={onChange}
+            setError={setError}
+          />
+          <EditorRow>
+            <EditorFieldGroup>
+              {!hideFormatAs && (
+                <FormatAsField
+                  query={query}
+                  datasource={datasource}
+                  subscriptionId={subscriptionId}
+                  variableOptionGroup={variableOptionGroup}
+                  onQueryChange={onChange}
+                  setError={setError}
+                />
+              )}
 
-      <QueryField
-        query={query}
-        datasource={datasource}
-        subscriptionId={subscriptionId}
-        variableOptionGroup={variableOptionGroup}
-        onQueryChange={onChange}
-        setError={setError}
-      />
+              {migrationError && <Alert title={migrationError.title}>{migrationError.message}</Alert>}
+            </EditorFieldGroup>
+          </EditorRow>
+        </EditorRows>
+      </span>
+    );
+  } else {
+    return (
+      <div data-testid="azure-monitor-logs-query-editor">
+        <ResourceField
+          query={query}
+          datasource={datasource}
+          subscriptionId={subscriptionId}
+          variableOptionGroup={variableOptionGroup}
+          onQueryChange={onChange}
+          setError={setError}
+          selectableEntryTypes={[
+            ResourceRowType.Subscription,
+            ResourceRowType.ResourceGroup,
+            ResourceRowType.Resource,
+            ResourceRowType.Variable,
+          ]}
+          setResource={setResource}
+          resourceUri={query.azureLogAnalytics?.resource}
+        />
 
-      {!hideFormatAs && (
-        <FormatAsField
+        <QueryField
           query={query}
           datasource={datasource}
           subscriptionId={subscriptionId}
@@ -70,11 +114,22 @@ const LogsQueryEditor: React.FC<LogsQueryEditorProps> = ({
           onQueryChange={onChange}
           setError={setError}
         />
-      )}
 
-      {migrationError && <Alert title={migrationError.title}>{migrationError.message}</Alert>}
-    </div>
-  );
+        {!hideFormatAs && (
+          <FormatAsField
+            query={query}
+            datasource={datasource}
+            subscriptionId={subscriptionId}
+            variableOptionGroup={variableOptionGroup}
+            onQueryChange={onChange}
+            setError={setError}
+          />
+        )}
+
+        {migrationError && <Alert title={migrationError.title}>{migrationError.message}</Alert>}
+      </div>
+    );
+  }
 };
 
 export default LogsQueryEditor;

From f8012e67895b1af257e098931d1afea176b4ceef Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 11:32:23 -0400
Subject: [PATCH 083/103] Fix: Timeseries migration regex override (#49629)
 (#49837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3d3cf7403854d68796af05e1ee27d477370314d9)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
---
 .../__snapshots__/migrations.test.ts.snap     | 30 +++++++++++++++++++
 .../panel/timeseries/migrations.test.ts       | 10 ++++++-
 .../plugins/panel/timeseries/migrations.ts    |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
index 60fb6a03a78..243f9f77801 100644
--- a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
@@ -141,6 +141,21 @@ Object {
           },
         ],
       },
+      Object {
+        "matcher": Object {
+          "id": "byName",
+          "options": "B-series",
+        },
+        "properties": Array [
+          Object {
+            "id": "color",
+            "value": Object {
+              "fixedColor": "rgba(16, 72, 170, 0.77)",
+              "mode": "fixed",
+            },
+          },
+        ],
+      },
     ],
   },
   "options": Object {
@@ -197,6 +212,21 @@ Object {
           },
         ],
       },
+      Object {
+        "matcher": Object {
+          "id": "byRegexp",
+          "options": "/.*Status: 2[0-9]+.*/i",
+        },
+        "properties": Array [
+          Object {
+            "id": "color",
+            "value": Object {
+              "fixedColor": "rgba(16, 72, 170, 0.77)",
+              "mode": "fixed",
+            },
+          },
+        ],
+      },
     ],
   },
   "options": Object {
diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts
index 1d4a553c40c..14310ce9fb6 100644
--- a/public/app/plugins/panel/timeseries/migrations.test.ts
+++ b/public/app/plugins/panel/timeseries/migrations.test.ts
@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash';
 
-import { PanelModel, FieldConfigSource } from '@grafana/data';
+import { PanelModel, FieldConfigSource, FieldMatcherID } from '@grafana/data';
 import { TooltipDisplayMode, SortOrder } from '@grafana/schema';
 
 import { graphPanelChangedHandler } from './migrations';
@@ -78,6 +78,8 @@ describe('Graph Migrations', () => {
     const panel = {} as PanelModel;
     panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
     expect(panel).toMatchSnapshot();
+    expect(panel.fieldConfig.overrides[0].matcher.id).toBe(FieldMatcherID.byRegexp);
+    expect(panel.fieldConfig.overrides[1].matcher.id).toBe(FieldMatcherID.byRegexp);
   });
 
   describe('legend', () => {
@@ -479,6 +481,11 @@ const customColor = {
       alias: 'A-series',
       color: 'rgba(165, 72, 170, 0.77)',
     },
+    {
+      $$hashKey: 'object:13',
+      alias: 'B-series',
+      color: 'rgba(16, 72, 170, 0.77)',
+    },
   ],
   spaceLength: 10,
   steppedLine: true,
@@ -536,6 +543,7 @@ const customColor = {
 
 const customColorRegex = cloneDeep(customColor);
 customColorRegex.seriesOverrides[0].alias = '/^A-/';
+customColorRegex.seriesOverrides[1].alias = '/.*Status: 2[0-9]+.*/i';
 
 const stairscase = {
   aliasColors: {},
diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts
index a19e7017cdb..e27b75fc8b1 100644
--- a/public/app/plugins/panel/timeseries/migrations.ts
+++ b/public/app/plugins/panel/timeseries/migrations.ts
@@ -119,7 +119,7 @@ export function flotToGraphOptions(angular: any): { fieldConfig: FieldConfigSour
       if (!seriesOverride.alias) {
         continue; // the matcher config
       }
-      const aliasIsRegex = seriesOverride.alias.startsWith('/') && seriesOverride.alias.endsWith('/');
+      const aliasIsRegex = /^([/~@;%#'])(.*?)\1([gimsuy]*)$/.test(seriesOverride.alias);
       const rule: ConfigOverrideRule = {
         matcher: {
           id: aliasIsRegex ? FieldMatcherID.byRegexp : FieldMatcherID.byName,

From 6949f6dddc307b8fddf6397578230374cd5b901d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 11:56:41 -0400
Subject: [PATCH 084/103] Prometheus: Predefined scopes for Azure
 authentication (#49557) (#49842)

* Predefined scopes for Azure Prometheus

* Allow override of audience

(cherry picked from commit 2b83cf46186f745e356a24e4c78a1fbc24b3051e)

Co-authored-by: Sergey Kostrukov <sergey@kostrukov.com>
---
 .../src/types/featureToggles.gen.ts           |  2 +-
 .../datasources/service/datasource_service.go | 23 +++--
 .../service/datasource_service_test.go        |  3 +-
 pkg/services/featuremgmt/registry.go          | 10 +--
 pkg/services/featuremgmt/toggles_gen.go       |  8 +-
 .../buffered/promclient/provider_azure.go     | 89 ++++++++++++++++---
 .../promclient/provider_azure_test.go         |  7 +-
 .../configuration/AzureAuthSettings.tsx       | 71 ++++++++++-----
 .../prometheus/configuration/ConfigEditor.tsx |  2 +-
 9 files changed, 153 insertions(+), 62 deletions(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 7fdfab135f2..2d990c58dda 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -18,7 +18,6 @@ export interface FeatureToggles {
 
   trimDefaults?: boolean;
   disableEnvelopeEncryption?: boolean;
-  httpclientprovider_azure_auth?: boolean;
   serviceAccounts?: boolean;
   database_metrics?: boolean;
   dashboardPreviews?: boolean;
@@ -33,6 +32,7 @@ export interface FeatureToggles {
   tempoServiceGraph?: boolean;
   lokiBackendMode?: boolean;
   prometheus_azure_auth?: boolean;
+  prometheusAzureOverrideAudience?: boolean;
   influxdbBackendMigration?: boolean;
   newNavigation?: boolean;
   showFeatureFlagsInUI?: boolean;
diff --git a/pkg/services/datasources/service/datasource_service.go b/pkg/services/datasources/service/datasource_service.go
index 8cbab36d30a..c95c6294fdf 100644
--- a/pkg/services/datasources/service/datasource_service.go
+++ b/pkg/services/datasources/service/datasource_service.go
@@ -6,8 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"net/url"
-	"path"
 	"strconv"
 	"strings"
 	"sync"
@@ -27,6 +25,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/buffered/promclient"
 )
 
 type Service struct {
@@ -402,7 +401,8 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *models.DataSource)
 		}
 	}
 
-	if ds.JsonData != nil && s.features.IsEnabled(featuremgmt.FlagHttpclientproviderAzureAuth) {
+	// TODO: #35857 Required for templating queries in Prometheus datasource when Azure authentication enabled
+	if ds.JsonData != nil && s.features.IsEnabled(featuremgmt.FlagPrometheusAzureAuth) {
 		credentials, err := azcredentials.FromDatasourceData(ds.JsonData.MustMap(), decryptedValues)
 		if err != nil {
 			err = fmt.Errorf("invalid Azure credentials: %s", err)
@@ -410,21 +410,18 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *models.DataSource)
 		}
 
 		if credentials != nil {
-			resourceIdStr := ds.JsonData.Get("azureEndpointResourceId").MustString()
-			if resourceIdStr == "" {
-				err := fmt.Errorf("endpoint resource ID (audience) not provided")
+			var scopes []string
+
+			if scopes, err = promclient.GetOverriddenScopes(ds.JsonData.MustMap()); err != nil {
 				return nil, err
 			}
 
-			resourceId, err := url.Parse(resourceIdStr)
-			if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
-				err := fmt.Errorf("endpoint resource ID (audience) '%s' invalid", resourceIdStr)
-				return nil, err
+			if scopes == nil {
+				if scopes, err = promclient.GetPrometheusScopes(s.cfg.Azure, credentials); err != nil {
+					return nil, err
+				}
 			}
 
-			resourceId.Path = path.Join(resourceId.Path, ".default")
-			scopes := []string{resourceId.String()}
-
 			azhttpclient.AddAzureAuthentication(opts, s.cfg.Azure, credentials, scopes)
 		}
 	}
diff --git a/pkg/services/datasources/service/datasource_service_test.go b/pkg/services/datasources/service/datasource_service_test.go
index 6cb930bd714..5a1a3487ad0 100644
--- a/pkg/services/datasources/service/datasource_service_test.go
+++ b/pkg/services/datasources/service/datasource_service_test.go
@@ -561,7 +561,7 @@ func TestService_HTTPClientOptions(t *testing.T) {
 
 	t.Run("Azure authentication", func(t *testing.T) {
 		t.Run("given feature flag enabled", func(t *testing.T) {
-			features := featuremgmt.WithFeatures(featuremgmt.FlagHttpclientproviderAzureAuth)
+			features := featuremgmt.WithFeatures(featuremgmt.FlagPrometheusAzureAuth)
 
 			t.Run("should set Azure middleware when JsonData contains valid credentials", func(t *testing.T) {
 				t.Cleanup(func() { ds.JsonData = emptyJsonData; ds.SecureJsonData = emptySecureJsonData })
@@ -571,7 +571,6 @@ func TestService_HTTPClientOptions(t *testing.T) {
 					"azureCredentials": map[string]interface{}{
 						"authType": "msi",
 					},
-					"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
 				})
 
 				secretsStore := kvstore.SetupTestService(t)
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index e3040ac1270..69d4781256f 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -18,11 +18,6 @@ var (
 			Description: "Disable envelope encryption (emergency only)",
 			State:       FeatureStateStable,
 		},
-		{
-			Name:        "httpclientprovider_azure_auth",
-			Description: "Experimental. Allow datasources to configure Azure authentication directly via JsonData",
-			State:       FeatureStateBeta,
-		},
 		{
 			Name:        "serviceAccounts",
 			Description: "support service accounts",
@@ -100,6 +95,11 @@ var (
 			Description: "Experimental. Azure authentication for Prometheus datasource",
 			State:       FeatureStateBeta,
 		},
+		{
+			Name:        "prometheusAzureOverrideAudience",
+			Description: "Experimental. Allow override default AAD audience for Azure Prometheus endpoint",
+			State:       FeatureStateBeta,
+		},
 		{
 			Name:         "influxdbBackendMigration",
 			Description:  "Query InfluxDB InfluxQL without the proxy",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index c9b410c2b39..f41fbacd7cb 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -15,10 +15,6 @@ const (
 	// Disable envelope encryption (emergency only)
 	FlagDisableEnvelopeEncryption = "disableEnvelopeEncryption"
 
-	// FlagHttpclientproviderAzureAuth
-	// Experimental. Allow datasources to configure Azure authentication directly via JsonData
-	FlagHttpclientproviderAzureAuth = "httpclientprovider_azure_auth"
-
 	// FlagServiceAccounts
 	// support service accounts
 	FlagServiceAccounts = "serviceAccounts"
@@ -75,6 +71,10 @@ const (
 	// Experimental. Azure authentication for Prometheus datasource
 	FlagPrometheusAzureAuth = "prometheus_azure_auth"
 
+	// FlagPrometheusAzureOverrideAudience
+	// Experimental. Allow override default AAD audience for Azure Prometheus endpoint
+	FlagPrometheusAzureOverrideAudience = "prometheusAzureOverrideAudience"
+
 	// FlagInfluxdbBackendMigration
 	// Query InfluxDB InfluxQL without the proxy
 	FlagInfluxdbBackendMigration = "influxdbBackendMigration"
diff --git a/pkg/tsdb/prometheus/buffered/promclient/provider_azure.go b/pkg/tsdb/prometheus/buffered/promclient/provider_azure.go
index 318867ef681..ba53aa3652d 100644
--- a/pkg/tsdb/prometheus/buffered/promclient/provider_azure.go
+++ b/pkg/tsdb/prometheus/buffered/promclient/provider_azure.go
@@ -7,12 +7,21 @@ import (
 
 	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
 	"github.com/grafana/grafana-azure-sdk-go/azhttpclient"
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/util/maputil"
 )
 
+var (
+	azurePrometheusScopes = map[string][]string{
+		azsettings.AzurePublic:       {"https://prometheus.monitor.azure.com/.default"},
+		azsettings.AzureChina:        {"https://prometheus.monitor.chinacloudapp.cn/.default"},
+		azsettings.AzureUSGovernment: {"https://prometheus.monitor.usgovcloudapi.net/.default"},
+	}
+)
+
 func (p *Provider) configureAzureAuthentication(opts *sdkhttpclient.Options) error {
 	// Azure authentication is experimental (#35857)
 	if !p.features.IsEnabled(featuremgmt.FlagPrometheusAzureAuth) {
@@ -21,30 +30,84 @@ func (p *Provider) configureAzureAuthentication(opts *sdkhttpclient.Options) err
 
 	credentials, err := azcredentials.FromDatasourceData(p.jsonData, p.settings.DecryptedSecureJSONData)
 	if err != nil {
-		err = fmt.Errorf("invalid Azure credentials: %s", err)
+		err = fmt.Errorf("invalid Azure credentials: %w", err)
 		return err
 	}
 
 	if credentials != nil {
-		resourceIdStr, err := maputil.GetStringOptional(p.jsonData, "azureEndpointResourceId")
-		if err != nil {
-			return err
-		} else if resourceIdStr == "" {
-			err := fmt.Errorf("endpoint resource ID (audience) not provided")
+		var scopes []string
+
+		if scopes, err = GetOverriddenScopes(p.jsonData); err != nil {
 			return err
 		}
 
-		resourceId, err := url.Parse(resourceIdStr)
-		if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
-			err := fmt.Errorf("endpoint resource ID (audience) '%s' invalid", resourceIdStr)
-			return err
+		if scopes == nil {
+			if scopes, err = GetPrometheusScopes(p.cfg.Azure, credentials); err != nil {
+				return err
+			}
 		}
 
-		resourceId.Path = path.Join(resourceId.Path, ".default")
-		scopes := []string{resourceId.String()}
-
 		azhttpclient.AddAzureAuthentication(opts, p.cfg.Azure, credentials, scopes)
 	}
 
 	return nil
 }
+
+func GetOverriddenScopes(jsonData map[string]interface{}) ([]string, error) {
+	resourceIdStr, err := maputil.GetStringOptional(jsonData, "azureEndpointResourceId")
+	if err != nil {
+		err = fmt.Errorf("overridden resource ID (audience) invalid")
+		return nil, err
+	} else if resourceIdStr == "" {
+		return nil, nil
+	}
+
+	resourceId, err := url.Parse(resourceIdStr)
+	if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
+		err = fmt.Errorf("overridden endpoint resource ID (audience) '%s' invalid", resourceIdStr)
+		return nil, err
+	}
+
+	resourceId.Path = path.Join(resourceId.Path, ".default")
+	scopes := []string{resourceId.String()}
+	return scopes, nil
+}
+
+func GetPrometheusScopes(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials) ([]string, error) {
+	// Extract cloud from credentials
+	azureCloud, err := getAzureCloudFromCredentials(settings, credentials)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get scopes for the given cloud
+	if scopes, ok := azurePrometheusScopes[azureCloud]; !ok {
+		err := fmt.Errorf("the Azure cloud '%s' not supported by Prometheus datasource", azureCloud)
+		return nil, err
+	} else {
+		return scopes, nil
+	}
+}
+
+// To be part of grafana-azure-sdk-go
+func getAzureCloudFromCredentials(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials) (string, error) {
+	switch c := credentials.(type) {
+	case *azcredentials.AzureManagedIdentityCredentials:
+		// In case of managed identity, the cloud is always same as where Grafana is hosted
+		return getDefaultAzureCloud(settings), nil
+	case *azcredentials.AzureClientSecretCredentials:
+		return c.AzureCloud, nil
+	default:
+		err := fmt.Errorf("the Azure credentials of type '%s' not supported by Prometheus datasource", c.AzureAuthType())
+		return "", err
+	}
+}
+
+// To be part of grafana-azure-sdk-go
+func getDefaultAzureCloud(settings *azsettings.AzureSettings) string {
+	cloudName := settings.Cloud
+	if cloudName == "" {
+		return azsettings.AzurePublic
+	}
+	return cloudName
+}
diff --git a/pkg/tsdb/prometheus/buffered/promclient/provider_azure_test.go b/pkg/tsdb/prometheus/buffered/promclient/provider_azure_test.go
index ee4c4536664..74c60e94ecf 100644
--- a/pkg/tsdb/prometheus/buffered/promclient/provider_azure_test.go
+++ b/pkg/tsdb/prometheus/buffered/promclient/provider_azure_test.go
@@ -3,8 +3,10 @@ package promclient
 import (
 	"testing"
 
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
@@ -12,7 +14,9 @@ import (
 )
 
 func TestConfigureAzureAuthentication(t *testing.T) {
-	cfg := &setting.Cfg{}
+	cfg := &setting.Cfg{
+		Azure: &azsettings.AzureSettings{},
+	}
 	settings := backend.DataSourceInstanceSettings{}
 
 	t.Run("given feature flag enabled", func(t *testing.T) {
@@ -24,7 +28,6 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 				"azureCredentials": map[string]interface{}{
 					"authType": "msi",
 				},
-				"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
 			}
 
 			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
index 1108dff3a9c..412e63f9389 100644
--- a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
@@ -1,7 +1,7 @@
-import React, { FunctionComponent, useMemo } from 'react';
+import React, { FunctionComponent, FormEvent, useMemo, useState } from 'react';
 
 import { config } from '@grafana/runtime';
-import { InlineFormLabel, Input } from '@grafana/ui';
+import { InlineField, InlineFieldRow, InlineSwitch, Input } from '@grafana/ui';
 import { HttpSettingsBaseProps } from '@grafana/ui/src/components/DataSourceSettings/types';
 
 import { KnownAzureClouds, AzureCredentials } from './AzureCredentials';
@@ -11,12 +11,38 @@ import { AzureCredentialsForm } from './AzureCredentialsForm';
 export const AzureAuthSettings: FunctionComponent<HttpSettingsBaseProps> = (props: HttpSettingsBaseProps) => {
   const { dataSourceConfig, onChange } = props;
 
+  const [overrideAudienceAllowed] = useState<boolean>(
+    config.featureToggles.prometheusAzureOverrideAudience || !!dataSourceConfig.jsonData.azureEndpointResourceId
+  );
+  const [overrideAudienceChecked, setOverrideAudienceChecked] = useState<boolean>(
+    !!dataSourceConfig.jsonData.azureEndpointResourceId
+  );
+
   const credentials = useMemo(() => getCredentials(dataSourceConfig), [dataSourceConfig]);
 
   const onCredentialsChange = (credentials: AzureCredentials): void => {
     onChange(updateCredentials(dataSourceConfig, credentials));
   };
 
+  const onOverrideAudienceChange = (ev: FormEvent<HTMLInputElement>): void => {
+    setOverrideAudienceChecked(ev.currentTarget.checked);
+    if (!ev.currentTarget.checked) {
+      onChange({
+        ...dataSourceConfig,
+        jsonData: { ...dataSourceConfig.jsonData, azureEndpointResourceId: undefined },
+      });
+    }
+  };
+
+  const onResourceIdChange = (ev: FormEvent<HTMLInputElement>): void => {
+    if (overrideAudienceChecked) {
+      onChange({
+        ...dataSourceConfig,
+        jsonData: { ...dataSourceConfig.jsonData, azureEndpointResourceId: ev.currentTarget.value },
+      });
+    }
+  };
+
   return (
     <>
       <h6>Azure Authentication</h6>
@@ -26,26 +52,29 @@ export const AzureAuthSettings: FunctionComponent<HttpSettingsBaseProps> = (prop
         azureCloudOptions={KnownAzureClouds}
         onCredentialsChange={onCredentialsChange}
       />
-      <h6>Azure Configuration</h6>
-      <div className="gf-form-group">
-        <div className="gf-form-inline">
-          <div className="gf-form">
-            <InlineFormLabel className="width-12">AAD resource ID</InlineFormLabel>
-            <div className="width-15">
-              <Input
-                className="width-30"
-                value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
-                onChange={(event) =>
-                  onChange({
-                    ...dataSourceConfig,
-                    jsonData: { ...dataSourceConfig.jsonData, azureEndpointResourceId: event.currentTarget.value },
-                  })
-                }
-              />
-            </div>
+      {overrideAudienceAllowed && (
+        <>
+          <h6>Azure Configuration</h6>
+          <div className="gf-form-group">
+            <InlineFieldRow>
+              <InlineField labelWidth={26} label="Override AAD audience">
+                <InlineSwitch value={overrideAudienceChecked} onChange={onOverrideAudienceChange} />
+              </InlineField>
+            </InlineFieldRow>
+            {overrideAudienceChecked && (
+              <InlineFieldRow>
+                <InlineField labelWidth={26} label="Resource ID">
+                  <Input
+                    className="width-30"
+                    value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
+                    onChange={onResourceIdChange}
+                  />
+                </InlineField>
+              </InlineFieldRow>
+            )}
           </div>
-        </div>
-      </div>
+        </>
+      )}
     </>
   );
 };
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
index 692e7cfe24d..82d80b12a65 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
@@ -18,7 +18,7 @@ export const ConfigEditor = (props: Props) => {
   const alertmanagers = getAllAlertmanagerDataSources();
 
   const azureAuthSettings = {
-    azureAuthSupported: config.featureToggles['prometheus_azure_auth'] ?? false,
+    azureAuthSupported: !!config.featureToggles.prometheus_azure_auth,
     getAzureAuthEnabled: (config: DataSourceSettings<any, any>): boolean => hasCredentials(config),
     setAzureAuthEnabled: (config: DataSourceSettings<any, any>, enabled: boolean) =>
       enabled ? setDefaultCredentials(config) : resetCredentials(config),

From 27b20676afec079afb61b50f66356efbe185fd89 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 12:06:16 -0400
Subject: [PATCH 085/103] Chore: Update theme json (#49480) (#49497)

(cherry picked from commit c043a2f83abc2486b7357f4312e6f4e57bae0169)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
---
 public/sass/theme.dark.generated.json  | 4 ++++
 public/sass/theme.light.generated.json | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/public/sass/theme.dark.generated.json b/public/sass/theme.dark.generated.json
index 0952f01c4a5..178b38b2614 100644
--- a/public/sass/theme.dark.generated.json
+++ b/public/sass/theme.dark.generated.json
@@ -152,6 +152,10 @@
     "menuTabs": {
       "height": 41
     },
+    "textHighlight": {
+      "text": "#000000",
+      "background": "#F5B73D"
+    },
     "horizontalDrawer": {
       "defaultHeight": 400
     }
diff --git a/public/sass/theme.light.generated.json b/public/sass/theme.light.generated.json
index 9e1b08ec313..ddd149cd45c 100644
--- a/public/sass/theme.light.generated.json
+++ b/public/sass/theme.light.generated.json
@@ -152,6 +152,10 @@
     "menuTabs": {
       "height": 41
     },
+    "textHighlight": {
+      "text": "#000000",
+      "background": "#FAD34A"
+    },
     "horizontalDrawer": {
       "defaultHeight": 400
     }

From ed06e3e4f9c7ece0c9d3b706bb48ffbf449a2690 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 12:13:39 -0400
Subject: [PATCH 086/103] Alerting: Enable Unified Alerting for open source and
 enterprise (#49834) (#49845)

This commit enables Unified Alerting for open source and enterprise unless disabled in configuration.

(cherry picked from commit 3b7f871bf4f678d485193e95a49c6ca79895b539)

Co-authored-by: George Robinson <george.robinson@grafana.com>
---
 .../sqlstore/migrations/migrations.go         |   7 --
 .../sqlstore/migrations/ualert/ualert.go      |  42 --------
 .../sqlstore/migrations/ualert/ualert_test.go | 102 +-----------------
 pkg/setting/setting_test.go                   |  19 ++--
 pkg/setting/setting_unified_alerting.go       |  57 +++++-----
 5 files changed, 42 insertions(+), 185 deletions(-)

diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 52a331415fc..3e60ddff3c2 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -1,8 +1,6 @@
 package migrations
 
 import (
-	"os"
-
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ualert"
@@ -52,11 +50,6 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 	addUserAuthTokenMigrations(mg)
 	addCacheMigration(mg)
 	addShortURLMigrations(mg)
-	// TODO Delete when unified alerting is enabled by default unconditionally (Grafana v9)
-	if err := ualert.CheckUnifiedAlertingEnabledByDefault(mg); err != nil { // this should always go before any other ualert migration
-		mg.Logger.Error("failed to determine the status of alerting engine. Enable either legacy or unified alerting explicitly and try again", "err", err)
-		os.Exit(1)
-	}
 	ualert.AddTablesMigrations(mg)
 	ualert.AddDashAlertMigration(mg)
 	addLibraryElementsMigrations(mg)
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go
index 7d118270d9b..5bd0bf5cacc 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert.go
@@ -706,48 +706,6 @@ func (u *upgradeNgAlerting) SQL(migrator.Dialect) string {
 	return "code migration"
 }
 
-// CheckUnifiedAlertingEnabledByDefault determines the final status of unified alerting, if it is not enabled explicitly.
-// Checks table `alert` and if it is empty, then it changes UnifiedAlerting.Enabled to true. Otherwise, it sets the flag to false.
-// After this method is executed the status of alerting should be determined, i.e. both flags will not be nil.
-// Note: this is not a real migration but a step that other migrations depend on.
-// TODO Delete when unified alerting is enabled by default unconditionally (Grafana v9)
-func CheckUnifiedAlertingEnabledByDefault(migrator *migrator.Migrator) error {
-	// if [unified_alerting][enabled] is explicitly set, we've got nothing to do here.
-	if migrator.Cfg.UnifiedAlerting.Enabled != nil {
-		return nil
-	}
-	var ualertEnabled bool
-	// this duplicates the logic in setting.ReadUnifiedAlertingSettings, and is put here just for logical completeness.
-	if setting.AlertingEnabled != nil && !*setting.AlertingEnabled {
-		ualertEnabled = true
-		migrator.Cfg.UnifiedAlerting.Enabled = &ualertEnabled
-		migrator.Logger.Debug("Unified alerting is enabled because the legacy is disabled explicitly")
-		return nil
-	}
-
-	resp := &struct {
-		Count int64
-	}{}
-	exist, err := migrator.DBEngine.IsTableExist("alert")
-	if err != nil {
-		return fmt.Errorf("failed to verify if the 'alert' table exists: %w", err)
-	}
-	if exist {
-		if _, err := migrator.DBEngine.SQL("SELECT COUNT(1) as count FROM alert").Get(resp); err != nil {
-			return fmt.Errorf("failed to read 'alert' table: %w", err)
-		}
-	}
-	// if table does not exist then we treat it as absence of legacy alerting and therefore enable unified alerting.
-
-	ualertEnabled = resp.Count == 0
-	legacyEnabled := !ualertEnabled
-	migrator.Cfg.UnifiedAlerting.Enabled = &ualertEnabled
-	setting.AlertingEnabled = &legacyEnabled
-
-	migrator.Logger.Debug(fmt.Sprintf("Found %d legacy alerts in the database. Unified alerting enabled is %v", resp.Count, ualertEnabled))
-	return nil
-}
-
 // getAlertFolderNameFromDashboard generates a folder name for alerts that belong to a dashboard. Formats the string according to DASHBOARD_FOLDER format.
 // If the resulting string exceeds the migrations.MaxTitleLength, the dashboard title is stripped to be at the maximum length
 func getAlertFolderNameFromDashboard(dash *dashboard) string {
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert_test.go b/pkg/services/sqlstore/migrations/ualert/ualert_test.go
index 75abe7369fa..38650fc1ed8 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert_test.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert_test.go
@@ -7,15 +7,10 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/util"
 	"github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 var MigTitle = migTitle
@@ -103,99 +98,6 @@ func Test_validateAlertmanagerConfig(t *testing.T) {
 	}
 }
 
-func TestCheckUnifiedAlertingEnabledByDefault(t *testing.T) {
-	testDB := sqlutil.SQLite3TestDB()
-	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
-	require.NoError(t, err)
-	_, err = x.Exec("CREATE TABLE alert ( id bigint )")
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		_, err = x.Exec("DROP TABLE alert")
-		require.NoError(t, err)
-	})
-
-	tests := []struct {
-		title                   string
-		legacyAlertExists       bool
-		legacyIsDefined         bool
-		legacyValue             bool
-		expectedUnifiedAlerting bool
-	}{
-		{
-			title:                   "enable unified alerting when there are no legacy alerts",
-			legacyIsDefined:         false,
-			legacyAlertExists:       false,
-			expectedUnifiedAlerting: true,
-		},
-		{
-			title:                   "enable unified alerting when there are no legacy alerts and legacy enabled",
-			legacyIsDefined:         true,
-			legacyValue:             true,
-			legacyAlertExists:       false,
-			expectedUnifiedAlerting: true,
-		},
-		{
-			title:                   "enable unified alerting when there are no legacy alerts and legacy disabled",
-			legacyIsDefined:         true,
-			legacyValue:             false,
-			legacyAlertExists:       false,
-			expectedUnifiedAlerting: true,
-		},
-		{
-			title:                   "enable unified alerting when there are legacy alerts but legacy disabled",
-			legacyIsDefined:         true,
-			legacyValue:             false,
-			legacyAlertExists:       true,
-			expectedUnifiedAlerting: true,
-		},
-		{
-			title:                   "disable unified alerting when there are legacy alerts",
-			legacyIsDefined:         false,
-			legacyAlertExists:       true,
-			expectedUnifiedAlerting: false,
-		},
-		{
-			title:                   "disable unified alerting when there are legacy alerts and it is enabled",
-			legacyIsDefined:         true,
-			legacyValue:             true,
-			legacyAlertExists:       true,
-			expectedUnifiedAlerting: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.title, func(t *testing.T) {
-			setting.AlertingEnabled = nil
-			if test.legacyIsDefined {
-				value := test.legacyValue
-				setting.AlertingEnabled = &value
-			}
-
-			if test.legacyAlertExists {
-				_, err := x.Exec("INSERT INTO alert VALUES (1)")
-				require.NoError(t, err)
-			} else {
-				_, err := x.Exec("DELETE FROM alert")
-				require.NoError(t, err)
-			}
-
-			cfg := setting.Cfg{
-				UnifiedAlerting: setting.UnifiedAlertingSettings{
-					Enabled: nil,
-				},
-			}
-			mg := migrator.NewMigrator(x, &cfg)
-
-			err := CheckUnifiedAlertingEnabledByDefault(mg)
-			require.NoError(t, err)
-			require.NotNil(t, setting.AlertingEnabled)
-			require.NotNil(t, cfg.UnifiedAlerting.Enabled)
-			require.Equal(t, *cfg.UnifiedAlerting.Enabled, test.expectedUnifiedAlerting)
-			require.Equal(t, *setting.AlertingEnabled, !test.expectedUnifiedAlerting)
-		})
-	}
-}
-
 func configFromReceivers(t *testing.T, receivers []*PostableGrafanaReceiver) *PostableUserConfig {
 	t.Helper()
 
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 8eac5e99be5..1018cd65951 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -539,9 +539,10 @@ func TestAlertingEnabled(t *testing.T) {
 				require.NoError(t, err)
 				err = cfg.ReadUnifiedAlertingSettings(f)
 				require.NoError(t, err)
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
+				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
+				assert.Equal(t, true, *cfg.UnifiedAlerting.Enabled)
 				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, true)
+				assert.Equal(t, false, *AlertingEnabled)
 			},
 		},
 		{
@@ -557,9 +558,9 @@ func TestAlertingEnabled(t *testing.T) {
 				err = cfg.ReadUnifiedAlertingSettings(f)
 				require.NoError(t, err)
 				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, false)
+				assert.Equal(t, true, *cfg.UnifiedAlerting.Enabled)
 				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, true)
+				assert.Equal(t, false, *AlertingEnabled)
 			},
 		},
 		{
@@ -593,7 +594,7 @@ func TestAlertingEnabled(t *testing.T) {
 				err = cfg.ReadUnifiedAlertingSettings(f)
 				require.NoError(t, err)
 				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, false)
+				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, true)
 				assert.NotNil(t, AlertingEnabled)
 				assert.Equal(t, *AlertingEnabled, false)
 			},
@@ -610,7 +611,8 @@ func TestAlertingEnabled(t *testing.T) {
 				require.NoError(t, err)
 				err = cfg.ReadUnifiedAlertingSettings(f)
 				require.NoError(t, err)
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
+				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
+				assert.True(t, *cfg.UnifiedAlerting.Enabled)
 				assert.Nil(t, AlertingEnabled)
 			},
 		},
@@ -627,9 +629,8 @@ func TestAlertingEnabled(t *testing.T) {
 				err = cfg.ReadUnifiedAlertingSettings(f)
 				require.NoError(t, err)
 				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, false)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, true)
+				assert.True(t, *cfg.UnifiedAlerting.Enabled)
+				assert.Nil(t, AlertingEnabled)
 			},
 		},
 		{
diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go
index 72cbc6eeb09..96bdf6bdc0c 100644
--- a/pkg/setting/setting_unified_alerting.go
+++ b/pkg/setting/setting_unified_alerting.go
@@ -95,47 +95,50 @@ func (u *UnifiedAlertingSettings) IsEnabled() bool {
 	return u.Enabled == nil || *u.Enabled
 }
 
+// readUnifiedAlertingEnabledSettings reads the settings for unified alerting.
+// It returns a non-nil bool and a nil error when unified alerting is enabled either
+// because it has been enabled in the settings or by default. It returns nil and
+// a non-nil error both unified alerting and legacy alerting are enabled at the same time.
 func (cfg *Cfg) readUnifiedAlertingEnabledSetting(section *ini.Section) (*bool, error) {
-	enabled, err := section.Key("enabled").Bool()
-	// the unified alerting is not enabled by default. First, check the feature flag
+	// At present an invalid value is considered the same as no value. This means that a
+	// spelling mistake in the string "false" could enable unified alerting rather
+	// than disable it. This issue can be found here
+	unifiedAlerting, err := section.Key("enabled").Bool()
 	if err != nil {
 		// TODO: Remove in Grafana v9
 		if cfg.IsFeatureToggleEnabled("ngalert") {
 			cfg.Logger.Warn("ngalert feature flag is deprecated: use unified alerting enabled setting instead")
-			enabled = true
-			// feature flag overrides the legacy alerting setting.
+			// feature flag overrides the legacy alerting setting
 			legacyAlerting := false
 			AlertingEnabled = &legacyAlerting
-			return &enabled, nil
+			unifiedAlerting = true
+			return &unifiedAlerting, nil
 		}
-		if IsEnterprise {
-			enabled = false
-			if AlertingEnabled == nil {
-				legacyEnabled := true
-				AlertingEnabled = &legacyEnabled
-			}
-			return &enabled, nil
+
+		// if legacy alerting has not been configured then enable unified alerting
+		if AlertingEnabled == nil {
+			unifiedAlerting = true
+			return &unifiedAlerting, nil
 		}
-		// next, check whether legacy flag is set
-		if AlertingEnabled != nil && !*AlertingEnabled {
-			enabled = true
-			return &enabled, nil // if legacy alerting is explicitly disabled, enable the unified alerting by default.
-		}
-		// NOTE: If the enabled flag is still not defined, the final decision is made during migration (see sqlstore.migrations.ualert.CheckUnifiedAlertingEnabledByDefault).
-		cfg.Logger.Info("The state of unified alerting is still not defined. The decision will be made during as we run the database migrations")
-		return nil, nil // the flag is not defined
+
+		// enable unified alerting and disable legacy alerting
+		legacyAlerting := false
+		AlertingEnabled = &legacyAlerting
+		unifiedAlerting = true
+		return &unifiedAlerting, nil
 	}
 
-	// If unified alerting is defined explicitly as well as legacy alerting and both are enabled, return error.
-	if enabled && AlertingEnabled != nil && *AlertingEnabled {
-		return nil, errors.New("both legacy and Grafana 8 Alerts are enabled. Disable one of them and restart")
+	// If both legacy and unified alerting are enabled then return an error
+	if AlertingEnabled != nil && *AlertingEnabled && unifiedAlerting {
+		return nil, errors.New("legacy and unified alerting cannot both be enabled at the same time, please disable one of them and restart Grafana")
 	}
-	// if legacy alerting is not defined but unified is determined then update the legacy with inverted value
+
 	if AlertingEnabled == nil {
-		legacyEnabled := !enabled
-		AlertingEnabled = &legacyEnabled
+		legacyAlerting := !unifiedAlerting
+		AlertingEnabled = &legacyAlerting
 	}
-	return &enabled, nil
+
+	return &unifiedAlerting, nil
 }
 
 // ReadUnifiedAlertingSettings reads both the `unified_alerting` and `alerting` sections of the configuration while preferring configuration the `alerting` section.

From d145bf358e54cd070bbdfa8f095c06dd0dcee187 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 12:34:45 -0400
Subject: [PATCH 087/103] Dashboard: Fix panel menu styling issues (#49806)
 (#49849)

* Dashboard: Fix panel menu styling issues

* remove !importants I added

(cherry picked from commit e0bb01aea6d171007661e487f34183beba160089)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
---
 public/sass/components/_dropdown.scss | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss
index f3613f6b7da..ee69ba95656 100644
--- a/public/sass/components/_dropdown.scss
+++ b/public/sass/components/_dropdown.scss
@@ -207,8 +207,8 @@
 // Right aligned dropdowns
 // ---------------------------
 .pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
+  left: 100%;
+  right: unset;
 }
 
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
@@ -243,7 +243,6 @@
   left: 100%;
   margin-top: 0px;
   margin-left: -1px;
-  @include border-radius(0 6px 6px 6px);
 }
 .dropdown-submenu:hover > .dropdown-menu {
   display: block;
@@ -255,7 +254,6 @@
   bottom: 0;
   margin-top: 0;
   margin-bottom: -2px;
-  @include border-radius(5px 5px 5px 0);
 }
 // .dropdown-submenu > a::after {
 //   position: absolute;
@@ -284,7 +282,6 @@
     left: -100%;
     width: 100%;
     margin-left: 2px;
-    @include border-radius(6px 0 6px 6px);
   }
 }
 

From 4e90a7211530532f8bfb73bee549d23fd80aaa04 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 13:00:02 -0400
Subject: [PATCH 088/103] [v9.0.x] SearchV2: Fix search input width on mobile
 (#49853)

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
---
 .../search/components/ManageDashboardsNew.tsx    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/app/features/search/components/ManageDashboardsNew.tsx b/public/app/features/search/components/ManageDashboardsNew.tsx
index 9756f9bf99e..22468b9fc1f 100644
--- a/public/app/features/search/components/ManageDashboardsNew.tsx
+++ b/public/app/features/search/components/ManageDashboardsNew.tsx
@@ -1,4 +1,4 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React, { useState } from 'react';
 import { useDebounce } from 'react-use';
 
@@ -38,8 +38,8 @@ export const ManageDashboardsNew = React.memo(({ folder }: Props) => {
 
   return (
     <>
-      <div className="page-action-bar">
-        <div className="gf-form gf-form--grow m-r-2">
+      <div className={cx(styles.actionBar, 'page-action-bar')}>
+        <div className={cx(styles.inputWrapper, 'gf-form gf-form--grow m-r-2')}>
           <Input
             value={inputValue}
             onChange={onSearchQueryChange}
@@ -68,6 +68,16 @@ ManageDashboardsNew.displayName = 'ManageDashboardsNew';
 export default ManageDashboardsNew;
 
 const getStyles = (theme: GrafanaTheme2) => ({
+  actionBar: css`
+    ${theme.breakpoints.down('sm')} {
+      flex-wrap: wrap;
+    }
+  `,
+  inputWrapper: css`
+    ${theme.breakpoints.down('sm')} {
+      margin-right: 0 !important;
+    }
+  `,
   searchInput: css`
     margin-bottom: 6px;
     min-height: ${theme.spacing(4)};

From 2a2982f9cc3b0853044db4c5b7ee2cb382b54f03 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 22:59:31 -0400
Subject: [PATCH 089/103] Alerting: Chore: Fix event name in ngalert/README.md
 (#49863)

Fix event name from *evalContext to *evaluation as #45144.

(cherry picked from commit 8b2a3a018d0f45027e235fac89a5ad03d0a5dbdb)

Co-authored-by: kyamau <kyamau.cs@gmail.com>
---
 pkg/services/ngalert/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/services/ngalert/README.md b/pkg/services/ngalert/README.md
index 7a44cae37a7..1f872989466 100644
--- a/pkg/services/ngalert/README.md
+++ b/pkg/services/ngalert/README.md
@@ -27,13 +27,13 @@ The scheduler runs at a fixed interval, called its heartbeat, in which it does a
 
 1. Fetch the alert rules for all organizations (excluding disabled)
 2. Start a goroutine (if this is a new alert rule or the scheduler has just started) to evaluate the alert rule
-3. Send an `*evalContext` event to the goroutine for each alert rule if its interval has elapsed
+3. Send an `*evaluation` event to the goroutine for each alert rule if its interval has elapsed
 4. Stop the goroutines for all alert rules that have been deleted since the last heartbeat
 
-The function that evaluates each alert rule is called `ruleRoutine`. It waits for an `*evalContext` event (sent each
+The function that evaluates each alert rule is called `ruleRoutine`. It waits for an `*evaluation` event (sent each
 interval seconds elapsed and is configurable per alert rule) and then evaluates the alert rule. To ensure that the
 scheduler is evaluating the latest version of the alert rule it compares its local version of the alert rule with that
-in the `*evalContext` event, fetching the latest version of the alert rule from the database if the version numbers
+in the `*evaluation` event, fetching the latest version of the alert rule from the database if the version numbers
 mismatch. It then invokes the Evaluator which evaluates any queries, classic conditions or expressions in alert rule
 and passes the results of this evaluation to the State Manager. An evaluation can return no results in the case of
 NoData or Error, a single result in the case of classic conditions, or more than one result if the alert rule is

From 5820ac0d7606988eca20092d00e9d8e84fb85f64 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 23:39:47 -0400
Subject: [PATCH 090/103] HeatmapNG: ensure non-zero y bucket size (#49454)
 (#49865)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 143f9e2dd9678ac7df4757b1f2a8c84789ca0adc)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .../plugins/panel/heatmap-new/HeatmapPanel.tsx |  1 +
 .../panel/heatmap-new/migrations.test.ts       |  2 +-
 .../plugins/panel/heatmap-new/migrations.ts    |  2 +-
 public/app/plugins/panel/heatmap-new/utils.ts  | 18 ++++++++++++++----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/panel/heatmap-new/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap-new/HeatmapPanel.tsx
index 09040bb6836..01ce263be9b 100644
--- a/public/app/plugins/panel/heatmap-new/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap-new/HeatmapPanel.tsx
@@ -115,6 +115,7 @@ export const HeatmapPanel: React.FC<HeatmapPanelProps> = ({
       cellGap: options.cellGap,
       hideThreshold: options.hideThreshold,
       exemplarColor: options.exemplars?.color ?? 'rgba(255,0,255,0.7)',
+      yAxisReverse: options.yAxisReverse,
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [options, data.structureRev]);
diff --git a/public/app/plugins/panel/heatmap-new/migrations.test.ts b/public/app/plugins/panel/heatmap-new/migrations.test.ts
index 276eb7fdb4d..8d8c5bf8018 100644
--- a/public/app/plugins/panel/heatmap-new/migrations.test.ts
+++ b/public/app/plugins/panel/heatmap-new/migrations.test.ts
@@ -43,7 +43,7 @@ describe('Heatmap Migrations', () => {
             "mode": "scheme",
             "scale": "exponential",
             "scheme": "BuGn",
-            "steps": 256,
+            "steps": 128,
           },
           "exemplars": Object {
             "color": "rgba(255,0,255,0.7)",
diff --git a/public/app/plugins/panel/heatmap-new/migrations.ts b/public/app/plugins/panel/heatmap-new/migrations.ts
index 9a1530f38d5..7864f8ff4ae 100644
--- a/public/app/plugins/panel/heatmap-new/migrations.ts
+++ b/public/app/plugins/panel/heatmap-new/migrations.ts
@@ -53,7 +53,7 @@ export function angularToReactHeatmap(angular: any): { fieldConfig: FieldConfigS
     calculate,
     color: {
       ...defaultPanelOptions.color,
-      steps: 256, // best match with existing colors
+      steps: 128, // best match with existing colors
     },
     cellGap: asNumber(angular.cards?.cardPadding),
     cellSize: asNumber(angular.cards?.cardRound),
diff --git a/public/app/plugins/panel/heatmap-new/utils.ts b/public/app/plugins/panel/heatmap-new/utils.ts
index 3197cfab7ac..15b4cb6e5a1 100644
--- a/public/app/plugins/panel/heatmap-new/utils.ts
+++ b/public/app/plugins/panel/heatmap-new/utils.ts
@@ -52,6 +52,7 @@ interface PrepConfigOpts {
   exemplarColor: string;
   cellGap?: number | null; // in css pixels
   hideThreshold?: number;
+  yAxisReverse?: boolean;
 }
 
 export function prepConfig(opts: PrepConfigOpts) {
@@ -67,6 +68,7 @@ export function prepConfig(opts: PrepConfigOpts) {
     palette,
     cellGap,
     hideThreshold,
+    yAxisReverse,
   } = opts;
 
   const pxRatio = devicePixelRatio;
@@ -210,14 +212,18 @@ export function prepConfig(opts: PrepConfigOpts) {
     isTime: false,
     // distribution: ScaleDistribution.Ordinal, // does not work with facets/scatter yet
     orientation: ScaleOrientation.Vertical,
-    direction: ScaleDirection.Up,
+    direction: yAxisReverse ? ScaleDirection.Down : ScaleDirection.Up,
     // should be tweakable manually
     distribution: shouldUseLogScale ? ScaleDistribution.Log : ScaleDistribution.Linear,
     log: 2,
     range: shouldUseLogScale
       ? undefined
       : (u, dataMin, dataMax) => {
-          const bucketSize = dataRef.current?.yBucketSize;
+          let bucketSize = dataRef.current?.yBucketSize;
+
+          if (bucketSize === 0) {
+            bucketSize = 1;
+          }
 
           if (bucketSize) {
             if (dataRef.current?.yLayout === BucketLayout.le) {
@@ -302,7 +308,11 @@ export function prepConfig(opts: PrepConfigOpts) {
       gap: cellGap,
       hideThreshold,
       xAlign: dataRef.current?.xLayout === BucketLayout.le ? -1 : dataRef.current?.xLayout === BucketLayout.ge ? 1 : 0,
-      yAlign: dataRef.current?.yLayout === BucketLayout.le ? -1 : dataRef.current?.yLayout === BucketLayout.ge ? 1 : 0,
+      yAlign: ((dataRef.current?.yLayout === BucketLayout.le
+        ? -1
+        : dataRef.current?.yLayout === BucketLayout.ge
+        ? 1
+        : 0) * (yAxisReverse ? -1 : 1)) as -1 | 0 | 1,
       disp: {
         fill: {
           values: (u, seriesIdx) => {
@@ -437,7 +447,7 @@ export function heatmapPathsDense(opts: PathbuilderOpts) {
         // detect x and y bin qtys by detecting layout repetition in x & y data
         let yBinQty = dlen - ys.lastIndexOf(ys[0]);
         let xBinQty = dlen / yBinQty;
-        let yBinIncr = ys[1] - ys[0];
+        let yBinIncr = ys[1] - ys[0] || scaleY.max! - scaleY.min!;
         let xBinIncr = xs[yBinQty] - xs[0];
 
         // uniform tile sizes based on zoom level

From 50ada76a7d3e6e54bd74155059f3a9edaa784eab Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 30 May 2022 23:47:14 -0400
Subject: [PATCH 091/103] PanelEditor: Fixes issue with Table view and multi
 data frames (#49854) (#49866)

(cherry picked from commit 056a1fec3d20ae9c9f79e5ef097e0ebaba77441e)

Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
---
 public/app/plugins/panel/table/TablePanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx
index d80d4234842..9e35be29ec8 100644
--- a/public/app/plugins/panel/table/TablePanel.tsx
+++ b/public/app/plugins/panel/table/TablePanel.tsx
@@ -145,7 +145,7 @@ export class TablePanel extends Component<Props> {
 
       return (
         <div className={tableStyles.wrapper}>
-          {this.renderTable(data.series[currentIndex], width, height - inputHeight + padding)}
+          {this.renderTable(data.series[currentIndex], width, height - inputHeight - padding)}
           <div className={tableStyles.selectWrapper}>
             <Select options={names} value={names[currentIndex]} onChange={this.onChangeTableSelection} />
           </div>

From f7d8974f524f472726f14e140b09e1d8ea7d11b7 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 02:36:17 -0400
Subject: [PATCH 092/103] Angular: Remove deprecated angular modal support and
 libs (#49781) (#49869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8fa8c9dc8b6922110d154705b9d822bb5319819d)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 public/app/angular/AngularApp.ts             |   10 +-
 public/app/angular/services/UtilSrv.ts       |   36 +-
 public/vendor/angular-other/angular-strap.js |  198 ----
 public/vendor/angular-other/datepicker.js    | 1046 ------------------
 public/vendor/angular-other/timepicker.js    |  888 ---------------
 5 files changed, 5 insertions(+), 2173 deletions(-)
 delete mode 100644 public/vendor/angular-other/angular-strap.js
 delete mode 100644 public/vendor/angular-other/datepicker.js
 delete mode 100644 public/vendor/angular-other/timepicker.js

diff --git a/public/app/angular/AngularApp.ts b/public/app/angular/AngularApp.ts
index 7bbdeba9768..5aa1e03bad3 100644
--- a/public/app/angular/AngularApp.ts
+++ b/public/app/angular/AngularApp.ts
@@ -3,7 +3,6 @@ import 'angular-route';
 import 'angular-sanitize';
 import 'angular-bindonce';
 import 'vendor/bootstrap/bootstrap';
-import 'vendor/angular-other/angular-strap';
 
 import angular from 'angular'; // eslint-disable-line no-duplicate-imports
 import { extend } from 'lodash';
@@ -78,14 +77,7 @@ export class AngularApp {
       }
     );
 
-    this.ngModuleDependencies = [
-      'grafana.core',
-      'ngSanitize',
-      '$strap.directives',
-      'grafana',
-      'pasvaz.bindonce',
-      'react',
-    ];
+    this.ngModuleDependencies = ['grafana.core', 'ngSanitize', 'grafana', 'pasvaz.bindonce', 'react'];
 
     // makes it possible to add dynamic stuff
     angularModules.forEach((m: angular.IModule) => {
diff --git a/public/app/angular/services/UtilSrv.ts b/public/app/angular/services/UtilSrv.ts
index af45b08cc7a..86afcf639b9 100644
--- a/public/app/angular/services/UtilSrv.ts
+++ b/public/app/angular/services/UtilSrv.ts
@@ -1,5 +1,4 @@
 import { deprecationWarning } from '@grafana/data';
-import { GrafanaRootScope } from 'app/angular/GrafanaCtrl';
 import { appEvents } from 'app/core/app_events';
 
 import { HideModalEvent, ShowModalEvent } from '../../types/events';
@@ -12,7 +11,7 @@ export class UtilSrv {
   modalScope: any;
 
   /** @ngInject */
-  constructor(private $rootScope: GrafanaRootScope, private $modal: any) {}
+  constructor() {}
 
   init() {
     appEvents.subscribe(ShowModalEvent, (e) => this.showModal(e.payload));
@@ -23,43 +22,16 @@ export class UtilSrv {
    * @deprecated use showModalReact instead that has this capability built in
    */
   hideModal() {
-    deprecationWarning('UtilSrv', 'hideModal', 'showModalReact');
+    deprecationWarning('UtilSrv', 'hideModal', '');
     if (this.modalScope && this.modalScope.dismiss) {
       this.modalScope.dismiss();
     }
   }
 
   /**
-   * @deprecated use showModalReact instead
+   * @deprecated
    */
   showModal(options: any) {
-    deprecationWarning('UtilSrv', 'showModal', 'showModalReact');
-    if (this.modalScope && this.modalScope.dismiss) {
-      this.modalScope.dismiss();
-    }
-
-    this.modalScope = options.scope;
-
-    if (options.model) {
-      this.modalScope = this.$rootScope.$new();
-      this.modalScope.model = options.model;
-    } else if (!this.modalScope) {
-      this.modalScope = this.$rootScope.$new();
-    }
-
-    const modal = this.$modal({
-      modalClass: options.modalClass,
-      template: options.src,
-      templateHtml: options.templateHtml,
-      persist: false,
-      show: false,
-      scope: this.modalScope,
-      keyboard: false,
-      backdrop: options.backdrop,
-    });
-
-    Promise.resolve(modal).then((modalEl) => {
-      modalEl.modal('show');
-    });
+    deprecationWarning('UtilSrv', 'showModal', 'publish ShowModalReactEvent');
   }
 }
diff --git a/public/vendor/angular-other/angular-strap.js b/public/vendor/angular-other/angular-strap.js
deleted file mode 100644
index 3670f3f8ac4..00000000000
--- a/public/vendor/angular-other/angular-strap.js
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * AngularStrap - Twitter Bootstrap directives for AngularJS
- * @version v0.7.5 - 2013-07-21
- * @link http://mgcrea.github.com/angular-strap
- * @author Olivier Louvignes <olivier@mg-crea.com>
- * @license MIT License, http://www.opensource.org/licenses/MIT
- */
-angular.module('$strap.config', []).value('$strapConfig', {});
-angular.module('$strap.filters', ['$strap.config']);
-angular.module('$strap.directives', ['$strap.config']);
-angular.module('$strap', [
-  '$strap.filters',
-  '$strap.directives',
-  '$strap.config'
-]);
-'use strict';
-angular.module('$strap.directives').factory('$modal', [
-  '$rootScope',
-  '$compile',
-  '$http',
-  '$timeout',
-  '$q',
-  '$templateCache',
-  '$strapConfig',
-  function ($rootScope, $compile, $http, $timeout, $q, $templateCache, $strapConfig) {
-    var ModalFactory = function ModalFactory(config) {
-      function Modal(config) {
-        var options = angular.extend({ show: true }, $strapConfig.modal, config);
-        var scope = options.scope ? options.scope : $rootScope.$new()
-        var templateUrl = options.template;
-        return $q.when(options.templateHtml || $templateCache.get(templateUrl) || $http.get(templateUrl, { cache: true }).then(function (res) {
-          return res.data;
-        })).then(function onSuccess(template) {
-          var id = scope.$id;
-          if (templateUrl) {
-            id += templateUrl.replace('.html', '').replace(/[\/|\.|:]/g, '-');
-          }
-          // grafana change, removed fade
-          var $modal = $('<div class="modal hide" tabindex="-1"></div>').attr('id', id).html(template);
-          if (options.modalClass)
-            $modal.addClass(options.modalClass);
-          $('body').append($modal);
-          $timeout(function () {
-            $compile($modal)(scope);
-          });
-          scope.$modal = function (name) {
-            $modal.modal(name);
-          };
-          angular.forEach([
-            'show',
-            'hide'
-          ], function (name) {
-            scope[name] = function () {
-              $modal.modal(name);
-            };
-          });
-          scope.dismiss = scope.hide;
-          angular.forEach([
-            'show',
-            'shown',
-            'hide',
-            'hidden'
-          ], function (name) {
-            $modal.on(name, function (ev) {
-              scope.$emit('modal-' + name, ev);
-            });
-          });
-          $modal.on('shown', function (ev) {
-            $('input[autofocus], textarea[autofocus]', $modal).first().trigger('focus');
-          });
-          $modal.on('hidden', function (ev) {
-            if (!options.persist)
-              scope.$destroy();
-          });
-          scope.$on('$destroy', function () {
-            $modal.remove();
-          });
-          $modal.modal(options);
-          return $modal;
-        });
-      }
-      return new Modal(config);
-    };
-    return ModalFactory;
-  }
-])
-
-'use strict';
-angular.module('$strap.directives').directive('bsTooltip', [
-  '$parse',
-  '$compile',
-  function ($parse, $compile) {
-    return {
-      restrict: 'A',
-      scope: true,
-      link: function postLink(scope, element, attrs, ctrl) {
-        var getter = $parse(attrs.bsTooltip), setter = getter.assign, value = getter(scope);
-        scope.$watch(attrs.bsTooltip, function (newValue, oldValue) {
-          if (newValue !== oldValue) {
-            value = newValue;
-          }
-        });
-        // Grafana change, always hide other tooltips
-        if (true) {
-          element.on('show', function (ev) {
-            $('.tooltip.in').each(function () {
-              var $this = $(this), tooltip = $this.data('tooltip');
-              if (tooltip && !tooltip.$element.is(element)) {
-                $this.tooltip('hide');
-              }
-            });
-          });
-        }
-        element.tooltip({
-          title: function () {
-            return angular.isFunction(value) ? value.apply(null, arguments) : value;
-          },
-          html: true,
-          container: 'body', // Grafana change
-        });
-        var tooltip = element.data('tooltip');
-        tooltip.show = function () {
-          var r = $.fn.tooltip.Constructor.prototype.show.apply(this, arguments);
-          this.tip().data('tooltip', this);
-          return r;
-        };
-        scope._tooltip = function (event) {
-          element.tooltip(event);
-        };
-        scope.hide = function () {
-          element.tooltip('hide');
-        };
-        scope.show = function () {
-          element.tooltip('show');
-        };
-        scope.dismiss = scope.hide;
-      }
-    };
-  }
-]);
-
-'use strict';
-angular.module('$strap.directives').directive('bsTypeahead', [
-  '$parse',
-  function ($parse) {
-    return {
-      restrict: 'A',
-      require: '?ngModel',
-      link: function postLink(scope, element, attrs, controller) {
-        var getter = $parse(attrs.bsTypeahead), setter = getter.assign, value = getter(scope);
-        scope.$watch(attrs.bsTypeahead, function (newValue, oldValue) {
-          if (newValue !== oldValue) {
-            value = newValue;
-          }
-        });
-        element.attr('data-provide', 'typeahead');
-        element.typeahead({
-          source: function (query) {
-            return angular.isFunction(value) ? value.apply(null, arguments) : value;
-          },
-          minLength: attrs.minLength || 1,
-          items: attrs.items,
-          updater: function (value) {
-            if (controller) {
-              scope.$apply(function () {
-                controller.$setViewValue(value);
-              });
-            }
-            scope.$emit('typeahead-updated', value);
-            return value;
-          }
-        });
-        var typeahead = element.data('typeahead');
-        typeahead.lookup = function (ev) {
-          var items;
-          this.query = this.$element.val() || '';
-          if (this.query.length < this.options.minLength) {
-            return this.shown ? this.hide() : this;
-          }
-          items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source;
-          return items ? this.process(items) : this;
-        };
-        if (!!attrs.matchAll) {
-          typeahead.matcher = function (item) {
-            return true;
-          };
-        }
-        if (attrs.minLength === '0') {
-          setTimeout(function () {
-            element.on('focus', function () {
-              element.val().length === 0 && setTimeout(element.typeahead.bind(element, 'lookup'), 200);
-            });
-          });
-        }
-      }
-    };
-  }
-]);
diff --git a/public/vendor/angular-other/datepicker.js b/public/vendor/angular-other/datepicker.js
deleted file mode 100644
index 0f5f4bad610..00000000000
--- a/public/vendor/angular-other/datepicker.js
+++ /dev/null
@@ -1,1046 +0,0 @@
-/* =========================================================
- * bootstrap-datepicker.js
- * http://www.eyecon.ro/bootstrap-datepicker
- * =========================================================
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-!function( $ ) {
-
-	function UTCDate(){
-		return new Date(Date.UTC.apply(Date, arguments));
-	}
-	function UTCToday(){
-		var today = new Date();
-		return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate());
-	}
-
-	// Picker object
-
-	var Datepicker = function(element, options) {
-		var that = this;
-
-		this.element = $(element);
-		this.language = options.language||this.element.data('date-language')||"en";
-		this.language = this.language in dates ? this.language : this.language.split('-')[0]; //Check if "de-DE" style date is available, if not language should fallback to 2 letter code eg "de"
-		this.language = this.language in dates ? this.language : "en";
-		this.isRTL = dates[this.language].rtl||false;
-		this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||dates[this.language].format||'mm/dd/yyyy');
-		this.isInline = false;
-		this.isInput = this.element.is('input');
-		this.component = this.element.is('.date') ? this.element.find('.add-on, .btn') : false;
-		this.hasInput = this.component && this.element.find('input').length;
-		if(this.component && this.component.length === 0)
-			this.component = false;
-
-		this.forceParse = true;
-		if ('forceParse' in options) {
-			this.forceParse = options.forceParse;
-		} else if ('dateForceParse' in this.element.data()) {
-			this.forceParse = this.element.data('date-force-parse');
-		}
-
-		this.picker = $(DPGlobal.template);
-		this._buildEvents();
-		this._attachEvents();
-
-		if(this.isInline) {
-			this.picker.addClass('datepicker-inline').appendTo(this.element);
-		} else {
-			this.picker.addClass('datepicker-dropdown dropdown-menu');
-		}
-		if (this.isRTL){
-			this.picker.addClass('datepicker-rtl');
-			this.picker.find('.prev i, .next i')
-						.toggleClass('icon-arrow-left icon-arrow-right');
-		}
-
-		this.autoclose = false;
-		if ('autoclose' in options) {
-			this.autoclose = options.autoclose;
-		} else if ('dateAutoclose' in this.element.data()) {
-			this.autoclose = this.element.data('date-autoclose');
-		}
-
-		this.keyboardNavigation = true;
-		if ('keyboardNavigation' in options) {
-			this.keyboardNavigation = options.keyboardNavigation;
-		} else if ('dateKeyboardNavigation' in this.element.data()) {
-			this.keyboardNavigation = this.element.data('date-keyboard-navigation');
-		}
-
-		this.viewMode = this.startViewMode = 0;
-		switch(options.startView || this.element.data('date-start-view')){
-			case 2:
-			case 'decade':
-				this.viewMode = this.startViewMode = 2;
-				break;
-			case 1:
-			case 'year':
-				this.viewMode = this.startViewMode = 1;
-				break;
-		}
-
-		this.minViewMode = options.minViewMode||this.element.data('date-min-view-mode')||0;
-		if (typeof this.minViewMode === 'string') {
-			switch (this.minViewMode) {
-				case 'months':
-					this.minViewMode = 1;
-					break;
-				case 'years':
-					this.minViewMode = 2;
-					break;
-				default:
-					this.minViewMode = 0;
-					break;
-			}
-		}
-
-		this.viewMode = this.startViewMode = Math.max(this.startViewMode, this.minViewMode);
-
-		this.todayBtn = (options.todayBtn||this.element.data('date-today-btn')||false);
-		this.todayHighlight = (options.todayHighlight||this.element.data('date-today-highlight')||false);
-
-		this.calendarWeeks = false;
-		if ('calendarWeeks' in options) {
-			this.calendarWeeks = options.calendarWeeks;
-		} else if ('dateCalendarWeeks' in this.element.data()) {
-			this.calendarWeeks = this.element.data('date-calendar-weeks');
-		}
-		if (this.calendarWeeks)
-			this.picker.find('tfoot th.today')
-						.attr('colspan', function(i, val){
-							return parseInt(val) + 1;
-						});
-
-		this._allow_update = false;
-
-		this.weekStart = ((options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0) % 7);
-		this.weekEnd = ((this.weekStart + 6) % 7);
-		this.startDate = -Infinity;
-		this.endDate = Infinity;
-		this.daysOfWeekDisabled = [];
-		this.setStartDate(options.startDate||this.element.data('date-startdate'));
-		this.setEndDate(options.endDate||this.element.data('date-enddate'));
-		this.setDaysOfWeekDisabled(options.daysOfWeekDisabled||this.element.data('date-days-of-week-disabled'));
-		this.fillDow();
-		this.fillMonths();
-
-		this._allow_update = true;
-
-		this.update();
-		this.showMode();
-
-		if(this.isInline) {
-			this.show();
-		}
-	};
-
-	Datepicker.prototype = {
-		constructor: Datepicker,
-
-		_events: [],
-		_secondaryEvents: [],
-		_applyEvents: function(evs){
-			for (var i=0, el, ev; i<evs.length; i++){
-				el = evs[i][0];
-				ev = evs[i][1];
-				el.on(ev);
-			}
-		},
-		_unapplyEvents: function(evs){
-			for (var i=0, el, ev; i<evs.length; i++){
-				el = evs[i][0];
-				ev = evs[i][1];
-				el.off(ev);
-			}
-		},
-		_buildEvents: function(){
-			if (this.isInput) { // single input
-				this._events = [
-					[this.element, {
-						focus: $.proxy(this.show, this),
-						keyup: $.proxy(this.update, this),
-						keydown: $.proxy(this.keydown, this)
-					}]
-				];
-			}
-			else if (this.component && this.hasInput){ // component: input + button
-				this._events = [
-					// For components that are not readonly, allow keyboard nav
-					[this.element.find('input'), {
-						focus: $.proxy(this.show, this),
-						keyup: $.proxy(this.update, this),
-						keydown: $.proxy(this.keydown, this)
-					}],
-					[this.component, {
-						click: $.proxy(this.show, this)
-					}]
-				];
-			}
-			else if (this.element.is('div')) {  // inline datepicker
-				this.isInline = true;
-			}
-			else {
-				this._events = [
-					[this.element, {
-						click: $.proxy(this.show, this)
-					}]
-				];
-			}
-
-			this._secondaryEvents = [
-				[this.picker, {
-					click: $.proxy(this.click, this)
-				}],
-				[$(window), {
-					resize: $.proxy(this.place, this)
-				}],
-				[$(document), {
-					mousedown: $.proxy(function (e) {
-						// Clicked outside the datepicker, hide it
-						if ($(e.target).closest('.datepicker.datepicker-inline, .datepicker.datepicker-dropdown').length === 0) {
-							this.hide();
-						}
-					}, this)
-				}]
-			];
-		},
-		_attachEvents: function(){
-			this._detachEvents();
-			this._applyEvents(this._events);
-		},
-		_detachEvents: function(){
-			this._unapplyEvents(this._events);
-		},
-		_attachSecondaryEvents: function(){
-			this._detachSecondaryEvents();
-			this._applyEvents(this._secondaryEvents);
-		},
-		_detachSecondaryEvents: function(){
-			this._unapplyEvents(this._secondaryEvents);
-		},
-
-		show: function(e) {
-			if (!this.isInline)
-				this.picker.appendTo('body');
-			this.picker.show();
-			this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
-			this.place();
-			this._attachSecondaryEvents();
-			if (e) {
-				e.preventDefault();
-			}
-			this.element.trigger({
-				type: 'show',
-				date: this.date
-			});
-		},
-
-		hide: function(e){
-			if(this.isInline) return;
-			if (!this.picker.is(':visible')) return;
-			this.picker.hide().detach();
-			this._detachSecondaryEvents();
-			this.viewMode = this.startViewMode;
-			this.showMode();
-
-			if (
-				this.forceParse &&
-				(
-					this.isInput && this.element.val() ||
-					this.hasInput && this.element.find('input').val()
-				)
-			)
-				this.setValue();
-			this.element.trigger({
-				type: 'hide',
-				date: this.date
-			});
-		},
-
-		remove: function() {
-			this.hide();
-			this._detachEvents();
-			this._detachSecondaryEvents();
-			this.picker.remove();
-			delete this.element.data().datepicker;
-			if (!this.isInput) {
-				delete this.element.data().date;
-			}
-		},
-
-		getDate: function() {
-			var d = this.getUTCDate();
-			return new Date(d.getTime() + (d.getTimezoneOffset()*60000));
-		},
-
-		getUTCDate: function() {
-			return this.date;
-		},
-
-		setDate: function(d) {
-			this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset()*60000)));
-		},
-
-		setUTCDate: function(d) {
-			this.date = d;
-			this.setValue();
-		},
-
-		setValue: function() {
-			var formatted = this.getFormattedDate();
-			if (!this.isInput) {
-				if (this.component){
-					this.element.find('input').val(formatted);
-				}
-				this.element.data('date', formatted);
-			} else {
-				this.element.val(formatted);
-			}
-		},
-
-		getFormattedDate: function(format) {
-			if (format === undefined)
-				format = this.format;
-			return DPGlobal.formatDate(this.date, format, this.language);
-		},
-
-		setStartDate: function(startDate){
-			this.startDate = startDate||-Infinity;
-			if (this.startDate !== -Infinity) {
-				this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language);
-			}
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setEndDate: function(endDate){
-			this.endDate = endDate||Infinity;
-			if (this.endDate !== Infinity) {
-				this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language);
-			}
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setDaysOfWeekDisabled: function(daysOfWeekDisabled){
-			this.daysOfWeekDisabled = daysOfWeekDisabled||[];
-			if (!$.isArray(this.daysOfWeekDisabled)) {
-				this.daysOfWeekDisabled = this.daysOfWeekDisabled.split(/,\s*/);
-			}
-			this.daysOfWeekDisabled = $.map(this.daysOfWeekDisabled, function (d) {
-				return parseInt(d, 10);
-			});
-			this.update();
-			this.updateNavArrows();
-		},
-
-		place: function(){
-						if(this.isInline) return;
-			var zIndex = parseInt(this.element.parents().filter(function() {
-							return $(this).css('z-index') != 'auto';
-						}).first().css('z-index'))+10;
-			var offset = this.component ? this.component.parent().offset() : this.element.offset();
-			var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(true);
-			this.picker.css({
-				top: offset.top + height,
-				left: offset.left,
-				zIndex: zIndex
-			});
-		},
-
-		_allow_update: true,
-		update: function(){
-			if (!this._allow_update) return;
-
-			var date, fromArgs = false;
-			if(arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) {
-				date = arguments[0];
-				fromArgs = true;
-			} else {
-				date = this.isInput ? this.element.val() : this.element.data('date') || this.element.find('input').val();
-			}
-
-			this.date = DPGlobal.parseDate(date, this.format, this.language);
-
-			if(fromArgs) this.setValue();
-
-			if (this.date < this.startDate) {
-				this.viewDate = new Date(this.startDate);
-			} else if (this.date > this.endDate) {
-				this.viewDate = new Date(this.endDate);
-			} else {
-				this.viewDate = new Date(this.date);
-			}
-			this.fill();
-		},
-
-		fillDow: function(){
-			var dowCnt = this.weekStart,
-			html = '<tr>';
-			if(this.calendarWeeks){
-				var cell = '<th class="cw">&nbsp;</th>';
-				html += cell;
-				this.picker.find('.datepicker-days thead tr:first-child').prepend(cell);
-			}
-			while (dowCnt < this.weekStart + 7) {
-				html += '<th class="dow">'+dates[this.language].daysMin[(dowCnt++)%7]+'</th>';
-			}
-			html += '</tr>';
-			this.picker.find('.datepicker-days thead').append(html);
-		},
-
-		fillMonths: function(){
-			var html = '',
-			i = 0;
-			while (i < 12) {
-				html += '<span class="month">'+dates[this.language].monthsShort[i++]+'</span>';
-			}
-			this.picker.find('.datepicker-months td').html(html);
-		},
-
-		fill: function() {
-			var d = new Date(this.viewDate),
-				year = d.getUTCFullYear(),
-				month = d.getUTCMonth(),
-				startYear = this.startDate !== -Infinity ? this.startDate.getUTCFullYear() : -Infinity,
-				startMonth = this.startDate !== -Infinity ? this.startDate.getUTCMonth() : -Infinity,
-				endYear = this.endDate !== Infinity ? this.endDate.getUTCFullYear() : Infinity,
-				endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() : Infinity,
-				currentDate = this.date && this.date.valueOf(),
-				today = new Date();
-			this.picker.find('.datepicker-days thead th.switch')
-						.text(dates[this.language].months[month]+' '+year);
-			this.picker.find('tfoot th.today')
-						.text(dates[this.language].today)
-						.toggle(this.todayBtn !== false);
-			this.updateNavArrows();
-			this.fillMonths();
-			var prevMonth = UTCDate(year, month-1, 28,0,0,0,0),
-				day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth());
-			prevMonth.setUTCDate(day);
-			prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7)%7);
-			var nextMonth = new Date(prevMonth);
-			nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
-			nextMonth = nextMonth.valueOf();
-			var html = [];
-			var clsName;
-			while(prevMonth.valueOf() < nextMonth) {
-				if (prevMonth.getUTCDay() == this.weekStart) {
-					html.push('<tr>');
-					if(this.calendarWeeks){
-						// ISO 8601: First week contains first thursday.
-						// ISO also states week starts on Monday, but we can be more abstract here.
-						var
-							// Start of current week: based on weekstart/current date
-							ws = new Date(+prevMonth + (this.weekStart - prevMonth.getUTCDay() - 7) % 7 * 864e5),
-							// Thursday of this week
-							th = new Date(+ws + (7 + 4 - ws.getUTCDay()) % 7 * 864e5),
-							// First Thursday of year, year from thursday
-							yth = new Date(+(yth = UTCDate(th.getUTCFullYear(), 0, 1)) + (7 + 4 - yth.getUTCDay())%7*864e5),
-							// Calendar week: ms between thursdays, div ms per day, div 7 days
-							calWeek =  (th - yth) / 864e5 / 7 + 1;
-						html.push('<td class="cw">'+ calWeek +'</td>');
-
-					}
-				}
-				clsName = '';
-				if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) {
-					clsName += ' old';
-				} else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) {
-					clsName += ' new';
-				}
-				// Compare internal UTC date with local today, not UTC today
-				if (this.todayHighlight &&
-					prevMonth.getUTCFullYear() == today.getFullYear() &&
-					prevMonth.getUTCMonth() == today.getMonth() &&
-					prevMonth.getUTCDate() == today.getDate()) {
-					clsName += ' today';
-				}
-				if (currentDate && prevMonth.valueOf() == currentDate) {
-					clsName += ' active';
-				}
-				if (prevMonth.valueOf() < this.startDate || prevMonth.valueOf() > this.endDate ||
-					$.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) {
-					clsName += ' disabled';
-				}
-				html.push('<td class="day'+clsName+'">'+prevMonth.getUTCDate() + '</td>');
-				if (prevMonth.getUTCDay() == this.weekEnd) {
-					html.push('</tr>');
-				}
-				prevMonth.setUTCDate(prevMonth.getUTCDate()+1);
-			}
-			this.picker.find('.datepicker-days tbody').empty().append(html.join(''));
-			var currentYear = this.date && this.date.getUTCFullYear();
-
-			var months = this.picker.find('.datepicker-months')
-						.find('th:eq(1)')
-							.text(year)
-							.end()
-						.find('span').removeClass('active');
-			if (currentYear && currentYear == year) {
-				months.eq(this.date.getUTCMonth()).addClass('active');
-			}
-			if (year < startYear || year > endYear) {
-				months.addClass('disabled');
-			}
-			if (year == startYear) {
-				months.slice(0, startMonth).addClass('disabled');
-			}
-			if (year == endYear) {
-				months.slice(endMonth+1).addClass('disabled');
-			}
-
-			html = '';
-			year = parseInt(year/10, 10) * 10;
-			var yearCont = this.picker.find('.datepicker-years')
-								.find('th:eq(1)')
-									.text(year + '-' + (year + 9))
-									.end()
-								.find('td');
-			year -= 1;
-			for (var i = -1; i < 11; i++) {
-				html += '<span class="year'+(i == -1 || i == 10 ? ' old' : '')+(currentYear == year ? ' active' : '')+(year < startYear || year > endYear ? ' disabled' : '')+'">'+year+'</span>';
-				year += 1;
-			}
-			yearCont.html(html);
-		},
-
-		updateNavArrows: function() {
-			if (!this._allow_update) return;
-
-			var d = new Date(this.viewDate),
-				year = d.getUTCFullYear(),
-				month = d.getUTCMonth();
-			switch (this.viewMode) {
-				case 0:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() && month <= this.startDate.getUTCMonth()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() && month >= this.endDate.getUTCMonth()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-				case 1:
-				case 2:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-			}
-		},
-
-		click: function(e) {
-			e.preventDefault();
-			var target = $(e.target).closest('span, td, th');
-			if (target.length == 1) {
-				switch(target[0].nodeName.toLowerCase()) {
-					case 'th':
-						switch(target[0].className) {
-							case 'switch':
-								this.showMode(1);
-								break;
-							case 'prev':
-							case 'next':
-								var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
-								switch(this.viewMode){
-									case 0:
-										this.viewDate = this.moveMonth(this.viewDate, dir);
-										break;
-									case 1:
-									case 2:
-										this.viewDate = this.moveYear(this.viewDate, dir);
-										break;
-								}
-								this.fill();
-								break;
-							case 'today':
-								var date = new Date();
-								date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
-
-								this.showMode(-2);
-								var which = this.todayBtn == 'linked' ? null : 'view';
-								this._setDate(date, which);
-								break;
-						}
-						break;
-					case 'span':
-						if (!target.is('.disabled')) {
-							this.viewDate.setUTCDate(1);
-							if (target.is('.month')) {
-								var day = 1;
-								var month = target.parent().find('span').index(target);
-								var year = this.viewDate.getUTCFullYear();
-								this.viewDate.setUTCMonth(month);
-								this.element.trigger({
-									type: 'changeMonth',
-									date: this.viewDate
-								});
-								if ( this.minViewMode == 1 ) {
-									this._setDate(UTCDate(year, month, day,0,0,0,0));
-								}
-							} else {
-								var year = parseInt(target.text(), 10)||0;
-								var day = 1;
-								var month = 0;
-								this.viewDate.setUTCFullYear(year);
-								this.element.trigger({
-									type: 'changeYear',
-									date: this.viewDate
-								});
-								if ( this.minViewMode == 2 ) {
-									this._setDate(UTCDate(year, month, day,0,0,0,0));
-								}
-							}
-							this.showMode(-1);
-							this.fill();
-						}
-						break;
-					case 'td':
-						if (target.is('.day') && !target.is('.disabled')){
-							var day = parseInt(target.text(), 10)||1;
-							var year = this.viewDate.getUTCFullYear(),
-								month = this.viewDate.getUTCMonth();
-							if (target.is('.old')) {
-								if (month === 0) {
-									month = 11;
-									year -= 1;
-								} else {
-									month -= 1;
-								}
-							} else if (target.is('.new')) {
-								if (month == 11) {
-									month = 0;
-									year += 1;
-								} else {
-									month += 1;
-								}
-							}
-							this._setDate(UTCDate(year, month, day,0,0,0,0));
-						}
-						break;
-				}
-			}
-		},
-
-		_setDate: function(date, which){
-			if (!which || which == 'date')
-				this.date = date;
-			if (!which || which  == 'view')
-				this.viewDate = date;
-			this.fill();
-			this.setValue();
-			this.element.trigger({
-				type: 'changeDate',
-				date: this.date
-			});
-			var element;
-			if (this.isInput) {
-				element = this.element;
-			} else if (this.component){
-				element = this.element.find('input');
-			}
-			if (element) {
-				element.change();
-				if (this.autoclose && (!which || which == 'date')) {
-					this.hide();
-				}
-			}
-		},
-
-		moveMonth: function(date, dir){
-			if (!dir) return date;
-			var new_date = new Date(date.valueOf()),
-				day = new_date.getUTCDate(),
-				month = new_date.getUTCMonth(),
-				mag = Math.abs(dir),
-				new_month, test;
-			dir = dir > 0 ? 1 : -1;
-			if (mag == 1){
-				test = dir == -1
-					// If going back one month, make sure month is not current month
-					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
-					? function(){ return new_date.getUTCMonth() == month; }
-					// If going forward one month, make sure month is as expected
-					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
-					: function(){ return new_date.getUTCMonth() != new_month; };
-				new_month = month + dir;
-				new_date.setUTCMonth(new_month);
-				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
-				if (new_month < 0 || new_month > 11)
-					new_month = (new_month + 12) % 12;
-			} else {
-				// For magnitudes >1, move one month at a time...
-				for (var i=0; i<mag; i++)
-					// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
-					new_date = this.moveMonth(new_date, dir);
-				// ...then reset the day, keeping it in the new month
-				new_month = new_date.getUTCMonth();
-				new_date.setUTCDate(day);
-				test = function(){ return new_month != new_date.getUTCMonth(); };
-			}
-			// Common date-resetting loop -- if date is beyond end of month, make it
-			// end of month
-			while (test()){
-				new_date.setUTCDate(--day);
-				new_date.setUTCMonth(new_month);
-			}
-			return new_date;
-		},
-
-		moveYear: function(date, dir){
-			return this.moveMonth(date, dir*12);
-		},
-
-		dateWithinRange: function(date){
-			return date >= this.startDate && date <= this.endDate;
-		},
-
-		keydown: function(e){
-			if (this.picker.is(':not(:visible)')){
-				if (e.keyCode == 27) // allow escape to hide and re-show picker
-					this.show();
-				return;
-			}
-			var dateChanged = false,
-				dir, day, month,
-				newDate, newViewDate;
-			switch(e.keyCode){
-				case 27: // escape
-					this.hide();
-					e.preventDefault();
-					break;
-				case 37: // left
-				case 39: // right
-					if (!this.keyboardNavigation) break;
-					dir = e.keyCode == 37 ? -1 : 1;
-					if (e.ctrlKey){
-						newDate = this.moveYear(this.date, dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (e.shiftKey){
-						newDate = this.moveMonth(this.date, dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else {
-						newDate = new Date(this.date);
-						newDate.setUTCDate(this.date.getUTCDate() + dir);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir);
-					}
-					if (this.dateWithinRange(newDate)){
-						this.date = newDate;
-						this.viewDate = newViewDate;
-						this.setValue();
-						this.update();
-						e.preventDefault();
-						dateChanged = true;
-					}
-					break;
-				case 38: // up
-				case 40: // down
-					if (!this.keyboardNavigation) break;
-					dir = e.keyCode == 38 ? -1 : 1;
-					if (e.ctrlKey){
-						newDate = this.moveYear(this.date, dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (e.shiftKey){
-						newDate = this.moveMonth(this.date, dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else {
-						newDate = new Date(this.date);
-						newDate.setUTCDate(this.date.getUTCDate() + dir * 7);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir * 7);
-					}
-					if (this.dateWithinRange(newDate)){
-						this.date = newDate;
-						this.viewDate = newViewDate;
-						this.setValue();
-						this.update();
-						e.preventDefault();
-						dateChanged = true;
-					}
-					break;
-				case 13: // enter
-					this.hide();
-					e.preventDefault();
-					break;
-				case 9: // tab
-					this.hide();
-					break;
-			}
-			if (dateChanged){
-				this.element.trigger({
-					type: 'changeDate',
-					date: this.date
-				});
-				var element;
-				if (this.isInput) {
-					element = this.element;
-				} else if (this.component){
-					element = this.element.find('input');
-				}
-				if (element) {
-					element.change();
-				}
-			}
-		},
-
-		showMode: function(dir) {
-			if (dir) {
-				this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir));
-			}
-			/*
-				vitalets: fixing bug of very special conditions:
-				jquery 1.7.1 + webkit + show inline datepicker in bootstrap popover.
-				Method show() does not set display css correctly and datepicker is not shown.
-				Changed to .css('display', 'block') solve the problem.
-				See https://github.com/vitalets/x-editable/issues/37
-
-				In jquery 1.7.2+ everything works fine.
-			*/
-			//this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
-			this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
-			this.updateNavArrows();
-		}
-	};
-
-	$.fn.datepicker = function ( option ) {
-		var args = Array.apply(null, arguments);
-		args.shift();
-		return this.each(function () {
-			var $this = $(this),
-				data = $this.data('datepicker'),
-				options = typeof option == 'object' && option;
-			if (!data) {
-				$this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options))));
-			}
-			if (typeof option == 'string' && typeof data[option] == 'function') {
-				data[option].apply(data, args);
-			}
-		});
-	};
-
-	$.fn.datepicker.defaults = {
-	};
-	$.fn.datepicker.Constructor = Datepicker;
-	var dates = $.fn.datepicker.dates = {
-		en: {
-			days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
-			daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-			daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
-			months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-			monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-			today: "Today"
-		}
-	};
-
-	var DPGlobal = {
-		modes: [
-			{
-				clsName: 'days',
-				navFnc: 'Month',
-				navStep: 1
-			},
-			{
-				clsName: 'months',
-				navFnc: 'FullYear',
-				navStep: 1
-			},
-			{
-				clsName: 'years',
-				navFnc: 'FullYear',
-				navStep: 10
-		}],
-		isLeapYear: function (year) {
-			return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0));
-		},
-		getDaysInMonth: function (year, month) {
-			return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
-		},
-		validParts: /dd?|DD?|mm?|MM?|yy(?:yy)?/g,
-		nonpunctuation: /[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g,
-		parseFormat: function(format){
-			// IE treats \0 as a string end in inputs (truncating the value),
-			// so it's a bad format delimiter, anyway
-			var separators = format.replace(this.validParts, '\0').split('\0'),
-				parts = format.match(this.validParts);
-			if (!separators || !separators.length || !parts || parts.length === 0){
-				throw new Error("Invalid date format.");
-			}
-			return {separators: separators, parts: parts};
-		},
-		parseDate: function(date, format, language) {
-			if (date instanceof Date) return date;
-			if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)) {
-				var part_re = /([\-+]\d+)([dmwy])/,
-					parts = date.match(/([\-+]\d+)([dmwy])/g),
-					part, dir;
-				date = new Date();
-				for (var i=0; i<parts.length; i++) {
-					part = part_re.exec(parts[i]);
-					dir = parseInt(part[1]);
-					switch(part[2]){
-						case 'd':
-							date.setUTCDate(date.getUTCDate() + dir);
-							break;
-						case 'm':
-							date = Datepicker.prototype.moveMonth.call(Datepicker.prototype, date, dir);
-							break;
-						case 'w':
-							date.setUTCDate(date.getUTCDate() + dir * 7);
-							break;
-						case 'y':
-							date = Datepicker.prototype.moveYear.call(Datepicker.prototype, date, dir);
-							break;
-					}
-				}
-				return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), 0, 0, 0);
-			}
-			var parts = date && date.match(this.nonpunctuation) || [],
-				date = new Date(),
-				parsed = {},
-				setters_order = ['yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'],
-				setters_map = {
-					yyyy: function(d,v){ return d.setUTCFullYear(v); },
-					yy: function(d,v){ return d.setUTCFullYear(2000+v); },
-					m: function(d,v){
-						v -= 1;
-						while (v<0) v += 12;
-						v %= 12;
-						d.setUTCMonth(v);
-						while (d.getUTCMonth() != v)
-							d.setUTCDate(d.getUTCDate()-1);
-						return d;
-					},
-					d: function(d,v){ return d.setUTCDate(v); }
-				},
-				val, filtered, part;
-			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
-			setters_map['dd'] = setters_map['d'];
-			date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
-			var fparts = format.parts.slice();
-			// Remove noop parts
-			if (parts.length != fparts.length) {
-				fparts = $(fparts).filter(function(i,p){
-					return $.inArray(p, setters_order) !== -1;
-				}).toArray();
-			}
-			// Process remainder
-			if (parts.length == fparts.length) {
-				for (var i=0, cnt = fparts.length; i < cnt; i++) {
-					val = parseInt(parts[i], 10);
-					part = fparts[i];
-					if (isNaN(val)) {
-						switch(part) {
-							case 'MM':
-								filtered = $(dates[language].months).filter(function(){
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
-								val = $.inArray(filtered[0], dates[language].months) + 1;
-								break;
-							case 'M':
-								filtered = $(dates[language].monthsShort).filter(function(){
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
-								val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
-								break;
-						}
-					}
-					parsed[part] = val;
-				}
-				for (var i=0, s; i<setters_order.length; i++){
-					s = setters_order[i];
-					if (s in parsed && !isNaN(parsed[s]))
-						setters_map[s](date, parsed[s]);
-				}
-			}
-			return date;
-		},
-		formatDate: function(date, format, language){
-			var val = {
-				d: date.getUTCDate(),
-				D: dates[language].daysShort[date.getUTCDay()],
-				DD: dates[language].days[date.getUTCDay()],
-				m: date.getUTCMonth() + 1,
-				M: dates[language].monthsShort[date.getUTCMonth()],
-				MM: dates[language].months[date.getUTCMonth()],
-				yy: date.getUTCFullYear().toString().substring(2),
-				yyyy: date.getUTCFullYear()
-			};
-			val.dd = (val.d < 10 ? '0' : '') + val.d;
-			val.mm = (val.m < 10 ? '0' : '') + val.m;
-			var date = [],
-				seps = $.extend([], format.separators);
-			for (var i=0, cnt = format.parts.length; i < cnt; i++) {
-				if (seps.length)
-					date.push(seps.shift());
-				date.push(val[format.parts[i]]);
-			}
-			return date.join('');
-		},
-		headTemplate: '<thead>'+
-							'<tr>'+
-								'<th class="prev"><icon name="angle-left"/></th>'+
-								'<th colspan="5" class="switch"></th>'+
-								'<th class="next"><i class="icon-arrow-right"/></th>'+
-							'</tr>'+
-						'</thead>',
-		contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>',
-		footTemplate: '<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'
-	};
-	DPGlobal.template = '<div class="datepicker">'+
-							'<div class="datepicker-days">'+
-								'<table class=" table-condensed">'+
-									DPGlobal.headTemplate+
-									'<tbody></tbody>'+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datepicker-months">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datepicker-years">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-						'</div>';
-
-	$.fn.datepicker.DPGlobal = DPGlobal;
-
-}( window.jQuery );
\ No newline at end of file
diff --git a/public/vendor/angular-other/timepicker.js b/public/vendor/angular-other/timepicker.js
deleted file mode 100644
index e0d9f51b33a..00000000000
--- a/public/vendor/angular-other/timepicker.js
+++ /dev/null
@@ -1,888 +0,0 @@
-/*!
- * Timepicker Component for Twitter Bootstrap
- *
- * Copyright 2013 Joris de Wit
- *
- * Contributors https://github.com/jdewit/bootstrap-timepicker/graphs/contributors
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-(function($, window, document, undefined) {
-  'use strict';
-
-  // TIMEPICKER PUBLIC CLASS DEFINITION
-  var Timepicker = function(element, options) {
-    this.widget = '';
-    this.$element = $(element);
-    this.defaultTime = options.defaultTime;
-    this.disableFocus = options.disableFocus;
-    this.isOpen = options.isOpen;
-    this.minuteStep = options.minuteStep;
-    this.modalBackdrop = options.modalBackdrop;
-    this.secondStep = options.secondStep;
-    this.showInputs = options.showInputs;
-    this.showMeridian = options.showMeridian;
-    this.showSeconds = options.showSeconds;
-    this.template = options.template;
-    this.appendWidgetTo = options.appendWidgetTo;
-
-    this._init();
-  };
-
-  Timepicker.prototype = {
-
-    constructor: Timepicker,
-
-    _init: function() {
-      var self = this;
-
-      if (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend')) {
-        this.$element.parent('.input-append, .input-prepend').find('.add-on').on({
-          'click.timepicker': $.proxy(this.showWidget, this)
-        });
-        this.$element.on({
-          'focus.timepicker': $.proxy(this.highlightUnit, this),
-          'click.timepicker': $.proxy(this.highlightUnit, this),
-          'keydown.timepicker': $.proxy(this.elementKeydown, this),
-          'blur.timepicker': $.proxy(this.blurElement, this)
-        });
-      } else {
-        if (this.template) {
-          this.$element.on({
-            'focus.timepicker': $.proxy(this.showWidget, this),
-            'click.timepicker': $.proxy(this.showWidget, this),
-            'blur.timepicker': $.proxy(this.blurElement, this)
-          });
-        } else {
-          this.$element.on({
-            'focus.timepicker': $.proxy(this.highlightUnit, this),
-            'click.timepicker': $.proxy(this.highlightUnit, this),
-            'keydown.timepicker': $.proxy(this.elementKeydown, this),
-            'blur.timepicker': $.proxy(this.blurElement, this)
-          });
-        }
-      }
-
-      if (this.template !== false) {
-        this.$widget = $(this.getTemplate()).prependTo(this.$element.parents(this.appendWidgetTo)).on('click', $.proxy(this.widgetClick, this));
-      } else {
-        this.$widget = false;
-      }
-
-      if (this.showInputs && this.$widget !== false) {
-        this.$widget.find('input').each(function() {
-          $(this).on({
-            'click.timepicker': function() { $(this).select(); },
-            'keydown.timepicker': $.proxy(self.widgetKeydown, self)
-          });
-        });
-      }
-
-      this.setDefaultTime(this.defaultTime);
-    },
-
-    blurElement: function() {
-      this.highlightedUnit = undefined;
-      this.updateFromElementVal();
-    },
-
-    decrementHour: function() {
-      if (this.showMeridian) {
-        if (this.hour === 1) {
-          this.hour = 12;
-        } else if (this.hour === 12) {
-          this.hour--;
-
-          return this.toggleMeridian();
-        } else if (this.hour === 0) {
-          this.hour = 11;
-
-          return this.toggleMeridian();
-        } else {
-          this.hour--;
-        }
-      } else {
-        if (this.hour === 0) {
-          this.hour = 23;
-        } else {
-          this.hour--;
-        }
-      }
-      this.update();
-    },
-
-    decrementMinute: function(step) {
-      var newVal;
-
-      if (step) {
-        newVal = this.minute - step;
-      } else {
-        newVal = this.minute - this.minuteStep;
-      }
-
-      if (newVal < 0) {
-        this.decrementHour();
-        this.minute = newVal + 60;
-      } else {
-        this.minute = newVal;
-      }
-      this.update();
-    },
-
-    decrementSecond: function() {
-      var newVal = this.second - this.secondStep;
-
-      if (newVal < 0) {
-        this.decrementMinute(true);
-        this.second = newVal + 60;
-      } else {
-        this.second = newVal;
-      }
-      this.update();
-    },
-
-    elementKeydown: function(e) {
-      switch (e.keyCode) {
-      case 9: //tab
-        this.updateFromElementVal();
-
-        switch (this.highlightedUnit) {
-        case 'hour':
-          e.preventDefault();
-          this.highlightNextUnit();
-          break;
-        case 'minute':
-          if (this.showMeridian || this.showSeconds) {
-            e.preventDefault();
-            this.highlightNextUnit();
-          }
-          break;
-        case 'second':
-          if (this.showMeridian) {
-            e.preventDefault();
-            this.highlightNextUnit();
-          }
-          break;
-        }
-        break;
-      case 27: // escape
-        this.updateFromElementVal();
-        break;
-      case 37: // left arrow
-        e.preventDefault();
-        this.highlightPrevUnit();
-        this.updateFromElementVal();
-        break;
-      case 38: // up arrow
-        e.preventDefault();
-        switch (this.highlightedUnit) {
-        case 'hour':
-          this.incrementHour();
-          this.highlightHour();
-          break;
-        case 'minute':
-          this.incrementMinute();
-          this.highlightMinute();
-          break;
-        case 'second':
-          this.incrementSecond();
-          this.highlightSecond();
-          break;
-        case 'meridian':
-          this.toggleMeridian();
-          this.highlightMeridian();
-          break;
-        }
-        break;
-      case 39: // right arrow
-        e.preventDefault();
-        this.updateFromElementVal();
-        this.highlightNextUnit();
-        break;
-      case 40: // down arrow
-        e.preventDefault();
-        switch (this.highlightedUnit) {
-        case 'hour':
-          this.decrementHour();
-          this.highlightHour();
-          break;
-        case 'minute':
-          this.decrementMinute();
-          this.highlightMinute();
-          break;
-        case 'second':
-          this.decrementSecond();
-          this.highlightSecond();
-          break;
-        case 'meridian':
-          this.toggleMeridian();
-          this.highlightMeridian();
-          break;
-        }
-        break;
-      }
-    },
-
-    formatTime: function(hour, minute, second, meridian) {
-      hour = hour < 10 ? '0' + hour : hour;
-      minute = minute < 10 ? '0' + minute : minute;
-      second = second < 10 ? '0' + second : second;
-
-      return hour + ':' + minute + (this.showSeconds ? ':' + second : '') + (this.showMeridian ? ' ' + meridian : '');
-    },
-
-    getCursorPosition: function() {
-      var input = this.$element.get(0);
-
-      if ('selectionStart' in input) {// Standard-compliant browsers
-
-        return input.selectionStart;
-      } else if (document.selection) {// IE fix
-        input.focus();
-        var sel = document.selection.createRange(),
-          selLen = document.selection.createRange().text.length;
-
-        sel.moveStart('character', - input.value.length);
-
-        return sel.text.length - selLen;
-      }
-    },
-
-    getTemplate: function() {
-      var template,
-        hourTemplate,
-        minuteTemplate,
-        secondTemplate,
-        meridianTemplate,
-        templateContent;
-
-      if (this.showInputs) {
-        hourTemplate = '<input type="text" name="hour" class="bootstrap-timepicker-hour" maxlength="2"/>';
-        minuteTemplate = '<input type="text" name="minute" class="bootstrap-timepicker-minute" maxlength="2"/>';
-        secondTemplate = '<input type="text" name="second" class="bootstrap-timepicker-second" maxlength="2"/>';
-        meridianTemplate = '<input type="text" name="meridian" class="bootstrap-timepicker-meridian" maxlength="2"/>';
-      } else {
-        hourTemplate = '<span class="bootstrap-timepicker-hour"></span>';
-        minuteTemplate = '<span class="bootstrap-timepicker-minute"></span>';
-        secondTemplate = '<span class="bootstrap-timepicker-second"></span>';
-        meridianTemplate = '<span class="bootstrap-timepicker-meridian"></span>';
-      }
-
-      templateContent = '<table>'+
-         '<tr>'+
-           '<td><a href="#" data-action="incrementHour"><i class="icon-chevron-up"></i></a></td>'+
-           '<td class="separator">&nbsp;</td>'+
-           '<td><a href="#" data-action="incrementMinute"><i class="icon-chevron-up"></i></a></td>'+
-           (this.showSeconds ?
-             '<td class="separator">&nbsp;</td>'+
-             '<td><a href="#" data-action="incrementSecond"><i class="icon-chevron-up"></i></a></td>'
-           : '') +
-           (this.showMeridian ?
-             '<td class="separator">&nbsp;</td>'+
-             '<td class="meridian-column"><a href="#" data-action="toggleMeridian"><i class="icon-chevron-up"></i></a></td>'
-           : '') +
-         '</tr>'+
-         '<tr>'+
-           '<td>'+ hourTemplate +'</td> '+
-           '<td class="separator">:</td>'+
-           '<td>'+ minuteTemplate +'</td> '+
-           (this.showSeconds ?
-            '<td class="separator">:</td>'+
-            '<td>'+ secondTemplate +'</td>'
-           : '') +
-           (this.showMeridian ?
-            '<td class="separator">&nbsp;</td>'+
-            '<td>'+ meridianTemplate +'</td>'
-           : '') +
-         '</tr>'+
-         '<tr>'+
-           '<td><a href="#" data-action="decrementHour"><i class="icon-chevron-down"></i></a></td>'+
-           '<td class="separator"></td>'+
-           '<td><a href="#" data-action="decrementMinute"><i class="icon-chevron-down"></i></a></td>'+
-           (this.showSeconds ?
-            '<td class="separator">&nbsp;</td>'+
-            '<td><a href="#" data-action="decrementSecond"><i class="icon-chevron-down"></i></a></td>'
-           : '') +
-           (this.showMeridian ?
-            '<td class="separator">&nbsp;</td>'+
-            '<td><a href="#" data-action="toggleMeridian"><i class="icon-chevron-down"></i></a></td>'
-           : '') +
-         '</tr>'+
-       '</table>';
-
-      switch(this.template) {
-      case 'modal':
-        template = '<div class="bootstrap-timepicker-widget modal hide fade in" data-backdrop="'+ (this.modalBackdrop ? 'true' : 'false') +'">'+
-          '<div class="modal-header">'+
-            '<a href="#" class="close" data-dismiss="modal">×</a>'+
-            '<h3>Pick a Time</h3>'+
-          '</div>'+
-          '<div class="modal-content">'+
-            templateContent +
-          '</div>'+
-          '<div class="modal-footer">'+
-            '<a href="#" class="btn btn-primary" data-dismiss="modal">OK</a>'+
-          '</div>'+
-        '</div>';
-        break;
-      case 'dropdown':
-        template = '<div class="bootstrap-timepicker-widget dropdown-menu">'+ templateContent +'</div>';
-        break;
-      }
-
-      return template;
-    },
-
-    getTime: function() {
-      return this.formatTime(this.hour, this.minute, this.second, this.meridian);
-    },
-
-    hideWidget: function() {
-      if (this.isOpen === false) {
-        return;
-      }
-
-      if (this.showInputs) {
-        this.updateFromWidgetInputs();
-      }
-
-      this.$element.trigger({
-        'type': 'hide.timepicker',
-        'time': {
-          'value': this.getTime(),
-          'hours': this.hour,
-          'minutes': this.minute,
-          'seconds': this.second,
-          'meridian': this.meridian
-        }
-      });
-
-      if (this.template === 'modal') {
-        this.$widget.modal('hide');
-      } else {
-        this.$widget.removeClass('open');
-      }
-
-      $(document).off('mousedown.timepicker');
-
-      this.isOpen = false;
-    },
-
-    highlightUnit: function() {
-      this.position = this.getCursorPosition();
-      if (this.position >= 0 && this.position <= 2) {
-        this.highlightHour();
-      } else if (this.position >= 3 && this.position <= 5) {
-        this.highlightMinute();
-      } else if (this.position >= 6 && this.position <= 8) {
-        if (this.showSeconds) {
-          this.highlightSecond();
-        } else {
-          this.highlightMeridian();
-        }
-      } else if (this.position >= 9 && this.position <= 11) {
-        this.highlightMeridian();
-      }
-    },
-
-    highlightNextUnit: function() {
-      switch (this.highlightedUnit) {
-      case 'hour':
-        this.highlightMinute();
-        break;
-      case 'minute':
-        if (this.showSeconds) {
-          this.highlightSecond();
-        } else if (this.showMeridian){
-          this.highlightMeridian();
-        } else {
-          this.highlightHour();
-        }
-        break;
-      case 'second':
-        if (this.showMeridian) {
-          this.highlightMeridian();
-        } else {
-          this.highlightHour();
-        }
-        break;
-      case 'meridian':
-        this.highlightHour();
-        break;
-      }
-    },
-
-    highlightPrevUnit: function() {
-      switch (this.highlightedUnit) {
-      case 'hour':
-        this.highlightMeridian();
-        break;
-      case 'minute':
-        this.highlightHour();
-        break;
-      case 'second':
-        this.highlightMinute();
-        break;
-      case 'meridian':
-        if (this.showSeconds) {
-          this.highlightSecond();
-        } else {
-          this.highlightMinute();
-        }
-        break;
-      }
-    },
-
-    highlightHour: function() {
-      var $element = this.$element.get(0);
-
-      this.highlightedUnit = 'hour';
-
-      if ($element.setSelectionRange) {
-        setTimeout(function() {
-          $element.setSelectionRange(0,2);
-        }, 0);
-      }
-    },
-
-    highlightMinute: function() {
-      var $element = this.$element.get(0);
-
-      this.highlightedUnit = 'minute';
-
-      if ($element.setSelectionRange) {
-        setTimeout(function() {
-          $element.setSelectionRange(3,5);
-        }, 0);
-      }
-    },
-
-    highlightSecond: function() {
-      var $element = this.$element.get(0);
-
-      this.highlightedUnit = 'second';
-
-      if ($element.setSelectionRange) {
-        setTimeout(function() {
-          $element.setSelectionRange(6,8);
-        }, 0);
-      }
-    },
-
-    highlightMeridian: function() {
-      var $element = this.$element.get(0);
-
-      this.highlightedUnit = 'meridian';
-
-      if ($element.setSelectionRange) {
-        if (this.showSeconds) {
-          setTimeout(function() {
-            $element.setSelectionRange(9,11);
-          }, 0);
-        } else {
-          setTimeout(function() {
-            $element.setSelectionRange(6,8);
-          }, 0);
-        }
-      }
-    },
-
-    incrementHour: function() {
-      if (this.showMeridian) {
-        if (this.hour === 11) {
-          this.hour++;
-          return this.toggleMeridian();
-        } else if (this.hour === 12) {
-          this.hour = 0;
-        }
-      }
-      if (this.hour === 23) {
-        this.hour = 0;
-
-        return;
-      }
-      this.hour++;
-      this.update();
-    },
-
-    incrementMinute: function(step) {
-      var newVal;
-
-      if (step) {
-        newVal = this.minute + step;
-      } else {
-        newVal = this.minute + this.minuteStep - (this.minute % this.minuteStep);
-      }
-
-      if (newVal > 59) {
-        this.incrementHour();
-        this.minute = newVal - 60;
-      } else {
-        this.minute = newVal;
-      }
-      this.update();
-    },
-
-    incrementSecond: function() {
-      var newVal = this.second + this.secondStep - (this.second % this.secondStep);
-
-      if (newVal > 59) {
-        this.incrementMinute(true);
-        this.second = newVal - 60;
-      } else {
-        this.second = newVal;
-      }
-      this.update();
-    },
-
-    remove: function() {
-      $('document').off('.timepicker');
-      if (this.$widget) {
-        this.$widget.remove();
-      }
-      delete this.$element.data().timepicker;
-    },
-
-    setDefaultTime: function(defaultTime){
-      if (!this.$element.val()) {
-        if (defaultTime === 'current') {
-          var dTime = new Date(),
-            hours = dTime.getHours(),
-            minutes = Math.floor(dTime.getMinutes() / this.minuteStep) * this.minuteStep,
-            seconds = Math.floor(dTime.getSeconds() / this.secondStep) * this.secondStep,
-            meridian = 'AM';
-
-          if (this.showMeridian) {
-            if (hours === 0) {
-              hours = 12;
-            } else if (hours >= 12) {
-              if (hours > 12) {
-                hours = hours - 12;
-              }
-              meridian = 'PM';
-            } else {
-              meridian = 'AM';
-            }
-          }
-
-          this.hour = hours;
-          this.minute = minutes;
-          this.second = seconds;
-          this.meridian = meridian;
-
-          this.update();
-
-        } else if (defaultTime === false) {
-          this.hour = 0;
-          this.minute = 0;
-          this.second = 0;
-          this.meridian = 'AM';
-        } else {
-          this.setTime(defaultTime);
-        }
-      } else {
-        this.updateFromElementVal();
-      }
-    },
-
-    setTime: function(time) {
-      var arr,
-        timeArray;
-
-      if (this.showMeridian) {
-        arr = time.split(' ');
-        timeArray = arr[0].split(':');
-        this.meridian = arr[1];
-      } else {
-        timeArray = time.split(':');
-      }
-
-      this.hour = parseInt(timeArray[0], 10);
-      this.minute = parseInt(timeArray[1], 10);
-      this.second = parseInt(timeArray[2], 10);
-
-      if (isNaN(this.hour)) {
-        this.hour = 0;
-      }
-      if (isNaN(this.minute)) {
-        this.minute = 0;
-      }
-
-      if (this.showMeridian) {
-        if (this.hour > 12) {
-          this.hour = 12;
-        } else if (this.hour < 1) {
-          this.hour = 12;
-        }
-
-        if (this.meridian === 'am' || this.meridian === 'a') {
-          this.meridian = 'AM';
-        } else if (this.meridian === 'pm' || this.meridian === 'p') {
-          this.meridian = 'PM';
-        }
-
-        if (this.meridian !== 'AM' && this.meridian !== 'PM') {
-          this.meridian = 'AM';
-        }
-      } else {
-        if (this.hour >= 24) {
-          this.hour = 23;
-        } else if (this.hour < 0) {
-          this.hour = 0;
-        }
-      }
-
-      if (this.minute < 0) {
-        this.minute = 0;
-      } else if (this.minute >= 60) {
-        this.minute = 59;
-      }
-
-      if (this.showSeconds) {
-        if (isNaN(this.second)) {
-          this.second = 0;
-        } else if (this.second < 0) {
-          this.second = 0;
-        } else if (this.second >= 60) {
-          this.second = 59;
-        }
-      }
-
-      this.update();
-    },
-
-    showWidget: function() {
-      if (this.isOpen) {
-        return;
-      }
-
-      if (this.$element.is(':disabled')) {
-        return;
-      }
-
-      var self = this;
-      $(document).on('mousedown.timepicker', function (e) {
-        // Clicked outside the timepicker, hide it
-        if ($(e.target).closest('.bootstrap-timepicker-widget').length === 0) {
-          self.hideWidget();
-        }
-      });
-
-      this.$element.trigger({
-        'type': 'show.timepicker',
-        'time': {
-          'value': this.getTime(),
-          'hours': this.hour,
-          'minutes': this.minute,
-          'seconds': this.second,
-          'meridian': this.meridian
-        }
-      });
-
-      if (this.disableFocus) {
-        this.$element.blur();
-      }
-
-      this.updateFromElementVal();
-
-      if (this.template === 'modal') {
-        this.$widget.modal('show').on('hidden', $.proxy(this.hideWidget, this));
-      } else {
-        if (this.isOpen === false) {
-          this.$widget.addClass('open');
-        }
-      }
-
-      this.isOpen = true;
-    },
-
-    toggleMeridian: function() {
-      this.meridian = this.meridian === 'AM' ? 'PM' : 'AM';
-      this.update();
-    },
-
-    update: function() {
-      this.$element.trigger({
-        'type': 'changeTime.timepicker',
-        'time': {
-          'value': this.getTime(),
-          'hours': this.hour,
-          'minutes': this.minute,
-          'seconds': this.second,
-          'meridian': this.meridian
-        }
-      });
-
-      this.updateElement();
-      this.updateWidget();
-    },
-
-    updateElement: function() {
-      this.$element.val(this.getTime()).change();
-    },
-
-    updateFromElementVal: function() {
-      var val = this.$element.val();
-
-      if (val) {
-        this.setTime(val);
-      }
-    },
-
-    updateWidget: function() {
-      if (this.$widget === false) {
-        return;
-      }
-
-      var hour = this.hour < 10 ? '0' + this.hour : this.hour,
-          minute = this.minute < 10 ? '0' + this.minute : this.minute,
-          second = this.second < 10 ? '0' + this.second : this.second;
-
-      if (this.showInputs) {
-        this.$widget.find('input.bootstrap-timepicker-hour').val(hour);
-        this.$widget.find('input.bootstrap-timepicker-minute').val(minute);
-
-        if (this.showSeconds) {
-          this.$widget.find('input.bootstrap-timepicker-second').val(second);
-        }
-        if (this.showMeridian) {
-          this.$widget.find('input.bootstrap-timepicker-meridian').val(this.meridian);
-        }
-      } else {
-        this.$widget.find('span.bootstrap-timepicker-hour').text(hour);
-        this.$widget.find('span.bootstrap-timepicker-minute').text(minute);
-
-        if (this.showSeconds) {
-          this.$widget.find('span.bootstrap-timepicker-second').text(second);
-        }
-        if (this.showMeridian) {
-          this.$widget.find('span.bootstrap-timepicker-meridian').text(this.meridian);
-        }
-      }
-    },
-
-    updateFromWidgetInputs: function() {
-      if (this.$widget === false) {
-        return;
-      }
-      var time = $('input.bootstrap-timepicker-hour', this.$widget).val() + ':' +
-        $('input.bootstrap-timepicker-minute', this.$widget).val() +
-        (this.showSeconds ? ':' + $('input.bootstrap-timepicker-second', this.$widget).val() : '') +
-        (this.showMeridian ? ' ' + $('input.bootstrap-timepicker-meridian', this.$widget).val() : '');
-
-      this.setTime(time);
-    },
-
-    widgetClick: function(e) {
-      e.stopPropagation();
-      e.preventDefault();
-
-      var action = $(e.target).closest('a').data('action');
-      if (action) {
-        this[action]();
-      }
-    },
-
-    widgetKeydown: function(e) {
-      var $input = $(e.target).closest('input'),
-          name = $input.attr('name');
-
-      switch (e.keyCode) {
-      case 9: //tab
-        if (this.showMeridian) {
-          if (name === 'meridian') {
-            return this.hideWidget();
-          }
-        } else {
-          if (this.showSeconds) {
-            if (name === 'second') {
-              return this.hideWidget();
-            }
-          } else {
-            if (name === 'minute') {
-              return this.hideWidget();
-            }
-          }
-        }
-
-        this.updateFromWidgetInputs();
-        break;
-      case 27: // escape
-        this.hideWidget();
-        break;
-      case 38: // up arrow
-        e.preventDefault();
-        switch (name) {
-        case 'hour':
-          this.incrementHour();
-          break;
-        case 'minute':
-          this.incrementMinute();
-          break;
-        case 'second':
-          this.incrementSecond();
-          break;
-        case 'meridian':
-          this.toggleMeridian();
-          break;
-        }
-        break;
-      case 40: // down arrow
-        e.preventDefault();
-        switch (name) {
-        case 'hour':
-          this.decrementHour();
-          break;
-        case 'minute':
-          this.decrementMinute();
-          break;
-        case 'second':
-          this.decrementSecond();
-          break;
-        case 'meridian':
-          this.toggleMeridian();
-          break;
-        }
-        break;
-      }
-    }
-  };
-
-
-  //TIMEPICKER PLUGIN DEFINITION
-  $.fn.timepicker = function(option) {
-    var args = Array.apply(null, arguments);
-    args.shift();
-    return this.each(function() {
-      var $this = $(this),
-        data = $this.data('timepicker'),
-        options = typeof option === 'object' && option;
-
-      if (!data) {
-        $this.data('timepicker', (data = new Timepicker(this, $.extend({}, $.fn.timepicker.defaults, options, $(this).data()))));
-      }
-
-      if (typeof option === 'string') {
-        data[option].apply(data, args);
-      }
-    });
-  };
-
-  $.fn.timepicker.defaults = {
-    defaultTime: 'current',
-    disableFocus: false,
-    isOpen: false,
-    minuteStep: 15,
-    modalBackdrop: false,
-    secondStep: 15,
-    showSeconds: false,
-    showInputs: true,
-    showMeridian: true,
-    template: 'dropdown',
-    appendWidgetTo: '.bootstrap-timepicker'
-  };
-
-  $.fn.timepicker.Constructor = Timepicker;
-
-})(jQuery, window, document);
\ No newline at end of file

From 606323212e0dc8c15e2adbb390a8c8233f2e63d6 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 05:28:33 -0400
Subject: [PATCH 093/103] Dependencies: Update etcd module (#49873) (#49880)

* Update etcd

* Update go.sum

* Replace etcd due to broken module

(cherry picked from commit 3587a5559bb45ecc46ec980d5842ff30f52f86e1)

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
---
 go.mod |  5 ++++-
 go.sum | 27 ++-------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/go.mod b/go.mod
index 821e967d0d9..3900b7e23b5 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,9 @@ replace github.com/denisenkom/go-mssqldb => github.com/grafana/go-mssqldb v0.0.0
 // It's also present on grafana/loki's go.mod so we'll need till it gets updated.
 replace k8s.io/client-go => k8s.io/client-go v0.22.1
 
+// Github issue https://github.com/etcd-io/etcd/issues/11154
+replace go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200520232829-54ba9589114f
+
 replace github.com/russellhaering/goxmldsig@v1.1.0 => github.com/russellhaering/goxmldsig v1.1.1
 
 require (
@@ -231,7 +234,7 @@ require (
 	go.uber.org/atomic v1.9.0
 	go.uber.org/goleak v1.1.12 // indirect
 	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.7
 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3
diff --git a/go.sum b/go.sum
index fe6d2ae3be3..0f8a1421224 100644
--- a/go.sum
+++ b/go.sum
@@ -585,7 +585,6 @@ github.com/cockroachdb/apd/v2 v2.0.1/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOG
 github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
-github.com/cockroachdb/datadriven v0.0.0-20190531201743-edce55837238/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
@@ -1218,7 +1217,6 @@ github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
 github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
-github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -1299,7 +1297,6 @@ github.com/gomodule/redigo v1.8.4/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUz
 github.com/gomodule/redigo v1.8.5/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
@@ -1461,10 +1458,6 @@ github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa/go.mod h1:0O8o/juxN
 github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b h1:YiSGp34F4V0G08HHx1cJBf2GVgwYAkXQjzuVs1t8jYk=
 github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b/go.mod h1:q83kyQoMD0vhy+RzFLlbw0UgHJ6TAihQpuXvdFmm4s4=
 github.com/grafana/sqlds/v2 v2.3.2/go.mod h1:34uyqPBWsEvg4V/xxh6V4uIqwu1qLfOfsmScll/ukrk=
-github.com/grafana/thema v0.0.0-20220413232647-fc54c169b508 h1:6k0scTj6kRDjn/qLigsLc9OTiMMaWkRUxjKBFowWEWg=
-github.com/grafana/thema v0.0.0-20220413232647-fc54c169b508/go.mod h1:KuqTKX9lfM87uu9vt9DS/q+REqSrAm2xYMnBBvlmevA=
-github.com/grafana/thema v0.0.0-20220427204245-a557e8970249 h1:PLB1iSjrosHU5MN3eJ2tSvjXX9zkek7gLeBF/L/3oFo=
-github.com/grafana/thema v0.0.0-20220427204245-a557e8970249/go.mod h1:KuqTKX9lfM87uu9vt9DS/q+REqSrAm2xYMnBBvlmevA=
 github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751 h1:5PpsfN52XA0hxOjD/qQ0QNiEkp9Y9Tb+yz/Hj9fyL4M=
 github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751/go.mod h1:KuqTKX9lfM87uu9vt9DS/q+REqSrAm2xYMnBBvlmevA=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -1480,7 +1473,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc=
-github.com/grpc-ecosystem/grpc-gateway v1.4.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
@@ -1782,7 +1774,6 @@ github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+
 github.com/jsimonetti/rtnetlink v0.0.0-20190830100107-3784a6c7c552/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
 github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -1853,7 +1844,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
@@ -1978,7 +1968,6 @@ github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
 github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/mattn/go-xmlrpc v0.0.3/go.mod h1:mqc2dz7tP5x5BKlCahN/n+hs7OSZKJkS9JsHNBRlrxA=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
-github.com/matttproud/golang_protobuf_extensions v1.0.0/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -2154,7 +2143,6 @@ github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -2287,7 +2275,6 @@ github.com/prometheus/alertmanager v0.23.1-0.20210914172521-e35efbddb66a/go.mod
 github.com/prometheus/alertmanager v0.23.1-0.20211116083607-e2a10119aaf7 h1:OMwDo53awRp+UzaBrwmVC7HJiAMYP/niBJfKcGpPiac=
 github.com/prometheus/alertmanager v0.23.1-0.20211116083607-e2a10119aaf7/go.mod h1:1UH4XA4DAXzsvofKVzcXmC0mqt6Y8BZP9JcQWKDmbFc=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
@@ -2308,7 +2295,6 @@ github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3e
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -2318,7 +2304,6 @@ github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -2354,7 +2339,6 @@ github.com/prometheus/exporter-toolkit v0.7.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQY
 github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 h1:dTUS1vaLWq+Y6XKOTnrFpoVsQKLCbCp1OLj24TDi7oM=
 github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289/go.mod h1:FGbBv5OPKjch+jNUJmEQpMZytIdyW0NdBtWFcfSKusc=
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20180612222113-7d6f385de8be/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -2504,7 +2488,6 @@ github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvq
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745/go.mod h1:G81aIFAMS9ECrwBYR9YxhlPjWgrItd+Kje78O6+uqm8=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -2768,12 +2751,8 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/etcd v0.0.0-20190709142735-eb7dd97135a5/go.mod h1:N0RPWo9FXJYZQI4BTkDtQylrstIigYHeR18ONnyTufk=
-go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8=
-go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
-go.etcd.io/etcd v3.3.25+incompatible h1:V1RzkZJj9LqsJRy+TUBgpWSbZXITLB819lstuTFoZOY=
-go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
+go.etcd.io/etcd v0.0.0-20200520232829-54ba9589114f h1:uj/Xzadu0dyweesgOo+HghLYs0ssb9IRDvMp1UbAwJU=
+go.etcd.io/etcd v0.0.0-20200520232829-54ba9589114f/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8=
 go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
@@ -2919,7 +2898,6 @@ gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk=
 gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -3592,7 +3570,6 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk=
 google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20180608181217-32ee49c4dd80/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=

From 326c48347e97c0da755003f6825876e48f735ab5 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 05:44:52 -0400
Subject: [PATCH 094/103] UI/Button: Remove deprecated "link" variant (#49843)
 (#49877)

(cherry picked from commit 0012d2d81fee889665d515226062c0eb122b490a)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 .../src/components/Button/Button.tsx          | 31 ++++---------------
 .../input-datasource/src/InputQueryEditor.tsx |  2 +-
 .../components/FolderFilter/FolderFilter.tsx  |  2 +-
 .../PanelTypeFilter/PanelTypeFilter.tsx       |  2 +-
 .../serviceaccounts/ServiceAccountProfile.tsx |  2 +-
 .../configuration/MappingsConfiguration.tsx   |  2 +-
 .../plugins/panel/nodeGraph/ViewControls.tsx  |  2 +-
 7 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/packages/grafana-ui/src/components/Button/Button.tsx b/packages/grafana-ui/src/components/Button/Button.tsx
index 978d7dea8fa..2479687518a 100644
--- a/packages/grafana-ui/src/components/Button/Button.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.tsx
@@ -10,7 +10,7 @@ import { ComponentSize } from '../../types/size';
 import { getPropertiesForButtonSize } from '../Forms/commonStyles';
 import { Icon } from '../Icon/Icon';
 
-export type ButtonVariant = 'primary' | 'secondary' | 'destructive' | 'link';
+export type ButtonVariant = 'primary' | 'secondary' | 'destructive';
 export const allButtonVariants: ButtonVariant[] = ['primary', 'secondary', 'destructive'];
 export type ButtonFill = 'solid' | 'outline' | 'text';
 export const allButtonFills: ButtonFill[] = ['solid', 'outline', 'text'];
@@ -53,11 +53,6 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       iconOnly: !children,
     });
 
-    deprecatedPropWarning(
-      variant === 'link',
-      `${Button.displayName}: Prop variant="link" is deprecated. Please use fill="text".`
-    );
-
     return (
       <button className={cx(styles.button, className)} type={type} {...otherProps} ref={ref}>
         {icon && <Icon name={icon} size={size} className={styles.icon} />}
@@ -108,11 +103,6 @@ export const LinkButton = React.forwardRef<HTMLAnchorElement, ButtonLinkProps>(
       className
     );
 
-    deprecatedPropWarning(
-      variant === 'link',
-      `${LinkButton.displayName}: Prop variant="link" is deprecated. Please use fill="text".`
-    );
-
     return (
       <a className={linkButtonStyles} {...otherProps} tabIndex={disabled ? -1 : 0} ref={ref}>
         {icon && <Icon name={icon} size={size} className={styles.icon} />}
@@ -256,7 +246,7 @@ function getPropertiesForDisabled(theme: GrafanaTheme2, variant: ButtonVariant,
     transition: 'none',
   };
 
-  if (fill === 'text' || variant === 'link') {
+  if (fill === 'text') {
     return {
       ...disabledStyles,
       background: 'transparent',
@@ -280,24 +270,15 @@ function getPropertiesForDisabled(theme: GrafanaTheme2, variant: ButtonVariant,
 }
 
 export function getPropertiesForVariant(theme: GrafanaTheme2, variant: ButtonVariant, fill: ButtonFill) {
-  const buttonVariant = variant === 'link' ? 'primary' : variant;
-  const buttonFill = variant === 'link' ? 'text' : fill;
-
-  switch (buttonVariant) {
+  switch (variant) {
     case 'secondary':
-      return getButtonVariantStyles(theme, theme.colors.secondary, buttonFill);
+      return getButtonVariantStyles(theme, theme.colors.secondary, fill);
 
     case 'destructive':
-      return getButtonVariantStyles(theme, theme.colors.error, buttonFill);
+      return getButtonVariantStyles(theme, theme.colors.error, fill);
 
     case 'primary':
     default:
-      return getButtonVariantStyles(theme, theme.colors.primary, buttonFill);
-  }
-}
-
-function deprecatedPropWarning(test: boolean, message: string) {
-  if (process.env.NODE_ENV === 'development' && test) {
-    console.warn(`@grafana/ui ${message}`);
+      return getButtonVariantStyles(theme, theme.colors.primary, fill);
   }
 }
diff --git a/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx b/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx
index 6f213e99719..b20520629f6 100644
--- a/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx
+++ b/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx
@@ -72,7 +72,7 @@ export class InputQueryEditor extends PureComponent<Props, State> {
             {query.data ? (
               <div style={{ alignSelf: 'center' }}>{describeDataFrame(query.data)}</div>
             ) : (
-              <LinkButton variant="link" href={`datasources/edit/${uid}/`}>
+              <LinkButton fill="text" href={`datasources/edit/${uid}/`}>
                 {name}: {describeDataFrame(datasource.data)} &nbsp;&nbsp;
                 <Icon name="pen" />
               </LinkButton>
diff --git a/public/app/core/components/FolderFilter/FolderFilter.tsx b/public/app/core/components/FolderFilter/FolderFilter.tsx
index 6fd7681dd80..c346fbda1ae 100644
--- a/public/app/core/components/FolderFilter/FolderFilter.tsx
+++ b/public/app/core/components/FolderFilter/FolderFilter.tsx
@@ -47,7 +47,7 @@ export function FolderFilter({ onChange: propsOnChange, maxMenuHeight }: FolderF
         <Button
           size="xs"
           icon="trash-alt"
-          variant="link"
+          fill="text"
           className={styles.clear}
           onClick={() => onChange([])}
           aria-label="Clear folders"
diff --git a/public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx b/public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx
index 9a3996315c3..0578fe8437a 100644
--- a/public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx
+++ b/public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx
@@ -55,7 +55,7 @@ export const PanelTypeFilter = ({ onChange: propsOnChange, maxMenuHeight }: Prop
         <Button
           size="xs"
           icon="trash-alt"
-          variant="link"
+          fill="text"
           className={styles.clear}
           onClick={() => onChange([])}
           aria-label="Clear types"
diff --git a/public/app/features/serviceaccounts/ServiceAccountProfile.tsx b/public/app/features/serviceaccounts/ServiceAccountProfile.tsx
index e1ab18f7739..ee3bb166da1 100644
--- a/public/app/features/serviceaccounts/ServiceAccountProfile.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountProfile.tsx
@@ -73,7 +73,7 @@ export function ServiceAccountProfile({
     <>
       <div style={{ marginBottom: '10px' }}>
         <a href="org/serviceaccounts" style={{ display: 'inline-block', verticalAlign: 'middle' }}>
-          <Button variant="link" icon="backward" />
+          <Button fill="text" icon="backward" />
         </a>
         <h1
           className="page-heading"
diff --git a/public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx b/public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx
index bb593a1edb0..8babee6d2a2 100644
--- a/public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx
+++ b/public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx
@@ -20,7 +20,7 @@ export const MappingsConfiguration = (props: Props): JSX.Element => {
       <h3 className="page-heading">Label mappings</h3>
       {!props.showHelp && (
         <p>
-          <Button variant="link" onClick={props.onRestoreHelp}>
+          <Button fill="text" onClick={props.onRestoreHelp}>
             Learn how label mappings work
           </Button>
         </p>
diff --git a/public/app/plugins/panel/nodeGraph/ViewControls.tsx b/public/app/plugins/panel/nodeGraph/ViewControls.tsx
index 1b3a7316014..ea460af3db4 100644
--- a/public/app/plugins/panel/nodeGraph/ViewControls.tsx
+++ b/public/app/plugins/panel/nodeGraph/ViewControls.tsx
@@ -75,7 +75,7 @@ export function ViewControls<Config extends Record<string, any>>(props: Props<Co
       </VerticalGroup>
 
       {allowConfiguration && (
-        <Button size={'xs'} variant={'link'} onClick={() => setShowConfig((showConfig) => !showConfig)}>
+        <Button size={'xs'} fill="text" onClick={() => setShowConfig((showConfig) => !showConfig)}>
           {showConfig ? 'Hide config' : 'Show config'}
         </Button>
       )}

From 8c91d4e6e2222133d7e7edab8be8e9ddc2ba5c68 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 06:54:17 -0400
Subject: [PATCH 095/103] Alerting: fix layout with long words / numbers
 (#49882) (#49889)

(cherry picked from commit e04f84fd1bd54fb9d129643a5a3a356ada143a8d)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../unified/components/AnnotationDetailsField.tsx   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx b/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
index 5d8061c220c..5c193fd1053 100644
--- a/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
+++ b/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
@@ -34,15 +34,22 @@ export const AnnotationDetailsField: FC<Props> = ({ annotationKey, value }) => {
 
 const AnnotationValue: FC<Props> = ({ annotationKey, value }) => {
   const styles = useStyles(getStyles);
-  if (wellableAnnotationKeys.includes(annotationKey)) {
-    return <Well>{value}</Well>;
-  } else if (value && value.startsWith('http')) {
+
+  const needsWell = wellableAnnotationKeys.includes(annotationKey);
+  const needsLink = value && value.startsWith('http');
+
+  if (needsWell) {
+    return <Well className={styles.well}>{value}</Well>;
+  }
+
+  if (needsLink) {
     return (
       <a href={value} target="__blank" className={styles.link}>
         {value}
       </a>
     );
   }
+
   return <>{value}</>;
 };
 

From 1d83694679cf748e8beab98c02cd6a2fd340a436 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 06:58:06 -0400
Subject: [PATCH 096/103] RBAC: drop permissions with folder:create action
 added by migration (#49878) (#49891)

(cherry picked from commit f4f25d911b77f98ed3748365b807360d3d219926)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 .../accesscontrol/dashboard_permissions.go     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go b/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
index 409af398583..7ba629bfd80 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
@@ -41,13 +41,11 @@ var folderPermissionTranslation = map[models.PermissionType][]string{
 		dashboards.ActionDashboardsCreate,
 		dashboards.ActionFoldersRead,
 		dashboards.ActionFoldersWrite,
-		dashboards.ActionFoldersCreate,
 		dashboards.ActionFoldersDelete,
 	}...),
 	models.PERMISSION_ADMIN: append(dashboardPermissionTranslation[models.PERMISSION_ADMIN], []string{
 		dashboards.ActionFoldersRead,
 		dashboards.ActionFoldersWrite,
-		dashboards.ActionFoldersCreate,
 		dashboards.ActionFoldersDelete,
 		dashboards.ActionFoldersPermissionsRead,
 		dashboards.ActionFoldersPermissionsWrite,
@@ -57,6 +55,7 @@ var folderPermissionTranslation = map[models.PermissionType][]string{
 func AddDashboardPermissionsMigrator(mg *migrator.Migrator) {
 	mg.AddMigration("dashboard permissions", &dashboardPermissionsMigrator{})
 	mg.AddMigration("dashboard permissions uid scopes", &dashboardUidPermissionMigrator{})
+	mg.AddMigration("drop managed folder create actions", &managedFolderCreateAction{})
 }
 
 var _ migrator.CodeMigration = new(dashboardPermissionsMigrator)
@@ -280,3 +279,18 @@ func (d *dashboardUidPermissionMigrator) migrateIdScopes(sess *xorm.Session) err
 	}
 	return nil
 }
+
+type managedFolderCreateAction struct {
+	migrator.MigrationBase
+}
+
+func (m *managedFolderCreateAction) SQL(dialect migrator.Dialect) string {
+	return CodeMigrationSQL
+}
+
+func (m *managedFolderCreateAction) Exec(sess *xorm.Session, migrator *migrator.Migrator) error {
+	if _, err := sess.Exec("DELETE FROM permission WHERE action = 'folders:create' AND scope LIKE 'folders:uid:%'"); err != nil {
+		return err
+	}
+	return nil
+}

From cf7ed5ed22cb844cd819e7aabef89eb6cb2a96b7 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 07:23:27 -0400
Subject: [PATCH 097/103] add feature highlighting in the expanded menu
 (#49892) (#49901)

(cherry picked from commit 0089779945fdef977a95457e0229fbc740dc46d3)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 .../app/core/components/NavBar/Next/NavBarMenu.tsx  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/app/core/components/NavBar/Next/NavBarMenu.tsx b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
index 750f86dd091..3ea31a4e153 100644
--- a/public/app/core/components/NavBar/Next/NavBarMenu.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
@@ -11,6 +11,7 @@ import { reportInteraction } from '@grafana/runtime';
 import { CollapsableSection, CustomScrollbar, Icon, IconButton, IconName, useStyles2, useTheme2 } from '@grafana/ui';
 
 import { Branding } from '../../Branding/Branding';
+import { NavFeatureHighlight } from '../NavFeatureHighlight';
 import { isMatchOrChildMatch } from '../utils';
 
 import { NavBarItemWithoutMenu } from './NavBarItemWithoutMenu';
@@ -255,6 +256,7 @@ function NavItem({
       </CollapsibleNavItem>
     );
   } else {
+    const FeatureHighlightWrapper = link.highlightText ? NavFeatureHighlight : React.Fragment;
     return (
       <li className={styles.flex}>
         <NavBarItemWithoutMenu
@@ -270,7 +272,9 @@ function NavItem({
           isActive={link === activeItem}
         >
           <div className={styles.itemWithoutMenuContent}>
-            <div className={styles.iconContainer}>{getLinkIcon(link)}</div>
+            <div className={styles.iconContainer}>
+              <FeatureHighlightWrapper>{getLinkIcon(link)}</FeatureHighlightWrapper>
+            </div>
             <span className={styles.linkText}>{link.text}</span>
           </div>
         </NavBarItemWithoutMenu>
@@ -339,6 +343,7 @@ function CollapsibleNavItem({
 }) {
   const styles = useStyles2(getCollapsibleStyles);
   const [sectionExpanded, setSectionExpanded] = useLocalStorage(`grafana.navigation.expanded[${link.text}]`, false);
+  const FeatureHighlightWrapper = link.highlightText ? NavFeatureHighlight : React.Fragment;
 
   return (
     <li className={cx(styles.menuItem, className)}>
@@ -354,7 +359,7 @@ function CollapsibleNavItem({
         className={styles.collapsibleMenuItem}
         elClassName={styles.collapsibleIcon}
       >
-        {getLinkIcon(link)}
+        <FeatureHighlightWrapper>{getLinkIcon(link)}</FeatureHighlightWrapper>
       </NavBarItemWithoutMenu>
       <div className={styles.collapsibleSectionWrapper}>
         <CollapsableSection
@@ -439,9 +444,7 @@ function getLinkIcon(link: NavModelItem) {
     return <Branding.MenuLogo />;
   } else if (link.icon) {
     return <Icon name={link.icon as IconName} size="xl" />;
-  } else if (link.img) {
-    return <img src={link.img} alt={`${link.text} logo`} height="24" width="24" style={{ borderRadius: '50%' }} />;
   } else {
-    return null;
+    return <img src={link.img} alt={`${link.text} logo`} height="24" width="24" style={{ borderRadius: '50%' }} />;
   }
 }

From 199b1467aae42cd014cd1e3a98c264e098451cc6 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 07:54:28 -0400
Subject: [PATCH 098/103] [v9.0.x] Prometheus: Cleanup annotation editor
 (#49884)

* Prometheus: Cleanup annotation editor (#49615)

* Remove unused code

* Remove test

* Remove Builder mode and simplify the code

* Fix step mapping

* Fix import

* change placeholder

(cherry picked from commit 72367cf1ad5224cb18f24455504c7c1f9317192c)

* Change import

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
---
 .../components/LokiQueryEditorSelector.tsx    | 10 +-
 .../components/AnnotationQueryEditor.tsx      | 76 ++++++++-------
 .../datasource/prometheus/datasource.tsx      |  2 +-
 .../datasource/prometheus/module.test.ts      |  6 --
 .../plugins/datasource/prometheus/module.ts   |  8 +-
 .../partials/annotations.editor.html          | 39 --------
 .../components/PromQueryBuilderOptions.tsx    | 96 ++++++++-----------
 .../components/PromQueryEditorSelector.tsx    | 60 +++---------
 .../shared/QueryEditorModeToggle.tsx          | 10 +-
 9 files changed, 101 insertions(+), 206 deletions(-)
 delete mode 100644 public/app/plugins/datasource/prometheus/partials/annotations.editor.html

diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
index 3d264ea554d..ef7aceaf560 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
@@ -99,15 +99,7 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
         >
           Run query
         </Button>
-        <QueryEditorModeToggle
-          mode={editorMode!}
-          onChange={onEditorModeChange}
-          uiOptions={{
-            [QueryEditorMode.Explain]: true,
-            [QueryEditorMode.Code]: true,
-            [QueryEditorMode.Builder]: true,
-          }}
-        />
+        <QueryEditorModeToggle mode={editorMode!} onChange={onEditorModeChange} />
       </EditorHeader>
       <Space v={0.5} />
       <EditorRows>
diff --git a/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
index cd7bfc987d4..3eed372d2d5 100644
--- a/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 
 import { AnnotationQuery } from '@grafana/data';
-import { EditorRow, EditorField, EditorSwitch, Space } from '@grafana/experimental';
+import { EditorRow, EditorField, EditorSwitch, Space, EditorRows } from '@grafana/experimental';
 import { Input } from '@grafana/ui';
 
-import { PromQueryEditorSelector } from '../querybuilder/components/PromQueryEditorSelector';
-import { QueryEditorMode } from '../querybuilder/shared/types';
+import { PromQueryCodeEditor } from '../querybuilder/components/PromQueryCodeEditor';
+import { AutoSizeInput } from '../querybuilder/shared/AutoSizeInput';
 import { PromQuery } from '../types';
 
 import { PromQueryEditorProps } from './types';
@@ -19,35 +19,47 @@ export function AnnotationQueryEditor(props: Props) {
   // This is because of problematic typing. See AnnotationQueryEditorProps in grafana-data/annotations.ts.
   const annotation = props.annotation!;
   const onAnnotationChange = props.onAnnotationChange!;
+  const query = { expr: annotation.expr, refId: annotation.name, interval: annotation.step };
+
   return (
     <>
-      <PromQueryEditorSelector
-        {...props}
-        query={{ expr: annotation.expr, refId: annotation.name, interval: annotation.step }}
-        onChange={(query) =>
-          onAnnotationChange({
-            ...annotation,
-            expr: query.expr,
-            step: query.interval,
-          })
-        }
-        uiOptions={{
-          modes: {
-            [QueryEditorMode.Explain]: false,
-            [QueryEditorMode.Code]: true,
-            [QueryEditorMode.Builder]: true,
-          },
-          runQueryButton: false,
-          options: {
-            exemplars: false,
-            type: false,
-            format: false,
-            minStep: true,
-            legend: false,
-            resolution: false,
-          },
-        }}
-      />
+      <EditorRows>
+        <PromQueryCodeEditor
+          {...props}
+          query={query}
+          onChange={(query) => {
+            onAnnotationChange({
+              ...annotation,
+              expr: query.expr,
+            });
+          }}
+        />
+        <EditorRow>
+          <EditorField
+            label="Min step"
+            tooltip={
+              <>
+                An additional lower limit for the step parameter of the Prometheus query and for the{' '}
+                <code>$__interval</code> and <code>$__rate_interval</code> variables.
+              </>
+            }
+          >
+            <AutoSizeInput
+              type="text"
+              aria-label="Set lower limit for the step parameter"
+              placeholder={'auto'}
+              minWidth={10}
+              onCommitChange={(ev) => {
+                onAnnotationChange({
+                  ...annotation,
+                  step: ev.currentTarget.value,
+                });
+              }}
+              defaultValue={query.interval}
+            />
+          </EditorField>
+        </EditorRow>
+      </EditorRows>
       <Space v={0.5} />
       <EditorRow>
         <EditorField
@@ -58,7 +70,7 @@ export function AnnotationQueryEditor(props: Props) {
         >
           <Input
             type="text"
-            placeholder="alertname"
+            placeholder="{{alertname}}"
             value={annotation.titleFormat}
             onChange={(event) => {
               onAnnotationChange({
@@ -89,7 +101,7 @@ export function AnnotationQueryEditor(props: Props) {
         >
           <Input
             type="text"
-            placeholder="instance"
+            placeholder="{{instance}}"
             value={annotation.textFormat}
             onChange={(event) => {
               onAnnotationChange({
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index 209112270d2..9c5426548d7 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -62,7 +62,7 @@ import {
 } from './types';
 import { PrometheusVariableSupport } from './variables';
 
-export const ANNOTATION_QUERY_STEP_DEFAULT = '60s';
+const ANNOTATION_QUERY_STEP_DEFAULT = '60s';
 const GET_AND_POST_METADATA_ENDPOINTS = ['api/v1/query', 'api/v1/query_range', 'api/v1/series', 'api/v1/labels'];
 
 export class PrometheusDatasource
diff --git a/public/app/plugins/datasource/prometheus/module.test.ts b/public/app/plugins/datasource/prometheus/module.test.ts
index af031a9ee84..171fd491637 100644
--- a/public/app/plugins/datasource/prometheus/module.test.ts
+++ b/public/app/plugins/datasource/prometheus/module.test.ts
@@ -1,13 +1,7 @@
-import { ANNOTATION_QUERY_STEP_DEFAULT } from './datasource';
 import { plugin as PrometheusDatasourcePlugin } from './module';
 
 describe('module', () => {
   it('should have metrics query field in panels and Explore', () => {
     expect(PrometheusDatasourcePlugin.components.QueryEditor).toBeDefined();
   });
-  it('should have stepDefaultValuePlaceholder set in annotations ctrl', () => {
-    expect(PrometheusDatasourcePlugin.components.AnnotationsQueryCtrl).toBeDefined();
-    const annotationsCtrl = new PrometheusDatasourcePlugin.components.AnnotationsQueryCtrl();
-    expect(annotationsCtrl.stepDefaultValuePlaceholder).toEqual(ANNOTATION_QUERY_STEP_DEFAULT);
-  });
 });
diff --git a/public/app/plugins/datasource/prometheus/module.ts b/public/app/plugins/datasource/prometheus/module.ts
index 06c047eeaf2..ba33b7f90cb 100644
--- a/public/app/plugins/datasource/prometheus/module.ts
+++ b/public/app/plugins/datasource/prometheus/module.ts
@@ -3,15 +3,9 @@ import { DataSourcePlugin } from '@grafana/data';
 import PromCheatSheet from './components/PromCheatSheet';
 import PromQueryEditorByApp from './components/PromQueryEditorByApp';
 import { ConfigEditor } from './configuration/ConfigEditor';
-import { ANNOTATION_QUERY_STEP_DEFAULT, PrometheusDatasource } from './datasource';
-
-class PrometheusAnnotationsQueryCtrl {
-  static templateUrl = 'partials/annotations.editor.html';
-  stepDefaultValuePlaceholder = ANNOTATION_QUERY_STEP_DEFAULT;
-}
+import { PrometheusDatasource } from './datasource';
 
 export const plugin = new DataSourcePlugin(PrometheusDatasource)
   .setQueryEditor(PromQueryEditorByApp)
   .setConfigEditor(ConfigEditor)
-  .setAnnotationQueryCtrl(PrometheusAnnotationsQueryCtrl)
   .setQueryEditorHelp(PromCheatSheet);
diff --git a/public/app/plugins/datasource/prometheus/partials/annotations.editor.html b/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
deleted file mode 100644
index c7c54e816e1..00000000000
--- a/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="gf-form-group">
-	<div class="gf-form">
-		<span class="gf-form-label width-10">Search expression</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.annotation.expr' placeholder="ALERTS"></input>
-	</div>
-	<div class="gf-form">
-		<span class="gf-form-label width-10">Step</span>
-		<input type="text" class="gf-form-input max-width-6" ng-model='ctrl.annotation.step' placeholder="{{::ctrl.stepDefaultValuePlaceholder}}"></input>
-	</div>
-</div>
-
-<div class="gf-form-group">
-	<h5 class="section-heading">Field formats<tip>For title and text fields, use either the name or a pattern. For example, {{instance}} is replaced with label value for the label instance.</tip></h5>
-	<div class="gf-form-inline">
-		<div class="gf-form">
-			<span class="gf-form-label width-5">Title</span>
-			<input type="text" class="gf-form-input max-width-9" ng-model='ctrl.annotation.titleFormat' placeholder="alertname"></input>
-		</div>
-		<div class="gf-form">
-			<span class="gf-form-label width-5">Tags</span>
-			<input type="text" class="gf-form-input max-width-9" ng-model='ctrl.annotation.tagKeys' placeholder="label1,label2"></input>
-		</div>
-		<div class="gf-form-inline">
-			<div class="gf-form">
-				<span class="gf-form-label width-5">Text</span>
-				<input type="text" class="gf-form-input max-width-9" ng-model='ctrl.annotation.textFormat' placeholder="instance"></input>
-			</div>
-		</div>
-	</div>
-
-	<h5 class="section-heading">Other options</h5>
-	<div class="gf-form-inline">
-		<div class="gf-form">
-			<gf-form-switch class="gf-form" label="Series value as timestamp" label-class="width-14" checked="ctrl.annotation.useValueForTime"
-			 tooltip="The unit of timestamp is milliseconds. If the unit of the series value is seconds, multiply its range vector by 1000.">
-			</gf-form-switch>
-		</div>
-	</div>
-</div>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
index 17b3b296eea..a071fe5230f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
@@ -26,10 +26,9 @@ export interface Props {
   app?: CoreApp;
   onChange: (update: PromQuery) => void;
   onRunQuery: () => void;
-  uiOptions: UIOptions;
 }
 
-export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange, onRunQuery, uiOptions }) => {
+export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange, onRunQuery }) => {
   const onChangeFormat = (value: SelectableValue<string>) => {
     onChange({ ...query, format: value.value });
     onRunQuery();
@@ -60,53 +59,42 @@ export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange
 
   return (
     <EditorRow>
-      <QueryOptionGroup
-        title="Options"
-        collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel, uiOptions)}
-      >
-        {uiOptions.legend && (
-          <PromQueryLegendEditor
-            legendFormat={query.legendFormat}
-            onChange={(legendFormat) => onChange({ ...query, legendFormat })}
-            onRunQuery={onRunQuery}
+      <QueryOptionGroup title="Options" collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel)}>
+        <PromQueryLegendEditor
+          legendFormat={query.legendFormat}
+          onChange={(legendFormat) => onChange({ ...query, legendFormat })}
+          onRunQuery={onRunQuery}
+        />
+        <EditorField
+          label="Min step"
+          tooltip={
+            <>
+              An additional lower limit for the step parameter of the Prometheus query and for the{' '}
+              <code>$__interval</code> and <code>$__rate_interval</code> variables.
+            </>
+          }
+        >
+          <AutoSizeInput
+            type="text"
+            aria-label="Set lower limit for the step parameter"
+            placeholder={'auto'}
+            minWidth={10}
+            onCommitChange={onChangeStep}
+            defaultValue={query.interval}
           />
-        )}
-        {uiOptions.minStep && (
-          <EditorField
-            label="Min step"
-            tooltip={
-              <>
-                An additional lower limit for the step parameter of the Prometheus query and for the{' '}
-                <code>$__interval</code> and <code>$__rate_interval</code> variables.
-              </>
-            }
-          >
-            <AutoSizeInput
-              type="text"
-              aria-label="Set lower limit for the step parameter"
-              placeholder={'auto'}
-              minWidth={10}
-              onCommitChange={onChangeStep}
-              defaultValue={query.interval}
-            />
-          </EditorField>
-        )}
-        {uiOptions.format && (
-          <EditorField label="Format">
-            <Select value={formatOption} allowCustomValue onChange={onChangeFormat} options={FORMAT_OPTIONS} />
-          </EditorField>
-        )}
-        {uiOptions.type && (
-          <EditorField label="Type">
-            <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
-          </EditorField>
-        )}
-        {uiOptions.exemplars && shouldShowExemplarSwitch(query, app) && (
+        </EditorField>
+        <EditorField label="Format">
+          <Select value={formatOption} allowCustomValue onChange={onChangeFormat} options={FORMAT_OPTIONS} />
+        </EditorField>
+        <EditorField label="Type">
+          <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
+        </EditorField>
+        {shouldShowExemplarSwitch(query, app) && (
           <EditorField label="Exemplars">
             <EditorSwitch value={query.exemplar} onChange={onExemplarChange} />
           </EditorField>
         )}
-        {uiOptions.resolution && query.intervalFactor && query.intervalFactor > 1 && (
+        {query.intervalFactor && query.intervalFactor > 1 && (
           <EditorField label="Resolution">
             <Select
               aria-label="Select resolution"
@@ -134,23 +122,15 @@ function getQueryTypeValue(query: PromQuery) {
   return query.range && query.instant ? 'both' : query.instant ? 'instant' : 'range';
 }
 
-function getCollapsedInfo(query: PromQuery, formatOption: string, queryType: string, uiOptions: UIOptions): string[] {
+function getCollapsedInfo(query: PromQuery, formatOption: string, queryType: string): string[] {
   const items: string[] = [];
 
-  if (uiOptions.legend) {
-    items.push(`Legend: ${getLegendModeLabel(query.legendFormat)}`);
-  }
-  if (uiOptions.format) {
-    items.push(`Format: ${formatOption}`);
-  }
-  if (uiOptions.minStep && query.interval) {
-    items.push(`Step ${query.interval}`);
-  }
-  if (uiOptions.type) {
-    items.push(`Type: ${queryType}`);
-  }
+  items.push(`Legend: ${getLegendModeLabel(query.legendFormat)}`);
+  items.push(`Format: ${formatOption}`);
+  items.push(`Step ${query.interval}`);
+  items.push(`Type: ${queryType}`);
 
-  if (uiOptions.exemplars && query.exemplar) {
+  if (query.exemplar) {
     items.push(`Exemplars: true`);
   }
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
index 902faa84b5c..cbb5f0801bc 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
@@ -10,43 +10,19 @@ import { PromQuery } from '../../types';
 import { promQueryModeller } from '../PromQueryModeller';
 import { buildVisualQueryFromString } from '../parsing';
 import { FeedbackLink } from '../shared/FeedbackLink';
-import { QueryEditorModeToggle, UIOptions as ModeToggleUIOptions } from '../shared/QueryEditorModeToggle';
+import { QueryEditorModeToggle } from '../shared/QueryEditorModeToggle';
 import { QueryHeaderSwitch } from '../shared/QueryHeaderSwitch';
 import { QueryEditorMode } from '../shared/types';
 import { changeEditorMode, getQueryWithDefaults } from '../state';
 
 import { PromQueryBuilderContainer } from './PromQueryBuilderContainer';
 import { PromQueryBuilderExplained } from './PromQueryBuilderExplained';
-import { PromQueryBuilderOptions, UIOptions as OptionsUIOptions } from './PromQueryBuilderOptions';
+import { PromQueryBuilderOptions } from './PromQueryBuilderOptions';
 import { PromQueryCodeEditor } from './PromQueryCodeEditor';
 
-interface UIOptions {
-  modes: ModeToggleUIOptions;
-  runQueryButton: boolean;
-  options: OptionsUIOptions;
-}
-
-const defaultOptions: UIOptions = {
-  modes: {
-    [QueryEditorMode.Explain]: true,
-    [QueryEditorMode.Code]: true,
-    [QueryEditorMode.Builder]: true,
-  },
-  runQueryButton: true,
-  options: {
-    exemplars: true,
-    type: true,
-    format: true,
-    minStep: true,
-    legend: true,
-    resolution: true,
-  },
-};
-
-type Props = PromQueryEditorProps & { uiOptions?: UIOptions };
+type Props = PromQueryEditorProps;
 
 export const PromQueryEditorSelector = React.memo<Props>((props) => {
-  const uiOptions = props.uiOptions || defaultOptions;
   const { onChange, onRunQuery, data, app } = props;
   const [parseModalOpen, setParseModalOpen] = useState(false);
   const [dataIsStale, setDataIsStale] = useState(false);
@@ -130,18 +106,16 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
           <FeedbackLink feedbackUrl="https://github.com/grafana/grafana/discussions/47693" />
         )}
         <FlexItem grow={1} />
-        {uiOptions.runQueryButton && (
-          <Button
-            variant={dataIsStale ? 'primary' : 'secondary'}
-            size="sm"
-            onClick={onRunQuery}
-            icon={data?.state === LoadingState.Loading ? 'fa fa-spinner' : undefined}
-            disabled={data?.state === LoadingState.Loading}
-          >
-            Run query
-          </Button>
-        )}
-        <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} uiOptions={uiOptions.modes} />
+        <Button
+          variant={dataIsStale ? 'primary' : 'secondary'}
+          size="sm"
+          onClick={onRunQuery}
+          icon={data?.state === LoadingState.Loading ? 'fa fa-spinner' : undefined}
+          disabled={data?.state === LoadingState.Loading}
+        >
+          Run query
+        </Button>
+        <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} />
       </EditorHeader>
       <Space v={0.5} />
       <EditorRows>
@@ -157,13 +131,7 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
         )}
         {editorMode === QueryEditorMode.Explain && <PromQueryBuilderExplained query={query.expr} />}
         {editorMode !== QueryEditorMode.Explain && (
-          <PromQueryBuilderOptions
-            query={query}
-            app={props.app}
-            onChange={onChange}
-            onRunQuery={onRunQuery}
-            uiOptions={uiOptions.options}
-          />
+          <PromQueryBuilderOptions query={query} app={props.app} onChange={onChange} onRunQuery={onRunQuery} />
         )}
       </EditorRows>
     </>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
index abf84395bea..22070b1d595 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx
@@ -5,14 +5,9 @@ import { RadioButtonGroup, Tag } from '@grafana/ui';
 
 import { QueryEditorMode } from './types';
 
-export type UIOptions = {
-  [key in QueryEditorMode]: boolean;
-};
-
 export interface Props {
   mode: QueryEditorMode;
   onChange: (mode: QueryEditorMode) => void;
-  uiOptions: UIOptions;
 }
 
 const editorModes = [
@@ -35,11 +30,10 @@ const editorModes = [
   { label: 'Code', value: QueryEditorMode.Code },
 ];
 
-export function QueryEditorModeToggle({ mode, onChange, uiOptions }: Props) {
-  const modes = editorModes.filter((m) => uiOptions[m.value]);
+export function QueryEditorModeToggle({ mode, onChange }: Props) {
   return (
     <div data-testid={'QueryEditorModeToggle'}>
-      <RadioButtonGroup options={modes} size="sm" value={mode} onChange={onChange} />
+      <RadioButtonGroup options={editorModes} size="sm" value={mode} onChange={onChange} />
     </div>
   );
 }

From a87062e4e605c97449bf6765b8ecc106c7a3d46d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 08:19:59 -0400
Subject: [PATCH 099/103] AuthProxy: Remove deprecated ldap_sync_ttl setting
 (#49902) (#49908)

* Remove deprecated ldap_sync_ttl

(cherry picked from commit 389eec089ec6897167343095fd8910b509c016b1)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 conf/defaults.ini           |  2 --
 pkg/setting/setting.go      | 16 +---------------
 pkg/setting/setting_test.go | 33 ---------------------------------
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 3b4edffb543..d7de0adab5b 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -582,8 +582,6 @@ enabled = false
 header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
-# Deprecated, use sync_ttl instead
-ldap_sync_ttl = 60
 sync_ttl = 60
 whitelist =
 headers =
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 51e1dd77eb9..861fe1358a1 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -49,12 +49,6 @@ const (
 	ApplicationName  = "Grafana"
 )
 
-// This constant corresponds to the default value for ldap_sync_ttl in .ini files
-// it is used for comparison and has to be kept in sync
-const (
-	authProxySyncTTL = 60
-)
-
 // zoneInfo names environment variable for setting the path to look for the timezone database in go
 const zoneInfo = "ZONEINFO"
 
@@ -1332,15 +1326,7 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 	cfg.AuthProxyAutoSignUp = authProxy.Key("auto_sign_up").MustBool(true)
 	cfg.AuthProxyEnableLoginToken = authProxy.Key("enable_login_token").MustBool(false)
 
-	ldapSyncVal := authProxy.Key("ldap_sync_ttl").MustInt()
-	syncVal := authProxy.Key("sync_ttl").MustInt()
-
-	if ldapSyncVal != authProxySyncTTL {
-		cfg.AuthProxySyncTTL = ldapSyncVal
-		cfg.Logger.Warn("[Deprecated] the configuration setting 'ldap_sync_ttl' is deprecated, please use 'sync_ttl' instead")
-	} else {
-		cfg.AuthProxySyncTTL = syncVal
-	}
+	cfg.AuthProxySyncTTL = authProxy.Key("sync_ttl").MustInt()
 
 	cfg.AuthProxyWhitelist = valueAsString(authProxy, "whitelist", "")
 
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 1018cd65951..59f8033a5c9 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -252,39 +252,6 @@ func TestLoadingSettings(t *testing.T) {
 		require.Equal(t, 2, cfg.AuthProxySyncTTL)
 	})
 
-	t.Run("Only ldap_sync_ttl should return the value ldap_sync_ttl", func(t *testing.T) {
-		cfg := NewCfg()
-		err := cfg.Load(CommandLineArgs{
-			HomePath: "../../",
-			Args:     []string{"cfg:auth.proxy.ldap_sync_ttl=5"},
-		})
-		require.Nil(t, err)
-
-		require.Equal(t, 5, cfg.AuthProxySyncTTL)
-	})
-
-	t.Run("ldap_sync should override ldap_sync_ttl that is default value", func(t *testing.T) {
-		cfg := NewCfg()
-		err := cfg.Load(CommandLineArgs{
-			HomePath: "../../",
-			Args:     []string{"cfg:auth.proxy.sync_ttl=5"},
-		})
-		require.Nil(t, err)
-
-		require.Equal(t, 5, cfg.AuthProxySyncTTL)
-	})
-
-	t.Run("ldap_sync should not override ldap_sync_ttl that is different from default value", func(t *testing.T) {
-		cfg := NewCfg()
-		err := cfg.Load(CommandLineArgs{
-			HomePath: "../../",
-			Args:     []string{"cfg:auth.proxy.ldap_sync_ttl=12", "cfg:auth.proxy.sync_ttl=5"},
-		})
-		require.Nil(t, err)
-
-		require.Equal(t, 12, cfg.AuthProxySyncTTL)
-	})
-
 	t.Run("Test reading string values from .ini file", func(t *testing.T) {
 		iniFile, err := ini.Load(path.Join(HomePath, "pkg/setting/testdata/invalid.ini"))
 		require.Nil(t, err)

From a8dbc1eaa05d652d90aacf3bcba29f0ea6c8c835 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 08:38:22 -0400
Subject: [PATCH 100/103] UI/Card: Remove deprecated props (#49885) (#49900)

(cherry picked from commit d590012a18e1a0c804acb189914c1fb6b110aca9)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 .../grafana-ui/src/components/Card/Card.tsx     | 17 +----------------
 .../components/rule-editor/QueryRows.tsx        | 11 +++++------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/packages/grafana-ui/src/components/Card/Card.tsx b/packages/grafana-ui/src/components/Card/Card.tsx
index f5056e9b232..91ce47f71d7 100644
--- a/packages/grafana-ui/src/components/Card/Card.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.tsx
@@ -47,17 +47,7 @@ const CardContext = React.createContext<{
  *
  * @public
  */
-export const Card: CardInterface = ({
-  disabled,
-  href,
-  onClick,
-  children,
-  heading: deprecatedHeading,
-  description: deprecatedDescription,
-  isSelected,
-  className,
-  ...htmlProps
-}) => {
+export const Card: CardInterface = ({ disabled, href, onClick, children, isSelected, className, ...htmlProps }) => {
   const hasHeadingComponent = useMemo(
     () =>
       React.Children.toArray(children).some(
@@ -81,8 +71,6 @@ export const Card: CardInterface = ({
     >
       <CardContext.Provider value={{ href, onClick: onCardClick, disabled, isSelected }}>
         {!hasHeadingComponent && <Heading />}
-        {deprecatedHeading && <Heading>{deprecatedHeading}</Heading>}
-        {deprecatedDescription && <Description>{deprecatedDescription}</Description>}
         {children}
       </CardContext.Provider>
     </CardContainer>
@@ -93,9 +81,6 @@ interface ChildProps {
   className?: string;
   disabled?: boolean;
   children?: React.ReactNode;
-
-  /** @deprecated Use `className` to add new styles */
-  styles?: ReturnType<typeof getCardStyles>;
 }
 
 /** Main heading for the card */
diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
index 17a7140bc80..a6e28db3a5e 100644
--- a/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
@@ -313,12 +313,11 @@ const DatasourceNotFound = ({ index, onUpdateDatasource, onRemoveQuery, model }:
   return (
     <EmptyQueryWrapper>
       <QueryOperationRow title={refId} draggable index={index} id={refId} isOpen>
-        <Card
-          heading="This datasource has been removed"
-          description={
-            'The datasource for this query was not found, it was either removed or is not installed correctly.'
-          }
-        >
+        <Card>
+          <Card.Heading>This datasource has been removed</Card.Heading>
+          <Card.Description>
+            The datasource for this query was not found, it was either removed or is not installed correctly.
+          </Card.Description>
           <Card.Figure>
             <Icon name="question-circle" />
           </Card.Figure>

From c73b1787ecc34383ebc4feab207834fa05eece38 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 08:41:35 -0400
Subject: [PATCH 101/103] [v9.0.x] Alerting: Add fgac support to alert list
 panel (#49912)

Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
---
 .../UnifiedAlertStatesWorker.test.ts          | 28 +++++++++++++++++++
 .../UnifiedAlertStatesWorker.ts               | 10 +++++++
 .../panel/alertlist/UnifiedAlertList.tsx      | 13 ++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.test.ts b/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.test.ts
index f2d1c4eaf8c..744885d9526 100644
--- a/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.test.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.test.ts
@@ -2,7 +2,9 @@ import { lastValueFrom } from 'rxjs';
 
 import { AlertState, getDefaultTimeRange, TimeRange } from '@grafana/data';
 import { backendSrv } from 'app/core/services/backend_srv';
+import { disableRBAC, enableRBAC, grantUserPermissions } from 'app/features/alerting/unified/mocks';
 import { Annotation } from 'app/features/alerting/unified/utils/constants';
+import { AccessControlAction } from 'app/types/accessControl';
 import { PromAlertingRuleState, PromRuleDTO, PromRulesResponse, PromRuleType } from 'app/types/unified-alerting-dto';
 
 import { silenceConsoleOutput } from '../../../../../test/core/utils/silenceConsoleOutput';
@@ -35,6 +37,10 @@ function getTestContext() {
 describe('UnifiedAlertStatesWorker', () => {
   const worker = new UnifiedAlertStatesWorker();
 
+  beforeAll(() => {
+    disableRBAC();
+  });
+
   describe('when canWork is called with correct props', () => {
     it('then it should return true', () => {
       const options = getDefaultOptions();
@@ -200,3 +206,25 @@ describe('UnifiedAlertStatesWorker', () => {
     });
   });
 });
+
+describe('UnifiedAlertStateWorker with RBAC', () => {
+  beforeAll(() => {
+    enableRBAC();
+    grantUserPermissions([]);
+  });
+
+  it('should not do work with insufficient permissions', () => {
+    const worker = new UnifiedAlertStatesWorker();
+    const options = getDefaultOptions();
+
+    expect(worker.canWork(options)).toBe(false);
+  });
+
+  it('should do work with correct permissions', () => {
+    grantUserPermissions([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]);
+    const workerWithPermissions = new UnifiedAlertStatesWorker();
+
+    const options = getDefaultOptions();
+    expect(workerWithPermissions.canWork(options)).toBe(true);
+  });
+});
diff --git a/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts b/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts
index a9100ce3e60..335b1cd20ca 100644
--- a/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts
@@ -3,8 +3,10 @@ import { catchError, map } from 'rxjs/operators';
 
 import { AlertState, AlertStateInfo } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
+import { contextSrv } from 'app/core/services/context_srv';
 import { Annotation } from 'app/features/alerting/unified/utils/constants';
 import { isAlertingRule } from 'app/features/alerting/unified/utils/rules';
+import { AccessControlAction } from 'app/types';
 import { PromAlertingRuleState, PromRulesResponse } from 'app/types/unified-alerting-dto';
 
 import { DashboardQueryRunnerOptions, DashboardQueryRunnerWorker, DashboardQueryRunnerWorkerResult } from './types';
@@ -29,6 +31,14 @@ export class UnifiedAlertStatesWorker implements DashboardQueryRunnerWorker {
       return false;
     }
 
+    const hasRuleReadPermission =
+      contextSrv.hasPermission(AccessControlAction.AlertingRuleRead) &&
+      contextSrv.hasPermission(AccessControlAction.AlertingRuleExternalRead);
+
+    if (!hasRuleReadPermission) {
+      return false;
+    }
+
     return true;
   }
 
diff --git a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
index da0feae77c7..194b7ceea09 100644
--- a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
@@ -4,7 +4,8 @@ import React, { useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
 import { GrafanaTheme2, PanelProps } from '@grafana/data';
-import { CustomScrollbar, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { Alert, CustomScrollbar, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { contextSrv } from 'app/core/services/context_srv';
 import alertDef from 'app/features/alerting/state/alertDef';
 import { useUnifiedAlertingSelector } from 'app/features/alerting/unified/hooks/useUnifiedAlertingSelector';
 import { fetchAllPromRulesAction } from 'app/features/alerting/unified/state/actions';
@@ -17,6 +18,7 @@ import {
 } from 'app/features/alerting/unified/utils/datasource';
 import { flattenRules, getFirstActiveAt } from 'app/features/alerting/unified/utils/rules';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { AccessControlAction } from 'app/types';
 import { PromRuleWithLocation } from 'app/types/unified-alerting';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
@@ -60,6 +62,15 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
 
   const noAlertsMessage = rules.length ? '' : 'No alerts';
 
+  if (
+    !contextSrv.hasPermission(AccessControlAction.AlertingRuleRead) &&
+    !contextSrv.hasPermission(AccessControlAction.AlertingRuleExternalRead)
+  ) {
+    return (
+      <Alert title="Permission required">Sorry, you do not have the required permissions to read alert rules</Alert>
+    );
+  }
+
   return (
     <CustomScrollbar autoHeightMin="100%" autoHeightMax="100%">
       <div className={styles.container}>

From 6d107a7f41ec4ad0e3c225f3cf2bb05b3ddedbce Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 09:07:57 -0400
Subject: [PATCH 102/103] Alerting: Add Go error message to warning log for
 screenshots. (#49870) (#49917)

Makes debugging problems with alert screenshotting easier.

(cherry picked from commit 56f40bd41377b9242a32e28c97a99073fa237809)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
---
 pkg/services/ngalert/state/manager.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/services/ngalert/state/manager.go b/pkg/services/ngalert/state/manager.go
index 5937a793780..42760d73f14 100644
--- a/pkg/services/ngalert/state/manager.go
+++ b/pkg/services/ngalert/state/manager.go
@@ -247,10 +247,11 @@ func (st *Manager) setNextState(ctx context.Context, alertRule *ngModels.AlertRu
 
 	err := st.maybeTakeScreenshot(ctx, alertRule, currentState, oldState)
 	if err != nil {
-		st.log.Warn("Error generating a screenshot for an alert instance.",
+		st.log.Warn("failed to generate a screenshot for an alert instance",
 			"alert_rule", alertRule.UID,
 			"dashboard", alertRule.DashboardUID,
-			"panel", alertRule.PanelID)
+			"panel", alertRule.PanelID,
+			"err", err)
 	}
 
 	st.set(currentState)

From a482c055a096070f6b0535711d6c3a443bf894a1 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 31 May 2022 09:16:20 -0400
Subject: [PATCH 103/103] Prometheus: Predefined scopes for Azure
 authentication (#49861) (#49881)

(cherry picked from commit 0101c193741bfba418a089b20949d561d81d23e7)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
---
 pkg/tsdb/prometheus/client/provider_azure.go  | 89 ++++++++++++++++---
 .../prometheus/client/provider_azure_test.go  |  7 +-
 2 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/pkg/tsdb/prometheus/client/provider_azure.go b/pkg/tsdb/prometheus/client/provider_azure.go
index 71a60dbc76f..87ed8083e7e 100644
--- a/pkg/tsdb/prometheus/client/provider_azure.go
+++ b/pkg/tsdb/prometheus/client/provider_azure.go
@@ -7,12 +7,21 @@ import (
 
 	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
 	"github.com/grafana/grafana-azure-sdk-go/azhttpclient"
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/util/maputil"
 )
 
+var (
+	azurePrometheusScopes = map[string][]string{
+		azsettings.AzurePublic:       {"https://prometheus.monitor.azure.com/.default"},
+		azsettings.AzureChina:        {"https://prometheus.monitor.chinacloudapp.cn/.default"},
+		azsettings.AzureUSGovernment: {"https://prometheus.monitor.usgovcloudapi.net/.default"},
+	}
+)
+
 func (p *Provider) configureAzureAuthentication(opts *sdkhttpclient.Options) error {
 	// Azure authentication is experimental (#35857)
 	if !p.features.IsEnabled(featuremgmt.FlagPrometheusAzureAuth) {
@@ -21,30 +30,84 @@ func (p *Provider) configureAzureAuthentication(opts *sdkhttpclient.Options) err
 
 	credentials, err := azcredentials.FromDatasourceData(p.jsonData, p.settings.DecryptedSecureJSONData)
 	if err != nil {
-		err = fmt.Errorf("invalid Azure credentials: %s", err)
+		err = fmt.Errorf("invalid Azure credentials: %w", err)
 		return err
 	}
 
 	if credentials != nil {
-		resourceIdStr, err := maputil.GetStringOptional(p.jsonData, "azureEndpointResourceId")
-		if err != nil {
-			return err
-		} else if resourceIdStr == "" {
-			err := fmt.Errorf("endpoint resource ID (audience) not provided")
+		var scopes []string
+
+		if scopes, err = GetOverriddenScopes(p.jsonData); err != nil {
 			return err
 		}
 
-		resourceId, err := url.Parse(resourceIdStr)
-		if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
-			err := fmt.Errorf("endpoint resource ID (audience) '%s' invalid", resourceIdStr)
-			return err
+		if scopes == nil {
+			if scopes, err = GetPrometheusScopes(p.cfg.Azure, credentials); err != nil {
+				return err
+			}
 		}
 
-		resourceId.Path = path.Join(resourceId.Path, ".default")
-		scopes := []string{resourceId.String()}
-
 		azhttpclient.AddAzureAuthentication(opts, p.cfg.Azure, credentials, scopes)
 	}
 
 	return nil
 }
+
+func GetOverriddenScopes(jsonData map[string]interface{}) ([]string, error) {
+	resourceIdStr, err := maputil.GetStringOptional(jsonData, "azureEndpointResourceId")
+	if err != nil {
+		err = fmt.Errorf("overridden resource ID (audience) invalid")
+		return nil, err
+	} else if resourceIdStr == "" {
+		return nil, nil
+	}
+
+	resourceId, err := url.Parse(resourceIdStr)
+	if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
+		err = fmt.Errorf("overridden endpoint resource ID (audience) '%s' invalid", resourceIdStr)
+		return nil, err
+	}
+
+	resourceId.Path = path.Join(resourceId.Path, ".default")
+	scopes := []string{resourceId.String()}
+	return scopes, nil
+}
+
+func GetPrometheusScopes(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials) ([]string, error) {
+	// Extract cloud from credentials
+	azureCloud, err := getAzureCloudFromCredentials(settings, credentials)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get scopes for the given cloud
+	if scopes, ok := azurePrometheusScopes[azureCloud]; !ok {
+		err := fmt.Errorf("the Azure cloud '%s' not supported by Prometheus datasource", azureCloud)
+		return nil, err
+	} else {
+		return scopes, nil
+	}
+}
+
+// To be part of grafana-azure-sdk-go
+func getAzureCloudFromCredentials(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials) (string, error) {
+	switch c := credentials.(type) {
+	case *azcredentials.AzureManagedIdentityCredentials:
+		// In case of managed identity, the cloud is always same as where Grafana is hosted
+		return getDefaultAzureCloud(settings), nil
+	case *azcredentials.AzureClientSecretCredentials:
+		return c.AzureCloud, nil
+	default:
+		err := fmt.Errorf("the Azure credentials of type '%s' not supported by Prometheus datasource", c.AzureAuthType())
+		return "", err
+	}
+}
+
+// To be part of grafana-azure-sdk-go
+func getDefaultAzureCloud(settings *azsettings.AzureSettings) string {
+	cloudName := settings.Cloud
+	if cloudName == "" {
+		return azsettings.AzurePublic
+	}
+	return cloudName
+}
diff --git a/pkg/tsdb/prometheus/client/provider_azure_test.go b/pkg/tsdb/prometheus/client/provider_azure_test.go
index 19115c5dc84..faf45cd59ed 100644
--- a/pkg/tsdb/prometheus/client/provider_azure_test.go
+++ b/pkg/tsdb/prometheus/client/provider_azure_test.go
@@ -3,8 +3,10 @@ package client
 import (
 	"testing"
 
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
@@ -12,7 +14,9 @@ import (
 )
 
 func TestConfigureAzureAuthentication(t *testing.T) {
-	cfg := &setting.Cfg{}
+	cfg := &setting.Cfg{
+		Azure: &azsettings.AzureSettings{},
+	}
 	settings := backend.DataSourceInstanceSettings{}
 
 	t.Run("given feature flag enabled", func(t *testing.T) {
@@ -24,7 +28,6 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 				"azureCredentials": map[string]interface{}{
 					"authType": "msi",
 				},
-				"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
 			}
 
 			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)