From ea27eca14712639a998235a095d07cf09ca9ff75 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Thu, 17 Nov 2022 21:41:46 +0100
Subject: [PATCH 001/153] Email: Use MJML email templates (#57751)

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
---
 devenv/README.md                              |   16 +
 emails/Makefile                               |   14 +
 emails/assets/css/ink.css                     |  688 -------
 emails/assets/css/style.css                   |  196 --
 emails/grunt/aliases.yaml                     |   11 +-
 emails/grunt/assemble.js                      |   11 +-
 emails/grunt/copy.js                          |   11 +
 emails/grunt/premailer.js                     |   31 -
 emails/grunt/processhtml.js                   |   12 -
 emails/grunt/replace.js                       |    2 +-
 emails/grunt/uncss.js                         |    9 -
 emails/grunt/watch.js                         |   16 -
 emails/package.json                           |   27 +-
 emails/templates/alert_notification.html      |  134 --
 emails/templates/alert_notification.txt       |   26 -
 emails/templates/invited_to_org.html          |   47 -
 emails/templates/invited_to_org.mjml          |   40 +
 emails/templates/invited_to_org.txt           |    2 +-
 emails/templates/layouts/default.html         |  161 --
 emails/templates/layouts/default.txt          |    3 -
 emails/templates/new_user_invite.html         |   49 -
 emails/templates/new_user_invite.mjml         |   36 +
 emails/templates/ng_alert_notification.html   |  271 ---
 emails/templates/ng_alert_notification.mjml   |  122 ++
 .../partials/alerting/firing_instance.mjml    |   23 +
 .../partials/alerting/grouping_labels.mjml    |   30 +
 .../partials/alerting/instance_details.mjml   |  195 ++
 .../partials/alerting/resolved_instance.mjml  |   23 +
 .../templates/partials/alerting/summary.mjml  |   28 +
 emails/templates/partials/layout/default.txt  |    3 +
 emails/templates/partials/layout/footer.mjml  |    5 +
 emails/templates/partials/layout/head.mjml    |   10 +
 emails/templates/partials/layout/header.mjml  |    3 +
 emails/templates/reset_password.html          |   42 -
 emails/templates/reset_password.mjml          |   36 +
 emails/templates/signup_started.html          |   46 -
 emails/templates/signup_started.mjml          |   39 +
 emails/templates/welcome_on_signup.html       |   48 -
 emails/templates/welcome_on_signup.mjml       |   40 +
 go.mod                                        |   10 +-
 go.sum                                        |   11 +
 .../ngalert/notifier/channels/email_test.go   |   10 +-
 pkg/services/notifications/notifications.go   |    2 +
 public/emails/alert_notification.txt          |    3 +-
 public/emails/invited_to_org.html             |  479 +++--
 public/emails/invited_to_org.txt              |    6 +-
 public/emails/new_user_invite.html            |  475 ++---
 public/emails/new_user_invite.txt             |    6 +-
 public/emails/ng_alert_notification.html      | 1663 +++++++++++++----
 public/emails/ng_alert_notification.txt       |    6 +-
 public/emails/reset_password.html             |  468 ++---
 public/emails/reset_password.txt              |    6 +-
 public/emails/signup_started.html             |  487 +++--
 public/emails/signup_started.txt              |    3 +-
 public/emails/welcome_on_signup.html          |  479 +++--
 public/emails/welcome_on_signup.txt           |    6 +-
 56 files changed, 3073 insertions(+), 3553 deletions(-)
 create mode 100644 emails/Makefile
 delete mode 100644 emails/assets/css/ink.css
 delete mode 100644 emails/assets/css/style.css
 create mode 100644 emails/grunt/copy.js
 delete mode 100644 emails/grunt/premailer.js
 delete mode 100644 emails/grunt/processhtml.js
 delete mode 100644 emails/grunt/uncss.js
 delete mode 100644 emails/grunt/watch.js
 delete mode 100644 emails/templates/alert_notification.html
 delete mode 100644 emails/templates/alert_notification.txt
 delete mode 100644 emails/templates/invited_to_org.html
 create mode 100644 emails/templates/invited_to_org.mjml
 delete mode 100644 emails/templates/layouts/default.html
 delete mode 100644 emails/templates/layouts/default.txt
 delete mode 100644 emails/templates/new_user_invite.html
 create mode 100644 emails/templates/new_user_invite.mjml
 delete mode 100644 emails/templates/ng_alert_notification.html
 create mode 100644 emails/templates/ng_alert_notification.mjml
 create mode 100644 emails/templates/partials/alerting/firing_instance.mjml
 create mode 100644 emails/templates/partials/alerting/grouping_labels.mjml
 create mode 100644 emails/templates/partials/alerting/instance_details.mjml
 create mode 100644 emails/templates/partials/alerting/resolved_instance.mjml
 create mode 100644 emails/templates/partials/alerting/summary.mjml
 create mode 100644 emails/templates/partials/layout/default.txt
 create mode 100644 emails/templates/partials/layout/footer.mjml
 create mode 100644 emails/templates/partials/layout/head.mjml
 create mode 100644 emails/templates/partials/layout/header.mjml
 delete mode 100644 emails/templates/reset_password.html
 create mode 100644 emails/templates/reset_password.mjml
 delete mode 100644 emails/templates/signup_started.html
 create mode 100644 emails/templates/signup_started.mjml
 delete mode 100644 emails/templates/welcome_on_signup.html
 create mode 100644 emails/templates/welcome_on_signup.mjml

diff --git a/devenv/README.md b/devenv/README.md
index 6d6a7065b87..b8cbc39c8e9 100644
--- a/devenv/README.md
+++ b/devenv/README.md
@@ -4,6 +4,7 @@ This folder contains useful scripts and configuration so you can:
 
 - Configure data sources in Grafana for development.
 - Configure dashboards for development and test scenarios.
+- Set up an SMTP Server + Web Interface for viewing and testing emails.
 - Create docker-compose file with databases and fake data.
 
 ## Install Docker
@@ -58,6 +59,21 @@ Jaeger block runs both Jaeger and Loki container. Loki container sends traces to
 | 1.0     | graphite1   | 8280              | 2203           | 2203        |
 | 0.9     | graphite09  | 8380              | 2303           | 2303        |
 
+#### MailDev
+
+MailDev block runs an SMTP server and a web UI to test and view emails. This is useful for testing your email notifications locally.
+
+Make sure you configure your .ini file with the following settings:
+
+```ini
+[smtp]
+enabled = true
+skip_verify = true
+host = "localhost:1025"
+```
+
+You can access the web UI at http://localhost:12080/#/
+
 ## Debugging setup in VS Code
 An example of launch.json is provided in `devenv/vscode/launch.json`. It basically does what Makefile and .bra.toml do. The 'program' field is set to the folder name so VS Code loads all *.go files in it instead of just main.go.
 
diff --git a/emails/Makefile b/emails/Makefile
new file mode 100644
index 00000000000..e44bd04b9a1
--- /dev/null
+++ b/emails/Makefile
@@ -0,0 +1,14 @@
+build: build-html build-txt
+
+build-html:
+	npx mjml \
+		--config.beautify true \
+		--config.minify false \
+		--config.validationLevel=strict \
+		--config.keepComments=false \
+		./templates/*.mjml --output ../public/emails/
+
+build-txt:
+	npx grunt
+
+.PHONY: build build-html build-txt
diff --git a/emails/assets/css/ink.css b/emails/assets/css/ink.css
deleted file mode 100644
index f4c1a291cb3..00000000000
--- a/emails/assets/css/ink.css
+++ /dev/null
@@ -1,688 +0,0 @@
-/**********************************************
-* Ink v1.0.5 - Copyright 2013 ZURB Inc        *
-**********************************************/
-
-/* Client-specific Styles & Reset */
-
-#outlook a {
-  padding:0;
-}
-
-body{
-  width:100% !important;
-  min-width: 100%;
-  -webkit-text-size-adjust:100%;
-  -ms-text-size-adjust:100%;
-  margin:0;
-  padding:0;
-}
-
-
-
-.ExternalClass {
-  width:100%;
-}
-
-.ExternalClass,
-.ExternalClass p,
-.ExternalClass span,
-.ExternalClass font,
-.ExternalClass td,
-.ExternalClass div {
-  line-height: 100%;
-}
-
-#backgroundTable {
-  margin:0;
-  padding:0;
-  width:100% !important;
-  line-height: 100% !important;
-}
-
-img {
-  outline:none;
-  text-decoration:none;
-  -ms-interpolation-mode: bicubic;
-  width: auto;
-  float: left;
-  clear: both;
-  display: block;
-}
-
-center {
-  width: 100%;
-  min-width: 580px;
-}
-
-a img {
-  border: none;
-}
-
-p {
-  margin: 0 0 0 10px;
-}
-
-table {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-td {
-  word-break: break-word;
-  -webkit-hyphens: auto;
-  -moz-hyphens: auto;
-  hyphens: auto;
-  border-collapse: collapse !important;
-}
-
-table, tr, td {
-  padding: 0;
-  vertical-align: top;
-  text-align: left;
-}
-
-hr {
-  color: #d9d9d9;
-  background-color: #d9d9d9;
-  height: 1px;
-  border: none;
-}
-
-/* Responsive Grid */
-
-table.body {
-  height: 100%;
-  width: 100%;
-}
-
-table.container {
-  width: 580px;
-  margin: 0 auto;
-  text-align: inherit;
-}
-
-table.row {
-  padding: 0px;
-  width: 100%;
-  position: relative;
-}
-
-table.container table.row {
-  display: block;
-}
-
-td.wrapper {
-  padding: 10px 20px 0px 0px;
-  position: relative;
-}
-
-table.columns,
-table.column {
-  margin: 0 auto;
-}
-
-table.columns td,
-table.column td {
-  padding: 0px 0px 10px;
-}
-
-table.columns td.sub-columns,
-table.column td.sub-columns,
-table.columns td.sub-column,
-table.column td.sub-column {
-  padding-right: 10px;
-}
-
-td.sub-column, td.sub-columns {
-  min-width: 0px;
-}
-
-table.row td.last,
-table.container td.last {
-  padding-right: 0px;
-}
-
-table.one { width: 30px; }
-table.two { width: 80px; }
-table.three { width: 130px; }
-table.four { width: 180px; }
-table.five { width: 230px; }
-table.six { width: 280px; }
-table.seven { width: 330px; }
-table.eight { width: 380px; }
-table.nine { width: 430px; }
-table.ten { width: 480px; }
-table.eleven { width: 530px; }
-table.twelve { width: 580px; }
-
-table.one center { min-width: 30px; }
-table.two center { min-width: 80px; }
-table.three center { min-width: 130px; }
-table.four center { min-width: 180px; }
-table.five center { min-width: 230px; }
-table.six center { min-width: 280px; }
-table.seven center { min-width: 330px; }
-table.eight center { min-width: 380px; }
-table.nine center { min-width: 430px; }
-table.ten center { min-width: 480px; }
-table.eleven center { min-width: 530px; }
-table.twelve center { min-width: 580px; }
-
-table.one .panel center { min-width: 10px; }
-table.two .panel center { min-width: 60px; }
-table.three .panel center { min-width: 110px; }
-table.four .panel center { min-width: 160px; }
-table.five .panel center { min-width: 210px; }
-table.six .panel center { min-width: 260px; }
-table.seven .panel center { min-width: 310px; }
-table.eight .panel center { min-width: 360px; }
-table.nine .panel center { min-width: 410px; }
-table.ten .panel center { min-width: 460px; }
-table.eleven .panel center { min-width: 510px; }
-table.twelve .panel center { min-width: 560px; }
-
-.body .columns td.one,
-.body .column td.one { width: 8.333333%; }
-.body .columns td.two,
-.body .column td.two { width: 16.666666%; }
-.body .columns td.three,
-.body .column td.three { width: 25%; }
-.body .columns td.four,
-.body .column td.four { width: 33.333333%; }
-.body .columns td.five,
-.body .column td.five { width: 41.666666%; }
-.body .columns td.six,
-.body .column td.six { width: 50%; }
-.body .columns td.seven,
-.body .column td.seven { width: 58.333333%; }
-.body .columns td.eight,
-.body .column td.eight { width: 66.666666%; }
-.body .columns td.nine,
-.body .column td.nine { width: 75%; }
-.body .columns td.ten,
-.body .column td.ten { width: 83.333333%; }
-.body .columns td.eleven,
-.body .column td.eleven { width: 91.666666%; }
-.body .columns td.twelve,
-.body .column td.twelve { width: 100%; }
-
-td.offset-by-one { padding-left: 50px; }
-td.offset-by-two { padding-left: 100px; }
-td.offset-by-three { padding-left: 150px; }
-td.offset-by-four { padding-left: 200px; }
-td.offset-by-five { padding-left: 250px; }
-td.offset-by-six { padding-left: 300px; }
-td.offset-by-seven { padding-left: 350px; }
-td.offset-by-eight { padding-left: 400px; }
-td.offset-by-nine { padding-left: 450px; }
-td.offset-by-ten { padding-left: 500px; }
-td.offset-by-eleven { padding-left: 550px; }
-
-td.expander {
-  visibility: hidden;
-  width: 0px;
-  padding: 0 !important;
-}
-
-table.columns .text-pad,
-table.column .text-pad {
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
-table.columns .left-text-pad,
-table.columns .text-pad-left,
-table.column .left-text-pad,
-table.column .text-pad-left {
-  padding-left: 10px;
-}
-
-table.columns .right-text-pad,
-table.columns .text-pad-right,
-table.column .right-text-pad,
-table.column .text-pad-right {
-  padding-right: 10px;
-}
-
-/* Block Grid */
-
-.block-grid {
-  width: 100%;
-  max-width: 580px;
-}
-
-.block-grid td {
-  display: inline-block;
-  padding:10px;
-}
-
-.two-up td {
-  width:270px;
-}
-
-.three-up td {
-  width:173px;
-}
-
-.four-up td {
-  width:125px;
-}
-
-.five-up td {
-  width:96px;
-}
-
-.six-up td {
-  width:76px;
-}
-
-.seven-up td {
-  width:62px;
-}
-
-.eight-up td {
-  width:52px;
-}
-
-/* Alignment & Visibility Classes */
-
-table.center, td.center {
-  text-align: center;
-}
-
-h1.center,
-h2.center,
-h3.center,
-h4.center,
-h5.center,
-h6.center {
-  text-align: center;
-}
-
-span.center {
-  display: block;
-  width: 100%;
-  text-align: center;
-}
-
-img.center {
-  margin: 0 auto;
-  float: none;
-}
-
-.show-for-small,
-.hide-for-desktop {
-  display: none;
-}
-
-/* Typography */
-
-body, table.body, h1, h2, h3, h4, h5, h6, p, td {
-  color: #222222;
-  font-family: "Helvetica", "Arial", sans-serif;
-  font-weight: normal;
-  padding:0;
-  margin: 0;
-  text-align: left;
-  line-height: 1.3;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  word-break: normal;
-}
-
-h1 {font-size: 40px;}
-h2 {font-size: 36px;}
-h3 {font-size: 32px;}
-h4 {font-size: 28px;}
-h5 {font-size: 24px;}
-h6 {font-size: 20px;}
-body, table.body, p, td {font-size: 14px;line-height:19px;}
-
-p.lead, p.lede, p.leed {
-  font-size: 18px;
-  line-height:21px;
-}
-
-p {
-  margin-bottom: 10px;
-}
-
-small {
-  font-size: 10px;
-}
-
-a {
-  color: #2ba6cb;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #2795b6 !important;
-}
-
-a:active {
-  color: #2795b6 !important;
-}
-
-a:visited {
-  color: #2ba6cb !important;
-}
-
-h1 a,
-h2 a,
-h3 a,
-h4 a,
-h5 a,
-h6 a {
-  color: #2ba6cb;
-}
-
-h1 a:active,
-h2 a:active,
-h3 a:active,
-h4 a:active,
-h5 a:active,
-h6 a:active {
-  color: #2ba6cb !important;
-}
-
-h1 a:visited,
-h2 a:visited,
-h3 a:visited,
-h4 a:visited,
-h5 a:visited,
-h6 a:visited {
-  color: #2ba6cb !important;
-}
-
-/* Panels */
-
-.panel {
-  background: #f2f2f2;
-  border: 1px solid #d9d9d9;
-  padding: 10px !important;
-}
-
-.sub-grid table {
-  width: 100%;
-}
-
-.sub-grid td.sub-columns {
-  padding-bottom: 0;
-}
-
-/* Buttons */
-
-table.button,
-table.tiny-button,
-table.small-button,
-table.medium-button,
-table.large-button {
-  width: 100%;
-  overflow: hidden;
-}
-
-table.button td,
-table.tiny-button td,
-table.small-button td,
-table.medium-button td,
-table.large-button td {
-  display: block;
-  width: auto !important;
-  text-align: center;
-  background: #2ba6cb;
-  border: 1px solid #2284a1;
-  color: #ffffff;
-  padding: 8px 0;
-}
-
-table.tiny-button td {
-  padding: 5px 0 4px;
-}
-
-table.small-button td {
-  padding: 8px 0 7px;
-}
-
-table.medium-button td {
-  padding: 12px 0 10px;
-}
-
-table.large-button td {
-  padding: 21px 0 18px;
-}
-
-table.button td a,
-table.tiny-button td a,
-table.small-button td a,
-table.medium-button td a,
-table.large-button td a {
-  font-weight: bold;
-  text-decoration: none;
-  font-family: Helvetica, Arial, sans-serif;
-  color: #ffffff;
-  font-size: 16px;
-}
-
-table.tiny-button td a {
-  font-size: 12px;
-  font-weight: normal;
-}
-
-table.small-button td a {
-  font-size: 16px;
-}
-
-table.medium-button td a {
-  font-size: 20px;
-}
-
-table.large-button td a {
-  font-size: 24px;
-}
-
-table.button:hover td,
-table.button:visited td,
-table.button:active td {
-  background: #2795b6 !important;
-}
-
-table.button:hover td a,
-table.button:visited td a,
-table.button:active td a {
-  color: #fff !important;
-}
-
-table.button:hover td,
-table.tiny-button:hover td,
-table.small-button:hover td,
-table.medium-button:hover td,
-table.large-button:hover td {
-  background: #2795b6 !important;
-}
-
-table.button:hover td a,
-table.button:active td a,
-table.button td a:visited,
-table.tiny-button:hover td a,
-table.tiny-button:active td a,
-table.tiny-button td a:visited,
-table.small-button:hover td a,
-table.small-button:active td a,
-table.small-button td a:visited,
-table.medium-button:hover td a,
-table.medium-button:active td a,
-table.medium-button td a:visited,
-table.large-button:hover td a,
-table.large-button:active td a,
-table.large-button td a:visited {
-  color: #ffffff !important;
-}
-
-table.secondary td {
-  background: #e9e9e9;
-  border-color: #d0d0d0;
-  color: #555;
-}
-
-table.secondary td a {
-  color: #555;
-}
-
-table.secondary:hover td {
-  background: #d0d0d0 !important;
-  color: #555;
-}
-
-table.secondary:hover td a,
-table.secondary td a:visited,
-table.secondary:active td a {
-  color: #555 !important;
-}
-
-table.success td {
-  background: #5da423;
-  border-color: #457a1a;
-}
-
-table.success:hover td {
-  background: #457a1a !important;
-}
-
-table.alert td {
-  background: #c60f13;
-  border-color: #970b0e;
-}
-
-table.alert:hover td {
-  background: #970b0e !important;
-}
-
-table.radius td {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-
-table.round td {
-  -webkit-border-radius: 500px;
-  -moz-border-radius: 500px;
-  border-radius: 500px;
-}
-
-/* Outlook First */
-
-body.outlook p {
-  display: inline !important;
-}
-
-/*  Media Queries */
-
-@media only screen and (max-width: 600px) {
-
-  table[class="body"] img {
-
-  }
-
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-
-  table[class="body"] .row {
-    width: 100% !important;
-    display: block !important;
-  }
-
-  table[class="body"] .wrapper {
-    display: block !important;
-    padding-right: 0 !important;
-  }
-
-  table[class="body"] .columns,
-  table[class="body"] .column {
-    table-layout: fixed !important;
-    float: none !important;
-    width: 100% !important;
-    padding-right: 0px !important;
-    padding-left: 0px !important;
-    display: block !important;
-  }
-
-  table[class="body"] .wrapper.first .columns,
-  table[class="body"] .wrapper.first .column {
-    display: table !important;
-  }
-
-  table[class="body"] table.columns td,
-  table[class="body"] table.column td {
-    width: 100% !important;
-  }
-
-  table[class="body"] .columns td.one,
-  table[class="body"] .column td.one { width: 8.333333% !important; }
-  table[class="body"] .columns td.two,
-  table[class="body"] .column td.two { width: 16.666666% !important; }
-  table[class="body"] .columns td.three,
-  table[class="body"] .column td.three { width: 25% !important; }
-  table[class="body"] .columns td.four,
-  table[class="body"] .column td.four { width: 33.333333% !important; }
-  table[class="body"] .columns td.five,
-  table[class="body"] .column td.five { width: 41.666666% !important; }
-  table[class="body"] .columns td.six,
-  table[class="body"] .column td.six { width: 50% !important; }
-  table[class="body"] .columns td.seven,
-  table[class="body"] .column td.seven { width: 58.333333% !important; }
-  table[class="body"] .columns td.eight,
-  table[class="body"] .column td.eight { width: 66.666666% !important; }
-  table[class="body"] .columns td.nine,
-  table[class="body"] .column td.nine { width: 75% !important; }
-  table[class="body"] .columns td.ten,
-  table[class="body"] .column td.ten { width: 83.333333% !important; }
-  table[class="body"] .columns td.eleven,
-  table[class="body"] .column td.eleven { width: 91.666666% !important; }
-  table[class="body"] .columns td.twelve,
-  table[class="body"] .column td.twelve { width: 100% !important; }
-
-  table[class="body"] td.offset-by-one,
-  table[class="body"] td.offset-by-two,
-  table[class="body"] td.offset-by-three,
-  table[class="body"] td.offset-by-four,
-  table[class="body"] td.offset-by-five,
-  table[class="body"] td.offset-by-six,
-  table[class="body"] td.offset-by-seven,
-  table[class="body"] td.offset-by-eight,
-  table[class="body"] td.offset-by-nine,
-  table[class="body"] td.offset-by-ten,
-  table[class="body"] td.offset-by-eleven {
-    padding-left: 0 !important;
-  }
-
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-
-  table[class="body"] .right-text-pad,
-  table[class="body"] .text-pad-right {
-    padding-left: 10px !important;
-  }
-
-  table[class="body"] .left-text-pad,
-  table[class="body"] .text-pad-left {
-    padding-right: 10px !important;
-  }
-
-  table[class="body"] .hide-for-small,
-  table[class="body"] .show-for-desktop {
-    display: none !important;
-  }
-
-  table[class="body"] .show-for-small,
-  table[class="body"] .hide-for-desktop {
-    display: inherit !important;
-  }
-}
diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css
deleted file mode 100644
index 065421a173d..00000000000
--- a/emails/assets/css/style.css
+++ /dev/null
@@ -1,196 +0,0 @@
-
-body, table.body, h1, h2, h3, h4, h5, h6, p, td {
-  font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -webkit-text-size-adjust: none;
-}
-
-h1 {font-size: 40px;}
-h2 {font-size: 36px;}
-h3 {
-  font-size: 22px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-h4 {font-size: 20px;}
-h5 {font-size: 18px;}
-h6 {font-size: 16px;}
-
-.emphasis {
-  font-weight: 600;
-}
-
-a {
-  color: #E67612;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #ff8f2b !important;
-}
-
-a:active {
-  color: #F2821E !important;
-}
-
-a:visited {
-  color: #E67612 !important;
-}
-
-table.facebook td {
-  background: #3b5998;
-  border-color: #2d4473;
-}
-
-table.facebook:hover td {
-  background: #2d4473 !important;
-}
-
-table.twitter td {
-  background: #00acee;
-  border-color: #0087bb;
-}
-
-table.twitter:hover td {
-  background: #0087bb !important;
-}
-
-table.google-plus td {
-  background-color: #DB4A39;
-  border-color: #CC0000;
-}
-
-table.google-plus:hover td {
-  background: #CC0000 !important;
-}
-
-.template-label {
-  color: #ffffff;
-  font-weight: bold;
-  font-size: 11px;
-}
-
-.callout .wrapper {
-  padding-bottom: 20px;
-}
-
-.callout .panel {
-  background: #ECF8FF;
-  border-color: #b9e5ff;
-}
-
-.header {
-margin-top:25px;
-margin-bottom: 25px;
-}
-
-.data {
-  font-size: 16px;
-}
-
-.footer {
-  background-color: #2e2e2e;
-  color: #999999;
-  margin: 0 auto;
-  width: 100%;
-}
-
-@media only screen and (max-width: 600px) {
-  table[class="body"] .right-text-pad {
-    padding-left: 10px !important;
-  }
-
-  table[class="body"] .left-text-pad {
-    padding-right: 10px !important;
-  }
-
-  .logo {
-    margin-left: 10px;
-  }
-}
-
-table.better-button {
-  margin-top: 10px;
-  margin-bottom: 20px;
-}
-
-table.columns td.better-button {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-  padding-bottom: 0px;
-}
-
-.better-button a {
-  text-decoration: none;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-
-  padding: 12px 25px;
-  border: 1px solid #ff8f2b;
-  display: inline-block;
-  color: #FFF;
-}
-
-.better-button:hover a {
-  color: #FFFFFF !important;
-  background-color: #F2821E;
-  border: 1px solid #F2821E;
-}
-
-.better-button:visited a {
-  color: #FFFFFF !important;
-}
-
-.better-button:active a {
-  color: #FFFFFF !important;
-}
-
-table.better-button-alt {
-  margin-top: 10px;
-  margin-bottom: 20px;
-}
-
-table.columns td.better-button-alt {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-  padding-bottom: 0px;
-}
-
-.better-button-alt a {
-  text-decoration: none;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-
-  padding: 12px 25px;
-  border: 1px solid #ff8f2b;
-  background-color: #EFEFEF;
-  display: inline-block;
-  color: #ff8f2b;
-}
-
-.better-button-alt:hover a {
-  color: #ff8f2b !important;
-  background-color: #DDDDDD;
-  border: 1px solid #F2821E;
-}
-
-.better-button-alt:visited a {
-  color: #ff8f2b !important;
-}
-
-.better-button-alt:active a {
-  color: #ff8f2b !important;
-}
-
-.verification-code {
-  background-color: #EEEEEE;
-  padding: 3px;
-  margin: 8px;
-  display: inline-block;
-  font-weight: bold;
-  font-size: 20px;
-}
diff --git a/emails/grunt/aliases.yaml b/emails/grunt/aliases.yaml
index 6a2e47777cd..550d7a5422a 100644
--- a/emails/grunt/aliases.yaml
+++ b/emails/grunt/aliases.yaml
@@ -1,8 +1,5 @@
-
 default:
-    - 'clean'
-    - 'assemble'
-    - 'replace'
-    - 'uncss'
-    - 'processhtml'
-    - 'premailer'
+  - 'clean'
+  - 'assemble'
+  - 'replace'
+  - 'copy'
diff --git a/emails/grunt/assemble.js b/emails/grunt/assemble.js
index 6ef46860267..e0d1f103a42 100644
--- a/emails/grunt/assemble.js
+++ b/emails/grunt/assemble.js
@@ -2,21 +2,12 @@ module.exports = function () {
   'use strict';
   return {
     options: {
-      partials: ['templates/partials/*.hbs'],
-      helpers: ['templates/helpers/**/*.js'],
       data: [],
       flatten: true,
     },
-    html: {
-      options: {
-        layout: 'templates/layouts/default.html',
-      },
-      src: ['templates/*.html'],
-      dest: 'dist/',
-    },
     txt: {
       options: {
-        layout: 'templates/layouts/default.txt',
+        layout: 'templates/partials/layout/default.txt',
         ext: '.txt',
       },
       src: ['templates/*.txt'],
diff --git a/emails/grunt/copy.js b/emails/grunt/copy.js
new file mode 100644
index 00000000000..4f794d85a3a
--- /dev/null
+++ b/emails/grunt/copy.js
@@ -0,0 +1,11 @@
+module.exports = function () {
+  'use strict';
+  return {
+    txt: {
+      expand: true,
+      cwd: 'dist',
+      src: ['**.txt'],
+      dest: '../public/emails/',
+    },
+  };
+};
diff --git a/emails/grunt/premailer.js b/emails/grunt/premailer.js
deleted file mode 100644
index f587095c256..00000000000
--- a/emails/grunt/premailer.js
+++ /dev/null
@@ -1,31 +0,0 @@
-module.exports = {
-  html: {
-    options: {
-      verbose: true,
-      removeComments: true,
-    },
-    files: [
-      {
-        expand: true, // Enable dynamic expansion.
-        cwd: 'dist', // Src matches are relative to this path.
-        src: ['*.html'], // Actual pattern(s) to match.
-        dest: '../public/emails/', // Destination path prefix.
-      },
-    ],
-  },
-  txt: {
-    options: {
-      verbose: true,
-      mode: 'txt',
-      lineLength: 90,
-    },
-    files: [
-      {
-        expand: true, // Enable dynamic expansion.
-        cwd: 'dist', // Src matches are relative to this path.
-        src: ['*.txt'], // Actual patterns to match.
-        dest: '../public/emails/', // Destination path prefix.
-      },
-    ],
-  },
-};
diff --git a/emails/grunt/processhtml.js b/emails/grunt/processhtml.js
deleted file mode 100644
index 777b2d27d73..00000000000
--- a/emails/grunt/processhtml.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
-  dist: {
-    files: [
-      {
-        expand: true, // Enable dynamic expansion.
-        cwd: 'dist', // Src matches are relative to this path.
-        src: ['*.html'], // Actual pattern(s) to match.
-        dest: 'dist/', // Destination path prefix.
-      },
-    ],
-  },
-};
diff --git a/emails/grunt/replace.js b/emails/grunt/replace.js
index 0d8c030d2f3..be4f18e34d4 100644
--- a/emails/grunt/replace.js
+++ b/emails/grunt/replace.js
@@ -1,7 +1,7 @@
 module.exports = {
   dist: {
     overwrite: true,
-    src: ['dist/*.html', 'dist/*.txt'],
+    src: ['dist/*.txt'],
     replacements: [
       {
         from: '[[',
diff --git a/emails/grunt/uncss.js b/emails/grunt/uncss.js
deleted file mode 100644
index c1ec535e1bb..00000000000
--- a/emails/grunt/uncss.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-  dist: {
-    src: ['dist/*.html'],
-    dest: 'dist/css/tidy.css',
-    options: {
-      report: 'min', // optional: include to report savings
-    },
-  },
-};
diff --git a/emails/grunt/watch.js b/emails/grunt/watch.js
deleted file mode 100644
index b071320b3e6..00000000000
--- a/emails/grunt/watch.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
-  src: {
-    files: [
-      //what are the files that we want to watch
-      'assets/css/*.css',
-      'templates/**/*.html',
-      'templates/**/*.txt',
-      'grunt/*.js',
-    ],
-    tasks: ['default'],
-    options: {
-      nospawn: true,
-      livereload: false,
-    },
-  },
-};
diff --git a/emails/package.json b/emails/package.json
index f4eb62d4eae..c8de033b507 100644
--- a/emails/package.json
+++ b/emails/package.json
@@ -1,26 +1,17 @@
 {
-  "name": "Grafana-Email-Campaign",
+  "name": "grafana-email-campaign",
   "version": "1.0.0",
-  "description": "Grafana Email templates based on Zurb Ink",
-  "repository": "dnnsldr/",
-  "author": {
-    "name": "dnnsldr",
-    "email": "delder@riester.com",
-    "url": "https://github.com/dnnsldr"
-  },
-  "scripts": {
-    "build": "grunt",
-    "start": "grunt watch"
-  },
+  "description": "Grafana Email templates based on MJML",
+  "author": "Grafana Labs",
   "devDependencies": {
     "grunt": "1.0.1",
-    "grunt-premailer": "1.1.0",
-    "grunt-processhtml": "^0.4.2",
-    "grunt-uncss": "0.9.0",
-    "load-grunt-config": "3.0.1",
+    "grunt-assemble": "0.6.3",
+    "grunt-cli": "^1.4.3",
+    "grunt-contrib-clean": "2.0.0",
+    "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-watch": "1.1.0",
     "grunt-text-replace": "0.4.0",
-    "grunt-assemble": "0.6.3",
-    "grunt-contrib-clean": "2.0.0"
+    "load-grunt-config": "3.0.1",
+    "mjml": "^4.13.0"
   }
 }
diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html
deleted file mode 100644
index 98d2f7ff56c..00000000000
--- a/emails/templates/alert_notification.html
+++ /dev/null
@@ -1,134 +0,0 @@
-[[Subject .Subject "[[.Title]]"]]
-
-<table class="row">
-  <tr>
-    <td class="wrapper last">
-      <table class="twelve columns">
-        <tr>
-          <td class="center">
-            <h3 style="/*text-align:center*/;color: [[.SeverityColor]]; font-weight: bold; font-style: italic;">[[.Title]]</h3>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<table class="row" >
-  <tr>
-    <td class="last">
-      <table class="twelve columns">
-        <tr>
-          <td class="center">
-            <p style="/*text-align:center*/">[[.Message]]</p>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-[[if ne .Error "" ]]
-<table class="row" >
-  <tr>
-    <td class="last">
-      <center>
-      <table class="twelve columns" >
-        <tr>
-          <td class="twelve last">
-            <h5 style="font-weight: bold;">Error message</h5>
-          </td>
-        </tr>
-        <tr>
-          <td class="twelve last">
-            <p>[[.Error]]</p>
-          </td>
-        </tr>
-      </table>
-      </center>
-    </td>
-  </tr>
-</table>
-[[end]]
-
-[[if ne .State "ok" ]]
-<table class="row" >
-  <tr>
-    <td class="last">
-      <center>
-      <table class="twelve columns" >
-        <tr>
-          <td class="six">
-            <h5 style="font-weight: bold;">Metric name</h5>
-          </td>
-          <td class="six last" style="text-align: right; width:100px;">
-            <h5 style="font-weight: bold;text-align: right;">Value</h5>
-          </td>
-        </tr>
-        [[range .EvalMatches]]
-        <tr>
-          <td class="six">
-            <h5 class="data">[[.Metric]]</h5>
-          </td>
-          <td class="six last" style="text-align: right; width:100px;">
-            <h5 class="data" style="text-align: right;">[[.Value]]</h5>
-          </td>
-        </tr>
-        [[end]]
-      </table>
-      </center>
-    </td>
-  </tr>
-</table>
-[[end]]
-
-<table class="row" >
-    <tr>
-    <td class="wrapper last">
-      <table class="twelve columns">
-        <tr>
-          <td class="center">
-            [[if ne .ImageLink "" ]]
-              <img src="[[.ImageLink]]" alt="Alerting Panel"/>
-            [[end]]
-            [[if ne .EmbeddedImage "" ]]
-              <img src="cid:[[.EmbeddedImage]]" alt="Alerting Panel"/>
-            [[end]]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-
-<table class="row">
-  <tr>
-    <td class="wrapper last">
-      <table class="twelve columns">
-        <tr>
-          <td class="center six">
-            <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td align="center" class="better-button" bgcolor="#ff8f2b">
-                  <a rel="noopener noreferrer" href="[[.RuleUrl]]"  target="_blank">View your Alert rule</a>
-                </td>
-              </tr>
-            </table>
-            </td>
-            <td class="center six">
-            <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td align="center" class="better-button-alt" bgcolor="#efefef">
-                  <a rel="noopener noreferrer" href="[[.AlertPageUrl]]"  target="_blank"> Go to the Alerts page</a>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-
diff --git a/emails/templates/alert_notification.txt b/emails/templates/alert_notification.txt
deleted file mode 100644
index 92b8d91386e..00000000000
--- a/emails/templates/alert_notification.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-[[Subject .Subject "[[.Title]]"]]
-
-[[.Title]]
-----------------
-
-[[.Message]]
-
-[[if ne .Error "" ]]
-Error message:
-[[.Error]]
-[[end]]
-
-[[if ne .State "ok" ]]
-[[range .EvalMatches]]
-Metric name:
-[[.Metric]]
-Value:
-[[.Value]]
-[[end]]
-[[end]]
-
-View your Alert rule:
-[[.RuleUrl]]"
-
-Go to the Alerts page:
-[[.AlertPageUrl]]
diff --git a/emails/templates/invited_to_org.html b/emails/templates/invited_to_org.html
deleted file mode 100644
index 69ef61587df..00000000000
--- a/emails/templates/invited_to_org.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- This email is sent when an existing user is added to an organization -->
-
-[[Subject .Subject "[[.InvitedBy]] has added you to the [[.OrgName]] organization"]]
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-
-			<table class="twelve columns">
-				<tr>
-					<td>
-						<h4 class="center">You have been added to [[.OrgName]]</h4>
-					</td>
-					<td class="expander"></td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-						<p><b>[[.InvitedBy]]</b> has added you to the <b>[[.OrgName]]</b> organization in Grafana.
-						<p>Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.</p>
-					</td>
-					<td class="expander"></td>
-				</tr>
-				<tr>
-					<td class="center">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="better-button" bgcolor="#ff8f2b"><a rel="noopener noreferrer" href="[[.AppUrl]]" target="_blank">Log in now</a></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-
diff --git a/emails/templates/invited_to_org.mjml b/emails/templates/invited_to_org.mjml
new file mode 100644
index 00000000000..d85a011dbc5
--- /dev/null
+++ b/emails/templates/invited_to_org.mjml
@@ -0,0 +1,40 @@
+<mjml>
+  <mj-head>
+    <!-- ⬇ Don't forget to specifify an email subject! Use the HTML comment below ⬇ -->
+    <mj-title>
+      {{ Subject .Subject "{{ .InvitedBy }} has added you to the {{ .OrgName }} organization" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section background-color="#22252b" border="1px solid #2f3037">
+      <mj-column>
+        <mj-text>
+          <h2>You have been added to {{ .OrgName }}</h2>
+          <strong>{{ .InvitedBy }}</strong> has added you to the <strong>{{ .OrgName }}</strong> organization in Grafana.
+        </mj-text>
+        <mj-text>
+          Once logged in, <strong>{{ .OrgName }}</strong> will be available to switch to in the user interface.
+        </mj-text>
+        <mj-text>
+          Log in now by clicking the link below:
+        </mj-text>
+        <mj-button href="{{ .AppUrl }}">
+          Login to Grafana
+        </mj-button>
+        <mj-text>
+          You can also copy and paste this link into your browser directly:
+        </mj-text>
+        <mj-text>
+          <a rel="noopener" href="{{ .AppUrl }}">{{ .AppUrl }}</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/emails/templates/invited_to_org.txt b/emails/templates/invited_to_org.txt
index 322119aa942..b2ae9e8a1ac 100644
--- a/emails/templates/invited_to_org.txt
+++ b/emails/templates/invited_to_org.txt
@@ -6,4 +6,4 @@ You have been added to [[.OrgName]]
 Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.
 
 Log in now:
-[[.AppUrl]]
\ No newline at end of file
+[[.AppUrl]]
diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html
deleted file mode 100644
index 7e580ac910f..00000000000
--- a/emails/templates/layouts/default.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width"/>
-	<!-- build:css css/tidy.css -->
-	<link inline rel="stylesheet" href="../assets/css/ink.css">
-	<link inline rel="stylesheet" href="../assets/css/style.css">
-	<!-- /build -->
-</head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="background: #2e2e2e; height: 100% !important; margin: 0 auto; padding: 0; width: 100% !important" bgcolor="#2e2e2e"><style type="text/css">
-body {
-	height: 100% !important; width: 100% !important;
-}
-body .copy {
-   -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-	width: 100%;
-}
-.ExternalClass {
-	line-height: 100%;
-}
-img {
-    -ms-interpolation-mode: bicubic;
-}
-img {
-	border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-	text-decoration: underline;
-}
-td[class="stack-column-center"] {
-    text-align: center !important;
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-  	width:270px;
-  }
-}
-</style>
-
-	<table class="body" style="background: #2e2e2e;">
-		<tr>
-			<td class="center" align="center" valign="top">
-        <center>
-					<table class="row header">
-						<tr>
-						  <td class="center" align="center">
-						    <center>
-
-						      <table class="container">
-						        <tr>
-						          <td class="wrapper last">
-
-						            <table class="twelve columns">
-						              <tr>
-						                <td class="twelve sub-columns center">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; float: none; display: inline">
-                            </td>
-                            <td class="expander"></td>
-                          </tr>
-						            </table>
-
-						          </td>
-						        </tr>
-						      </table>
-
-						    </center>
-						  </td>
-						</tr>
-					</table>
-
-					<table class="container" style="background-color: #efefef;" width="600">
-						<tr>
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; vertical-align: top; border: 0; background: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important" valign="top"> </td>
-						</tr>
-						<tr>
-							<td class="mini-centered-text" style="color: #343b41; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif; mso-table-lspace: 0pt; mso-table-rspace: 0pt; padding: 25px 35px; text-align: center; vertical-align: top" align="center" valign="top">
-								{{> body }}
-								<!-- container end below -->
-							</td>
-						</tr>
-					</table>
-					<!-- footer -->
-					<table class="footer center">
-						<tr>
-							<td class="wrapper last">
-								<table class="twelve columns center">
-									<tr>
-										<td class="twelve" align="center">
-											<center>
-												<p style="text-align: center; font-size: 12px; color: #999999;">
-													Sent by <a href="[[.AppUrl]]">Grafana v[[.BuildVersion]]</a>
-													<br />&copy; 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
-</body>
-</html>
diff --git a/emails/templates/layouts/default.txt b/emails/templates/layouts/default.txt
deleted file mode 100644
index 543f4ac140d..00000000000
--- a/emails/templates/layouts/default.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{{> body }}
-
-Sent by Grafana v[[.BuildVersion]] (c) 2022 Grafana Labs
\ No newline at end of file
diff --git a/emails/templates/new_user_invite.html b/emails/templates/new_user_invite.html
deleted file mode 100644
index b2c0b431fd3..00000000000
--- a/emails/templates/new_user_invite.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- This email is sent when user who does not already exist in Grafana is added to an organization -->
-
-[[Subject .Subject "[[.InvitedBy]] has invited you to join Grafana"]]
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-
-			<table class="twelve columns">
-				<tr>
-					<td>
-						<h4 class="center">You're invited to join [[.OrgName]]</h4>
-					</td>
-					<td class="expander"></td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-						<p>You've been invited to join the <b>[[.OrgName]]</b> organization by <b>[[.InvitedBy]]</b>. To accept your invitation and join the team, please click the link below:</p>
-					</td>
-				</tr>
-				<tr>
-					<td class="center">
-	                    <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-	                    	<tr>
-	                          <td align="center" class="better-button" bgcolor="#ff8f2b"><a rel="noopener noreferrer" href="[[.LinkUrl]]" target="_blank">Accept Invitation</a></td>
-	                        </tr>
-	                    </table>
-					</td>
-				</tr>
-				<tr>
-					<td class="center">
-						<p>You can also copy and paste this link into your browser directly: <a href="[[.LinkUrl]]">[[.LinkUrl]]</a></p>
-					</td>
-					<td class="expander"></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/emails/templates/new_user_invite.mjml b/emails/templates/new_user_invite.mjml
new file mode 100644
index 00000000000..66c28de9454
--- /dev/null
+++ b/emails/templates/new_user_invite.mjml
@@ -0,0 +1,36 @@
+<mjml>
+  <mj-head>
+    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject "{{ .InvitedBy }} has invited you to join Grafana" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section background-color="#22252b" border="1px solid #2f3037">
+      <mj-column>
+        <mj-text>
+          <h2>You're invited to join {{ .OrgName }}</h2>
+        </mj-text>
+        <mj-text>
+          You've been invited to join the <strong>{{ .OrgName }}</strong> organization by <strong>{{ .InvitedBy }}</strong>. To accept your invitation and join the team, please click the link below:
+        </mj-text>
+        <mj-button href="{{ .LinkUrl }}">
+          Accept Invitation
+        </mj-button>
+        <mj-text>
+          You can also copy and paste this link into your browser directly:
+        </mj-text>
+        <mj-text>
+          <a rel="noopener" href="{{ .LinkUrl }}">{{ .LinkUrl }}</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/emails/templates/ng_alert_notification.html b/emails/templates/ng_alert_notification.html
deleted file mode 100644
index 093c75cc21e..00000000000
--- a/emails/templates/ng_alert_notification.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!-- The template body needs to be wrapped in div to prevent Premailer from adding </tr></td> tags which breaks the HTML structure -->
-<div>
-
-[[Subject .Subject "[[.Title]]"]]
-
-[[ define "__text_values_list" ]][[ $len := len .Values ]][[ if $len ]][[ $first := gt $len 1 ]][[ range $refID, $value := .Values -]]
-[[ $refID ]]=[[ $value ]][[ if $first ]], [[ end ]][[ $first = false ]][[ end -]]
-[[ else ]][no value][[ end ]][[ end ]]
-
-[[ define "alert" ]]
-
-  [[ if ne .ImageURL "" ]]
-  <tr>
-    <td colspan="2" class="value">
-      <img src="[[.ImageURL]]" class="fluid-centered" alt="Alerting Panel" />
-    </td>
-  </tr>
-  [[ end ]]
-  [[ if ne .EmbeddedImage "" ]]
-  <tr>
-    <td colspan="2" class="value">
-      <img src="cid:[[.EmbeddedImage]]" alt="Alerting Chart Attached Below" />
-    </td>
-  </tr>
-  [[ end ]]
-  <tr>
-    <td colspan="2" class="value">
-      <span class="value-heading">Value:</span> <span class="value-value">[[ template "__text_values_list" . ]]</span>
-    </td>
-  </tr>
-  [[ if gt (len .Annotations.SortedPairs) 0 ]]
-      <tr>
-        <td colspan="2" class="annotations">
-          [[ range .Annotations.SortedPairs ]]
-          <p><span class="annotations-heading">[[ .Name ]]:</span> <span class="annotations-value">[[ .Value ]]</span></p>
-          [[ end ]]
-        </td>
-      </tr>
-  [[ end ]]
-  <tr>
-    <td colspan="2">
-      <span class="labels-heading">Labels:</span>
-      <ul class="labels-list">
-        [[ range .Labels.SortedPairs ]]<li>[[ .Name ]]: [[ .Value ]]</li>[[ end ]]
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="actions">
-      [[ if .SilenceURL ]]
-        <a
-          href="[[ .SilenceURL ]]"
-          class="button"
-        >
-          <img
-            alt=""
-            height="14"
-            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAF1SURBVHgBrZLNTsJAEMf/2wYTPfEI9Q1qvBgjsEl5gB498gj1SDHpEKUckaMn4eiNFyAp4cJN30CPHrn5BV1noTWlFD3oJNuZ3Z39zUcH+A9pUffJpzAoOO/xuvvprZHooYCgLISoa7FyFSCbdOXuApj6M43GUVXWhYZUpKP3k1NZ14+kAOYChleVjnssK/ezKHrLAkQuZWIVKCgKyW+n55cUciZClzLoUPOiqISVlPB+s6ZulnNN/ihG3GfT84jKOwGvMO0krVEewoBoHeTA2glIhRuno7WzkH0Yc633sCz/CoiVshdYRGxGKYSo9ahgHnEPoqzvdxP1b/sEHtgsF2e12ditDD6gPE59XgIO8ytfTlbM1DiTzjk7WQvEYgllZ5fSXeE7vnfTOdkC1GqOBSFO2Mk22JG1TB4l+1VzX/IQgQJpBaHHsB6bA47+rNOHUI1O4A/zw2YWAaaT8UyPNkdcZ6JUs0P+7eouGXuO3WC7j7/KF29iokiLUdaFAAAAAElFTkSuQmCC"
-            class="button-img"
-            width="14"
-          />
-          Silence
-        </a>
-      [[ end ]]
-      [[ if .Annotations.runbook_url ]]
-        <a
-          href="[[ .Annotations.runbook_url ]]"
-          class="button"
-        >
-          <img
-            class="button-img"
-            alt=""
-            height="14"
-            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADaSURBVHgBrVNLDoIwFJwq0bjTG+ARvIGeQI/ADdSVARY8oki8jZxEbyDewLUfahttAoEWDM7m9bVvJtN0CrQEyzdENLyjt2RgtoFzjcgl1XTyJw/0T4K8ghmBH8Zz1VhqsaHtVBT7CYwP5KY6tk+xw3k2Kgl0YdmyKrIYvEjB73EqbI+rBC1owMDXGdjws0aqm9MK7Mg7ogE6aInWAqUreLQPanJgdtAgB2YHIgeTuhxUOlBPNcBvKPwFT4RHbnDgLOpNw3EEaxEFblJwIPECZhw8MZAlQkX+C95zCzqWDYrK2AAAAABJRU5ErkJggg=="
-            width="14"
-          />
-          View Runbook
-        </a>
-      [[ end ]]
-      [[ if .DashboardURL]]
-        <a
-          href="[[ .DashboardURL ]]"
-          class="button"
-        >
-          <img
-            alt=""
-            height="14"
-            class="button-img"
-            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAE9SURBVHgBrVLNWcMwDH220/bjhEdIR2AC6ASMQEeAU6G9+FLycQojdAUmgE7ACGSEcEybRkj5cUKbnFp9X2JZ8nuypQecaUp+Kxf98BIeJ3cwNxqZDRB89mCTtXuZBvVGwBsCtiUrkYVS8RgHmzeVFB4Lwm9d9Y6XB/EbAhCK7atbbcRfuCjkRNwtt6fs4825RPyli4SkJNA40/wNFCm7cC6sdnnYSdVmQs6Xnla4JjoikDcHmMQYrCSNrI434C7BrA/EXf6Slad0kieY1BPsUKQahcWA5cj7otYTjKG/+/oplQU8oAMx1aKInkbAVL6BJ818ns82wVYHilLnlon4rIOTGeTIWHleB6mq4xfUAfTts1tXPh1YyubfwZGa3HO+K+WWgMeacHBuoOc1m7cr6HSPcvbvpnNhweAS9gdSqGSnoVA2cQAAAABJRU5ErkJggg=="
-            width="14"
-          />
-          Go to Dashboard
-        </a>
-      [[ end ]]
-      [[ if .PanelURL]]
-        <a
-          href="[[ .PanelURL ]]"
-          class="button"
-        >
-          <img
-            alt=""
-            class="button-img"
-            height="14"
-            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAE9SURBVHgBrVLNWcMwDH220/bjhEdIR2AC6ASMQEeAU6G9+FLycQojdAUmgE7ACGSEcEybRkj5cUKbnFp9X2JZ8nuypQecaUp+Kxf98BIeJ3cwNxqZDRB89mCTtXuZBvVGwBsCtiUrkYVS8RgHmzeVFB4Lwm9d9Y6XB/EbAhCK7atbbcRfuCjkRNwtt6fs4825RPyli4SkJNA40/wNFCm7cC6sdnnYSdVmQs6Xnla4JjoikDcHmMQYrCSNrI434C7BrA/EXf6Slad0kieY1BPsUKQahcWA5cj7otYTjKG/+/oplQU8oAMx1aKInkbAVL6BJ818ns82wVYHilLnlon4rIOTGeTIWHleB6mq4xfUAfTts1tXPh1YyubfwZGa3HO+K+WWgMeacHBuoOc1m7cr6HSPcvbvpnNhweAS9gdSqGSnoVA2cQAAAABJRU5ErkJggg=="
-            width="14"
-          />
-            Go to Panel
-          </a>
-      [[ end ]]
-      [[ if gt (len .GeneratorURL) 0 ]]<a href="[[ .GeneratorURL ]]" class="button">Source</a>[[ end ]]
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <div style="height: 24px"></div>
-      <div style="background: #c7d0d9; height: 1px"></div>
-      <div style="height: 24px"></div>
-    </td>
-  </tr>
-[[ end ]]
-
-[[ if gt (len .Message) 0 ]]
-  <div style="white-space: pre-line;" align="left">[[ .Message ]]</span>
-[[ else ]]
-
-<style>
-  .button {
-    background: #f1f5f9;
-    border: 1px solid #c7d0d9;
-    border-radius: 2px;
-    color: #464c54;
-    display: inline-block;
-    font-size: 12px;
-    font-weight: bold;
-    margin: 0 10px 0 0;
-    padding: 5px 9px;
-  }
-  .value {
-    font-size: 14px;
-    padding-top: 24px;
-  }
-  .value-heading {
-    font-weight: bold;
-  }
-  .value-value {
-    padding-left: 8px;
-  }
-  .annotations {
-    font-size: 14px;
-    padding: 24px 0 12px 0;
-  }
-  .labels-heading {
-    font-size: 14px;
-    font-weight: bold;
-    vertical-align: top;
-    display: inline-block;
-  }
-  .annotations-heading {
-    font-weight: bold;
-    text-transform: capitalize;
-  }
-  .annotations-value {
-    padding-left: 8px;
-  }
-  .labels-list {
-    font-size: 14px;
-    vertical-align: top;
-    margin: 0;
-    display: inline-block;
-    padding-left: 8px;
-  }
-  .actions {
-    padding: 24px 0 12px 0;
-  }
-  .section-heading {
-    color: #2c3235;
-    font-size: 22px;
-    font-weight: bold;
-    padding: 0 0 32px 0;
-  }
-  .alert-label {
-    font-size: 16px;
-    font-weight: bold;
-    padding: 0 0 0 12px;
-    text-decoration: underline;
-    vertical-align: middle;
-  }
-  .status-tag {
-    color: #ffffff;
-    padding: 4px 8px;
-    text-align: center;
-    width: 68px
-  }
-  .status-firing {
-    background: #e02f44;
-  }
-  .status-resolved {
-    background: #464c54;
-  }
-  .button-img {
-    height: 14px;
-    margin: 0 5px 0 0;
-    vertical-align: sub;
-    width: 14px;
-  }
-</style>
-
-<table class="row">
-  <tr>
-    <td class="twelve">
-      <table>
-          [[ if gt (len .Alerts.Firing) 0 ]]
-            <tr>
-              <td colspan="2" class="section-heading">
-                Firing: [[ .Alerts.Firing | len ]] alert[[ if gt (len .Alerts.Firing) 1 ]]s[[ end ]][[ if gt (len .GroupLabels.SortedPairs) 1 ]] for
-                [[ range .GroupLabels.SortedPairs ]]
-                [[ .Name ]]=[[ .Value ]]
-                [[ end ]][[ end ]]
-              </td>
-            </tr>
-            [[ range .Alerts.Firing ]]
-              <tr>
-                <td
-                  class="status-tag status-firing"
-                  width="68"
-                >
-                  Firing
-                </td>
-                <td class="alert-label">
-                  [[ .Labels.alertname ]]
-                </td>
-              </tr>
-              [[ template "alert" . ]]
-            [[ end ]]
-          [[ end ]]
-          [[ if gt (len .Alerts.Resolved) 0 ]]
-            <tr>
-              <td colspan="2" class="section-heading">
-                Resolved: [[ .Alerts.Resolved | len ]] alert[[ if gt (len .Alerts.Resolved) 1 ]]s[[ end ]][[ if gt (len .GroupLabels.SortedPairs) 1 ]] for
-                [[ range .GroupLabels.SortedPairs ]]
-                  [[ .Name ]]=[[ .Value ]]
-                [[ end ]][[ end ]]
-              </td>
-            </tr>
-            [[ range .Alerts.Resolved ]]
-              <tr>
-                <td
-                  class="status-tag status-resolved"
-                  width="68"
-                >
-                  Resolved
-                </td>
-                <td class="alert-label">
-                  [[ .Labels.alertname ]]
-                </td>
-              </tr>
-              [[ template "alert" . ]]
-            [[ end ]]
-          [[ end ]]
-          <tr>
-            <td colspan="2">
-              <a href="[[ .AlertPageUrl ]]" class="button">Go to alerts page</a>
-            </td>
-          </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-[[ end ]]
-
-</div>
diff --git a/emails/templates/ng_alert_notification.mjml b/emails/templates/ng_alert_notification.mjml
new file mode 100644
index 00000000000..f5ff61069c4
--- /dev/null
+++ b/emails/templates/ng_alert_notification.mjml
@@ -0,0 +1,122 @@
+<mjml>
+  <mj-head>
+    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject "{{ .Title }}" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+    <!-- Summary of the email contents, this will go in the email preview -->
+    <mj-include path="./partials/alerting/summary.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+
+    <!-- This is our grouping header, it says what grouping labels have been applied to this email -->
+    <mj-include path="./partials/alerting/grouping_labels.mjml" />
+
+    <!-- custom email message -->
+    <mj-raw>
+      {{ if .Message }}
+    </mj-raw>
+    <mj-wrapper background-color="#22252b" border="1px solid #2f3037" padding="0">
+      <mj-section padding="0">
+        <mj-column>
+          <mj-text align="left">
+            <mj-raw>
+              {{ range $line := (splitList "\n" .Message) }}
+            </mj-raw>
+            {{ $line }}<br />
+            <mj-raw>
+              {{ end }}
+            </mj-raw>
+          </mj-text>
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+
+    <!-- end custom email message -->
+    <mj-raw>
+      {{ else }}
+    </mj-raw>
+
+    <!-- default template -->
+
+    <!-- Firing instances -->
+    <mj-raw>
+      {{ if .Alerts.Firing  }}
+    </mj-raw>
+
+    <!-- Firing header -->
+    <mj-section padding="0">
+      <mj-column>
+        <mj-text padding="0">
+          <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <!-- Firing instances loop -->
+    <mj-raw>
+      {{ range .Alerts.Firing }}
+    </mj-raw>
+    <mj-wrapper background-color="#22252b" border="1px solid #2f3037" padding="0">
+      <mj-include path="./partials/alerting/firing_instance.mjml" />
+      <mj-include path="./partials/alerting/instance_details.mjml" />
+    </mj-wrapper>
+    <mj-section padding="10px" />
+
+    <!-- end Firing instances loop -->
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <!-- end Firing instances section -->
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <!-- Resolved instances -->
+    <mj-raw>
+      {{ if .Alerts.Resolved }}
+    </mj-raw>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-text padding="0">
+          <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <!-- Resolved instances loop -->
+    <mj-raw>
+      {{ range .Alerts.Resolved }}
+    </mj-raw>
+    <mj-wrapper background-color="#22252b" border="1px solid #2f3037" padding="0">
+      <mj-include path="./partials/alerting/resolved_instance.mjml" />
+      <mj-include path="./partials/alerting/instance_details.mjml" />
+    </mj-wrapper>
+    <mj-section padding="10px" />
+
+    <!-- end Resolved instances loop -->
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <!-- end Resolved instances -->
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <!-- end default template -->
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <mj-section padding-top="10px">
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/emails/templates/partials/alerting/firing_instance.mjml b/emails/templates/partials/alerting/firing_instance.mjml
new file mode 100644
index 00000000000..9f392b5e788
--- /dev/null
+++ b/emails/templates/partials/alerting/firing_instance.mjml
@@ -0,0 +1,23 @@
+<mj-section padding="10px 0" border-bottom="1px solid #2f3037">
+  <mj-column vertical-align="middle">
+    <mj-button href="{{ .GeneratorURL }}" border="1px solid #970a1b" background-color="#392228" color="#f7919d" padding="0" inner-padding="5px 12px">
+      Firing
+    </mj-button>
+  </mj-column>
+  <mj-column vertical-align="middle">
+    <mj-text align="center" padding="0">
+      <strong>{{ .Labels.alertname }}</strong>
+    </mj-text>
+  </mj-column>
+  <mj-raw>
+    {{ if gt (len .GeneratorURL) 0 }}
+  </mj-raw>
+  <mj-column vertical-align="middle">
+    <mj-button href="{{ .GeneratorURL }}" padding="0" inner-padding="5px 12px">
+      View alert
+    </mj-button>
+  </mj-column>
+  <mj-raw>
+    {{ end }}
+  </mj-raw>
+</mj-section>
diff --git a/emails/templates/partials/alerting/grouping_labels.mjml b/emails/templates/partials/alerting/grouping_labels.mjml
new file mode 100644
index 00000000000..629351abbb0
--- /dev/null
+++ b/emails/templates/partials/alerting/grouping_labels.mjml
@@ -0,0 +1,30 @@
+<mj-section padding="0">
+  <mj-column>
+    <!-- we show this only when we're using the default grouping (grafana_folder, alertname) -->
+    <mj-raw>
+      {{ if eq (.GroupLabels.SortedPairs.Names | join ",") "alertname,grafana_folder" }}
+    </mj-raw>
+    <mj-text padding="0" align="left">
+      <h2>📁 {{ .GroupLabels.grafana_folder }} &rsaquo; {{ .GroupLabels.alertname }}</h2>
+    </mj-text>
+    <mj-raw>
+      {{ else }}
+    </mj-raw>
+    <!-- non-default grouping labels are just printed verbatim -->
+    <mj-text padding="0" align="left">
+      <h2>
+        📁 Grouped by&nbsp;
+      </h2>
+      <mj-raw>
+        {{ range .GroupLabels.SortedPairs }}
+      </mj-raw>
+      {{ .Name }}={{ .Value }}
+      <mj-raw>
+        {{ end }}
+      </mj-raw>
+    </mj-text>
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+  </mj-column>
+</mj-section>
diff --git a/emails/templates/partials/alerting/instance_details.mjml b/emails/templates/partials/alerting/instance_details.mjml
new file mode 100644
index 00000000000..26a4bbd7856
--- /dev/null
+++ b/emails/templates/partials/alerting/instance_details.mjml
@@ -0,0 +1,195 @@
+<!-- Image from external service -->
+<mj-raw>
+  {{ if .ImageURL }}
+</mj-raw>
+<mj-section padding="0">
+  <mj-column border-bottom="1px solid #2f3037">
+    <mj-image href="{{ .ImageURL }}" src="{{ .ImageURL }}" padding="0" />
+  </mj-column>
+</mj-section>
+<mj-raw>
+  {{ end }}
+</mj-raw>
+
+<!-- Embedded Image -->
+<mj-raw>
+  {{ if .EmbeddedImage }}
+</mj-raw>
+<mj-section padding="0">
+  <mj-column border-bottom="1px solid #2f3037">
+    <mj-image src="cid:{{ .EmbeddedImage }}" padding="0" />
+  </mj-column>
+</mj-section>
+<mj-raw>
+  {{ end }}
+</mj-raw>
+
+<mj-section padding="0" text-align="left">
+  <mj-column>
+    <!-- Summary -->
+    <mj-raw>
+      {{ if .Annotations.summary }}
+    </mj-raw>
+    <mj-text>
+      <strong>Summary</strong>
+    </mj-text>
+    <mj-text>
+      {{- .Annotations.summary -}}
+    </mj-text>
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <!-- Description -->
+    <mj-raw>
+      {{ if .Annotations.description }}
+    </mj-raw>
+    <mj-text>
+      <strong>Description</strong>
+    </mj-text>
+    <mj-text>
+      <mj-raw>
+        {{ range $line := (splitList "\n" .Annotations.description) }}
+      </mj-raw>
+      {{ $line }}<br />
+      <mj-raw>
+        {{ end }}
+      </mj-raw>
+    </mj-text>
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+  </mj-column>
+</mj-section>
+
+<!-- Values -->
+<mj-raw>
+  {{ if .Values }}
+</mj-raw>
+<mj-section padding="0" text-align="left">
+  <mj-column>
+    <mj-text>
+      <strong>Values</strong>
+    </mj-text>
+  </mj-column>
+</mj-section>
+<mj-section padding="0 25px" text-align="left">
+  <mj-column padding="10px" background-color="#111217" border="1px solid #2f3037">
+    <mj-text>
+      <mj-raw>
+        {{ range $refID, $value := .Values }}
+      </mj-raw>
+      {{ $refID }}={{ $value }}&nbsp;
+      <mj-raw>
+        {{ end }}
+      </mj-raw>
+    </mj-text>
+  </mj-column>
+</mj-section>
+<mj-raw>
+  {{ end }}
+</mj-raw>
+
+<!-- Labels and annotations -->
+<mj-section>
+  <mj-column>
+    <!-- Labels -->
+    <mj-raw>
+      {{ if .Labels.SortedPairs }}
+    </mj-raw>
+    <mj-text>
+      <strong>Labels</strong>
+    </mj-text>
+
+    <mj-table color="white">
+      <mj-raw>
+        {{ range .Labels.SortedPairs }}
+      </mj-raw>
+      <tr>
+        <td>
+          <strong>{{ .Name }}</strong>
+        </td>
+        <td>
+          {{ .Value }}
+        </td>
+      </tr>
+      <mj-raw>
+        {{ end }}
+      </mj-raw>
+    </mj-table>
+
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+
+    <!-- Annotations -->
+    <mj-raw>
+      {{ if .Annotations.SortedPairs }}
+    </mj-raw>
+    <mj-text>
+      <strong>Annotations</strong>
+    </mj-text>
+
+    <mj-table color="white">
+      <mj-raw>
+        {{ range .Annotations.SortedPairs }}
+      </mj-raw>
+      <tr>
+        <td>
+          <strong>{{ .Name }}</strong>
+        </td>
+        <td>
+          {{ .Value }}
+        </td>
+      </tr>
+      <mj-raw>
+        {{ end }}
+      </mj-raw>
+    </mj-table>
+
+    <mj-raw>
+      {{ end }}
+    </mj-raw>
+  </mj-column>
+</mj-section>
+
+<!-- actions -->
+<mj-section text-align="left" border-top="1px solid #2f3037" padding="15px 0px">
+  <mj-raw>{{ if .SilenceURL }}</mj-raw>
+  <mj-column>
+    <mj-button align="center" vertical-align="middle" href="{{ .SilenceURL }}" padding="0" inner-padding="5px 12px">
+      Silence
+    </mj-button>
+  </mj-column>
+  <mj-raw>{{ end }}</mj-raw>
+  <mj-raw>{{ if .Annotations.runbook_url }}</mj-raw>
+  <mj-column>
+    <mj-button align="center" href="{{ .Annotations.runbook_url }}" padding="0" inner-padding="5px 12px">
+      View runbook
+    </mj-button>
+  </mj-column>
+  <mj-raw>{{ end }}</mj-raw>
+  <mj-raw>{{ if .DashboardURL }}</mj-raw>
+  <mj-column>
+    <mj-button align="center" href="{{ .DashboardURL }}" padding="0" inner-padding="5px 12px">
+      View dashboard
+    </mj-button>
+  </mj-column>
+  <mj-raw>{{ end }}</mj-raw>
+  <mj-raw>{{ if .PanelURL }}</mj-raw>
+  <mj-column>
+    <mj-button align="center" href="{{ .PanelURL }}" padding="0" inner-padding="5px 12px">
+      View panel
+    </mj-button>
+  </mj-column>
+  <mj-raw>{{ end }}</mj-raw>
+</mj-section>
+
+<!-- Observed -->
+<mj-section border-top="1px solid #2f3037" padding="5px 0">
+  <mj-column>
+    <mj-text color="#91929e">
+      Observed <strong>{{ ago .StartsAt }}</strong> before this notification was delivered, at <strong>{{ .StartsAt }}</strong>
+    </mj-text>
+  </mj-column>
+</mj-section>
diff --git a/emails/templates/partials/alerting/resolved_instance.mjml b/emails/templates/partials/alerting/resolved_instance.mjml
new file mode 100644
index 00000000000..5b9060f5922
--- /dev/null
+++ b/emails/templates/partials/alerting/resolved_instance.mjml
@@ -0,0 +1,23 @@
+<mj-section padding="10px 0" border-bottom="1px solid #2f3037">
+  <mj-column vertical-align="middle">
+    <mj-button border="1px solid #32632b" color="#a5d69e" background-color="#26322a" padding="0" inner-padding="5px 12px">
+      Resolved
+    </mj-button>
+  </mj-column>
+  <mj-column vertical-align="middle">
+    <mj-text align="center" padding="0">
+      <strong>{{ .Labels.alertname }}</strong>
+    </mj-text>
+  </mj-column>
+  <mj-raw>
+    {{ if gt (len .GeneratorURL) 0 }}
+  </mj-raw>
+  <mj-column vertical-align="middle">
+    <mj-button href="{{ .GeneratorURL }}" padding="0" inner-padding="5px 12px">
+      View alert
+    </mj-button>
+  </mj-column>
+  <mj-raw>
+    {{ end }}
+  </mj-raw>
+</mj-section>
diff --git a/emails/templates/partials/alerting/summary.mjml b/emails/templates/partials/alerting/summary.mjml
new file mode 100644
index 00000000000..16d910fe437
--- /dev/null
+++ b/emails/templates/partials/alerting/summary.mjml
@@ -0,0 +1,28 @@
+<mj-raw>
+  {{ $numberOfFiringInstance := (len .Alerts.Firing) }}
+  {{ $numberOfResolvedAlerts := (len .Alerts.Resolved) }}
+</mj-raw>
+
+<mj-preview>
+  <mj-raw>
+    {{ if $numberOfFiringInstance }}
+  </mj-raw>
+  <strong>{{ $numberOfFiringInstance }} firing</strong> alert {{ $numberOfFiringInstance| plural "instance" "instances" }}
+  <mj-raw>
+    {{ end }}
+  </mj-raw>
+  <mj-raw>
+    {{ if and $numberOfFiringInstance $numberOfResolvedAlerts }}
+  </mj-raw>
+  &nbsp;and&nbsp;
+  <mj-raw>
+    {{ end }}
+  </mj-raw>
+  <mj-raw>
+    {{ if $numberOfResolvedAlerts }}
+  </mj-raw>
+  <strong>{{ $numberOfResolvedAlerts }} resolved</strong> alert {{ $numberOfResolvedAlerts| plural "instance" "instances" }}
+  <mj-raw>
+    {{ end }}
+  </mj-raw>
+</mj-preview>
diff --git a/emails/templates/partials/layout/default.txt b/emails/templates/partials/layout/default.txt
new file mode 100644
index 00000000000..a27a0817378
--- /dev/null
+++ b/emails/templates/partials/layout/default.txt
@@ -0,0 +1,3 @@
+{{> body }}
+
+Sent by Grafana v[[.BuildVersion]] (c) [[now | date "2006"]] Grafana Labs
diff --git a/emails/templates/partials/layout/footer.mjml b/emails/templates/partials/layout/footer.mjml
new file mode 100644
index 00000000000..fddf35962c8
--- /dev/null
+++ b/emails/templates/partials/layout/footer.mjml
@@ -0,0 +1,5 @@
+<mj-column background-color="transparent">
+  <mj-text align="center">
+    &copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}">Grafana v{{ .BuildVersion }}</a>.
+  </mj-text>
+</mj-column>
diff --git a/emails/templates/partials/layout/head.mjml b/emails/templates/partials/layout/head.mjml
new file mode 100644
index 00000000000..83c9269b784
--- /dev/null
+++ b/emails/templates/partials/layout/head.mjml
@@ -0,0 +1,10 @@
+<mj-attributes>
+  <mj-text align="left" color="#FFF" line-height="1.5" />
+  <mj-button background-color="#3D71D9" rel="noopener" />
+  <mj-body background-color="#111217" />
+</mj-attributes>
+<mj-style inline="inline">
+  a {
+    color: #6E9FFF;
+  }
+</mj-style>
diff --git a/emails/templates/partials/layout/header.mjml b/emails/templates/partials/layout/header.mjml
new file mode 100644
index 00000000000..15d50e0024b
--- /dev/null
+++ b/emails/templates/partials/layout/header.mjml
@@ -0,0 +1,3 @@
+<mj-column background-color="transparent">
+  <mj-image padding="0" width="200px" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" align="left" />
+</mj-column>
diff --git a/emails/templates/reset_password.html b/emails/templates/reset_password.html
deleted file mode 100644
index e9d1527116c..00000000000
--- a/emails/templates/reset_password.html
+++ /dev/null
@@ -1,42 +0,0 @@
-[[Subject .Subject "Reset your Grafana password - [[.Name]]"]]
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-
-			<table class="twelve columns">
-				<tr>
-					<td>
-						<h4>Hi [[.Name]],</h4>
-					</td>
-					<td class="expander"></td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-						<p>
-							Please click the following link to reset your password within <b>[[.EmailCodeValidHours]] hours</b>.
-						</p>
-						<p>
-							<a href="[[.AppUrl]]user/password/reset?code=[[.Code]]">[[.AppUrl]]user/password/reset?code=[[.Code]]</a>
-						</p>
-						<p>Not working? Try copying and pasting it to your browser.</p>
-					</td>
-					<td class="expander"></td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-
-
diff --git a/emails/templates/reset_password.mjml b/emails/templates/reset_password.mjml
new file mode 100644
index 00000000000..f1face73715
--- /dev/null
+++ b/emails/templates/reset_password.mjml
@@ -0,0 +1,36 @@
+<mjml>
+  <mj-head>
+    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject "Reset your Grafana password - {{.Name}}" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section background-color="#22252b" border="1px solid #2f3037">
+      <mj-column>
+        <mj-text>
+          <h2>Hi {{ .Name }},</h2>
+        </mj-text>
+        <mj-text>
+          Please click the following link to reset your password within <strong>{{ .EmailCodeValidHours }} hours</strong>.
+        </mj-text>
+        <mj-button href="{{ .AppUrl }}user/password/reset?code={{ .Code }}">
+          Reset Password
+        </mj-button>
+        <mj-text>
+          You can also copy and paste this link into your browser directly:
+        </mj-text>
+        <mj-text>
+          <a rel="noopener" href="{{ .AppUrl }}user/password/reset?code={{ .Code }}">{{ .AppUrl }}user/password/reset?code={{ .Code }}</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/emails/templates/signup_started.html b/emails/templates/signup_started.html
deleted file mode 100644
index 3e8b3e0b976..00000000000
--- a/emails/templates/signup_started.html
+++ /dev/null
@@ -1,46 +0,0 @@
-[[Subject .Subject "Welcome to Grafana, please complete your sign up!"]]
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-
-			<table class="twelve columns">
-				<tr>
-					<td>
-						<h4 class="center">Complete the signup</h4>
-					</td>
-					<td class="expander"></td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-						Copy and paste the email verification code:<br>
-						<span class="verification-code">[[.Code]]</span><br> in
-						the sign up form <strong>or</strong> use the link below.
-					</td>
-					<td class="expander"></td>
-				</tr>
-				<tr>
-					<td class="center">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="better-button" bgcolor="#ff8f2b"><a rel="noopener noreferrer" href="[[.SignUpUrl]]" target="_blank">Complete Sign Up</a></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-
diff --git a/emails/templates/signup_started.mjml b/emails/templates/signup_started.mjml
new file mode 100644
index 00000000000..98b85a6e955
--- /dev/null
+++ b/emails/templates/signup_started.mjml
@@ -0,0 +1,39 @@
+<mjml>
+  <mj-head>
+    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject "Welcome to Grafana, please complete your sign up!" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section background-color="#22252b" border="1px solid #2f3037">
+      <mj-column>
+        <mj-text>
+          <h2>Complete the signup</h2>
+        </mj-text>
+        <mj-text>
+          Copy and paste the email verification code in the sign up form <strong>or</strong> use the link below.
+        </mj-text>
+        <mj-button background-color="transparent" border="1px solid #44474f" color="#ccccdd" font-size="22px" font-weight="bold">
+          {{ .Code }}
+        </mj-button>
+        <mj-button href="{{ .SignUpUrl }}">
+          Complete Sign Up
+        </mj-button>
+        <mj-text>
+          You can also copy and paste this link into your browser directly:
+        </mj-text>
+        <mj-text>
+          <a rel="noopener" href="{{ .LinkUrl }}">{{ .SignUpUrl }}</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/emails/templates/welcome_on_signup.html b/emails/templates/welcome_on_signup.html
deleted file mode 100644
index 7e2e004342a..00000000000
--- a/emails/templates/welcome_on_signup.html
+++ /dev/null
@@ -1,48 +0,0 @@
-[[Subject .Subject "Welcome to Grafana"]]
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-
-			<table class="twelve columns">
-				<tr>
-					<td>
-						<h4>Hi [[.Name]],</h4>
-					</td>
-					<td class="expander"></td>
-				</tr>
-				<tr>
-					<td>
-						Welcome! Ready to start building some beautiful metric and analytic dashboards?
-					</td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-						<p>
-							If you are new to Grafana, refer to the <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/">Getting started with Grafana</a> guide.
-						</p>
-					</td>
-					<td class="expander"></td>
-				</tr>
-				<tr>
-					<td>
-						Thank you for joining our community.
-						<br />
-						<p>The Grafana Team</p>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
diff --git a/emails/templates/welcome_on_signup.mjml b/emails/templates/welcome_on_signup.mjml
new file mode 100644
index 00000000000..642496c3762
--- /dev/null
+++ b/emails/templates/welcome_on_signup.mjml
@@ -0,0 +1,40 @@
+<mjml>
+  <mj-head>
+    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject "Welcome to Grafana" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section background-color="#22252b" border="1px solid #2f3037">
+      <mj-column>
+        <mj-text>
+          <h2>Hi {{ .Name }},</h2>
+        </mj-text>
+        <mj-text>
+          Welcome! Ready to start building some beautiful metric and analytic dashboards?
+        </mj-text>
+        <mj-text>
+          If you are new to Grafana, refer to the <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/">Getting started with Grafana</a>
+          guide.
+        </mj-text>
+        <mj-button href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/">
+          Check out our getting started guide
+        </mj-button>
+        <mj-text>
+          Thank you for joining our community.
+        </mj-text>
+        <mj-text>
+          The Grafana Team
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/go.mod b/go.mod
index 1e5d862639d..50dbe4cff3c 100644
--- a/go.mod
+++ b/go.mod
@@ -256,7 +256,6 @@ require (
 	github.com/grafana/codejen v0.0.3
 	github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f
 	github.com/jmoiron/sqlx v1.3.5
-	github.com/kr/pretty v0.3.0
 	github.com/matryer/is v1.4.0
 	github.com/parca-dev/parca v0.12.1
 	github.com/urfave/cli v1.22.9
@@ -271,6 +270,8 @@ require (
 require (
 	cloud.google.com/go v0.102.0 // indirect
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/armon/go-metrics v0.3.10 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
@@ -287,15 +288,19 @@ require (
 	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/memberlist v0.4.0 // indirect
+	github.com/huandu/xstrings v1.3.1 // indirect
 	github.com/invopop/yaml v0.1.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-ieproxy v0.0.3 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/segmentio/asm v1.1.4 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
 	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
 )
 
@@ -305,6 +310,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.2.1 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
diff --git a/go.sum b/go.sum
index 88e4e481756..e5f5e30bf67 100644
--- a/go.sum
+++ b/go.sum
@@ -234,11 +234,16 @@ github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod h1:BWJ+nMSHY3L41Zj7CA3uXnl
 github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
+github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.16.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
+github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/Masterminds/squirrel v0.0.0-20161115235646-20f192218cf5/go.mod h1:xnKTFzjGUiZtiOagBsfnvomW+nJg2usB1ZpordQWqNM=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
@@ -1507,6 +1512,8 @@ github.com/hetznercloud/hcloud-go v1.33.2 h1:ptWKVYLW7YtjXzsqTFKFxwpVo3iM9UMkVPB
 github.com/hodgesds/perf-utils v0.0.8/go.mod h1:F6TfvsbtrF88i++hou29dTXlI2sfsJv+gRZDtmTJkAs=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
+github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
+github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -1865,6 +1872,7 @@ github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -2265,6 +2273,7 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v3.21.6+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
@@ -2305,6 +2314,7 @@ github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY52
 github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
@@ -2667,6 +2677,7 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
diff --git a/pkg/services/ngalert/notifier/channels/email_test.go b/pkg/services/ngalert/notifier/channels/email_test.go
index da621f7e646..d29bc1273f0 100644
--- a/pkg/services/ngalert/notifier/channels/email_test.go
+++ b/pkg/services/ngalert/notifier/channels/email_test.go
@@ -189,9 +189,13 @@ func TestEmailNotifierIntegration(t *testing.T) {
 			messageTmpl: "",
 			expSubject:  "[FIRING:2]  ",
 			expSnippets: []string{
-				"Firing: 2 alerts",
-				"<li>alertname: FiringOne</li><li>severity: warning</li>",
-				"<li>alertname: FiringTwo</li><li>severity: critical</li>",
+				"2 firing instances",
+				"<strong>severity</strong>",
+				"warning\n",
+				"critical\n",
+				"<strong>alertname</strong>",
+				"FiringTwo\n",
+				"FiringOne\n",
 				"<a href=\"http://fix.me\"",
 				"<a href=\"http://localhost/base/d/abc",
 				"<a href=\"http://localhost/base/d/abc?viewPanel=5",
diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index d57d1bd8a99..ab93cee5c21 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/Masterminds/sprig/v3"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/events"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -53,6 +54,7 @@ func ProvideService(bus bus.Bus, cfg *setting.Cfg, mailer Mailer, store TempUser
 	mailTemplates.Funcs(template.FuncMap{
 		"Subject": subjectTemplateFunc,
 	})
+	mailTemplates.Funcs(sprig.FuncMap())
 
 	for _, pattern := range ns.Cfg.Smtp.TemplatesPatterns {
 		templatePattern := filepath.Join(ns.Cfg.StaticRootPath, pattern)
diff --git a/public/emails/alert_notification.txt b/public/emails/alert_notification.txt
index 6be25c8e232..9e16ea5574f 100644
--- a/public/emails/alert_notification.txt
+++ b/public/emails/alert_notification.txt
@@ -25,4 +25,5 @@ View your Alert rule:
 Go to the Alerts page:
 {{.AlertPageUrl}}
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html
index 7a7a76924d6..edbab072a83 100644
--- a/public/emails/invited_to_org.html
+++ b/public/emails/invited_to_org.html
@@ -1,284 +1,223 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width" />
-	
-<style>body {
-width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
-}
-img {
-outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block;
-}
-body {
-color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
-}
-body {
-font-size: 14px; line-height: 19px;
-}
-a:hover {
-color: #2795b6 !important;
-}
-a:active {
-color: #2795b6 !important;
-}
-a:visited {
-color: #2ba6cb !important;
-}
-body {
-font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;
-}
-a:hover {
-color: #ff8f2b !important;
-}
-a:active {
-color: #F2821E !important;
-}
-a:visited {
-color: #E67612 !important;
-}
-.better-button:hover a {
-color: #FFFFFF !important; background-color: #F2821E; border: 1px solid #F2821E;
-}
-.better-button:visited a {
-color: #FFFFFF !important;
-}
-.better-button:active a {
-color: #FFFFFF !important;
-}
-.better-button-alt:hover a {
-color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E;
-}
-.better-button-alt:visited a {
-color: #ff8f2b !important;
-}
-.better-button-alt:active a {
-color: #ff8f2b !important;
-}
-body {
-height: 100% !important; width: 100% !important;
-}
-body .copy {
--ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-width: 100%;
-}
-.ExternalClass {
-line-height: 100%;
-}
-img {
--ms-interpolation-mode: bicubic;
-}
-img {
-border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-text-decoration: underline;
-}
-@media only screen and (max-width: 600px) {
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-  table[class="body"] .row {
-    width: 100% !important; display: block !important;
-  }
-  table[class="body"] .wrapper {
-    display: block !important; padding-right: 0 !important;
-  }
-  table[class="body"] .columns {
-    table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
-  }
-  table[class="body"] table.columns td {
-    width: 100% !important;
-  }
-  table[class="body"] .columns td.six {
-    width: 50% !important;
-  }
-  table[class="body"] .columns td.twelve {
-    width: 100% !important;
-  }
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-    width: 270px;
-  }
-}
-</style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+  <title>
+    {{ Subject .Subject "{{ .InvitedBy }} has added you to the {{ .OrgName }} organization" }}
+  </title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
-		<tr style="vertical-align: top; padding: 0;" align="left">
-			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
-        <center style="width: 100%; min-width: 580px;">
-					<table class="row header" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; margin-top: 25px; margin-bottom: 25px; padding: 0px;">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-						  <td class="center" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" valign="top">
-						    <center style="width: 100%; min-width: 580px;">
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
 
-						      <table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;">
-						        <tr style="vertical-align: top; padding: 0;" align="left">
-						          <td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
 
-						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-						              <tr style="vertical-align: top; padding: 0;" align="left">
-						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
-                            </td>
-                            <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-                          </tr>
-						            </table>
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
 
-						          </td>
-						        </tr>
-						      </table>
+    p {
+      display: block;
+      margin: 13px 0;
+    }
 
-						    </center>
-						  </td>
-						</tr>
-					</table>
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
 
-					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
-						</tr>
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
-								
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
 
-{{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}}
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
 
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						<h4 class="center" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; word-break: normal; font-size: 20px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="center">You have been added to {{.OrgName}}</h4>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-			</table>
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
 
-		</td>
-	</tr>
-</table>
+  </style>
+  <style type="text/css">
+  </style>
+</head>
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left"><b>{{.InvitedBy}}</b> has added you to the <b>{{.OrgName}}</b> organization in Grafana.
-						</p><p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.</p>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; margin-top: 10px; margin-bottom: 20px; padding: 0;">
-							<tr style="vertical-align: top; padding: 0;" align="left">
-								<td align="center" class="better-button" bgcolor="#ff8f2b" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; margin: 0; padding: 0px;" valign="top"><a rel="noopener noreferrer" href="{{.AppUrl}}" target="_blank" style="color: #FFF; text-decoration: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; display: inline-block; padding: 12px 25px; border: 1px solid #ff8f2b;">Log in now</a></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-
-
-								
-							</td>
-						</tr>
-					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
-								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
-									<tr style="vertical-align: top; padding: 0;" align="left">
-										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
-											<center style="width: 100%; min-width: 580px;">
-												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
+<body style="word-spacing:normal;background-color:#111217;">
+  <div style="background-color:#111217;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:200px;">
+                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2>You have been added to {{ .OrgName }}</h2>
+                          <strong>{{ .InvitedBy }}</strong> has added you to the <strong>{{ .OrgName }}</strong> organization in Grafana.
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">Once logged in, <strong>{{ .OrgName }}</strong> will be available to switch to in the user interface.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">Log in now by clicking the link below:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
+                                <a href="{{ .AppUrl }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Login to Grafana </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">You can also copy and paste this link into your browser directly:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><a rel="noopener" href="{{ .AppUrl }}" style="color: #6E9FFF;">{{ .AppUrl }}</a></div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
 </body>
+
 </html>
diff --git a/public/emails/invited_to_org.txt b/public/emails/invited_to_org.txt
index 6d4a8a3e74b..61982198bef 100644
--- a/public/emails/invited_to_org.txt
+++ b/public/emails/invited_to_org.txt
@@ -3,10 +3,10 @@
 You have been added to {{.OrgName}}
 
 {{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana.
-Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown
-below your username.
+Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
 
 Log in now:
 {{.AppUrl}}
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html
index 0728cefffdc..dd70e3d50f7 100644
--- a/public/emails/new_user_invite.html
+++ b/public/emails/new_user_invite.html
@@ -1,286 +1,217 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width" />
-	
-<style>body {
-width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
-}
-img {
-outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block;
-}
-body {
-color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
-}
-body {
-font-size: 14px; line-height: 19px;
-}
-a:hover {
-color: #2795b6 !important;
-}
-a:active {
-color: #2795b6 !important;
-}
-a:visited {
-color: #2ba6cb !important;
-}
-body {
-font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;
-}
-a:hover {
-color: #ff8f2b !important;
-}
-a:active {
-color: #F2821E !important;
-}
-a:visited {
-color: #E67612 !important;
-}
-.better-button:hover a {
-color: #FFFFFF !important; background-color: #F2821E; border: 1px solid #F2821E;
-}
-.better-button:visited a {
-color: #FFFFFF !important;
-}
-.better-button:active a {
-color: #FFFFFF !important;
-}
-.better-button-alt:hover a {
-color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E;
-}
-.better-button-alt:visited a {
-color: #ff8f2b !important;
-}
-.better-button-alt:active a {
-color: #ff8f2b !important;
-}
-body {
-height: 100% !important; width: 100% !important;
-}
-body .copy {
--ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-width: 100%;
-}
-.ExternalClass {
-line-height: 100%;
-}
-img {
--ms-interpolation-mode: bicubic;
-}
-img {
-border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-text-decoration: underline;
-}
-@media only screen and (max-width: 600px) {
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-  table[class="body"] .row {
-    width: 100% !important; display: block !important;
-  }
-  table[class="body"] .wrapper {
-    display: block !important; padding-right: 0 !important;
-  }
-  table[class="body"] .columns {
-    table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
-  }
-  table[class="body"] table.columns td {
-    width: 100% !important;
-  }
-  table[class="body"] .columns td.six {
-    width: 50% !important;
-  }
-  table[class="body"] .columns td.twelve {
-    width: 100% !important;
-  }
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-    width: 270px;
-  }
-}
-</style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+  <title>
+    {{ Subject .Subject "{{ .InvitedBy }} has invited you to join Grafana" }}
+  </title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
-		<tr style="vertical-align: top; padding: 0;" align="left">
-			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
-        <center style="width: 100%; min-width: 580px;">
-					<table class="row header" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; margin-top: 25px; margin-bottom: 25px; padding: 0px;">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-						  <td class="center" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" valign="top">
-						    <center style="width: 100%; min-width: 580px;">
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
 
-						      <table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;">
-						        <tr style="vertical-align: top; padding: 0;" align="left">
-						          <td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
 
-						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-						              <tr style="vertical-align: top; padding: 0;" align="left">
-						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
-                            </td>
-                            <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-                          </tr>
-						            </table>
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
 
-						          </td>
-						        </tr>
-						      </table>
+    p {
+      display: block;
+      margin: 13px 0;
+    }
 
-						    </center>
-						  </td>
-						</tr>
-					</table>
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
 
-					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
-						</tr>
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
-								
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
 
-{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}}
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
 
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						<h4 class="center" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; word-break: normal; font-size: 20px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="center">You're invited to join {{.OrgName}}</h4>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-			</table>
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
 
-		</td>
-	</tr>
-</table>
+  </style>
+  <style type="text/css">
+  </style>
+</head>
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">You've been invited to join the <b>{{.OrgName}}</b> organization by <b>{{.InvitedBy}}</b>. To accept your invitation and join the team, please click the link below:</p>
-					</td>
-				</tr>
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-	                    <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; margin-top: 10px; margin-bottom: 20px; padding: 0;">
-	                    	<tr style="vertical-align: top; padding: 0;" align="left">
-	                          <td align="center" class="better-button" bgcolor="#ff8f2b" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; margin: 0; padding: 0px;" valign="top"><a rel="noopener noreferrer" href="{{.LinkUrl}}" target="_blank" style="color: #FFF; text-decoration: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; display: inline-block; padding: 12px 25px; border: 1px solid #ff8f2b;">Accept Invitation</a></td>
-	                        </tr>
-	                    </table>
-					</td>
-				</tr>
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">You can also copy and paste this link into your browser directly: <a href="{{.LinkUrl}}" style="color: #E67612; text-decoration: none;">{{.LinkUrl}}</a></p>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-								
-							</td>
-						</tr>
-					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
-								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
-									<tr style="vertical-align: top; padding: 0;" align="left">
-										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
-											<center style="width: 100%; min-width: 580px;">
-												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
+<body style="word-spacing:normal;background-color:#111217;">
+  <div style="background-color:#111217;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:200px;">
+                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2>You're invited to join {{ .OrgName }}</h2>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">You've been invited to join the <strong>{{ .OrgName }}</strong> organization by <strong>{{ .InvitedBy }}</strong>. To accept your invitation and join the team, please click the link below:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
+                                <a href="{{ .LinkUrl }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Accept Invitation </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">You can also copy and paste this link into your browser directly:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><a rel="noopener" href="{{ .LinkUrl }}" style="color: #6E9FFF;">{{ .LinkUrl }}</a></div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
 </body>
+
 </html>
diff --git a/public/emails/new_user_invite.txt b/public/emails/new_user_invite.txt
index b9b686b8839..2cc475a1052 100644
--- a/public/emails/new_user_invite.txt
+++ b/public/emails/new_user_invite.txt
@@ -2,10 +2,8 @@
 
 You're invited to join {{.OrgName}}
 
-You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept
-your invitation and join the team, copy and paste the link below into your browser
-directly:
+You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, copy and paste the link below into your browser directly:
 
 {{.LinkUrl}}
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html
index c0824fac335..d4858b482f9 100644
--- a/public/emails/ng_alert_notification.html
+++ b/public/emails/ng_alert_notification.html
@@ -1,386 +1,1315 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width" />
-	
-<style>body {
-width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
-}
-img {
-outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block;
-}
-body {
-color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
-}
-body {
-font-size: 14px; line-height: 19px;
-}
-a:hover {
-color: #2795b6 !important;
-}
-a:active {
-color: #2795b6 !important;
-}
-a:visited {
-color: #2ba6cb !important;
-}
-body {
-font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;
-}
-a:hover {
-color: #ff8f2b !important;
-}
-a:active {
-color: #F2821E !important;
-}
-a:visited {
-color: #E67612 !important;
-}
-.better-button:hover a {
-color: #FFFFFF !important; background-color: #F2821E; border: 1px solid #F2821E;
-}
-.better-button:visited a {
-color: #FFFFFF !important;
-}
-.better-button:active a {
-color: #FFFFFF !important;
-}
-.better-button-alt:hover a {
-color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E;
-}
-.better-button-alt:visited a {
-color: #ff8f2b !important;
-}
-.better-button-alt:active a {
-color: #ff8f2b !important;
-}
-body {
-height: 100% !important; width: 100% !important;
-}
-body .copy {
--ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-width: 100%;
-}
-.ExternalClass {
-line-height: 100%;
-}
-img {
--ms-interpolation-mode: bicubic;
-}
-img {
-border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-text-decoration: underline;
-}
-@media only screen and (max-width: 600px) {
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-  table[class="body"] .row {
-    width: 100% !important; display: block !important;
-  }
-  table[class="body"] .wrapper {
-    display: block !important; padding-right: 0 !important;
-  }
-  table[class="body"] .columns {
-    table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
-  }
-  table[class="body"] table.columns td {
-    width: 100% !important;
-  }
-  table[class="body"] .columns td.six {
-    width: 50% !important;
-  }
-  table[class="body"] .columns td.twelve {
-    width: 100% !important;
-  }
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-    width: 270px;
-  }
-}
-</style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+  <title>
+    {{ Subject .Subject "{{ .Title }}" }}
+  </title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
-		<tr style="vertical-align: top; padding: 0;" align="left">
-			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
-        <center style="width: 100%; min-width: 580px;">
-					<table class="row header" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; margin-top: 25px; margin-bottom: 25px; padding: 0px;">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-						  <td class="center" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" valign="top">
-						    <center style="width: 100%; min-width: 580px;">
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
 
-						      <table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;">
-						        <tr style="vertical-align: top; padding: 0;" align="left">
-						          <td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
 
-						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-						              <tr style="vertical-align: top; padding: 0;" align="left">
-						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
-                            </td>
-                            <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-                          </tr>
-						            </table>
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
 
-						          </td>
-						        </tr>
-						      </table>
+    p {
+      display: block;
+      margin: 13px 0;
+    }
 
-						    </center>
-						  </td>
-						</tr>
-					</table>
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
 
-					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
-						</tr>
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
-								
-<div>
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
 
-{{Subject .Subject "{{.Title}}"}}
+      .mj-column-per-33-333333333333336 {
+        width: 33.333333333333336% !important;
+        max-width: 33.333333333333336%;
+      }
 
-{{ define "__text_values_list" }}{{ $len := len .Values }}{{ if $len }}{{ $first := gt $len 1 }}{{ range $refID, $value := .Values -}}
-{{ $refID }}={{ $value }}{{ if $first }}, {{ end }}{{ $first = false }}{{ end -}}
-{{ else }}[no value]{{ end }}{{ end }}
+      .mj-column-per-25 {
+        width: 25% !important;
+        max-width: 25%;
+      }
+    }
 
-{{ define "alert" }}
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
 
-  {{ if ne .ImageURL "" }}
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td colspan="2" class="value" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 24px 0 0;" align="left" valign="top">
-      <img src="{{.ImageURL}}" class="fluid-centered" alt="Alerting Panel" style="outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; width: auto; clear: both; display: block; border-width: 0;" align="left" />
-    </td>
-  </tr>
-  {{ end }}
-  {{ if ne .EmbeddedImage "" }}
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td colspan="2" class="value" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 24px 0 0;" align="left" valign="top">
-      <img src="cid:{{.EmbeddedImage}}" alt="Alerting Chart Attached Below" style="outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; width: auto; clear: both; display: block; border-width: 0;" align="left" />
-    </td>
-  </tr>
-  {{ end }}
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td colspan="2" class="value" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 24px 0 0;" align="left" valign="top">
-      <span class="value-heading" style="font-weight: bold;">Value:</span> <span class="value-value" style="padding-left: 8px;">{{ template "__text_values_list" . }}</span>
-    </td>
-  </tr>
-  {{ if gt (len .Annotations.SortedPairs) 0 }}
-      <tr style="vertical-align: top; padding: 0;" align="left">
-        <td colspan="2" class="annotations" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 24px 0 12px;" align="left" valign="top">
-          {{ range .Annotations.SortedPairs }}
-          <p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left"><span class="annotations-heading" style="font-weight: bold; text-transform: capitalize;">{{ .Name }}:</span> <span class="annotations-value" style="padding-left: 8px;">{{ .Value }}</span></p>
-          {{ end }}
-        </td>
-      </tr>
-  {{ end }}
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td colspan="2" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top">
-      <span class="labels-heading" style="font-size: 14px; font-weight: bold; vertical-align: top; display: inline-block;">Labels:</span>
-      <ul class="labels-list" style="font-size: 14px; vertical-align: top; display: inline-block; padding-left: 8px; margin: 0;">
-        {{ range .Labels.SortedPairs }}<li>{{ .Name }}: {{ .Value }}</li>{{ end }}
-      </ul>
-    </td>
-  </tr>
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td colspan="2" class="actions" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 24px 0 12px;" align="left" valign="top">
-      {{ if .SilenceURL }}
-        <a href="{{ .SilenceURL }}" class="button" style="color: #464c54; text-decoration: none; background-color: #f1f5f9; border-radius: 2px; display: inline-block; font-size: 12px; font-weight: bold; margin: 0 10px 0 0; padding: 5px 9px; border: 1px solid #c7d0d9;">
-          <img alt="" height="14" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAF1SURBVHgBrZLNTsJAEMf/2wYTPfEI9Q1qvBgjsEl5gB498gj1SDHpEKUckaMn4eiNFyAp4cJN30CPHrn5BV1noTWlFD3oJNuZ3Z39zUcH+A9pUffJpzAoOO/xuvvprZHooYCgLISoa7FyFSCbdOXuApj6M43GUVXWhYZUpKP3k1NZ14+kAOYChleVjnssK/ezKHrLAkQuZWIVKCgKyW+n55cUciZClzLoUPOiqISVlPB+s6ZulnNN/ihG3GfT84jKOwGvMO0krVEewoBoHeTA2glIhRuno7WzkH0Yc633sCz/CoiVshdYRGxGKYSo9ahgHnEPoqzvdxP1b/sEHtgsF2e12ditDD6gPE59XgIO8ytfTlbM1DiTzjk7WQvEYgllZ5fSXeE7vnfTOdkC1GqOBSFO2Mk22JG1TB4l+1VzX/IQgQJpBaHHsB6bA47+rNOHUI1O4A/zw2YWAaaT8UyPNkdcZ6JUs0P+7eouGXuO3WC7j7/KF29iokiLUdaFAAAAAElFTkSuQmCC" class="button-img" width="14" style="outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; width: 14px; clear: both; display: block; height: 14px; vertical-align: sub; margin: 0 5px 0 0; border-style: none; border-width: 0;" align="left" />
-          Silence
-        </a>
+    .moz-text-html .mj-column-per-33-333333333333336 {
+      width: 33.333333333333336% !important;
+      max-width: 33.333333333333336%;
+    }
+
+    .moz-text-html .mj-column-per-25 {
+      width: 25% !important;
+      max-width: 25%;
+    }
+
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
+
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
+
+  </style>
+  <style type="text/css">
+  </style>
+  {{ $numberOfFiringInstance := (len .Alerts.Firing) }}
+  {{ $numberOfResolvedAlerts := (len .Alerts.Resolved) }}
+</head>
+
+<body style="word-spacing:normal;background-color:#111217;">
+  <div style="display:none;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">
+    <mj-raw>
+      {{ if $numberOfFiringInstance }}
+    </mj-raw>
+    <strong>{{ $numberOfFiringInstance }} firing</strong> alert {{ $numberOfFiringInstance| plural "instance" "instances" }}
+    <mj-raw>
       {{ end }}
-      {{ if .Annotations.runbook_url }}
-        <a href="{{ .Annotations.runbook_url }}" class="button" style="color: #464c54; text-decoration: none; background-color: #f1f5f9; border-radius: 2px; display: inline-block; font-size: 12px; font-weight: bold; margin: 0 10px 0 0; padding: 5px 9px; border: 1px solid #c7d0d9;">
-          <img class="button-img" alt="" height="14" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADaSURBVHgBrVNLDoIwFJwq0bjTG+ARvIGeQI/ADdSVARY8oki8jZxEbyDewLUfahttAoEWDM7m9bVvJtN0CrQEyzdENLyjt2RgtoFzjcgl1XTyJw/0T4K8ghmBH8Zz1VhqsaHtVBT7CYwP5KY6tk+xw3k2Kgl0YdmyKrIYvEjB73EqbI+rBC1owMDXGdjws0aqm9MK7Mg7ogE6aInWAqUreLQPanJgdtAgB2YHIgeTuhxUOlBPNcBvKPwFT4RHbnDgLOpNw3EEaxEFblJwIPECZhw8MZAlQkX+C95zCzqWDYrK2AAAAABJRU5ErkJggg==" width="14" style="outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; width: 14px; clear: both; display: block; height: 14px; vertical-align: sub; margin: 0 5px 0 0; border-style: none; border-width: 0;" align="left" />
-          View Runbook
-        </a>
+    </mj-raw>
+    <mj-raw>
+      {{ if and $numberOfFiringInstance $numberOfResolvedAlerts }}
+    </mj-raw> &nbsp;and&nbsp; <mj-raw>
       {{ end }}
-      {{ if .DashboardURL}}
-        <a href="{{ .DashboardURL }}" class="button" style="color: #464c54; text-decoration: none; background-color: #f1f5f9; border-radius: 2px; display: inline-block; font-size: 12px; font-weight: bold; margin: 0 10px 0 0; padding: 5px 9px; border: 1px solid #c7d0d9;">
-          <img alt="" height="14" class="button-img" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAE9SURBVHgBrVLNWcMwDH220/bjhEdIR2AC6ASMQEeAU6G9+FLycQojdAUmgE7ACGSEcEybRkj5cUKbnFp9X2JZ8nuypQecaUp+Kxf98BIeJ3cwNxqZDRB89mCTtXuZBvVGwBsCtiUrkYVS8RgHmzeVFB4Lwm9d9Y6XB/EbAhCK7atbbcRfuCjkRNwtt6fs4825RPyli4SkJNA40/wNFCm7cC6sdnnYSdVmQs6Xnla4JjoikDcHmMQYrCSNrI434C7BrA/EXf6Slad0kieY1BPsUKQahcWA5cj7otYTjKG/+/oplQU8oAMx1aKInkbAVL6BJ818ns82wVYHilLnlon4rIOTGeTIWHleB6mq4xfUAfTts1tXPh1YyubfwZGa3HO+K+WWgMeacHBuoOc1m7cr6HSPcvbvpnNhweAS9gdSqGSnoVA2cQAAAABJRU5ErkJggg==" width="14" style="outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; width: 14px; clear: both; display: block; height: 14px; vertical-align: sub; margin: 0 5px 0 0; border-style: none; border-width: 0;" align="left" />
-          Go to Dashboard
-        </a>
+    </mj-raw>
+    <mj-raw>
+      {{ if $numberOfResolvedAlerts }}
+    </mj-raw>
+    <strong>{{ $numberOfResolvedAlerts }} resolved</strong> alert {{ $numberOfResolvedAlerts| plural "instance" "instances" }}
+    <mj-raw>
       {{ end }}
-      {{ if .PanelURL}}
-        <a href="{{ .PanelURL }}" class="button" style="color: #464c54; text-decoration: none; background-color: #f1f5f9; border-radius: 2px; display: inline-block; font-size: 12px; font-weight: bold; margin: 0 10px 0 0; padding: 5px 9px; border: 1px solid #c7d0d9;">
-          <img alt="" class="button-img" height="14" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAE9SURBVHgBrVLNWcMwDH220/bjhEdIR2AC6ASMQEeAU6G9+FLycQojdAUmgE7ACGSEcEybRkj5cUKbnFp9X2JZ8nuypQecaUp+Kxf98BIeJ3cwNxqZDRB89mCTtXuZBvVGwBsCtiUrkYVS8RgHmzeVFB4Lwm9d9Y6XB/EbAhCK7atbbcRfuCjkRNwtt6fs4825RPyli4SkJNA40/wNFCm7cC6sdnnYSdVmQs6Xnla4JjoikDcHmMQYrCSNrI434C7BrA/EXf6Slad0kieY1BPsUKQahcWA5cj7otYTjKG/+/oplQU8oAMx1aKInkbAVL6BJ818ns82wVYHilLnlon4rIOTGeTIWHleB6mq4xfUAfTts1tXPh1YyubfwZGa3HO+K+WWgMeacHBuoOc1m7cr6HSPcvbvpnNhweAS9gdSqGSnoVA2cQAAAABJRU5ErkJggg==" width="14" style="outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; width: 14px; clear: both; display: block; height: 14px; vertical-align: sub; margin: 0 5px 0 0; border-style: none; border-width: 0;" align="left" />
-            Go to Panel
-          </a>
-      {{ end }}
-      {{ if gt (len .GeneratorURL) 0 }}<a href="{{ .GeneratorURL }}" class="button" style="color: #464c54; text-decoration: none; background-color: #f1f5f9; border-radius: 2px; display: inline-block; font-size: 12px; font-weight: bold; margin: 0 10px 0 0; padding: 5px 9px; border: 1px solid #c7d0d9;">Source</a>{{ end }}
-    </td>
-  </tr>
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td colspan="2" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top">
-      <div style="height: 24px;"></div>
-      <div style="background-color: #c7d0d9; height: 1px;"></div>
-      <div style="height: 24px;"></div>
-    </td>
-  </tr>
-{{ end }}
-
-{{ if gt (len .Message) 0 }}
-  <div style="white-space: pre-line;" align="left">{{ .Message }}
-{{ else }}
-
-
-
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-  <tr style="vertical-align: top; padding: 0;" align="left">
-    <td class="twelve" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top">
-      <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; padding: 0;">
-          {{ if gt (len .Alerts.Firing) 0 }}
-            <tr style="vertical-align: top; padding: 0;" align="left">
-              <td colspan="2" class="section-heading" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #2c3235; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: bold; line-height: 19px; font-size: 22px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0 0 32px;" align="left" valign="top">
-                Firing: {{ .Alerts.Firing | len }} alert{{ if gt (len .Alerts.Firing) 1 }}s{{ end }}{{ if gt (len .GroupLabels.SortedPairs) 1 }} for
-                {{ range .GroupLabels.SortedPairs }}
-                {{ .Name }}={{ .Value }}
-                {{ end }}{{ end }}
-              </td>
-            </tr>
-            {{ range .Alerts.Firing }}
-              <tr style="vertical-align: top; padding: 0;" align="left">
-                <td class="status-tag status-firing" width="68" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #ffffff; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 68px; margin: 0; padding: 4px 8px;" align="center" bgcolor="#e02f44" valign="top">
-                  Firing
-                </td>
-                <td class="alert-label" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: bold; line-height: 19px; font-size: 16px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; text-decoration: underline; margin: 0; padding: 0 0 0 12px;" align="left" valign="middle">
-                  {{ .Labels.alertname }}
-                </td>
-              </tr>
-              {{ template "alert" . }}
-            {{ end }}
-          {{ end }}
-          {{ if gt (len .Alerts.Resolved) 0 }}
-            <tr style="vertical-align: top; padding: 0;" align="left">
-              <td colspan="2" class="section-heading" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #2c3235; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: bold; line-height: 19px; font-size: 22px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0 0 32px;" align="left" valign="top">
-                Resolved: {{ .Alerts.Resolved | len }} alert{{ if gt (len .Alerts.Resolved) 1 }}s{{ end }}{{ if gt (len .GroupLabels.SortedPairs) 1 }} for
-                {{ range .GroupLabels.SortedPairs }}
-                  {{ .Name }}={{ .Value }}
-                {{ end }}{{ end }}
-              </td>
-            </tr>
-            {{ range .Alerts.Resolved }}
-              <tr style="vertical-align: top; padding: 0;" align="left">
-                <td class="status-tag status-resolved" width="68" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #ffffff; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 68px; margin: 0; padding: 4px 8px;" align="center" bgcolor="#464c54" valign="top">
-                  Resolved
-                </td>
-                <td class="alert-label" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: bold; line-height: 19px; font-size: 16px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; text-decoration: underline; margin: 0; padding: 0 0 0 12px;" align="left" valign="middle">
-                  {{ .Labels.alertname }}
-                </td>
-              </tr>
-              {{ template "alert" . }}
-            {{ end }}
-          {{ end }}
-          <tr style="vertical-align: top; padding: 0;" align="left">
-            <td colspan="2" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top">
-              <a href="{{ .AlertPageUrl }}" class="button" style="color: #464c54; text-decoration: none; background-color: #f1f5f9; border-radius: 2px; display: inline-block; font-size: 12px; font-weight: bold; margin: 0 10px 0 0; padding: 5px 9px; border: 1px solid #c7d0d9;">Go to alerts page</a>
+    </mj-raw>
+  </div>
+  <div style="background-color:#111217;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:200px;">
+                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
             </td>
           </tr>
+        </tbody>
       </table>
-    </td>
-  </tr>
-</table>
-{{ end }}
-
-</div>
-
-								
-							</div></td>
-						</tr>
-					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
-								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
-									<tr style="vertical-align: top; padding: 0;" align="left">
-										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
-											<center style="width: 100%; min-width: 580px;">
-												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    {{ if eq (.GroupLabels.SortedPairs.Names | join ",") "alertname,grafana_folder" }}
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2>📁 {{ .GroupLabels.grafana_folder }} &rsaquo; {{ .GroupLabels.alertname }}</h2>
+                        </div>
+                      </td>
+                    </tr>
+                    {{ else }}
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2> 📁 Grouped by&nbsp; </h2>
+                          <mj-raw>
+                            {{ range .GroupLabels.SortedPairs }}
+                          </mj-raw>
+                          {{ .Name }}={{ .Value }}
+                          <mj-raw>
+                            {{ end }}
+                          </mj-raw>
+                        </div>
+                      </td>
+                    </tr>
+                    {{ end }}
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+    {{ if .Message }}
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                                    <mj-raw>
+                                      {{ range $line := (splitList "\n" .Message) }}
+                                    </mj-raw>
+                                    {{ $line }}<br>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+    {{ else }}{{ if .Alerts.Firing  }}
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+    {{ range .Alerts.Firing }}
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="border-bottom:1px solid #2f3037;direction:ltr;font-size:0px;padding:10px 0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:middle;width:199.33333333333337px;" ><![endif]-->
+                        <div class="mj-column-per-33-333333333333336 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:middle;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#392228" role="presentation" style="border:1px solid #970a1b;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#392228;" valign="middle">
+                                          <a href="{{ .GeneratorURL }}" rel="noopener" style="display: inline-block; background: #392228; color: #f7919d; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Firing </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><td class="" style="vertical-align:middle;width:199.33333333333337px;" ><![endif]-->
+                        <div class="mj-column-per-33-333333333333336 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:middle;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;"><strong>{{ .Labels.alertname }}</strong></div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ if gt (len .GeneratorURL) 0 }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:middle;width:199.33333333333337px;" ><![endif]-->
+                        <div class="mj-column-per-33-333333333333336 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:middle;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .GeneratorURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View alert </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}
+                        <!--[if mso | IE]></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ if .ImageURL }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-bottom:1px solid #2f3037;vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                                    <tbody>
+                                      <tr>
+                                        <td style="width:598px;">
+                                          <a href="{{ .ImageURL }}" target="_blank" style="color: #6E9FFF;">
+                                            <img height="auto" src="{{ .ImageURL }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="598">
+                                          </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ end }}{{ if .EmbeddedImage }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-bottom:1px solid #2f3037;vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                                    <tbody>
+                                      <tr>
+                                        <td style="width:598px;">
+                                          <img height="auto" src="cid:{{ .EmbeddedImage }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="598">
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ end }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              {{ if .Annotations.summary }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Summary</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">{{- .Annotations.summary -}}</div>
+                                </td>
+                              </tr>
+                              {{ end }}{{ if .Annotations.description }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Description</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                                    <mj-raw>
+                                      {{ range $line := (splitList "\n" .Annotations.description) }}
+                                    </mj-raw>
+                                    {{ $line }}<br>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </div>
+                                </td>
+                              </tr>
+                              {{ end }}
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ if .Values }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Values</strong></div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0 25px;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:548px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
+                            <tbody>
+                              <tr>
+                                <td style="background-color:#111217;border:1px solid #2f3037;vertical-align:top;padding:10px;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style width="100%">
+                                    <tbody>
+                                      <tr>
+                                        <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                          <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                                            <mj-raw>
+                                              {{ range $refID, $value := .Values }}
+                                            </mj-raw>
+                                            {{ $refID }}={{ $value }}&nbsp; <mj-raw>
+                                              {{ end }}
+                                            </mj-raw>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ end }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              {{ if .Labels.SortedPairs }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Labels</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
+                                    <mj-raw>
+                                      {{ range .Labels.SortedPairs }}
+                                    </mj-raw>
+                                    <tr>
+                                      <td>
+                                        <strong>{{ .Name }}</strong>
+                                      </td>
+                                      <td>
+                                        {{ .Value }}
+                                      </td>
+                                    </tr>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </table>
+                                </td>
+                              </tr>
+                              {{ end }}{{ if .Annotations.SortedPairs }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Annotations</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
+                                    <mj-raw>
+                                      {{ range .Annotations.SortedPairs }}
+                                    </mj-raw>
+                                    <tr>
+                                      <td>
+                                        <strong>{{ .Name }}</strong>
+                                      </td>
+                                      <td>
+                                        {{ .Value }}
+                                      </td>
+                                    </tr>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </table>
+                                </td>
+                              </tr>
+                              {{ end }}
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="border-top:1px solid #2f3037;direction:ltr;font-size:0px;padding:15px 0px;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><![endif]-->
+                        {{ if .SilenceURL }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .SilenceURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Silence </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}{{ if .Annotations.runbook_url }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .Annotations.runbook_url }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View runbook </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}{{ if .DashboardURL }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .DashboardURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View dashboard </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}{{ if .PanelURL }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .PanelURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View panel </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}
+                        <!--[if mso | IE]></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="border-top:1px solid #2f3037;direction:ltr;font-size:0px;padding:5px 0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#91929e;">Observed <strong>{{ ago .StartsAt }}</strong> before this notification was delivered, at <strong>{{ .StartsAt }}</strong></div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:10px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+    {{ end }}{{ end }}{{ if .Alerts.Resolved }}
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+    {{ range .Alerts.Resolved }}
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="border-bottom:1px solid #2f3037;direction:ltr;font-size:0px;padding:10px 0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:middle;width:199.33333333333337px;" ><![endif]-->
+                        <div class="mj-column-per-33-333333333333336 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:middle;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#26322a" role="presentation" style="border:1px solid #32632b;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#26322a;" valign="middle">
+                                          <p rel="noopener" style="display:inline-block;background:#26322a;color:#a5d69e;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:5px 12px;mso-padding-alt:0px;border-radius:3px;"> Resolved </p>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><td class="" style="vertical-align:middle;width:199.33333333333337px;" ><![endif]-->
+                        <div class="mj-column-per-33-333333333333336 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:middle;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;"><strong>{{ .Labels.alertname }}</strong></div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ if gt (len .GeneratorURL) 0 }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:middle;width:199.33333333333337px;" ><![endif]-->
+                        <div class="mj-column-per-33-333333333333336 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:middle;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .GeneratorURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View alert </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}
+                        <!--[if mso | IE]></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ if .ImageURL }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-bottom:1px solid #2f3037;vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                                    <tbody>
+                                      <tr>
+                                        <td style="width:598px;">
+                                          <a href="{{ .ImageURL }}" target="_blank" style="color: #6E9FFF;">
+                                            <img height="auto" src="{{ .ImageURL }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="598">
+                                          </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ end }}{{ if .EmbeddedImage }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-bottom:1px solid #2f3037;vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                                    <tbody>
+                                      <tr>
+                                        <td style="width:598px;">
+                                          <img height="auto" src="cid:{{ .EmbeddedImage }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="598">
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ end }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              {{ if .Annotations.summary }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Summary</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">{{- .Annotations.summary -}}</div>
+                                </td>
+                              </tr>
+                              {{ end }}{{ if .Annotations.description }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Description</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                                    <mj-raw>
+                                      {{ range $line := (splitList "\n" .Annotations.description) }}
+                                    </mj-raw>
+                                    {{ $line }}<br>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </div>
+                                </td>
+                              </tr>
+                              {{ end }}
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ if .Values }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Values</strong></div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:0 25px;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:548px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
+                            <tbody>
+                              <tr>
+                                <td style="background-color:#111217;border:1px solid #2f3037;vertical-align:top;padding:10px;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style width="100%">
+                                    <tbody>
+                                      <tr>
+                                        <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                          <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                                            <mj-raw>
+                                              {{ range $refID, $value := .Values }}
+                                            </mj-raw>
+                                            {{ $refID }}={{ $value }}&nbsp; <mj-raw>
+                                              {{ end }}
+                                            </mj-raw>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+              {{ end }}
+              <!--[if mso | IE]><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              {{ if .Labels.SortedPairs }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Labels</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
+                                    <mj-raw>
+                                      {{ range .Labels.SortedPairs }}
+                                    </mj-raw>
+                                    <tr>
+                                      <td>
+                                        <strong>{{ .Name }}</strong>
+                                      </td>
+                                      <td>
+                                        {{ .Value }}
+                                      </td>
+                                    </tr>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </table>
+                                </td>
+                              </tr>
+                              {{ end }}{{ if .Annotations.SortedPairs }}
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Annotations</strong></div>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
+                                    <mj-raw>
+                                      {{ range .Annotations.SortedPairs }}
+                                    </mj-raw>
+                                    <tr>
+                                      <td>
+                                        <strong>{{ .Name }}</strong>
+                                      </td>
+                                      <td>
+                                        {{ .Value }}
+                                      </td>
+                                    </tr>
+                                    <mj-raw>
+                                      {{ end }}
+                                    </mj-raw>
+                                  </table>
+                                </td>
+                              </tr>
+                              {{ end }}
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="border-top:1px solid #2f3037;direction:ltr;font-size:0px;padding:15px 0px;text-align:left;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><![endif]-->
+                        {{ if .SilenceURL }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .SilenceURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Silence </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}{{ if .Annotations.runbook_url }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .Annotations.runbook_url }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View runbook </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}{{ if .DashboardURL }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .DashboardURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View dashboard </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}{{ if .PanelURL }}
+                        <!--[if mso | IE]><td class="" style="vertical-align:top;width:149.5px;" ><![endif]-->
+                        <div class="mj-column-per-25 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:5px 12px;background:#3D71D9;" valign="middle">
+                                          <a href="{{ .PanelURL }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 5px 12px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> View panel </a>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td><![endif]-->
+                        {{ end }}
+                        <!--[if mso | IE]></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr><tr><td class="" width="600px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:598px;" width="598" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:598px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="border-top:1px solid #2f3037;direction:ltr;font-size:0px;padding:5px 0;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                            <tbody>
+                              <tr>
+                                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#91929e;">Observed <strong>{{ ago .StartsAt }}</strong> before this notification was delivered, at <strong>{{ .StartsAt }}</strong></div>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:10px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+    {{ end }}{{ end }}{{ end }}
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;padding-top:10px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
 </body>
+
 </html>
diff --git a/public/emails/ng_alert_notification.txt b/public/emails/ng_alert_notification.txt
index 485bdfe3f07..be157396c17 100644
--- a/public/emails/ng_alert_notification.txt
+++ b/public/emails/ng_alert_notification.txt
@@ -19,8 +19,7 @@ Annotations:
 {{ range .Annotations.SortedPairs }}
 {{ .Name }} = {{ .Value }}
 {{ end }}
-{{ end }}{{ if gt (len .Alerts.Resolved) 0 }}({{ .Alerts.Resolved | len }}) Resolved{{ end
-}}
+{{ end }}{{ if gt (len .Alerts.Resolved) 0 }}({{ .Alerts.Resolved | len }}) Resolved{{ end }}
 {{ range .Alerts.Resolved }}
 Labels:
 {{ range .Labels.SortedPairs }}
@@ -38,4 +37,5 @@ Annotations:
 Go to the Alerts page:
 {{.AlertPageUrl}}
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html
index ab4ef1c761c..b064b21c180 100644
--- a/public/emails/reset_password.html
+++ b/public/emails/reset_password.html
@@ -1,279 +1,217 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width" />
-	
-<style>body {
-width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
-}
-img {
-outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block;
-}
-body {
-color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
-}
-body {
-font-size: 14px; line-height: 19px;
-}
-a:hover {
-color: #2795b6 !important;
-}
-a:active {
-color: #2795b6 !important;
-}
-a:visited {
-color: #2ba6cb !important;
-}
-body {
-font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;
-}
-a:hover {
-color: #ff8f2b !important;
-}
-a:active {
-color: #F2821E !important;
-}
-a:visited {
-color: #E67612 !important;
-}
-.better-button:hover a {
-color: #FFFFFF !important; background-color: #F2821E; border: 1px solid #F2821E;
-}
-.better-button:visited a {
-color: #FFFFFF !important;
-}
-.better-button:active a {
-color: #FFFFFF !important;
-}
-.better-button-alt:hover a {
-color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E;
-}
-.better-button-alt:visited a {
-color: #ff8f2b !important;
-}
-.better-button-alt:active a {
-color: #ff8f2b !important;
-}
-body {
-height: 100% !important; width: 100% !important;
-}
-body .copy {
--ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-width: 100%;
-}
-.ExternalClass {
-line-height: 100%;
-}
-img {
--ms-interpolation-mode: bicubic;
-}
-img {
-border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-text-decoration: underline;
-}
-@media only screen and (max-width: 600px) {
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-  table[class="body"] .row {
-    width: 100% !important; display: block !important;
-  }
-  table[class="body"] .wrapper {
-    display: block !important; padding-right: 0 !important;
-  }
-  table[class="body"] .columns {
-    table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
-  }
-  table[class="body"] table.columns td {
-    width: 100% !important;
-  }
-  table[class="body"] .columns td.six {
-    width: 50% !important;
-  }
-  table[class="body"] .columns td.twelve {
-    width: 100% !important;
-  }
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-    width: 270px;
-  }
-}
-</style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+  <title>
+    {{ Subject .Subject "Reset your Grafana password - {{.Name}}" }}
+  </title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
-		<tr style="vertical-align: top; padding: 0;" align="left">
-			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
-        <center style="width: 100%; min-width: 580px;">
-					<table class="row header" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; margin-top: 25px; margin-bottom: 25px; padding: 0px;">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-						  <td class="center" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" valign="top">
-						    <center style="width: 100%; min-width: 580px;">
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
 
-						      <table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;">
-						        <tr style="vertical-align: top; padding: 0;" align="left">
-						          <td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
 
-						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-						              <tr style="vertical-align: top; padding: 0;" align="left">
-						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
-                            </td>
-                            <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-                          </tr>
-						            </table>
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
 
-						          </td>
-						        </tr>
-						      </table>
+    p {
+      display: block;
+      margin: 13px 0;
+    }
 
-						    </center>
-						  </td>
-						</tr>
-					</table>
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
 
-					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
-						</tr>
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
-								{{Subject .Subject "Reset your Grafana password - {{.Name}}"}}
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
 
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						<h4 style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; word-break: normal; font-size: 20px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left">Hi {{.Name}},</h4>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-			</table>
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
 
-		</td>
-	</tr>
-</table>
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">
-							Please click the following link to reset your password within <b>{{.EmailCodeValidHours}} hours</b>.
-						</p>
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">
-							<a href="{{.AppUrl}}user/password/reset?code={{.Code}}" style="color: #E67612; text-decoration: none;">{{.AppUrl}}user/password/reset?code={{.Code}}</a>
-						</p>
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">Not working? Try copying and pasting it to your browser.</p>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-			</table>
+  </style>
+  <style type="text/css">
+  </style>
+</head>
 
-		</td>
-	</tr>
-</table>
-
-
-
-								
-							</td>
-						</tr>
-					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
-								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
-									<tr style="vertical-align: top; padding: 0;" align="left">
-										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
-											<center style="width: 100%; min-width: 580px;">
-												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
+<body style="word-spacing:normal;background-color:#111217;">
+  <div style="background-color:#111217;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:200px;">
+                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2>Hi {{ .Name }},</h2>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">Please click the following link to reset your password within <strong>{{ .EmailCodeValidHours }} hours</strong>.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
+                                <a href="{{ .AppUrl }}user/password/reset?code={{ .Code }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Reset Password </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">You can also copy and paste this link into your browser directly:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><a rel="noopener" href="{{ .AppUrl }}user/password/reset?code={{ .Code }}" style="color: #6E9FFF;">{{ .AppUrl }}user/password/reset?code={{ .Code }}</a></div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
 </body>
+
 </html>
diff --git a/public/emails/reset_password.txt b/public/emails/reset_password.txt
index 0c5397416fc..0b15365f391 100644
--- a/public/emails/reset_password.txt
+++ b/public/emails/reset_password.txt
@@ -2,8 +2,8 @@
 
 Hi {{.Name}},
 
-Copy and paste the following link directly in your browser to reset your password within
-{{.EmailCodeValidHours}} hours.
+Copy and paste the following link directly in your browser to reset your password within {{.EmailCodeValidHours}} hours.
 {{.AppUrl}}user/password/reset?code={{.Code}}
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html
index 15f1945862d..48d4c6236df 100644
--- a/public/emails/signup_started.html
+++ b/public/emails/signup_started.html
@@ -1,283 +1,232 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width" />
-	
-<style>body {
-width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
-}
-img {
-outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block;
-}
-body {
-color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
-}
-body {
-font-size: 14px; line-height: 19px;
-}
-a:hover {
-color: #2795b6 !important;
-}
-a:active {
-color: #2795b6 !important;
-}
-a:visited {
-color: #2ba6cb !important;
-}
-body {
-font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;
-}
-a:hover {
-color: #ff8f2b !important;
-}
-a:active {
-color: #F2821E !important;
-}
-a:visited {
-color: #E67612 !important;
-}
-.better-button:hover a {
-color: #FFFFFF !important; background-color: #F2821E; border: 1px solid #F2821E;
-}
-.better-button:visited a {
-color: #FFFFFF !important;
-}
-.better-button:active a {
-color: #FFFFFF !important;
-}
-.better-button-alt:hover a {
-color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E;
-}
-.better-button-alt:visited a {
-color: #ff8f2b !important;
-}
-.better-button-alt:active a {
-color: #ff8f2b !important;
-}
-body {
-height: 100% !important; width: 100% !important;
-}
-body .copy {
--ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-width: 100%;
-}
-.ExternalClass {
-line-height: 100%;
-}
-img {
--ms-interpolation-mode: bicubic;
-}
-img {
-border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-text-decoration: underline;
-}
-@media only screen and (max-width: 600px) {
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-  table[class="body"] .row {
-    width: 100% !important; display: block !important;
-  }
-  table[class="body"] .wrapper {
-    display: block !important; padding-right: 0 !important;
-  }
-  table[class="body"] .columns {
-    table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
-  }
-  table[class="body"] table.columns td {
-    width: 100% !important;
-  }
-  table[class="body"] .columns td.six {
-    width: 50% !important;
-  }
-  table[class="body"] .columns td.twelve {
-    width: 100% !important;
-  }
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-    width: 270px;
-  }
-}
-</style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+  <title>
+    {{ Subject .Subject "Welcome to Grafana, please complete your sign up!" }}
+  </title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
-		<tr style="vertical-align: top; padding: 0;" align="left">
-			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
-        <center style="width: 100%; min-width: 580px;">
-					<table class="row header" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; margin-top: 25px; margin-bottom: 25px; padding: 0px;">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-						  <td class="center" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" valign="top">
-						    <center style="width: 100%; min-width: 580px;">
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
 
-						      <table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;">
-						        <tr style="vertical-align: top; padding: 0;" align="left">
-						          <td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
 
-						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-						              <tr style="vertical-align: top; padding: 0;" align="left">
-						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
-                            </td>
-                            <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-                          </tr>
-						            </table>
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
 
-						          </td>
-						        </tr>
-						      </table>
+    p {
+      display: block;
+      margin: 13px 0;
+    }
 
-						    </center>
-						  </td>
-						</tr>
-					</table>
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
 
-					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
-						</tr>
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
-								{{Subject .Subject "Welcome to Grafana, please complete your sign up!"}}
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
 
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						<h4 class="center" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; word-break: normal; font-size: 20px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="center">Complete the signup</h4>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-			</table>
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
 
-		</td>
-	</tr>
-</table>
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						Copy and paste the email verification code:<br />
-						<span class="verification-code" style="background-color: #EEEEEE; display: inline-block; font-weight: bold; font-size: 20px; margin: 8px; padding: 3px;">{{.Code}}</span><br /> in
-						the sign up form <strong>or</strong> use the link below.
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; margin-top: 10px; margin-bottom: 20px; padding: 0;">
-							<tr style="vertical-align: top; padding: 0;" align="left">
-								<td align="center" class="better-button" bgcolor="#ff8f2b" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; margin: 0; padding: 0px;" valign="top"><a rel="noopener noreferrer" href="{{.SignUpUrl}}" target="_blank" style="color: #FFF; text-decoration: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; display: inline-block; padding: 12px 25px; border: 1px solid #ff8f2b;">Complete Sign Up</a></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
+  </style>
+  <style type="text/css">
+  </style>
+</head>
 
-
-
-								
-							</td>
-						</tr>
-					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
-								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
-									<tr style="vertical-align: top; padding: 0;" align="left">
-										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
-											<center style="width: 100%; min-width: 580px;">
-												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
+<body style="word-spacing:normal;background-color:#111217;">
+  <div style="background-color:#111217;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:200px;">
+                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2>Complete the signup</h2>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">Copy and paste the email verification code in the sign up form <strong>or</strong> use the link below.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="transparent" role="presentation" style="border:1px solid #44474f;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:transparent;" valign="middle">
+                                <p rel="noopener" style="display:inline-block;background:transparent;color:#ccccdd;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:22px;font-weight:bold;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;">
+                                  {{ .Code }}
+                                </p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
+                                <a href="{{ .SignUpUrl }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Complete Sign Up </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">You can also copy and paste this link into your browser directly:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><a rel="noopener" href="{{ .LinkUrl }}" style="color: #6E9FFF;">{{ .SignUpUrl }}</a></div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
 </body>
+
 </html>
diff --git a/public/emails/signup_started.txt b/public/emails/signup_started.txt
index 94dd8547936..a40e7403ecd 100644
--- a/public/emails/signup_started.txt
+++ b/public/emails/signup_started.txt
@@ -8,4 +8,5 @@ in the sign up form or use the link below.
 
 {{.SignUpUrl}}
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html
index 28ac926fb06..a532fc8a58a 100644
--- a/public/emails/welcome_on_signup.html
+++ b/public/emails/welcome_on_signup.html
@@ -1,285 +1,222 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width" />
-	
-<style>body {
-width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
-}
-img {
-outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block;
-}
-body {
-color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
-}
-body {
-font-size: 14px; line-height: 19px;
-}
-a:hover {
-color: #2795b6 !important;
-}
-a:active {
-color: #2795b6 !important;
-}
-a:visited {
-color: #2ba6cb !important;
-}
-body {
-font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;
-}
-a:hover {
-color: #ff8f2b !important;
-}
-a:active {
-color: #F2821E !important;
-}
-a:visited {
-color: #E67612 !important;
-}
-.better-button:hover a {
-color: #FFFFFF !important; background-color: #F2821E; border: 1px solid #F2821E;
-}
-.better-button:visited a {
-color: #FFFFFF !important;
-}
-.better-button:active a {
-color: #FFFFFF !important;
-}
-.better-button-alt:hover a {
-color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E;
-}
-.better-button-alt:visited a {
-color: #ff8f2b !important;
-}
-.better-button-alt:active a {
-color: #ff8f2b !important;
-}
-body {
-height: 100% !important; width: 100% !important;
-}
-body .copy {
--ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-}
-.ExternalClass {
-width: 100%;
-}
-.ExternalClass {
-line-height: 100%;
-}
-img {
--ms-interpolation-mode: bicubic;
-}
-img {
-border: 0 !important; outline: none !important; text-decoration: none !important;
-}
-a:hover {
-text-decoration: underline;
-}
-@media only screen and (max-width: 600px) {
-  table[class="body"] center {
-    min-width: 0 !important;
-  }
-  table[class="body"] .container {
-    width: 95% !important;
-  }
-  table[class="body"] .row {
-    width: 100% !important; display: block !important;
-  }
-  table[class="body"] .wrapper {
-    display: block !important; padding-right: 0 !important;
-  }
-  table[class="body"] .columns {
-    table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
-  }
-  table[class="body"] table.columns td {
-    width: 100% !important;
-  }
-  table[class="body"] .columns td.six {
-    width: 50% !important;
-  }
-  table[class="body"] .columns td.twelve {
-    width: 100% !important;
-  }
-  table[class="body"] table.columns td.expander {
-    width: 1px !important;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-}
-@media (max-width: 600px) {
-  table[class="email-container"] {
-    width: 95% !important;
-  }
-  img[class="fluid"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    width: 100% !important; max-width: 100% !important; height: auto !important; margin: auto !important;
-  }
-  img[class="fluid-centered"] {
-    margin: auto !important;
-  }
-  td[class="comms-content"] {
-    padding: 20px !important;
-  }
-  td[class="stack-column"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    display: block !important; width: 100% !important; direction: ltr !important;
-  }
-  td[class="stack-column-center"] {
-    text-align: center !important;
-  }
-  td[class="copy"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -center"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="copy -bold"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="small-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 0 30px !important;
-  }
-  td[class="mini-centered-text"] {
-    font-size: 14px !important; line-height: 24px !important; padding: 15px 30px !important;
-  }
-  td[class="copy -padd"] {
-    padding: 0 40px !important;
-  }
-  span[class="sep"] {
-    display: none !important;
-  }
-  td[class="mb-hide"] {
-    display: none !important; height: 0 !important;
-  }
-  td[class="spacer mb-shorten"] {
-    height: 25px !important;
-  }
-  .two-up td {
-    width: 270px;
-  }
-}
-</style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+  <title>
+    {{ Subject .Subject "Welcome to Grafana" }}
+  </title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
-		<tr style="vertical-align: top; padding: 0;" align="left">
-			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
-        <center style="width: 100%; min-width: 580px;">
-					<table class="row header" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; margin-top: 25px; margin-bottom: 25px; padding: 0px;">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-						  <td class="center" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" valign="top">
-						    <center style="width: 100%; min-width: 580px;">
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
 
-						      <table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;">
-						        <tr style="vertical-align: top; padding: 0;" align="left">
-						          <td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
 
-						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-						              <tr style="vertical-align: top; padding: 0;" align="left">
-						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
-                            </td>
-                            <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-                          </tr>
-						            </table>
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
 
-						          </td>
-						        </tr>
-						      </table>
+    p {
+      display: block;
+      margin: 13px 0;
+    }
 
-						    </center>
-						  </td>
-						</tr>
-					</table>
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
 
-					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
-						</tr>
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
-								{{Subject .Subject "Welcome to Grafana"}}
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
 
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						<h4 style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; word-break: normal; font-size: 20px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left">Hi {{.Name}},</h4>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						Welcome! Ready to start building some beautiful metric and analytic dashboards?
-					</td>
-				</tr>
-			</table>
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
 
-		</td>
-	</tr>
-</table>
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
 
-<table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: block; padding: 0px;">
-	<tr style="vertical-align: top; padding: 0;" align="left">
-		<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 0px 0px;" align="left" valign="top">
-			<table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td class="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">
-							If you are new to Grafana, refer to the <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/" style="color: #E67612; text-decoration: none;">Getting started with Grafana</a> guide.
-						</p>
-					</td>
-					<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-				</tr>
-				<tr style="vertical-align: top; padding: 0;" align="left">
-					<td style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="left" valign="top">
-						Thank you for joining our community.
-						<br />
-						<p style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="left">The Grafana Team</p>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
+  </style>
+  <style type="text/css">
+  </style>
+</head>
 
-
-								
-							</td>
-						</tr>
-					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
-						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
-								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
-									<tr style="vertical-align: top; padding: 0;" align="left">
-										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
-											<center style="width: 100%; min-width: 580px;">
-												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
-												</p>
-											</center>
-										</td>
-										<td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-	</table>
+<body style="word-spacing:normal;background-color:#111217;">
+  <div style="background-color:#111217;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:200px;">
+                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#22252b" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#22252b;background-color:#22252b;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#22252b;background-color:#22252b;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #2f3037;direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
+                          <h2>Hi {{ .Name }},</h2>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">Welcome! Ready to start building some beautiful metric and analytic dashboards?</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">If you are new to Grafana, refer to the <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/" style="color: #6E9FFF;">Getting started with Grafana</a> guide.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
+                                <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Ubuntu, Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Check out our getting started guide </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">Thank you for joining our community.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">The Grafana Team</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:center;color:#FFFFFF;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
 </body>
+
 </html>
diff --git a/public/emails/welcome_on_signup.txt b/public/emails/welcome_on_signup.txt
index 31bd3632997..4608fa9e82e 100644
--- a/public/emails/welcome_on_signup.txt
+++ b/public/emails/welcome_on_signup.txt
@@ -4,11 +4,11 @@ Hi {{.Name}},
 
 Welcome! Ready to start building some beautiful metric and analytic dashboards?
 
-If you are new to Grafana, refer to the Getting started with Grafana guide on
-https://grafana.com/docs/grafana/latest/getting-started/getting-started/.
+If you are new to Grafana, refer to the Getting started with Grafana guide on https://grafana.com/docs/grafana/latest/getting-started/getting-started/.
 
 Thank you for joining our community.
 
 The Grafana team
 
-Sent by Grafana v{{.BuildVersion}} (c) 2022 Grafana Labs
+
+Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs

From fef1e1d5bc8c1ea7d6deb6a8ef808988cdec61aa Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Fri, 18 Nov 2022 09:56:06 +0100
Subject: [PATCH 002/153] Auth: Refactor auth package (#58920)

* Auth: move interface to its own file

* Auth: move to test package

* Auth: move quota consts to auth file

* Auth: move service to impl package

* Auth: move interfaces and related models to auth package

* Auth: Create sub package and type alias to avoid circular dependency
---
 pkg/api/admin_users.go                        |  7 +--
 pkg/api/admin_users_test.go                   | 13 ++---
 pkg/api/common_test.go                        |  6 +--
 pkg/api/http_server.go                        |  5 +-
 pkg/api/ldap_debug_test.go                    |  4 +-
 pkg/api/login.go                              |  7 +--
 pkg/api/login_test.go                         | 12 ++---
 pkg/api/user_token.go                         | 13 ++---
 pkg/api/user_token_test.go                    | 41 +++++++-------
 pkg/cmd/grafana-cli/runner/wire.go            |  5 +-
 pkg/cmd/grafana-cli/runner/wireexts_oss.go    |  7 +--
 pkg/middleware/auth.go                        |  5 +-
 pkg/middleware/middleware_test.go             | 39 +++++++-------
 pkg/middleware/org_redirect_test.go           | 10 ++--
 pkg/middleware/quota_test.go                  |  6 +--
 pkg/middleware/recovery_test.go               |  4 +-
 pkg/middleware/testing.go                     |  6 +--
 pkg/models/context.go                         |  3 +-
 pkg/models/usertoken/user_token.go            | 26 +++++++++
 .../backgroundsvcs/background_services.go     |  4 +-
 pkg/server/wire.go                            |  5 +-
 pkg/server/wireexts_oss.go                    |  7 +--
 pkg/services/accesscontrol/middleware.go      |  6 +--
 .../user_token.go => services/auth/auth.go}   | 40 ++++++--------
 .../auth/{ => authimpl}/auth_token.go         | 54 +++++++++----------
 .../auth/{ => authimpl}/auth_token_test.go    | 26 ++++-----
 pkg/services/auth/{ => authimpl}/model.go     | 16 ++----
 .../auth/{ => authimpl}/token_cleanup.go      |  2 +-
 .../auth/{ => authimpl}/token_cleanup_test.go |  2 +-
 pkg/services/auth/{ => authtest}/testing.go   | 47 ++++++++--------
 .../contexthandler/auth_proxy_test.go         |  4 +-
 pkg/services/contexthandler/contexthandler.go | 10 ++--
 .../contexthandler/contexthandler_test.go     | 18 ++++---
 pkg/services/ngalert/api/util_test.go         |  3 +-
 pkg/services/quota/quotaimpl/quota_test.go    |  3 +-
 35 files changed, 245 insertions(+), 221 deletions(-)
 create mode 100644 pkg/models/usertoken/user_token.go
 rename pkg/{models/user_token.go => services/auth/auth.go} (74%)
 rename pkg/services/auth/{ => authimpl}/auth_token.go (91%)
 rename pkg/services/auth/{ => authimpl}/auth_token_test.go (96%)
 rename pkg/services/auth/{ => authimpl}/model.go (77%)
 rename pkg/services/auth/{ => authimpl}/token_cleanup.go (99%)
 rename pkg/services/auth/{ => authimpl}/token_cleanup_test.go (99%)
 rename pkg/services/auth/{ => authtest}/testing.go (77%)

diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go
index e0b244bfab4..bf284cddb33 100644
--- a/pkg/api/admin_users.go
+++ b/pkg/api/admin_users.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
@@ -416,7 +417,7 @@ func (hs *HTTPServer) AdminGetUserAuthTokens(c *models.ReqContext) response.Resp
 // 404: notFoundError
 // 500: internalServerError
 func (hs *HTTPServer) AdminRevokeUserAuthToken(c *models.ReqContext) response.Response {
-	cmd := models.RevokeAuthTokenCmd{}
+	cmd := auth.RevokeAuthTokenCmd{}
 	if err := web.Bind(c.Req, &cmd); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
@@ -476,7 +477,7 @@ type AdminLogoutUserParams struct {
 type AdminRevokeUserAuthTokenParams struct {
 	// in:body
 	// required:true
-	Body models.RevokeAuthTokenCmd `json:"body"`
+	Body auth.RevokeAuthTokenCmd `json:"body"`
 	// in:path
 	// required:true
 	UserID int64 `json:"user_id"`
@@ -508,5 +509,5 @@ type AdminCreateUserResponseResponse struct {
 // swagger:response adminGetUserAuthTokensResponse
 type AdminGetUserAuthTokensResponse struct {
 	// in:body
-	Body []*models.UserToken `json:"body"`
+	Body []*auth.UserToken `json:"body"`
 }
diff --git a/pkg/api/admin_users_test.go b/pkg/api/admin_users_test.go
index 41f79831f74..3de90077df9 100644
--- a/pkg/api/admin_users_test.go
+++ b/pkg/api/admin_users_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
 	"github.com/grafana/grafana/pkg/services/login/logintest"
 	"github.com/grafana/grafana/pkg/services/org"
@@ -65,7 +66,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
 	})
 
 	t.Run("When a server admin attempts to revoke an auth token for a non-existing user", func(t *testing.T) {
-		cmd := models.RevokeAuthTokenCmd{AuthTokenId: 2}
+		cmd := auth.RevokeAuthTokenCmd{AuthTokenId: 2}
 		mockUser := usertest.NewUserServiceFake()
 		mockUser.ExpectedError = user.ErrUserNotFound
 		adminRevokeUserAuthTokenScenario(t, "Should return not found when calling POST on",
@@ -263,7 +264,7 @@ func putAdminScenario(t *testing.T, desc string, url string, routePattern string
 func adminLogoutUserScenario(t *testing.T, desc string, url string, routePattern string, fn scenarioFunc, userService *usertest.FakeUserService) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
 		hs := HTTPServer{
-			AuthTokenService: auth.NewFakeUserAuthTokenService(),
+			AuthTokenService: authtest.NewFakeUserAuthTokenService(),
 			userService:      userService,
 		}
 
@@ -285,9 +286,9 @@ func adminLogoutUserScenario(t *testing.T, desc string, url string, routePattern
 	})
 }
 
-func adminRevokeUserAuthTokenScenario(t *testing.T, desc string, url string, routePattern string, cmd models.RevokeAuthTokenCmd, fn scenarioFunc, userService user.Service) {
+func adminRevokeUserAuthTokenScenario(t *testing.T, desc string, url string, routePattern string, cmd auth.RevokeAuthTokenCmd, fn scenarioFunc, userService user.Service) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		hs := HTTPServer{
 			AuthTokenService: fakeAuthTokenService,
@@ -315,7 +316,7 @@ func adminRevokeUserAuthTokenScenario(t *testing.T, desc string, url string, rou
 
 func adminGetUserAuthTokensScenario(t *testing.T, desc string, url string, routePattern string, fn scenarioFunc, userService *usertest.FakeUserService) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		hs := HTTPServer{
 			AuthTokenService: fakeAuthTokenService,
@@ -341,7 +342,7 @@ func adminGetUserAuthTokensScenario(t *testing.T, desc string, url string, route
 
 func adminDisableUserScenario(t *testing.T, desc string, action string, url string, routePattern string, fn scenarioFunc) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		authInfoService := &logintest.AuthInfoServiceFake{}
 
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index e6f0c159401..39be06adbc5 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -28,7 +28,7 @@ import (
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/contexthandler/authproxy"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
@@ -181,7 +181,7 @@ type scenarioContext struct {
 	defaultHandler          web.Handler
 	req                     *http.Request
 	url                     string
-	userAuthTokenService    *auth.FakeUserAuthTokenService
+	userAuthTokenService    *authtest.FakeUserAuthTokenService
 	sqlStore                sqlstore.Store
 	authInfoService         *logintest.AuthInfoServiceFake
 	dashboardVersionService dashver.Service
@@ -207,7 +207,7 @@ func getContextHandler(t *testing.T, cfg *setting.Cfg) *contexthandler.ContextHa
 	cfg.RemoteCacheOptions = &setting.RemoteCacheOptions{
 		Name: "database",
 	}
-	userAuthTokenSvc := auth.NewFakeUserAuthTokenService()
+	userAuthTokenSvc := authtest.NewFakeUserAuthTokenService()
 	renderSvc := &fakeRenderService{}
 	authJWTSvc := models.NewFakeJWTService()
 	tracer := tracing.InitializeTracerForTest()
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index f2cfce24fc1..7320b71b2cd 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/middleware/csrf"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
 	"github.com/grafana/grafana/pkg/services/querylibrary"
@@ -120,7 +121,7 @@ type HTTPServer struct {
 	navTreeService               navtree.Service
 	CacheService                 *localcache.CacheService
 	DataSourceCache              datasources.CacheService
-	AuthTokenService             models.UserTokenService
+	AuthTokenService             auth.UserTokenService
 	QuotaService                 quota.Service
 	RemoteCacheService           *remotecache.RemoteCache
 	ProvisioningService          provisioning.ProvisioningService
@@ -220,7 +221,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	pluginRequestValidator models.PluginRequestValidator, pluginStaticRouteResolver plugins.StaticRouteResolver,
 	pluginDashboardService plugindashboards.Service, pluginStore plugins.Store, pluginClient plugins.Client,
 	pluginErrorResolver plugins.ErrorResolver, pluginInstaller plugins.Installer, settingsProvider setting.Provider,
-	dataSourceCache datasources.CacheService, userTokenService models.UserTokenService,
+	dataSourceCache datasources.CacheService, userTokenService auth.UserTokenService,
 	cleanUpService *cleanup.CleanUpService, shortURLService shorturls.Service, queryHistoryService queryhistory.Service, correlationsService correlations.Service,
 	thumbService thumbs.Service, remoteCache *remotecache.RemoteCache, provisioningService provisioning.ProvisioningService,
 	loginService login.Service, authenticator loginpkg.Authenticator, accessControl accesscontrol.AccessControl,
diff --git a/pkg/api/ldap_debug_test.go b/pkg/api/ldap_debug_test.go
index 5a93f53e3ba..95b92e4e06f 100644
--- a/pkg/api/ldap_debug_test.go
+++ b/pkg/api/ldap_debug_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/ldap"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
 	"github.com/grafana/grafana/pkg/services/login/logintest"
@@ -379,7 +379,7 @@ func postSyncUserWithLDAPContext(t *testing.T, requestURL string, preHook func(*
 
 	hs := &HTTPServer{
 		Cfg:              sc.cfg,
-		AuthTokenService: auth.NewFakeUserAuthTokenService(),
+		AuthTokenService: authtest.NewFakeUserAuthTokenService(),
 		Login:            loginservice.LoginServiceMock{},
 		authInfoService:  sc.authInfoService,
 		userService:      userService,
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 20baa31bde5..9b23ad05b6e 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -16,6 +16,7 @@ import (
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/middleware/cookies"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	loginService "github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -227,7 +228,7 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext) response.Response {
 
 	err = hs.loginUserWithUser(usr, c)
 	if err != nil {
-		var createTokenErr *models.CreateTokenErr
+		var createTokenErr *auth.CreateTokenErr
 		if errors.As(err, &createTokenErr) {
 			resp = response.Error(createTokenErr.StatusCode, createTokenErr.ExternalErr, createTokenErr.InternalErr)
 		} else {
@@ -299,7 +300,7 @@ func (hs *HTTPServer) Logout(c *models.ReqContext) {
 	}
 
 	err := hs.AuthTokenService.RevokeToken(c.Req.Context(), c.UserToken, false)
-	if err != nil && !errors.Is(err, models.ErrUserTokenNotFound) {
+	if err != nil && !errors.Is(err, auth.ErrUserTokenNotFound) {
 		hs.log.Error("failed to revoke auth token", "error", err)
 	}
 
@@ -370,7 +371,7 @@ func (hs *HTTPServer) samlSingleLogoutEnabled() bool {
 }
 
 func getLoginExternalError(err error) string {
-	var createTokenErr *models.CreateTokenErr
+	var createTokenErr *auth.CreateTokenErr
 	if errors.As(err, &createTokenErr) {
 		return createTokenErr.ExternalErr
 	}
diff --git a/pkg/api/login_test.go b/pkg/api/login_test.go
index 27452b9bd09..ea30addb451 100644
--- a/pkg/api/login_test.go
+++ b/pkg/api/login_test.go
@@ -12,8 +12,6 @@ import (
 	"strings"
 	"testing"
 
-	loginservice "github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/navtree"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -25,9 +23,11 @@ import (
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/hooks"
 	"github.com/grafana/grafana/pkg/services/licensing"
+	loginservice "github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/navtree"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
@@ -323,7 +323,7 @@ func TestLoginPostRedirect(t *testing.T) {
 		Cfg:              setting.NewCfg(),
 		HooksService:     &hooks.HooksService{},
 		License:          &licensing.OSSLicensingService{},
-		AuthTokenService: auth.NewFakeUserAuthTokenService(),
+		AuthTokenService: authtest.NewFakeUserAuthTokenService(),
 	}
 	hs.Cfg.CookieSecure = true
 
@@ -564,7 +564,7 @@ func setupAuthProxyLoginTest(t *testing.T, enableLoginToken bool) *scenarioConte
 		Cfg:              sc.cfg,
 		SettingsProvider: &setting.OSSImpl{Cfg: sc.cfg},
 		License:          &licensing.OSSLicensingService{},
-		AuthTokenService: auth.NewFakeUserAuthTokenService(),
+		AuthTokenService: authtest.NewFakeUserAuthTokenService(),
 		log:              log.New("hello"),
 		SocialService:    &mockSocialService{},
 	}
@@ -602,7 +602,7 @@ func TestLoginPostRunLokingHook(t *testing.T) {
 		log:              log.New("test"),
 		Cfg:              setting.NewCfg(),
 		License:          &licensing.OSSLicensingService{},
-		AuthTokenService: auth.NewFakeUserAuthTokenService(),
+		AuthTokenService: authtest.NewFakeUserAuthTokenService(),
 		HooksService:     hookService,
 	}
 
diff --git a/pkg/api/user_token.go b/pkg/api/user_token.go
index 772cb0ff183..3e12fca2d2e 100644
--- a/pkg/api/user_token.go
+++ b/pkg/api/user_token.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
@@ -43,7 +44,7 @@ func (hs *HTTPServer) GetUserAuthTokens(c *models.ReqContext) response.Response
 // 403: forbiddenError
 // 500: internalServerError
 func (hs *HTTPServer) RevokeUserAuthToken(c *models.ReqContext) response.Response {
-	cmd := models.RevokeAuthTokenCmd{}
+	cmd := auth.RevokeAuthTokenCmd{}
 	if err := web.Bind(c.Req, &cmd); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
@@ -143,7 +144,7 @@ func (hs *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID int
 	return response.JSON(http.StatusOK, result)
 }
 
-func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID int64, cmd models.RevokeAuthTokenCmd) response.Response {
+func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID int64, cmd auth.RevokeAuthTokenCmd) response.Response {
 	userQuery := user.GetUserByIDQuery{ID: userID}
 	_, err := hs.userService.GetByID(c.Req.Context(), &userQuery)
 	if err != nil {
@@ -155,7 +156,7 @@ func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID i
 
 	token, err := hs.AuthTokenService.GetUserToken(c.Req.Context(), userID, cmd.AuthTokenId)
 	if err != nil {
-		if errors.Is(err, models.ErrUserTokenNotFound) {
+		if errors.Is(err, auth.ErrUserTokenNotFound) {
 			return response.Error(404, "User auth token not found", err)
 		}
 		return response.Error(500, "Failed to get user auth token", err)
@@ -167,7 +168,7 @@ func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID i
 
 	err = hs.AuthTokenService.RevokeToken(c.Req.Context(), token, false)
 	if err != nil {
-		if errors.Is(err, models.ErrUserTokenNotFound) {
+		if errors.Is(err, auth.ErrUserTokenNotFound) {
 			return response.Error(404, "User auth token not found", err)
 		}
 		return response.Error(500, "Failed to revoke user auth token", err)
@@ -182,11 +183,11 @@ func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID i
 type RevokeUserAuthTokenParams struct {
 	// in:body
 	// required:true
-	Body models.RevokeAuthTokenCmd `json:"body"`
+	Body auth.RevokeAuthTokenCmd `json:"body"`
 }
 
 // swagger:response getUserAuthTokensResponse
 type GetUserAuthTokensResponse struct {
 	// in:body
-	Body []*models.UserToken `json:"body"`
+	Body []*auth.UserToken `json:"body"`
 }
diff --git a/pkg/api/user_token_test.go b/pkg/api/user_token_test.go
index 2dd7d7e7fbd..093a27011b9 100644
--- a/pkg/api/user_token_test.go
+++ b/pkg/api/user_token_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
@@ -20,7 +21,7 @@ import (
 func TestUserTokenAPIEndpoint(t *testing.T) {
 	userMock := usertest.NewUserServiceFake()
 	t.Run("When current user attempts to revoke an auth token for a non-existing user", func(t *testing.T) {
-		cmd := models.RevokeAuthTokenCmd{AuthTokenId: 2}
+		cmd := auth.RevokeAuthTokenCmd{AuthTokenId: 2}
 		userMock.ExpectedError = user.ErrUserNotFound
 		revokeUserAuthTokenScenario(t, "Should return not found when calling POST on", "/api/user/revoke-auth-token",
 			"/api/user/revoke-auth-token", cmd, 200, func(sc *scenarioContext) {
@@ -59,15 +60,15 @@ func TestUserTokenAPIEndpoint(t *testing.T) {
 	})
 
 	t.Run("When revoke an auth token for a user", func(t *testing.T) {
-		cmd := models.RevokeAuthTokenCmd{AuthTokenId: 2}
-		token := &models.UserToken{Id: 1}
+		cmd := auth.RevokeAuthTokenCmd{AuthTokenId: 2}
+		token := &auth.UserToken{Id: 1}
 		mockUser := &usertest.FakeUserService{
 			ExpectedUser: &user.User{ID: 200},
 		}
 
 		revokeUserAuthTokenInternalScenario(t, "Should be successful", cmd, 200, token, func(sc *scenarioContext) {
-			sc.userAuthTokenService.GetUserTokenProvider = func(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) {
-				return &models.UserToken{Id: 2}, nil
+			sc.userAuthTokenService.GetUserTokenProvider = func(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error) {
+				return &auth.UserToken{Id: 2}, nil
 			}
 			sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
 			assert.Equal(t, 200, sc.resp.Code)
@@ -75,11 +76,11 @@ func TestUserTokenAPIEndpoint(t *testing.T) {
 	})
 
 	t.Run("When revoke the active auth token used by himself", func(t *testing.T) {
-		cmd := models.RevokeAuthTokenCmd{AuthTokenId: 2}
-		token := &models.UserToken{Id: 2}
+		cmd := auth.RevokeAuthTokenCmd{AuthTokenId: 2}
+		token := &auth.UserToken{Id: 2}
 		mockUser := usertest.NewUserServiceFake()
 		revokeUserAuthTokenInternalScenario(t, "Should not be successful", cmd, testUserID, token, func(sc *scenarioContext) {
-			sc.userAuthTokenService.GetUserTokenProvider = func(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) {
+			sc.userAuthTokenService.GetUserTokenProvider = func(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error) {
 				return token, nil
 			}
 			sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
@@ -88,10 +89,10 @@ func TestUserTokenAPIEndpoint(t *testing.T) {
 	})
 
 	t.Run("When gets auth tokens for a user", func(t *testing.T) {
-		currentToken := &models.UserToken{Id: 1}
+		currentToken := &auth.UserToken{Id: 1}
 		mockUser := usertest.NewUserServiceFake()
 		getUserAuthTokensInternalScenario(t, "Should be successful", currentToken, func(sc *scenarioContext) {
-			tokens := []*models.UserToken{
+			tokens := []*auth.UserToken{
 				{
 					Id:        1,
 					ClientIp:  "127.0.0.1",
@@ -107,7 +108,7 @@ func TestUserTokenAPIEndpoint(t *testing.T) {
 					SeenAt:    0,
 				},
 			}
-			sc.userAuthTokenService.GetUserTokensProvider = func(ctx context.Context, userId int64) ([]*models.UserToken, error) {
+			sc.userAuthTokenService.GetUserTokensProvider = func(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
 				return tokens, nil
 			}
 			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
@@ -145,10 +146,10 @@ func TestUserTokenAPIEndpoint(t *testing.T) {
 	})
 }
 
-func revokeUserAuthTokenScenario(t *testing.T, desc string, url string, routePattern string, cmd models.RevokeAuthTokenCmd,
+func revokeUserAuthTokenScenario(t *testing.T, desc string, url string, routePattern string, cmd auth.RevokeAuthTokenCmd,
 	userId int64, fn scenarioFunc, userService user.Service) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		hs := HTTPServer{
 			AuthTokenService: fakeAuthTokenService,
@@ -175,7 +176,7 @@ func revokeUserAuthTokenScenario(t *testing.T, desc string, url string, routePat
 
 func getUserAuthTokensScenario(t *testing.T, desc string, url string, routePattern string, userId int64, fn scenarioFunc, userService user.Service) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		hs := HTTPServer{
 			AuthTokenService: fakeAuthTokenService,
@@ -202,7 +203,7 @@ func getUserAuthTokensScenario(t *testing.T, desc string, url string, routePatte
 func logoutUserFromAllDevicesInternalScenario(t *testing.T, desc string, userId int64, fn scenarioFunc, userService user.Service) {
 	t.Run(desc, func(t *testing.T) {
 		hs := HTTPServer{
-			AuthTokenService: auth.NewFakeUserAuthTokenService(),
+			AuthTokenService: authtest.NewFakeUserAuthTokenService(),
 			userService:      userService,
 		}
 
@@ -222,10 +223,10 @@ func logoutUserFromAllDevicesInternalScenario(t *testing.T, desc string, userId
 	})
 }
 
-func revokeUserAuthTokenInternalScenario(t *testing.T, desc string, cmd models.RevokeAuthTokenCmd, userId int64,
-	token *models.UserToken, fn scenarioFunc, userService user.Service) {
+func revokeUserAuthTokenInternalScenario(t *testing.T, desc string, cmd auth.RevokeAuthTokenCmd, userId int64,
+	token *auth.UserToken, fn scenarioFunc, userService user.Service) {
 	t.Run(desc, func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		hs := HTTPServer{
 			AuthTokenService: fakeAuthTokenService,
@@ -248,9 +249,9 @@ func revokeUserAuthTokenInternalScenario(t *testing.T, desc string, cmd models.R
 	})
 }
 
-func getUserAuthTokensInternalScenario(t *testing.T, desc string, token *models.UserToken, fn scenarioFunc, userService user.Service) {
+func getUserAuthTokensInternalScenario(t *testing.T, desc string, token *auth.UserToken, fn scenarioFunc, userService user.Service) {
 	t.Run(desc, func(t *testing.T) {
-		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
 		hs := HTTPServer{
 			AuthTokenService: fakeAuthTokenService,
diff --git a/pkg/cmd/grafana-cli/runner/wire.go b/pkg/cmd/grafana-cli/runner/wire.go
index 82efb1ce69e..8ee0af3f6a5 100644
--- a/pkg/cmd/grafana-cli/runner/wire.go
+++ b/pkg/cmd/grafana-cli/runner/wire.go
@@ -7,6 +7,7 @@ import (
 	"context"
 
 	"github.com/google/wire"
+	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/tsdb/parca"
 	"github.com/grafana/grafana/pkg/tsdb/phlare"
 
@@ -253,8 +254,8 @@ var wireSet = wire.NewSet(
 	influxdb.ProvideService,
 	wire.Bind(new(social.Service), new(*social.SocialService)),
 	oauthtoken.ProvideService,
-	auth.ProvideActiveAuthTokenService,
-	wire.Bind(new(auth.ActiveTokenService), new(*auth.ActiveAuthTokenService)),
+	authimpl.ProvideActiveAuthTokenService,
+	wire.Bind(new(auth.ActiveTokenService), new(*authimpl.ActiveAuthTokenService)),
 	wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)),
 	tempo.ProvideService,
 	loki.ProvideService,
diff --git a/pkg/cmd/grafana-cli/runner/wireexts_oss.go b/pkg/cmd/grafana-cli/runner/wireexts_oss.go
index 407ce3c1945..dfc36b3cd26 100644
--- a/pkg/cmd/grafana-cli/runner/wireexts_oss.go
+++ b/pkg/cmd/grafana-cli/runner/wireexts_oss.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/datasources/permissions"
 	datasourceservice "github.com/grafana/grafana/pkg/services/datasources/service"
@@ -48,9 +49,9 @@ var wireExtsSet = wire.NewSet(
 	wire.Bind(new(setting.Provider), new(*setting.OSSImpl)),
 	osskmsproviders.ProvideService,
 	wire.Bind(new(kmsproviders.Service), new(osskmsproviders.Service)),
-	auth.ProvideUserAuthTokenService,
-	wire.Bind(new(models.UserTokenService), new(*auth.UserAuthTokenService)),
-	wire.Bind(new(models.UserTokenBackgroundService), new(*auth.UserAuthTokenService)),
+	authimpl.ProvideUserAuthTokenService,
+	wire.Bind(new(auth.UserTokenService), new(*authimpl.UserAuthTokenService)),
+	wire.Bind(new(auth.UserTokenBackgroundService), new(*authimpl.UserAuthTokenService)),
 	acimpl.ProvideService,
 	wire.Bind(new(accesscontrol.Service), new(*acimpl.Service)),
 	wire.Bind(new(accesscontrol.RoleRegistry), new(*acimpl.Service)),
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index 7ab6274bc4c..b7e00465586 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -10,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/middleware/cookies"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/team"
@@ -42,7 +43,7 @@ func notAuthorized(c *models.ReqContext) {
 	c.Redirect(setting.AppSubUrl + "/login")
 }
 
-func tokenRevoked(c *models.ReqContext, err *models.TokenRevokedError) {
+func tokenRevoked(c *models.ReqContext, err *auth.TokenRevokedError) {
 	if c.IsApiRequest() {
 		c.JSON(401, map[string]interface{}{
 			"message": "Token revoked",
@@ -117,7 +118,7 @@ func Auth(options *AuthOptions) web.Handler {
 		requireLogin := !c.AllowAnonymous || forceLogin || options.ReqNoAnonynmous
 
 		if !c.IsSignedIn && options.ReqSignedIn && requireLogin {
-			var revokedErr *models.TokenRevokedError
+			var revokedErr *auth.TokenRevokedError
 			if errors.As(c.LookupTokenErr, &revokedErr) {
 				tokenRevoked(c, revokedErr)
 				return
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index fec44973196..94efe1c7ee4 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeytest"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/contexthandler/authproxy"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -264,8 +265,8 @@ func TestMiddlewareContext(t *testing.T) {
 		sc.withTokenSessionCookie("token")
 		sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 2, UserID: userID}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        userID,
 				UnhashedToken: unhashedToken,
 			}, nil
@@ -288,14 +289,14 @@ func TestMiddlewareContext(t *testing.T) {
 		sc.withTokenSessionCookie("token")
 		sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 2, UserID: userID}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        userID,
 				UnhashedToken: "",
 			}, nil
 		}
 
-		sc.userAuthTokenService.TryRotateTokenProvider = func(ctx context.Context, userToken *models.UserToken,
+		sc.userAuthTokenService.TryRotateTokenProvider = func(ctx context.Context, userToken *auth.UserToken,
 			clientIP net.IP, userAgent string) (bool, error) {
 			userToken.UnhashedToken = "rotated"
 			return true, nil
@@ -371,8 +372,8 @@ func TestMiddlewareContext(t *testing.T) {
 	middlewareScenario(t, "Invalid/expired auth token in cookie", func(t *testing.T, sc *scenarioContext) {
 		sc.withTokenSessionCookie("token")
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return nil, models.ErrUserTokenNotFound
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return nil, auth.ErrUserTokenNotFound
 		}
 
 		sc.fakeReq("GET", "/").exec()
@@ -391,8 +392,8 @@ func TestMiddlewareContext(t *testing.T) {
 		sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 2, UserID: userID}
 		sc.oauthTokenService.ExpectedAuthUser = &models.UserAuth{UserId: userID, OAuthExpiry: fakeGetTime()().Add(11 * time.Second)}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        userID,
 				UnhashedToken: unhashedToken,
 			}, nil
@@ -424,8 +425,8 @@ func TestMiddlewareContext(t *testing.T) {
 			OAuthRefreshToken: "refresh_token"}
 		sc.oauthTokenService.ExpectedErrors = map[string]error{"TryTokenRefresh": errors.New("error")}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        userID,
 				UnhashedToken: unhashedToken,
 			}, nil
@@ -454,8 +455,8 @@ func TestMiddlewareContext(t *testing.T) {
 		sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 2, UserID: userID}
 		sc.oauthTokenService.ExpectedAuthUser = &models.UserAuth{UserId: userID, OAuthExpiry: fakeGetTime()().Add(-5 * time.Second), OAuthRefreshToken: "refreshtoken"}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        userID,
 				UnhashedToken: unhashedToken,
 			}, nil
@@ -481,8 +482,8 @@ func TestMiddlewareContext(t *testing.T) {
 		sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 2, UserID: userID}
 		sc.oauthTokenService.ExpectedAuthUser = &models.UserAuth{UserId: userID}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        userID,
 				UnhashedToken: unhashedToken,
 			}, nil
@@ -819,14 +820,14 @@ func middlewareScenario(t *testing.T, desc string, fn scenarioFunc, cbs ...func(
 		sc.userService = usertest.NewUserServiceFake()
 		sc.orgService = orgtest.NewOrgServiceFake()
 		sc.apiKeyService = &apikeytest.Service{}
-		sc.oauthTokenService = &auth.FakeOAuthTokenService{}
+		sc.oauthTokenService = &authtest.FakeOAuthTokenService{}
 		ctxHdlr := getContextHandler(t, cfg, sc.mockSQLStore, sc.loginService, sc.apiKeyService, sc.userService, sc.orgService, sc.oauthTokenService)
 		sc.sqlStore = ctxHdlr.SQLStore
 		sc.contextHandler = ctxHdlr
 		sc.m.Use(ctxHdlr.Middleware)
 		sc.m.Use(OrgRedirect(sc.cfg, sc.userService))
 
-		sc.userAuthTokenService = ctxHdlr.AuthTokenService.(*auth.FakeUserAuthTokenService)
+		sc.userAuthTokenService = ctxHdlr.AuthTokenService.(*authtest.FakeUserAuthTokenService)
 		sc.jwtAuthService = ctxHdlr.JWTAuthService.(*models.FakeJWTService)
 		sc.remoteCacheService = ctxHdlr.RemoteCache
 
@@ -856,7 +857,7 @@ func middlewareScenario(t *testing.T, desc string, fn scenarioFunc, cbs ...func(
 func getContextHandler(t *testing.T, cfg *setting.Cfg, mockSQLStore *dbtest.FakeDB,
 	loginService *loginservice.LoginServiceMock, apiKeyService *apikeytest.Service,
 	userService *usertest.FakeUserService, orgService *orgtest.FakeOrgService,
-	oauthTokenService *auth.FakeOAuthTokenService,
+	oauthTokenService *authtest.FakeOAuthTokenService,
 ) *contexthandler.ContextHandler {
 	t.Helper()
 
@@ -868,7 +869,7 @@ func getContextHandler(t *testing.T, cfg *setting.Cfg, mockSQLStore *dbtest.Fake
 	}
 
 	remoteCacheSvc := remotecache.NewFakeStore(t)
-	userAuthTokenSvc := auth.NewFakeUserAuthTokenService()
+	userAuthTokenSvc := authtest.NewFakeUserAuthTokenService()
 	renderSvc := &fakeRenderService{}
 	authJWTSvc := models.NewFakeJWTService()
 	tracer := tracing.InitializeTracerForTest()
diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go
index 8d1460983df..810f04e56a1 100644
--- a/pkg/middleware/org_redirect_test.go
+++ b/pkg/middleware/org_redirect_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
@@ -48,8 +48,8 @@ func TestOrgRedirectMiddleware(t *testing.T) {
 		middlewareScenario(t, tc.desc, func(t *testing.T, sc *scenarioContext) {
 			sc.withTokenSessionCookie("token")
 			sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 1, UserID: 12}
-			sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-				return &models.UserToken{
+			sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+				return &auth.UserToken{
 					UserId:        0,
 					UnhashedToken: "",
 				}, nil
@@ -68,8 +68,8 @@ func TestOrgRedirectMiddleware(t *testing.T) {
 		sc.userService.ExpectedSetUsingOrgError = fmt.Errorf("")
 		sc.userService.ExpectedSignedInUser = &user.SignedInUser{OrgID: 1, UserID: 12}
 
-		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        12,
 				UnhashedToken: "",
 			}, nil
diff --git a/pkg/middleware/quota_test.go b/pkg/middleware/quota_test.go
index 446b7842933..156a626b10e 100644
--- a/pkg/middleware/quota_test.go
+++ b/pkg/middleware/quota_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -55,8 +55,8 @@ func TestMiddlewareQuota(t *testing.T) {
 		setUp := func(sc *scenarioContext) {
 			sc.withTokenSessionCookie("token")
 			sc.userService.ExpectedSignedInUser = &user.SignedInUser{UserID: 12}
-			sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-				return &models.UserToken{
+			sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+				return &auth.UserToken{
 					UserId:        12,
 					UnhashedToken: "",
 				}, nil
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index 866eeaa490f..1a8fe8537c5 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -65,7 +65,7 @@ func recoveryScenario(t *testing.T, desc string, url string, fn scenarioFunc) {
 		sc.m.Use(AddDefaultResponseHeaders(cfg))
 		sc.m.UseMiddleware(web.Renderer(viewsPath, "[[", "]]"))
 
-		sc.userAuthTokenService = auth.NewFakeUserAuthTokenService()
+		sc.userAuthTokenService = authtest.NewFakeUserAuthTokenService()
 		sc.remoteCacheService = remotecache.NewFakeStore(t)
 
 		contextHandler := getContextHandler(t, nil, nil, nil, nil, nil, nil, nil)
diff --git a/pkg/middleware/testing.go b/pkg/middleware/testing.go
index a091f9118fe..7e858cfd845 100644
--- a/pkg/middleware/testing.go
+++ b/pkg/middleware/testing.go
@@ -13,7 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeytest"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
@@ -36,7 +36,7 @@ type scenarioContext struct {
 	handlerFunc          handlerFunc
 	defaultHandler       web.Handler
 	url                  string
-	userAuthTokenService *auth.FakeUserAuthTokenService
+	userAuthTokenService *authtest.FakeUserAuthTokenService
 	jwtAuthService       *models.FakeJWTService
 	remoteCacheService   *remotecache.RemoteCache
 	cfg                  *setting.Cfg
@@ -46,7 +46,7 @@ type scenarioContext struct {
 	loginService         *loginservice.LoginServiceMock
 	apiKeyService        *apikeytest.Service
 	userService          *usertest.FakeUserService
-	oauthTokenService    *auth.FakeOAuthTokenService
+	oauthTokenService    *authtest.FakeOAuthTokenService
 	orgService           *orgtest.FakeOrgService
 
 	req *http.Request
diff --git a/pkg/models/context.go b/pkg/models/context.go
index dd07b7236b8..432dee40e99 100644
--- a/pkg/models/context.go
+++ b/pkg/models/context.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -15,7 +16,7 @@ import (
 type ReqContext struct {
 	*web.Context
 	*user.SignedInUser
-	UserToken *UserToken
+	UserToken *usertoken.UserToken
 
 	IsSignedIn     bool
 	IsRenderCall   bool
diff --git a/pkg/models/usertoken/user_token.go b/pkg/models/usertoken/user_token.go
new file mode 100644
index 00000000000..beb2ac1355f
--- /dev/null
+++ b/pkg/models/usertoken/user_token.go
@@ -0,0 +1,26 @@
+package usertoken
+
+type TokenRevokedError struct {
+	UserID                int64
+	TokenID               int64
+	MaxConcurrentSessions int64
+}
+
+func (e *TokenRevokedError) Error() string { return "user token revoked" }
+
+// UserToken represents a user token
+type UserToken struct {
+	Id            int64
+	UserId        int64
+	AuthToken     string
+	PrevAuthToken string
+	UserAgent     string
+	ClientIp      string
+	AuthTokenSeen bool
+	SeenAt        int64
+	RotatedAt     int64
+	CreatedAt     int64
+	UpdatedAt     int64
+	RevokedAt     int64
+	UnhashedToken string
+}
diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index eaaa092aa08..2582d680327 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -7,10 +7,10 @@ import (
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	uss "github.com/grafana/grafana/pkg/infra/usagestats/service"
 	"github.com/grafana/grafana/pkg/infra/usagestats/statscollector"
-	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins/manager/process"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/alerting"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 	"github.com/grafana/grafana/pkg/services/grpcserver"
@@ -38,7 +38,7 @@ import (
 func ProvideBackgroundServiceRegistry(
 	httpServer *api.HTTPServer, ng *ngalert.AlertNG, cleanup *cleanup.CleanUpService, live *live.GrafanaLive,
 	pushGateway *pushhttp.Gateway, notifications *notifications.NotificationService, processManager *process.Manager,
-	rendering *rendering.RenderingService, tokenService models.UserTokenBackgroundService, tracing tracing.Tracer,
+	rendering *rendering.RenderingService, tokenService auth.UserTokenBackgroundService, tracing tracing.Tracer,
 	provisioning *provisioning.ProvisioningServiceImpl, alerting *alerting.AlertEngine, usageStats *uss.UsageStats,
 	statsCollector *statscollector.Service, grafanaUpdateChecker *updatechecker.GrafanaService,
 	pluginsUpdateChecker *updatechecker.PluginsService, metrics *metrics.InternalMetricsService,
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 57338f5d46c..4d2802abbe8 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -49,6 +49,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeyimpl"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/auth/jwt"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/comments"
@@ -271,8 +272,8 @@ var wireBasicSet = wire.NewSet(
 	influxdb.ProvideService,
 	wire.Bind(new(social.Service), new(*social.SocialService)),
 	oauthtoken.ProvideService,
-	auth.ProvideActiveAuthTokenService,
-	wire.Bind(new(auth.ActiveTokenService), new(*auth.ActiveAuthTokenService)),
+	authimpl.ProvideActiveAuthTokenService,
+	wire.Bind(new(auth.ActiveTokenService), new(*authimpl.ActiveAuthTokenService)),
 	wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)),
 	tempo.ProvideService,
 	loki.ProvideService,
diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go
index 5c366331875..6fae56eaaca 100644
--- a/pkg/server/wireexts_oss.go
+++ b/pkg/server/wireexts_oss.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/datasources/permissions"
 	datasourceservice "github.com/grafana/grafana/pkg/services/datasources/service"
@@ -39,9 +40,9 @@ import (
 )
 
 var wireExtsBasicSet = wire.NewSet(
-	auth.ProvideUserAuthTokenService,
-	wire.Bind(new(models.UserTokenService), new(*auth.UserAuthTokenService)),
-	wire.Bind(new(models.UserTokenBackgroundService), new(*auth.UserAuthTokenService)),
+	authimpl.ProvideUserAuthTokenService,
+	wire.Bind(new(auth.UserTokenService), new(*authimpl.UserAuthTokenService)),
+	wire.Bind(new(auth.UserTokenBackgroundService), new(*authimpl.UserAuthTokenService)),
 	licensing.ProvideService,
 	wire.Bind(new(models.Licensing), new(*licensing.OSSLicensingService)),
 	setting.ProvideProvider,
diff --git a/pkg/services/accesscontrol/middleware.go b/pkg/services/accesscontrol/middleware.go
index c0d3868e266..99b93d329dd 100644
--- a/pkg/services/accesscontrol/middleware.go
+++ b/pkg/services/accesscontrol/middleware.go
@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/middleware/cookies"
-
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -41,7 +41,7 @@ func Middleware(ac AccessControl) func(web.Handler, Evaluator) web.Handler {
 				}
 			}
 
-			var revokedErr *models.TokenRevokedError
+			var revokedErr *usertoken.TokenRevokedError
 			if errors.As(c.LookupTokenErr, &revokedErr) {
 				unauthorized(c, revokedErr)
 				return
@@ -111,7 +111,7 @@ func unauthorized(c *models.ReqContext, err error) {
 			"message": "Unauthorized",
 		}
 
-		var revokedErr *models.TokenRevokedError
+		var revokedErr *usertoken.TokenRevokedError
 		if errors.As(err, &revokedErr) {
 			response["message"] = "Token revoked"
 			response["error"] = map[string]interface{}{
diff --git a/pkg/models/user_token.go b/pkg/services/auth/auth.go
similarity index 74%
rename from pkg/models/user_token.go
rename to pkg/services/auth/auth.go
index 6c92a40d86b..77b21316707 100644
--- a/pkg/models/user_token.go
+++ b/pkg/services/auth/auth.go
@@ -1,19 +1,32 @@
-package models
+package auth
 
 import (
 	"context"
 	"errors"
 	"net"
 
+	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/registry"
+	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
+const (
+	QuotaTargetSrv quota.TargetSrv = "auth"
+	QuotaTarget    quota.Target    = "session"
+)
+
+type ActiveTokenService interface {
+	ActiveTokenCount(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error)
+}
+
 // Typed errors
 var (
 	ErrUserTokenNotFound = errors.New("user token not found")
 )
 
+type TokenRevokedError = usertoken.TokenRevokedError
+
 // CreateTokenErr represents a token creation error; used in Enterprise
 type CreateTokenErr struct {
 	StatusCode  int
@@ -35,30 +48,7 @@ type TokenExpiredError struct {
 
 func (e *TokenExpiredError) Error() string { return "user token expired" }
 
-type TokenRevokedError struct {
-	UserID                int64
-	TokenID               int64
-	MaxConcurrentSessions int64
-}
-
-func (e *TokenRevokedError) Error() string { return "user token revoked" }
-
-// UserToken represents a user token
-type UserToken struct {
-	Id            int64
-	UserId        int64
-	AuthToken     string
-	PrevAuthToken string
-	UserAgent     string
-	ClientIp      string
-	AuthTokenSeen bool
-	SeenAt        int64
-	RotatedAt     int64
-	CreatedAt     int64
-	UpdatedAt     int64
-	RevokedAt     int64
-	UnhashedToken string
-}
+type UserToken = usertoken.UserToken
 
 type RevokeAuthTokenCmd struct {
 	AuthTokenId int64 `json:"authTokenId"`
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/authimpl/auth_token.go
similarity index 91%
rename from pkg/services/auth/auth_token.go
rename to pkg/services/auth/authimpl/auth_token.go
index f261e33bcd1..c969686a2f8 100644
--- a/pkg/services/auth/auth_token.go
+++ b/pkg/services/auth/authimpl/auth_token.go
@@ -1,4 +1,4 @@
-package auth
+package authimpl
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/serverlock"
-	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -42,10 +42,6 @@ type UserAuthTokenService struct {
 	log               log.Logger
 }
 
-type ActiveTokenService interface {
-	ActiveTokenCount(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error)
-}
-
 type ActiveAuthTokenService struct {
 	cfg      *setting.Cfg
 	sqlStore db.DB
@@ -63,7 +59,7 @@ func ProvideActiveAuthTokenService(cfg *setting.Cfg, sqlStore db.DB, quotaServic
 	}
 
 	if err := quotaService.RegisterQuotaReporter(&quota.NewUsageReporter{
-		TargetSrv:     QuotaTargetSrv,
+		TargetSrv:     auth.QuotaTargetSrv,
 		DefaultLimits: defaultLimits,
 		Reporter:      s.ActiveTokenCount,
 	}); err != nil {
@@ -86,7 +82,7 @@ func (a *ActiveAuthTokenService) ActiveTokenCount(ctx context.Context, _ *quota.
 		return err
 	})
 
-	tag, err := quota.NewTag(QuotaTargetSrv, QuotaTarget, quota.GlobalScope)
+	tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
 	if err != nil {
 		return nil, err
 	}
@@ -96,7 +92,7 @@ func (a *ActiveAuthTokenService) ActiveTokenCount(ctx context.Context, _ *quota.
 	return u, err
 }
 
-func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*models.UserToken, error) {
+func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*auth.UserToken, error) {
 	token, err := util.RandomHex(16)
 	if err != nil {
 		return nil, err
@@ -138,13 +134,13 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User,
 	ctxLogger := s.log.FromContext(ctx)
 	ctxLogger.Debug("user auth token created", "tokenId", userAuthToken.Id, "userId", userAuthToken.UserId, "clientIP", userAuthToken.ClientIp, "userAgent", userAuthToken.UserAgent, "authToken", userAuthToken.AuthToken)
 
-	var userToken models.UserToken
+	var userToken auth.UserToken
 	err = userAuthToken.toUserToken(&userToken)
 
 	return &userToken, err
 }
 
-func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
+func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
 	hashedToken := hashToken(unhashedToken)
 	var model userAuthToken
 	var exists bool
@@ -162,14 +158,14 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 	}
 
 	if !exists {
-		return nil, models.ErrUserTokenNotFound
+		return nil, auth.ErrUserTokenNotFound
 	}
 
 	ctxLogger := s.log.FromContext(ctx)
 
 	if model.RevokedAt > 0 {
 		ctxLogger.Debug("user token has been revoked", "user ID", model.UserId, "token ID", model.Id)
-		return nil, &models.TokenRevokedError{
+		return nil, &auth.TokenRevokedError{
 			UserID:  model.UserId,
 			TokenID: model.Id,
 		}
@@ -177,7 +173,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 
 	if model.CreatedAt <= s.createdAfterParam() || model.RotatedAt <= s.rotatedAfterParam() {
 		ctxLogger.Debug("user token has expired", "user ID", model.UserId, "token ID", model.Id)
-		return nil, &models.TokenExpiredError{
+		return nil, &auth.TokenExpiredError{
 			UserID:  model.UserId,
 			TokenID: model.Id,
 		}
@@ -242,13 +238,13 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 
 	model.UnhashedToken = unhashedToken
 
-	var userToken models.UserToken
+	var userToken auth.UserToken
 	err = model.toUserToken(&userToken)
 
 	return &userToken, err
 }
 
-func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *models.UserToken,
+func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.UserToken,
 	clientIP net.IP, userAgent string) (bool, error) {
 	if token == nil {
 		return false, nil
@@ -328,9 +324,9 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *models
 	return false, nil
 }
 
-func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *models.UserToken, soft bool) error {
+func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *auth.UserToken, soft bool) error {
 	if token == nil {
-		return models.ErrUserTokenNotFound
+		return auth.ErrUserTokenNotFound
 	}
 
 	model, err := userAuthTokenFromUserToken(token)
@@ -361,7 +357,7 @@ func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *models.Us
 
 	if rowsAffected == 0 {
 		ctxLogger.Debug("user auth token not found/revoked", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent)
-		return models.ErrUserTokenNotFound
+		return auth.ErrUserTokenNotFound
 	}
 
 	ctxLogger.Debug("user auth token revoked", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "soft", soft)
@@ -418,8 +414,8 @@ func (s *UserAuthTokenService) BatchRevokeAllUserTokens(ctx context.Context, use
 	})
 }
 
-func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) {
-	var result models.UserToken
+func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error) {
+	var result auth.UserToken
 	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		var token userAuthToken
 		exists, err := dbSession.Where("id = ? AND user_id = ?", userTokenId, userId).Get(&token)
@@ -428,7 +424,7 @@ func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTok
 		}
 
 		if !exists {
-			return models.ErrUserTokenNotFound
+			return auth.ErrUserTokenNotFound
 		}
 
 		return token.toUserToken(&result)
@@ -437,8 +433,8 @@ func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTok
 	return &result, err
 }
 
-func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*models.UserToken, error) {
-	result := []*models.UserToken{}
+func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
+	result := []*auth.UserToken{}
 	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		var tokens []*userAuthToken
 		err := dbSession.Where("user_id = ? AND created_at > ? AND rotated_at > ? AND revoked_at = 0",
@@ -451,7 +447,7 @@ func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64)
 		}
 
 		for _, token := range tokens {
-			var userToken models.UserToken
+			var userToken auth.UserToken
 			if err := token.toUserToken(&userToken); err != nil {
 				return err
 			}
@@ -464,8 +460,8 @@ func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64)
 	return result, err
 }
 
-func (s *UserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId int64) ([]*models.UserToken, error) {
-	result := []*models.UserToken{}
+func (s *UserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
+	result := []*auth.UserToken{}
 	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		var tokens []*userAuthToken
 		err := dbSession.Where("user_id = ? AND revoked_at > 0", userId).Find(&tokens)
@@ -474,7 +470,7 @@ func (s *UserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId
 		}
 
 		for _, token := range tokens {
-			var userToken models.UserToken
+			var userToken auth.UserToken
 			if err := token.toUserToken(&userToken); err != nil {
 				return err
 			}
@@ -507,7 +503,7 @@ func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 		return limits, nil
 	}
 
-	globalQuotaTag, err := quota.NewTag(QuotaTargetSrv, QuotaTarget, quota.GlobalScope)
+	globalQuotaTag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
 	if err != nil {
 		return limits, err
 	}
diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/authimpl/auth_token_test.go
similarity index 96%
rename from pkg/services/auth/auth_token_test.go
rename to pkg/services/auth/authimpl/auth_token_test.go
index 16886d7b439..97528bf6be2 100644
--- a/pkg/services/auth/auth_token_test.go
+++ b/pkg/services/auth/authimpl/auth_token_test.go
@@ -1,4 +1,4 @@
-package auth
+package authimpl
 
 import (
 	"context"
@@ -8,12 +8,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -29,7 +29,7 @@ func TestUserAuthToken(t *testing.T) {
 	defer func() { getTime = time.Now }()
 
 	t.Run("When creating token", func(t *testing.T) {
-		createToken := func() *models.UserToken {
+		createToken := func() *auth.UserToken {
 			userToken, err := ctx.tokenService.CreateToken(context.Background(), user,
 				net.ParseIP("192.168.10.11"), "some user agent")
 			require.Nil(t, err)
@@ -43,7 +43,7 @@ func TestUserAuthToken(t *testing.T) {
 		t.Run("Can count active tokens", func(t *testing.T) {
 			m, err := ctx.activeTokenService.ActiveTokenCount(context.Background(), &quota.ScopeParameters{})
 			require.Nil(t, err)
-			tag, err := quota.NewTag(QuotaTargetSrv, QuotaTarget, quota.GlobalScope)
+			tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
 			require.NoError(t, err)
 			count, ok := m.Get(tag)
 			require.True(t, ok)
@@ -65,7 +65,7 @@ func TestUserAuthToken(t *testing.T) {
 
 		t.Run("When lookup hashed token should return user auth token not found error", func(t *testing.T) {
 			userToken, err := ctx.tokenService.LookupToken(context.Background(), userToken.AuthToken)
-			require.Equal(t, models.ErrUserTokenNotFound, err)
+			require.Equal(t, auth.ErrUserTokenNotFound, err)
 			require.Nil(t, userToken)
 		})
 
@@ -90,13 +90,13 @@ func TestUserAuthToken(t *testing.T) {
 
 		t.Run("revoking nil token should return error", func(t *testing.T) {
 			err := ctx.tokenService.RevokeToken(context.Background(), nil, false)
-			require.Equal(t, models.ErrUserTokenNotFound, err)
+			require.Equal(t, auth.ErrUserTokenNotFound, err)
 		})
 
 		t.Run("revoking non-existing token should return error", func(t *testing.T) {
 			userToken.Id = 1000
 			err := ctx.tokenService.RevokeToken(context.Background(), userToken, false)
-			require.Equal(t, models.ErrUserTokenNotFound, err)
+			require.Equal(t, auth.ErrUserTokenNotFound, err)
 		})
 
 		ctx = createTestContext(t)
@@ -209,13 +209,13 @@ func TestUserAuthToken(t *testing.T) {
 			}
 
 			notGood, err := ctx.tokenService.LookupToken(context.Background(), userToken.UnhashedToken)
-			require.Equal(t, reflect.TypeOf(err), reflect.TypeOf(&models.TokenExpiredError{}))
+			require.Equal(t, reflect.TypeOf(err), reflect.TypeOf(&auth.TokenExpiredError{}))
 			require.Nil(t, notGood)
 
 			t.Run("should not find active token when expired", func(t *testing.T) {
 				m, err := ctx.activeTokenService.ActiveTokenCount(context.Background(), &quota.ScopeParameters{})
 				require.Nil(t, err)
-				tag, err := quota.NewTag(QuotaTargetSrv, QuotaTarget, quota.GlobalScope)
+				tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
 				require.NoError(t, err)
 				count, ok := m.Get(tag)
 				require.True(t, ok)
@@ -247,7 +247,7 @@ func TestUserAuthToken(t *testing.T) {
 			}
 
 			notGood, err := ctx.tokenService.LookupToken(context.Background(), userToken.UnhashedToken)
-			require.Equal(t, reflect.TypeOf(err), reflect.TypeOf(&models.TokenExpiredError{}))
+			require.Equal(t, reflect.TypeOf(err), reflect.TypeOf(&auth.TokenExpiredError{}))
 			require.Nil(t, notGood)
 		})
 	})
@@ -274,7 +274,7 @@ func TestUserAuthToken(t *testing.T) {
 		model, err := ctx.getAuthTokenByID(userToken.Id)
 		require.Nil(t, err)
 
-		var tok models.UserToken
+		var tok auth.UserToken
 		err = model.toUserToken(&tok)
 		require.Nil(t, err)
 
@@ -471,7 +471,7 @@ func TestUserAuthToken(t *testing.T) {
 	})
 
 	t.Run("When populating userAuthToken from UserToken should copy all properties", func(t *testing.T) {
-		ut := models.UserToken{
+		ut := auth.UserToken{
 			Id:            1,
 			UserId:        2,
 			AuthToken:     "a",
@@ -524,7 +524,7 @@ func TestUserAuthToken(t *testing.T) {
 		require.Nil(t, err)
 		uatMap := uatJSON.MustMap()
 
-		var ut models.UserToken
+		var ut auth.UserToken
 		err = uat.toUserToken(&ut)
 		require.Nil(t, err)
 		utBytes, err := json.Marshal(ut)
diff --git a/pkg/services/auth/model.go b/pkg/services/auth/authimpl/model.go
similarity index 77%
rename from pkg/services/auth/model.go
rename to pkg/services/auth/authimpl/model.go
index afc5b566c48..407927df572 100644
--- a/pkg/services/auth/model.go
+++ b/pkg/services/auth/authimpl/model.go
@@ -1,10 +1,9 @@
-package auth
+package authimpl
 
 import (
 	"fmt"
 
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/quota"
+	"github.com/grafana/grafana/pkg/services/auth"
 )
 
 type userAuthToken struct {
@@ -23,13 +22,13 @@ type userAuthToken struct {
 	UnhashedToken string `xorm:"-"`
 }
 
-func userAuthTokenFromUserToken(ut *models.UserToken) (*userAuthToken, error) {
+func userAuthTokenFromUserToken(ut *auth.UserToken) (*userAuthToken, error) {
 	var uat userAuthToken
 	err := uat.fromUserToken(ut)
 	return &uat, err
 }
 
-func (uat *userAuthToken) fromUserToken(ut *models.UserToken) error {
+func (uat *userAuthToken) fromUserToken(ut *auth.UserToken) error {
 	if uat == nil {
 		return fmt.Errorf("needs pointer to userAuthToken struct")
 	}
@@ -51,7 +50,7 @@ func (uat *userAuthToken) fromUserToken(ut *models.UserToken) error {
 	return nil
 }
 
-func (uat *userAuthToken) toUserToken(ut *models.UserToken) error {
+func (uat *userAuthToken) toUserToken(ut *auth.UserToken) error {
 	if uat == nil {
 		return fmt.Errorf("needs pointer to userAuthToken struct")
 	}
@@ -72,8 +71,3 @@ func (uat *userAuthToken) toUserToken(ut *models.UserToken) error {
 
 	return nil
 }
-
-const (
-	QuotaTargetSrv quota.TargetSrv = "auth"
-	QuotaTarget    quota.Target    = "session"
-)
diff --git a/pkg/services/auth/token_cleanup.go b/pkg/services/auth/authimpl/token_cleanup.go
similarity index 99%
rename from pkg/services/auth/token_cleanup.go
rename to pkg/services/auth/authimpl/token_cleanup.go
index a82f13630fe..08d8ae7c614 100644
--- a/pkg/services/auth/token_cleanup.go
+++ b/pkg/services/auth/authimpl/token_cleanup.go
@@ -1,4 +1,4 @@
-package auth
+package authimpl
 
 import (
 	"context"
diff --git a/pkg/services/auth/token_cleanup_test.go b/pkg/services/auth/authimpl/token_cleanup_test.go
similarity index 99%
rename from pkg/services/auth/token_cleanup_test.go
rename to pkg/services/auth/authimpl/token_cleanup_test.go
index a39e0d7892b..e207448c8f6 100644
--- a/pkg/services/auth/token_cleanup_test.go
+++ b/pkg/services/auth/authimpl/token_cleanup_test.go
@@ -1,4 +1,4 @@
-package auth
+package authimpl
 
 import (
 	"context"
diff --git a/pkg/services/auth/testing.go b/pkg/services/auth/authtest/testing.go
similarity index 77%
rename from pkg/services/auth/testing.go
rename to pkg/services/auth/authtest/testing.go
index 63b08a9a639..d2bbd09b46b 100644
--- a/pkg/services/auth/testing.go
+++ b/pkg/services/auth/authtest/testing.go
@@ -1,4 +1,4 @@
-package auth
+package authtest
 
 import (
 	"context"
@@ -6,42 +6,43 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/user"
 	"golang.org/x/oauth2"
 )
 
 type FakeUserAuthTokenService struct {
-	CreateTokenProvider          func(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*models.UserToken, error)
-	TryRotateTokenProvider       func(ctx context.Context, token *models.UserToken, clientIP net.IP, userAgent string) (bool, error)
-	LookupTokenProvider          func(ctx context.Context, unhashedToken string) (*models.UserToken, error)
-	RevokeTokenProvider          func(ctx context.Context, token *models.UserToken, soft bool) error
+	CreateTokenProvider          func(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*auth.UserToken, error)
+	TryRotateTokenProvider       func(ctx context.Context, token *auth.UserToken, clientIP net.IP, userAgent string) (bool, error)
+	LookupTokenProvider          func(ctx context.Context, unhashedToken string) (*auth.UserToken, error)
+	RevokeTokenProvider          func(ctx context.Context, token *auth.UserToken, soft bool) error
 	RevokeAllUserTokensProvider  func(ctx context.Context, userId int64) error
 	ActiveAuthTokenCount         func(ctx context.Context) (int64, error)
-	GetUserTokenProvider         func(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error)
-	GetUserTokensProvider        func(ctx context.Context, userId int64) ([]*models.UserToken, error)
-	GetUserRevokedTokensProvider func(ctx context.Context, userId int64) ([]*models.UserToken, error)
+	GetUserTokenProvider         func(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error)
+	GetUserTokensProvider        func(ctx context.Context, userId int64) ([]*auth.UserToken, error)
+	GetUserRevokedTokensProvider func(ctx context.Context, userId int64) ([]*auth.UserToken, error)
 	BatchRevokedTokenProvider    func(ctx context.Context, userIds []int64) error
 }
 
 func NewFakeUserAuthTokenService() *FakeUserAuthTokenService {
 	return &FakeUserAuthTokenService{
-		CreateTokenProvider: func(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*models.UserToken, error) {
-			return &models.UserToken{
+		CreateTokenProvider: func(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        0,
 				UnhashedToken: "",
 			}, nil
 		},
-		TryRotateTokenProvider: func(ctx context.Context, token *models.UserToken, clientIP net.IP, userAgent string) (bool, error) {
+		TryRotateTokenProvider: func(ctx context.Context, token *auth.UserToken, clientIP net.IP, userAgent string) (bool, error) {
 			return false, nil
 		},
-		LookupTokenProvider: func(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
-			return &models.UserToken{
+		LookupTokenProvider: func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
+			return &auth.UserToken{
 				UserId:        0,
 				UnhashedToken: "",
 			}, nil
 		},
-		RevokeTokenProvider: func(ctx context.Context, token *models.UserToken, soft bool) error {
+		RevokeTokenProvider: func(ctx context.Context, token *auth.UserToken, soft bool) error {
 			return nil
 		},
 		RevokeAllUserTokensProvider: func(ctx context.Context, userId int64) error {
@@ -53,10 +54,10 @@ func NewFakeUserAuthTokenService() *FakeUserAuthTokenService {
 		ActiveAuthTokenCount: func(ctx context.Context) (int64, error) {
 			return 10, nil
 		},
-		GetUserTokenProvider: func(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) {
+		GetUserTokenProvider: func(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error) {
 			return nil, nil
 		},
-		GetUserTokensProvider: func(ctx context.Context, userId int64) ([]*models.UserToken, error) {
+		GetUserTokensProvider: func(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
 			return nil, nil
 		},
 	}
@@ -68,20 +69,20 @@ func (s *FakeUserAuthTokenService) Init() error {
 	return nil
 }
 
-func (s *FakeUserAuthTokenService) CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*models.UserToken, error) {
+func (s *FakeUserAuthTokenService) CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*auth.UserToken, error) {
 	return s.CreateTokenProvider(context.Background(), user, clientIP, userAgent)
 }
 
-func (s *FakeUserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
+func (s *FakeUserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
 	return s.LookupTokenProvider(context.Background(), unhashedToken)
 }
 
-func (s *FakeUserAuthTokenService) TryRotateToken(ctx context.Context, token *models.UserToken, clientIP net.IP,
+func (s *FakeUserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.UserToken, clientIP net.IP,
 	userAgent string) (bool, error) {
 	return s.TryRotateTokenProvider(context.Background(), token, clientIP, userAgent)
 }
 
-func (s *FakeUserAuthTokenService) RevokeToken(ctx context.Context, token *models.UserToken, soft bool) error {
+func (s *FakeUserAuthTokenService) RevokeToken(ctx context.Context, token *auth.UserToken, soft bool) error {
 	return s.RevokeTokenProvider(context.Background(), token, soft)
 }
 
@@ -93,15 +94,15 @@ func (s *FakeUserAuthTokenService) ActiveTokenCount(ctx context.Context) (int64,
 	return s.ActiveAuthTokenCount(context.Background())
 }
 
-func (s *FakeUserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) {
+func (s *FakeUserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error) {
 	return s.GetUserTokenProvider(context.Background(), userId, userTokenId)
 }
 
-func (s *FakeUserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*models.UserToken, error) {
+func (s *FakeUserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
 	return s.GetUserTokensProvider(context.Background(), userId)
 }
 
-func (s *FakeUserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId int64) ([]*models.UserToken, error) {
+func (s *FakeUserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
 	return s.GetUserRevokedTokensProvider(context.Background(), userId)
 }
 
diff --git a/pkg/services/contexthandler/auth_proxy_test.go b/pkg/services/contexthandler/auth_proxy_test.go
index 307ca2b51bc..dc697eff484 100644
--- a/pkg/services/contexthandler/auth_proxy_test.go
+++ b/pkg/services/contexthandler/auth_proxy_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/contexthandler/authproxy"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
@@ -80,7 +80,7 @@ func getContextHandler(t *testing.T) *ContextHandler {
 	cfg.AuthProxyHeaderProperty = "username"
 	remoteCacheSvc, err := remotecache.ProvideService(cfg, sqlStore)
 	require.NoError(t, err)
-	userAuthTokenSvc := auth.NewFakeUserAuthTokenService()
+	userAuthTokenSvc := authtest.NewFakeUserAuthTokenService()
 	renderSvc := &fakeRenderService{}
 	authJWTSvc := models.NewFakeJWTService()
 	tracer := tracing.InitializeTracerForTest()
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index c8d67f165c0..6e2be2233c5 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -44,7 +44,7 @@ const (
 
 const ServiceName = "ContextHandler"
 
-func ProvideService(cfg *setting.Cfg, tokenService models.UserTokenService, jwtService models.JWTService,
+func ProvideService(cfg *setting.Cfg, tokenService auth.UserTokenService, jwtService models.JWTService,
 	remoteCache *remotecache.RemoteCache, renderService rendering.Service, sqlStore db.DB,
 	tracer tracing.Tracer, authProxy *authproxy.AuthProxy, loginService login.Service,
 	apiKeyService apikey.Service, authenticator loginpkg.Authenticator, userService user.Service,
@@ -77,7 +77,7 @@ func ProvideService(cfg *setting.Cfg, tokenService models.UserTokenService, jwtS
 // ContextHandler is a middleware.
 type ContextHandler struct {
 	Cfg               *setting.Cfg
-	AuthTokenService  models.UserTokenService
+	AuthTokenService  auth.UserTokenService
 	JWTAuthService    models.JWTService
 	RemoteCache       *remotecache.RemoteCache
 	RenderService     rendering.Service
@@ -474,7 +474,7 @@ func (h *ContextHandler) initContextWithToken(reqContext *models.ReqContext, org
 					}
 
 					err = h.AuthTokenService.RevokeToken(ctx, token, false)
-					if err != nil && !errors.Is(err, models.ErrUserTokenNotFound) {
+					if err != nil && !errors.Is(err, auth.ErrUserTokenNotFound) {
 						reqContext.Logger.Error("failed to revoke auth token", "error", err)
 					}
 					return false
@@ -506,8 +506,8 @@ func (h *ContextHandler) deleteInvalidCookieEndOfRequestFunc(reqContext *models.
 	}
 }
 
-func (h *ContextHandler) rotateEndOfRequestFunc(reqContext *models.ReqContext, authTokenService models.UserTokenService,
-	token *models.UserToken) web.BeforeFunc {
+func (h *ContextHandler) rotateEndOfRequestFunc(reqContext *models.ReqContext, authTokenService auth.UserTokenService,
+	token *auth.UserToken) web.BeforeFunc {
 	return func(w web.ResponseWriter) {
 		// if response has already been written, skip.
 		if w.Written() {
diff --git a/pkg/services/contexthandler/contexthandler_test.go b/pkg/services/contexthandler/contexthandler_test.go
index 3e61b65d0ed..fa882f2fc81 100644
--- a/pkg/services/contexthandler/contexthandler_test.go
+++ b/pkg/services/contexthandler/contexthandler_test.go
@@ -7,14 +7,16 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestDontRotateTokensOnCancelledRequests(t *testing.T) {
@@ -25,15 +27,15 @@ func TestDontRotateTokensOnCancelledRequests(t *testing.T) {
 	require.NoError(t, err)
 
 	tryRotateCallCount := 0
-	uts := &auth.FakeUserAuthTokenService{
-		TryRotateTokenProvider: func(ctx context.Context, token *models.UserToken, clientIP net.IP,
+	uts := &authtest.FakeUserAuthTokenService{
+		TryRotateTokenProvider: func(ctx context.Context, token *auth.UserToken, clientIP net.IP,
 			userAgent string) (bool, error) {
 			tryRotateCallCount++
 			return false, nil
 		},
 	}
 
-	token := &models.UserToken{AuthToken: "oldtoken"}
+	token := &auth.UserToken{AuthToken: "oldtoken"}
 
 	fn := ctxHdlr.rotateEndOfRequestFunc(reqContext, uts, token)
 	cancel()
@@ -48,8 +50,8 @@ func TestTokenRotationAtEndOfRequest(t *testing.T) {
 	reqContext, rr, err := initTokenRotationScenario(context.Background(), t, ctxHdlr)
 	require.NoError(t, err)
 
-	uts := &auth.FakeUserAuthTokenService{
-		TryRotateTokenProvider: func(ctx context.Context, token *models.UserToken, clientIP net.IP,
+	uts := &authtest.FakeUserAuthTokenService{
+		TryRotateTokenProvider: func(ctx context.Context, token *auth.UserToken, clientIP net.IP,
 			userAgent string) (bool, error) {
 			newToken, err := util.RandomHex(16)
 			require.NoError(t, err)
@@ -58,7 +60,7 @@ func TestTokenRotationAtEndOfRequest(t *testing.T) {
 		},
 	}
 
-	token := &models.UserToken{AuthToken: "oldtoken"}
+	token := &auth.UserToken{AuthToken: "oldtoken"}
 
 	ctxHdlr.rotateEndOfRequestFunc(reqContext, uts, token)(reqContext.Resp)
 
diff --git a/pkg/services/ngalert/api/util_test.go b/pkg/services/ngalert/api/util_test.go
index 34f4deb08e2..3ed32d797e6 100644
--- a/pkg/services/ngalert/api/util_test.go
+++ b/pkg/services/ngalert/api/util_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
+	"github.com/grafana/grafana/pkg/services/auth"
 	models2 "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -45,7 +46,7 @@ func TestAlertingProxy_createProxyContext(t *testing.T) {
 			Req: &http.Request{},
 		},
 		SignedInUser:          &user.SignedInUser{},
-		UserToken:             &models.UserToken{},
+		UserToken:             &auth.UserToken{},
 		IsSignedIn:            rand.Int63()%2 == 1,
 		IsRenderCall:          rand.Int63()%2 == 1,
 		AllowAnonymous:        rand.Int63()%2 == 1,
diff --git a/pkg/services/quota/quotaimpl/quota_test.go b/pkg/services/quota/quotaimpl/quota_test.go
index 17164adc785..5d73021f2c9 100644
--- a/pkg/services/quota/quotaimpl/quota_test.go
+++ b/pkg/services/quota/quotaimpl/quota_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeyimpl"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashboardStore "github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -464,7 +465,7 @@ func getQuotaBySrvTargetScope(t *testing.T, quotaService quota.Service, srv quot
 func setupEnv(t *testing.T, sqlStore *sqlstore.SQLStore, b bus.Bus, quotaService quota.Service) {
 	_, err := apikeyimpl.ProvideService(sqlStore, sqlStore.Cfg, quotaService)
 	require.NoError(t, err)
-	_, err = auth.ProvideActiveAuthTokenService(sqlStore.Cfg, sqlStore, quotaService)
+	_, err = authimpl.ProvideActiveAuthTokenService(sqlStore.Cfg, sqlStore, quotaService)
 	require.NoError(t, err)
 	_, err = dashboardStore.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
 	require.NoError(t, err)

From 48c34d310c244be32b56d3cd6db530ea390ce726 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Fri, 18 Nov 2022 09:04:43 +0000
Subject: [PATCH 003/153] Alerting: Add tests that check current No Data
 behaviour with two conditions (#58650)

---
 pkg/expr/classic/classic_test.go | 125 +++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/pkg/expr/classic/classic_test.go b/pkg/expr/classic/classic_test.go
index e5d85f9dd78..74f6a09eda2 100644
--- a/pkg/expr/classic/classic_test.go
+++ b/pkg/expr/classic/classic_test.go
@@ -473,6 +473,131 @@ func TestConditionsCmd(t *testing.T) {
 			})
 			return newResults(v)
 		},
+	}, {
+		name: "two queries with two conditions using and operator and first is No Data",
+		vars: mathexp.Vars{
+			"A": mathexp.Results{
+				Values: []mathexp.Value{mathexp.NoData{}.New()},
+			},
+			"B": mathexp.Results{
+				Values: []mathexp.Value{newSeries(ptr.Float64(5))},
+			},
+		},
+		cmd: &ConditionsCmd{
+			Conditions: []condition{
+				{
+					InputRefID: "A",
+					Reducer:    reducer("min"),
+					Operator:   "and",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+				{
+					InputRefID: "B",
+					Reducer:    reducer("min"),
+					Operator:   "and",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+			},
+		},
+		expected: func() mathexp.Results {
+			v := newNumber(ptr.Float64(0))
+			v.SetMeta([]EvalMatch{{Metric: "NoData"}, {Value: ptr.Float64(5)}})
+			return newResults(v)
+		},
+	}, {
+		// TODO: NoData behavior is different if the last condition is no data
+		name: "two queries with two conditions using and operator and last is No Data",
+		vars: mathexp.Vars{
+			"A": mathexp.Results{
+				Values: []mathexp.Value{newSeries(ptr.Float64(5))},
+			},
+			"B": mathexp.Results{
+				Values: []mathexp.Value{mathexp.NoData{}.New()},
+			},
+		},
+		cmd: &ConditionsCmd{
+			Conditions: []condition{
+				{
+					InputRefID: "A",
+					Reducer:    reducer("min"),
+					Operator:   "and",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+				{
+					InputRefID: "B",
+					Reducer:    reducer("min"),
+					Operator:   "and",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+			},
+		},
+		expected: func() mathexp.Results {
+			v := newNumber(nil)
+			v.SetMeta([]EvalMatch{{Value: ptr.Float64(5)}, {Metric: "NoData"}})
+			return newResults(v)
+		},
+	}, {
+		name: "two queries with two conditions using or operator and first is No Data",
+		vars: mathexp.Vars{
+			"A": mathexp.Results{
+				Values: []mathexp.Value{mathexp.NoData{}.New()},
+			},
+			"B": mathexp.Results{
+				Values: []mathexp.Value{newSeries(ptr.Float64(5))},
+			},
+		},
+		cmd: &ConditionsCmd{
+			Conditions: []condition{
+				{
+					InputRefID: "A",
+					Reducer:    reducer("min"),
+					Operator:   "or",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+				{
+					InputRefID: "B",
+					Reducer:    reducer("min"),
+					Operator:   "or",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+			},
+		},
+		expected: func() mathexp.Results {
+			v := newNumber(nil)
+			v.SetMeta([]EvalMatch{{Metric: "NoData"}, {Value: ptr.Float64(5)}})
+			return newResults(v)
+		},
+	}, {
+		name: "two queries with two conditions using or operator and last is No Data",
+		vars: mathexp.Vars{
+			"A": mathexp.Results{
+				Values: []mathexp.Value{newSeries(ptr.Float64(5))},
+			},
+			"B": mathexp.Results{
+				Values: []mathexp.Value{mathexp.NoData{}.New()},
+			},
+		},
+		cmd: &ConditionsCmd{
+			Conditions: []condition{
+				{
+					InputRefID: "A",
+					Reducer:    reducer("min"),
+					Operator:   "or",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+				{
+					InputRefID: "B",
+					Reducer:    reducer("min"),
+					Operator:   "or",
+					Evaluator:  &thresholdEvaluator{"gt", 1},
+				},
+			},
+		},
+		expected: func() mathexp.Results {
+			v := newNumber(nil)
+			v.SetMeta([]EvalMatch{{Value: ptr.Float64(5)}, {Metric: "NoData"}})
+			return newResults(v)
+		},
 	}}
 
 	for _, tt := range tests {

From d46e3916a137aed51c917c50c54b8fb969b829e0 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 18 Nov 2022 09:05:45 +0000
Subject: [PATCH 004/153] Navigation: move connections + integrations to be a
 top level item (#58902)

* move connections + integrations to be a top level item

* add a test to check we can move apps to the root

* split out movePlugin logic into a separate function

* fix linting

* rename movePlugin -> addPluginToSection
---
 pkg/services/navtree/models.go                |  1 +
 pkg/services/navtree/navtreeimpl/applinks.go  | 13 +++++++---
 .../navtree/navtreeimpl/applinks_test.go      | 24 +++++++++++++++++++
 .../app/core/components/MegaMenu/MegaMenu.tsx |  7 ++----
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index f71ceea0808..8f521be5a46 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -36,6 +36,7 @@ const (
 )
 
 const (
+	NavIDRoot               = "root"
 	NavIDDashboards         = "dashboards"
 	NavIDDashboardsBrowse   = "dashboards/browse"
 	NavIDCfg                = "cfg" // NavIDCfg is the id for org configuration navigation node
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index 22c0aef5acf..e59a4d6bd09 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -170,6 +170,12 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *models.ReqCo
 	}
 	appLink.Children = childrenWithoutDefault
 
+	s.addPluginToSection(c, treeRoot, plugin, appLink)
+
+	return nil
+}
+
+func (s *ServiceImpl) addPluginToSection(c *models.ReqContext, treeRoot *navtree.NavTreeRoot, plugin plugins.PluginDTO, appLink *navtree.NavLink) {
 	// Handle moving apps into specific navtree sections
 	alertingNode := treeRoot.FindById(navtree.NavIDAlerting)
 	sectionID := navtree.NavIDApps
@@ -183,7 +189,9 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *models.ReqCo
 		}
 	}
 
-	if navNode := treeRoot.FindById(sectionID); navNode != nil {
+	if sectionID == navtree.NavIDRoot {
+		treeRoot.AddSection(appLink)
+	} else if navNode := treeRoot.FindById(sectionID); navNode != nil {
 		navNode.Children = append(navNode.Children, appLink)
 	} else {
 		switch sectionID {
@@ -227,8 +235,6 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *models.ReqCo
 			s.log.Error("Plugin app nav id not found", "pluginId", plugin.ID, "navId", sectionID)
 		}
 	}
-
-	return nil
 }
 
 func (s *ServiceImpl) hasAccessToInclude(c *models.ReqContext, pluginID string) func(include *plugins.Includes) bool {
@@ -256,6 +262,7 @@ func (s *ServiceImpl) readNavigationSettings() {
 		"grafana-incident-app":             {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incident"},
 		"grafana-ml-app":                   {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"},
 		"grafana-cloud-link-app":           {SectionID: navtree.NavIDCfg},
+		"grafana-easystart-app":            {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightSavedItems + 1, Text: "Connections"},
 	}
 
 	s.navigationAppPathConfig = map[string]NavigationAppConfig{
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index de6ffacf500..f0ed89967ba 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -147,6 +147,30 @@ func TestAddAppLinks(t *testing.T) {
 		require.Equal(t, "Page2", app1Node.Children[0].Text)
 	})
 
+	// This can be done by using `[navigation.app_sections]` in the INI config
+	t.Run("Should move apps that have root nav id configured to the root", func(t *testing.T) {
+		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
+		service.navigationAppConfig = map[string]NavigationAppConfig{
+			"test-app1": {SectionID: navtree.NavIDRoot},
+		}
+
+		treeRoot := navtree.NavTreeRoot{}
+
+		err := service.addAppLinks(&treeRoot, reqCtx)
+		require.NoError(t, err)
+
+		// Check if the plugin gets moved to the root
+		require.Len(t, treeRoot.Children, 2)
+		require.Equal(t, "plugin-page-test-app1", treeRoot.Children[0].Id)
+
+		// Check if it is not under the "Apps" section anymore
+		appsNode := treeRoot.FindById(navtree.NavIDApps)
+		require.NotNil(t, appsNode)
+		require.Len(t, appsNode.Children, 2)
+		require.Equal(t, "plugin-page-test-app2", appsNode.Children[0].Id)
+		require.Equal(t, "plugin-page-test-app3", appsNode.Children[1].Id)
+	})
+
 	// This can be done by using `[navigation.app_sections]` in the INI config
 	t.Run("Should move apps that have specific nav id configured to correct section", func(t *testing.T) {
 		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
diff --git a/public/app/core/components/MegaMenu/MegaMenu.tsx b/public/app/core/components/MegaMenu/MegaMenu.tsx
index a6115e7988f..b9a4cef37c7 100644
--- a/public/app/core/components/MegaMenu/MegaMenu.tsx
+++ b/public/app/core/components/MegaMenu/MegaMenu.tsx
@@ -25,17 +25,14 @@ export const MegaMenu = React.memo<Props>(({ onClose, searchBarHidden }) => {
   const navTree = cloneDeep(navBarTree);
 
   const coreItems = navTree
-    .filter((item) => item.section === NavSection.Core)
-    .map((item) => enrichWithInteractionTracking(item, true));
-  const pluginItems = navTree
-    .filter((item) => item.section === NavSection.Plugin)
+    .filter((item) => item.section === NavSection.Core || item.section === NavSection.Plugin)
     .map((item) => enrichWithInteractionTracking(item, true));
   const configItems = enrichConfigItems(
     navTree.filter((item) => item.section === NavSection.Config && item && item.id !== 'help' && item.id !== 'profile'),
     location
   ).map((item) => enrichWithInteractionTracking(item, true));
 
-  const navItems = [...coreItems, ...pluginItems, ...configItems];
+  const navItems = [...coreItems, ...configItems];
 
   const activeItem = getActiveItem(navItems, location.pathname);
 

From 9c98314e9f9f488470eea88d6f596d7d4cf9ade3 Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Fri, 18 Nov 2022 10:12:17 +0100
Subject: [PATCH 005/153] OAuth: Refactor OAuth parameters handling to support
 obtaining refresh tokens for Google OAuth (#58782)

* Add ApprovalForce to AuthCodeOptions

* Extract access token validity check to a function

* Refactor

* Oauth: set options internally instead of exposing new function

* Align tests

* Remove unused function

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 pkg/api/frontendsettings_test.go              |  2 +-
 pkg/api/login_oauth.go                        |  4 +--
 pkg/api/login_oauth_test.go                   |  8 +++---
 pkg/login/social/azuread_oauth_test.go        | 28 ++++++++++---------
 pkg/login/social/generic_oauth.go             |  9 ++++++
 pkg/login/social/github_oauth_test.go         |  4 ++-
 pkg/login/social/google_oauth.go              |  9 ++++++
 pkg/login/social/social.go                    | 21 ++++++++------
 pkg/server/server.go                          |  2 +-
 pkg/services/contexthandler/contexthandler.go | 23 +++++++++------
 10 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/pkg/api/frontendsettings_test.go b/pkg/api/frontendsettings_test.go
index ef37a076523..dc1d1446a43 100644
--- a/pkg/api/frontendsettings_test.go
+++ b/pkg/api/frontendsettings_test.go
@@ -58,7 +58,7 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features *featuremgmt.
 		grafanaUpdateChecker: &updatechecker.GrafanaService{},
 		AccessControl:        accesscontrolmock.New().WithDisabled(),
 		PluginSettings:       pluginSettings.ProvideService(sqlStore, secretsService),
-		SocialService:        social.ProvideService(cfg),
+		SocialService:        social.ProvideService(cfg, features),
 	}
 
 	m := web.New()
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 88a465d7fdb..603f158611a 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -97,9 +97,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) {
 
 	code := ctx.Query("code")
 	if code == "" {
-		// FIXME: access_type is a Google OAuth2 specific thing, consider refactoring this and moving to google_oauth.go
-		opts := []oauth2.AuthCodeOption{oauth2.AccessTypeOffline}
-
+		var opts []oauth2.AuthCodeOption
 		if provider.UsePKCE {
 			ascii, pkce, err := genPKCECode()
 			if err != nil {
diff --git a/pkg/api/login_oauth_test.go b/pkg/api/login_oauth_test.go
index b5143949443..f39c5cda96c 100644
--- a/pkg/api/login_oauth_test.go
+++ b/pkg/api/login_oauth_test.go
@@ -9,15 +9,15 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/secrets/fakes"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/hooks"
 	"github.com/grafana/grafana/pkg/services/licensing"
+	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -36,7 +36,7 @@ func setupOAuthTest(t *testing.T, cfg *setting.Cfg) *web.Mux {
 		Cfg:            cfg,
 		License:        &licensing.OSSLicensingService{Cfg: cfg},
 		SQLStore:       sqlStore,
-		SocialService:  social.ProvideService(cfg),
+		SocialService:  social.ProvideService(cfg, featuremgmt.WithFeatures()),
 		HooksService:   hooks.ProvideService(),
 		SecretsService: fakes.NewFakeSecretsService(),
 	}
diff --git a/pkg/login/social/azuread_oauth_test.go b/pkg/login/social/azuread_oauth_test.go
index ea632e9457b..4a03dc12002 100644
--- a/pkg/login/social/azuread_oauth_test.go
+++ b/pkg/login/social/azuread_oauth_test.go
@@ -13,6 +13,8 @@ import (
 	"golang.org/x/oauth2"
 	"gopkg.in/square/go-jose.v2"
 	"gopkg.in/square/go-jose.v2/jwt"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 func trueBoolPtr() *bool {
@@ -54,7 +56,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 				ID:                "1234",
 			},
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Viewer", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
 			},
 			want: &BasicUserInfo{
 				Id:     "1234",
@@ -93,7 +95,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 				ID:                "1234",
 			},
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Viewer", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
 			},
 			want: &BasicUserInfo{
 				Id:     "1234",
@@ -143,7 +145,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		{
 			name: "Only other roles",
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Viewer", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
 			},
 			claims: &azureClaims{
 				Email:             "me@example.com",
@@ -171,7 +173,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 				ID:                "1234",
 			},
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Editor", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "Editor", false, *featuremgmt.WithFeatures()),
 			},
 			want: &BasicUserInfo{
 				Id:     "1234",
@@ -220,7 +222,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		},
 		{
 			name:   "Grafana Admin but setting is disabled",
-			fields: fields{SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Editor", false)},
+			fields: fields{SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Editor", false, *featuremgmt.WithFeatures())},
 			claims: &azureClaims{
 				Email:             "me@example.com",
 				PreferredUsername: "",
@@ -242,7 +244,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 			name: "Editor roles in claim and GrafanaAdminAssignment enabled",
 			fields: fields{
 				SocialBase: newSocialBase("azuread",
-					&oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false)},
+					&oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false, *featuremgmt.WithFeatures())},
 			claims: &azureClaims{
 				Email:             "me@example.com",
 				PreferredUsername: "",
@@ -263,7 +265,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		{
 			name: "Grafana Admin and Editor roles in claim",
 			fields: fields{SocialBase: newSocialBase("azuread",
-				&oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false)},
+				&oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false, *featuremgmt.WithFeatures())},
 			claims: &azureClaims{
 				Email:             "me@example.com",
 				PreferredUsername: "",
@@ -302,7 +304,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 			fields: fields{
 				allowedGroups: []string{"foo", "bar"},
 				SocialBase: newSocialBase("azuread",
-					&oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Viewer", false),
+					&oauth2.Config{}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Viewer", false, *featuremgmt.WithFeatures()),
 			},
 			claims: &azureClaims{
 				Email:             "me@example.com",
@@ -324,7 +326,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		{
 			name: "Fetch groups when ClaimsNames and ClaimsSources is set",
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "", false, *featuremgmt.WithFeatures()),
 			},
 			claims: &azureClaims{
 				ID:                "1",
@@ -349,7 +351,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		{
 			name: "Fetch groups when forceUseGraphAPI is set",
 			fields: fields{
-				SocialBase:       newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "", false),
+				SocialBase:       newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "", false, *featuremgmt.WithFeatures()),
 				forceUseGraphAPI: true,
 			},
 			claims: &azureClaims{
@@ -376,7 +378,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		{
 			name: "Fetch empty role when strict attribute role is true and no match",
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{RoleAttributeStrict: true}, "", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{RoleAttributeStrict: true}, "", false, *featuremgmt.WithFeatures()),
 			},
 			claims: &azureClaims{
 				Email:             "me@example.com",
@@ -392,7 +394,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 		{
 			name: "Fetch empty role when strict attribute role is true and no role claims returned",
 			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{RoleAttributeStrict: true}, "", false),
+				SocialBase: newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{RoleAttributeStrict: true}, "", false, *featuremgmt.WithFeatures()),
 			},
 			claims: &azureClaims{
 				Email:             "me@example.com",
@@ -416,7 +418,7 @@ func TestSocialAzureAD_UserInfo(t *testing.T) {
 			}
 
 			if tt.fields.SocialBase == nil {
-				s.SocialBase = newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "", false)
+				s.SocialBase = newSocialBase("azuread", &oauth2.Config{}, &OAuthInfo{}, "", false, *featuremgmt.WithFeatures())
 			}
 
 			key := []byte("secret")
diff --git a/pkg/login/social/generic_oauth.go b/pkg/login/social/generic_oauth.go
index 69a47ccef22..d0cd1bc716d 100644
--- a/pkg/login/social/generic_oauth.go
+++ b/pkg/login/social/generic_oauth.go
@@ -14,6 +14,8 @@ import (
 	"strconv"
 
 	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 type SocialGenericOAuth struct {
@@ -504,3 +506,10 @@ func (s *SocialGenericOAuth) FetchOrganizations(client *http.Client) ([]string,
 
 	return logins, true
 }
+
+func (s *SocialGenericOAuth) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
+	if s.features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
+		opts = append(opts, oauth2.AccessTypeOffline)
+	}
+	return s.SocialBase.AuthCodeURL(state, opts...)
+}
diff --git a/pkg/login/social/github_oauth_test.go b/pkg/login/social/github_oauth_test.go
index f610bd5843c..cdb400b15ea 100644
--- a/pkg/login/social/github_oauth_test.go
+++ b/pkg/login/social/github_oauth_test.go
@@ -9,6 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 const testGHUserTeamsJSON = `[
@@ -202,7 +204,7 @@ func TestSocialGitHub_UserInfo(t *testing.T) {
 
 			s := &SocialGithub{
 				SocialBase: newSocialBase("github", &oauth2.Config{},
-					&OAuthInfo{RoleAttributePath: tt.roleAttributePath}, tt.autoAssignOrgRole, false),
+					&OAuthInfo{RoleAttributePath: tt.roleAttributePath}, tt.autoAssignOrgRole, false, *featuremgmt.WithFeatures()),
 				allowedOrganizations: []string{},
 				apiUrl:               server.URL + "/user",
 				teamIds:              []int{},
diff --git a/pkg/login/social/google_oauth.go b/pkg/login/social/google_oauth.go
index 0c0a1d256dd..b499cc613be 100644
--- a/pkg/login/social/google_oauth.go
+++ b/pkg/login/social/google_oauth.go
@@ -6,6 +6,8 @@ import (
 	"net/http"
 
 	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 type SocialGoogle struct {
@@ -38,3 +40,10 @@ func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*Basi
 		Login: data.Email,
 	}, nil
 }
+
+func (s *SocialGoogle) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
+	if s.features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
+		opts = append(opts, oauth2.AccessTypeOffline, oauth2.ApprovalForce)
+	}
+	return s.SocialBase.AuthCodeURL(state, opts...)
+}
diff --git a/pkg/login/social/social.go b/pkg/login/social/social.go
index 217f2606a19..fad3ed7095b 100644
--- a/pkg/login/social/social.go
+++ b/pkg/login/social/social.go
@@ -16,6 +16,7 @@ import (
 	"golang.org/x/text/language"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -58,7 +59,7 @@ type OAuthInfo struct {
 	UsePKCE                 bool
 }
 
-func ProvideService(cfg *setting.Cfg) *SocialService {
+func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager) *SocialService {
 	ss := SocialService{
 		cfg:           cfg,
 		oAuthProvider: make(map[string]*OAuthInfo),
@@ -139,7 +140,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 		// GitHub.
 		if name == "github" {
 			ss.socialMap["github"] = &SocialGithub{
-				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				apiUrl:               info.ApiUrl,
 				teamIds:              sec.Key("team_ids").Ints(","),
 				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
@@ -149,7 +150,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 		// GitLab.
 		if name == "gitlab" {
 			ss.socialMap["gitlab"] = &SocialGitlab{
-				SocialBase:    newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:    newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				apiUrl:        info.ApiUrl,
 				allowedGroups: util.SplitString(sec.Key("allowed_groups").String()),
 			}
@@ -158,7 +159,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 		// Google.
 		if name == "google" {
 			ss.socialMap["google"] = &SocialGoogle{
-				SocialBase:   newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:   newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				hostedDomain: info.HostedDomain,
 				apiUrl:       info.ApiUrl,
 			}
@@ -167,7 +168,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 		// AzureAD.
 		if name == "azuread" {
 			ss.socialMap["azuread"] = &SocialAzureAD{
-				SocialBase:       newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:       newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				allowedGroups:    util.SplitString(sec.Key("allowed_groups").String()),
 				forceUseGraphAPI: sec.Key("force_use_graph_api").MustBool(false),
 			}
@@ -176,7 +177,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 		// Okta
 		if name == "okta" {
 			ss.socialMap["okta"] = &SocialOkta{
-				SocialBase:    newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:    newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				apiUrl:        info.ApiUrl,
 				allowedGroups: util.SplitString(sec.Key("allowed_groups").String()),
 			}
@@ -185,7 +186,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 		// Generic - Uses the same scheme as GitHub.
 		if name == "generic_oauth" {
 			ss.socialMap["generic_oauth"] = &SocialGenericOAuth{
-				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				apiUrl:               info.ApiUrl,
 				teamsUrl:             info.TeamsUrl,
 				emailAttributeName:   info.EmailAttributeName,
@@ -214,8 +215,7 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
 			}
 
 			ss.socialMap[grafanaCom] = &SocialGrafanaCom{
-				SocialBase: newSocialBase(name, &config, info,
-					cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync),
+				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
 				url:                  cfg.GrafanaComURL,
 				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
 			}
@@ -261,6 +261,7 @@ type SocialBase struct {
 	roleAttributeStrict bool
 	autoAssignOrgRole   string
 	skipOrgRoleSync     bool
+	features            featuremgmt.FeatureManager
 }
 
 type Error struct {
@@ -295,6 +296,7 @@ func newSocialBase(name string,
 	info *OAuthInfo,
 	autoAssignOrgRole string,
 	skipOrgRoleSync bool,
+	features featuremgmt.FeatureManager,
 ) *SocialBase {
 	logger := log.New("oauth." + name)
 
@@ -308,6 +310,7 @@ func newSocialBase(name string,
 		roleAttributePath:       info.RoleAttributePath,
 		roleAttributeStrict:     info.RoleAttributeStrict,
 		skipOrgRoleSync:         skipOrgRoleSync,
+		features:                features,
 	}
 }
 
diff --git a/pkg/server/server.go b/pkg/server/server.go
index aec724df979..4b80055b009 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -127,7 +127,7 @@ func (s *Server) init() error {
 	}
 
 	login.ProvideService(s.HTTPServer.SQLStore, s.HTTPServer.Login, s.loginAttemptService, s.userService)
-	social.ProvideService(s.cfg)
+	social.ProvideService(s.cfg, s.HTTPServer.Features)
 
 	if err := s.roleRegistry.RegisterFixedRoles(s.context); err != nil {
 		return err
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index 6e2be2233c5..01e48445926 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -449,20 +449,14 @@ func (h *ContextHandler) initContextWithToken(reqContext *models.ReqContext, org
 		return false
 	}
 
-	getTime := h.GetTime
-	if getTime == nil {
-		getTime = time.Now
-	}
-
 	if h.features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
 		// Check whether the logged in User has a token (whether the User used an OAuth provider to login)
 		oauthToken, exists, _ := h.oauthTokenService.HasOAuthEntry(ctx, queryResult)
 		if exists {
-			// Skip where the OAuthExpiry is default/zero/unset
-			if !oauthToken.OAuthExpiry.IsZero() && oauthToken.OAuthExpiry.Round(0).Add(-oauthtoken.ExpiryDelta).Before(getTime()) {
+			if h.hasAccessTokenExpired(oauthToken) {
 				reqContext.Logger.Info("access token expired", "userId", query.UserID, "expiry", fmt.Sprintf("%v", oauthToken.OAuthExpiry))
 
-				// If the User doesn't have a refresh_token or refreshing the token was unsuccessful then log out the User and Invalidate the OAuth tokens
+				// If the User doesn't have a refresh_token or refreshing the token was unsuccessful then log out the User and invalidate the OAuth tokens
 				if err = h.oauthTokenService.TryTokenRefresh(ctx, oauthToken); err != nil {
 					if !errors.Is(err, oauthtoken.ErrNoRefreshTokenFound) {
 						reqContext.Logger.Error("could not fetch a new access token", "userId", oauthToken.UserId, "error", err)
@@ -732,3 +726,16 @@ func AuthHTTPHeaderListFromContext(c context.Context) *AuthHTTPHeaderList {
 	}
 	return nil
 }
+
+func (h *ContextHandler) hasAccessTokenExpired(token *models.UserAuth) bool {
+	if token.OAuthExpiry.IsZero() {
+		return false
+	}
+
+	getTime := h.GetTime
+	if getTime == nil {
+		getTime = time.Now
+	}
+
+	return token.OAuthExpiry.Round(0).Add(-oauthtoken.ExpiryDelta).Before(getTime())
+}

From b77c3946a5b2dac7ded143b8caddfc33852182ef Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Fri, 18 Nov 2022 09:28:21 +0000
Subject: [PATCH 006/153] Alerting: Fix ConditionsCmd No Data for "has no
 value" (#58634)

This commit fixes a bug where ConditionsCmd returns No Data even when
the condition checks for "has no value". It should return 1 with a nil
match.
---
 pkg/expr/classic/classic.go      | 12 ++++++++----
 pkg/expr/classic/classic_test.go | 13 ++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkg/expr/classic/classic.go b/pkg/expr/classic/classic.go
index 4b06f0ce65b..33e57d5e6a5 100644
--- a/pkg/expr/classic/classic.go
+++ b/pkg/expr/classic/classic.go
@@ -79,6 +79,12 @@ func (cmd *ConditionsCmd) Execute(_ context.Context, _ time.Time, vars mathexp.V
 		querySeriesSet := vars[c.InputRefID]
 		nilReducedCount := 0
 		firingCount := 0
+
+		if len(querySeriesSet.Values) == 0 {
+			// Append a NoData data frame so "has no value" still works
+			querySeriesSet.Values = append(querySeriesSet.Values, mathexp.NoData{}.New())
+		}
+
 		for _, val := range querySeriesSet.Values {
 			var reducedNum mathexp.Number
 			var name string
@@ -103,10 +109,6 @@ func (cmd *ConditionsCmd) Execute(_ context.Context, _ time.Time, vars mathexp.V
 			// TODO handle error / no data signals
 			thisCondNoDataFound := reducedNum.GetFloat64Value() == nil
 
-			if thisCondNoDataFound {
-				nilReducedCount++
-			}
-
 			evalRes := c.Evaluator.Eval(reducedNum)
 
 			if evalRes {
@@ -119,6 +121,8 @@ func (cmd *ConditionsCmd) Execute(_ context.Context, _ time.Time, vars mathexp.V
 				}
 				matches = append(matches, match)
 				firingCount++
+			} else if thisCondNoDataFound {
+				nilReducedCount++
 			}
 		}
 
diff --git a/pkg/expr/classic/classic_test.go b/pkg/expr/classic/classic_test.go
index 74f6a09eda2..266640fc1bc 100644
--- a/pkg/expr/classic/classic_test.go
+++ b/pkg/expr/classic/classic_test.go
@@ -203,9 +203,8 @@ func TestConditionsCmd(t *testing.T) {
 			},
 		},
 		expected: func() mathexp.Results {
-			v := newNumber(nil)
-			// This seems incorrect
-			v.SetMeta([]EvalMatch{{}, {Metric: "NoData"}})
+			v := newNumber(ptr.Float64(1))
+			v.SetMeta([]EvalMatch{{Value: nil}})
 			return newResults(v)
 		},
 	}, {
@@ -226,9 +225,9 @@ func TestConditionsCmd(t *testing.T) {
 			},
 		},
 		expected: func() mathexp.Results {
-			v := newNumber(nil)
+			v := newNumber(ptr.Float64(1))
 			// This too seems incorrect, looks like we don't call the evaluator
-			v.SetMeta([]EvalMatch{{Metric: "NoData"}})
+			v.SetMeta([]EvalMatch{{Value: nil}})
 			return newResults(v)
 		},
 	}, {
@@ -251,9 +250,9 @@ func TestConditionsCmd(t *testing.T) {
 			},
 		},
 		expected: func() mathexp.Results {
-			v := newNumber(nil)
+			v := newNumber(ptr.Float64(1))
 			// This seems incorrect
-			v.SetMeta([]EvalMatch{{}, {Metric: "NoData"}})
+			v.SetMeta([]EvalMatch{{Value: nil}})
 			return newResults(v)
 		},
 	}, {

From 38b980bd818e005fa82c920867c37bbf99977820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 18 Nov 2022 10:35:27 +0100
Subject: [PATCH 007/153] SceneObject: Prevent state mutation by using
 Object.freeze (#58936)

---
 .../features/scenes/core/SceneObjectBase.test.ts   | 14 ++++++++++++++
 .../app/features/scenes/core/SceneObjectBase.tsx   | 10 ++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/public/app/features/scenes/core/SceneObjectBase.test.ts b/public/app/features/scenes/core/SceneObjectBase.test.ts
index c8d3f138e76..e36d5479388 100644
--- a/public/app/features/scenes/core/SceneObjectBase.test.ts
+++ b/public/app/features/scenes/core/SceneObjectBase.test.ts
@@ -76,6 +76,20 @@ describe('SceneObject', () => {
     expect(clone.state.name).toBe('new name');
   });
 
+  it('Cannot modify state', () => {
+    const scene = new TestScene({ name: 'name' });
+    expect(() => {
+      scene.state.name = 'new name';
+    }).toThrow();
+
+    scene.setState({ name: 'new name' });
+    expect(scene.state.name).toBe('new name');
+
+    expect(() => {
+      scene.state.name = 'other name';
+    }).toThrow();
+  });
+
   describe('When activated', () => {
     const scene = new TestScene({
       $data: new SceneDataNode({}),
diff --git a/public/app/features/scenes/core/SceneObjectBase.tsx b/public/app/features/scenes/core/SceneObjectBase.tsx
index f0c5f75b27f..ffb997e5a1d 100644
--- a/public/app/features/scenes/core/SceneObjectBase.tsx
+++ b/public/app/features/scenes/core/SceneObjectBase.tsx
@@ -32,7 +32,7 @@ export abstract class SceneObjectBase<TState extends SceneObjectState = SceneObj
       state.key = uuidv4();
     }
 
-    this._state = state;
+    this._state = Object.freeze(state);
     this._subject.next(state);
     this.setParent();
   }
@@ -92,19 +92,21 @@ export abstract class SceneObjectBase<TState extends SceneObjectState = SceneObj
 
   public setState(update: Partial<TState>) {
     const prevState = this._state;
-    this._state = {
+    const newState: TState = {
       ...this._state,
       ...update,
     };
 
+    this._state = Object.freeze(newState);
+
     this.setParent();
-    this._subject.next(this._state);
+    this._subject.next(newState);
 
     // Bubble state change event. This is event is subscribed to by UrlSyncManager and UndoManager
     this.publishEvent(
       new SceneObjectStateChangedEvent({
         prevState,
-        newState: this._state,
+        newState,
         partialUpdate: update,
         changedObject: this,
       }),

From 0e4108f62f1e9a03a0097f2b8c1236582cac5cfd Mon Sep 17 00:00:00 2001
From: Alex Pakalniskis <43630382+alex-pakalniskis@users.noreply.github.com>
Date: Fri, 18 Nov 2022 02:34:25 -0800
Subject: [PATCH 008/153] Documentation Update: Minor spelling change (#58933)

chore: minor grammar tweak
---
 .../alerting/alerting-rules/create-grafana-managed-rule.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 67d9736dc13..786de9cf53b 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -15,7 +15,7 @@ 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. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
+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 fixed thresholds. When these are executed, Grafana sends notifications to the contact point. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
 
 Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 

From 8e19a1618fd6547189ffc015cb5329e914e484ab Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 18 Nov 2022 10:46:50 +0000
Subject: [PATCH 009/153] QueryData: skip header validation (revert check)
 (#58871)

---
 pkg/services/query/query.go      | 3 ++-
 pkg/services/query/query_test.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index 773d0577f43..cefd648e19e 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -372,7 +372,8 @@ func (s *Service) parseMetricRequest(ctx context.Context, user *user.SignedInUse
 		req.httpRequest = reqDTO.HTTPRequest
 	}
 
-	return req, req.validateRequest()
+	_ = req.validateRequest()
+	return req, nil // TODO req.validateRequest()
 }
 
 func (s *Service) getDataSourceFromQuery(ctx context.Context, user *user.SignedInUser, skipCache bool, query *simplejson.Json, history map[string]*datasources.DataSource) (*datasources.DataSource, error) {
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index e8da4ab6481..af81ea8f8b4 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -189,7 +189,7 @@ func TestParseMetricRequest(t *testing.T) {
 		httpreq.Header.Add("X-Datasource-Uid", "gIEkMvIVz")
 		mr.HTTPRequest = httpreq
 		_, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr)
-		require.Error(t, err)
+		require.NoError(t, err)
 
 		// With the second value it is OK
 		httpreq.Header.Add("X-Datasource-Uid", "sEx6ZvSVk")

From e823a90b82addd7350aa7241d2d5007d8c94ceb7 Mon Sep 17 00:00:00 2001
From: sfranzis <sfranzis71@gmail.com>
Date: Fri, 18 Nov 2022 12:13:31 +0100
Subject: [PATCH 010/153] GaugePanel: Setting the neutral-point of a gauge
 (#53989)

---
 .../src/components/Gauge/Gauge.test.tsx       |  3 +
 .../grafana-ui/src/components/Gauge/Gauge.tsx |  1 +
 public/app/plugins/panel/gauge/module.tsx     | 15 +++-
 public/vendor/flot/jquery.flot.gauge.js       | 78 +++++++++++++++++--
 4 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx
index 0a337707c36..00037a9872c 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx
@@ -19,6 +19,9 @@ const field: FieldConfig = {
     mode: ThresholdsMode.Absolute,
     steps: [{ value: -Infinity, color: '#7EB26D' }],
   },
+  custom: {
+    neeutral: 0,
+  },
 };
 
 const props: Props = {
diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
index 39e7a80808e..1f54b72aff4 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
@@ -98,6 +98,7 @@ export class Gauge extends PureComponent<Props> {
           gauge: {
             min,
             max,
+            neutralValue: field.custom?.neutral,
             background: { color: backgroundColor },
             border: { color: null },
             shadow: { show: false },
diff --git a/public/app/plugins/panel/gauge/module.tsx b/public/app/plugins/panel/gauge/module.tsx
index 3a36fd460a2..0910083e231 100644
--- a/public/app/plugins/panel/gauge/module.tsx
+++ b/public/app/plugins/panel/gauge/module.tsx
@@ -9,11 +9,22 @@ import { PanelOptions, defaultPanelOptions } from './models.gen';
 import { GaugeSuggestionsSupplier } from './suggestions';
 
 export const plugin = new PanelPlugin<PanelOptions>(GaugePanel)
-  .useFieldConfig()
+  .useFieldConfig({
+    useCustomConfig: (builder) => {
+      builder.addNumberInput({
+        path: 'neutral',
+        name: 'Neutral',
+        description: 'Leave empty to use Min as neutral point',
+        category: ['Gauge'],
+        settings: {
+          placeholder: 'auto',
+        },
+      });
+    },
+  })
   .setPanelOptions((builder) => {
     addStandardDataReduceOptions(builder);
     addOrientationOption(builder);
-
     builder
       .addBooleanSwitch({
         path: 'showThresholdLabels',
diff --git a/public/vendor/flot/jquery.flot.gauge.js b/public/vendor/flot/jquery.flot.gauge.js
index 760354cecd4..8c5c43a9213 100644
--- a/public/vendor/flot/jquery.flot.gauge.js
+++ b/public/vendor/flot/jquery.flot.gauge.js
@@ -325,9 +325,9 @@
          */
         Gauge.prototype.drawGauge = function(gaugeOptionsi, layout, cellLayout, label, data) {
 
-
             var blur = gaugeOptionsi.gauge.shadow.show ? gaugeOptionsi.gauge.shadow.blur : 0;
-
+            var color = getColor(gaugeOptionsi, data);
+            var angles = calculateAnglesForGauge(gaugeOptionsi, layout, data);
 
             // draw gauge frame
             drawArcWithShadow(
@@ -343,19 +343,74 @@
                 blur);
 
             // draw gauge
-            var c1 = getColor(gaugeOptionsi, data);
-            var a2 = calculateAngle(gaugeOptionsi, layout, data);
             drawArcWithShadow(
                 cellLayout.cx, // center x
                 cellLayout.cy, // center y
                 layout.radius - 1,
                 layout.width - 2,
-                toRad(gaugeOptionsi.gauge.startAngle),
-                toRad(a2),
-                c1,           // line color
+                toRad(angles.a1),
+                toRad(angles.a2),
+                color,
                 1,            // line width
-                c1,           // fill color
+                color,           // fill color
                 blur);
+            
+            if(gaugeOptionsi.gauge.neutralValue != null)  {
+                drawZeroMarker(gaugeOptionsi, layout, cellLayout, color);
+            }
+        }
+
+        /**
+         * Calcualte the angles for the gauge, depending on if there are
+         * negative numbers or not.
+         * 
+         * @method calculateAnglesForGauge
+         * @param {Object} gaugeOptionsi the options of the gauge
+         * @param  {Number} data the value of the gauge
+         * @returns {Object}
+         */
+        function calculateAnglesForGauge(gaugeOptionsi, layout, data) {
+            let angles = {};
+            var neutral = gaugeOptionsi.gauge.neutralValue;
+
+            if (neutral != null) {
+                if (data < neutral) {
+                    angles.a1 = calculateAngle(gaugeOptionsi, layout, data);
+                    angles.a2 = calculateAngle(gaugeOptionsi, layout, neutral);
+                } else {
+                    angles.a1 = calculateAngle(gaugeOptionsi, layout, neutral);
+                    angles.a2 = calculateAngle(gaugeOptionsi, layout, data);
+                }
+            } else {
+                angles.a1 = gaugeOptionsi.gauge.startAngle;
+                angles.a2 = calculateAngle(gaugeOptionsi, layout, data);
+            }
+            
+            return angles;
+        }
+
+        /**
+         * Draw zero marker for Gauge with negative values
+         * 
+         * @method drawZeroMarker
+         * @param  {Object} gaugeOptionsi the options of the gauge
+         * @param  {Object} layout the layout properties
+         * @param  {Object} cellLayout the cell layout properties
+         * @param  {String} color line color
+         */
+        function drawZeroMarker(gaugeOptionsi, layout, cellLayout, color) {
+            var diff = (gaugeOptionsi.gauge.max - gaugeOptionsi.gauge.min) / 600;
+
+            drawArc(context,
+                cellLayout.cx,
+                cellLayout.cy,
+                layout.radius - 2,
+                layout.width - 4,
+                toRad(calculateAngle(gaugeOptionsi, layout, gaugeOptionsi.gauge.neutralValue-diff)),
+                toRad(calculateAngle(gaugeOptionsi, layout, gaugeOptionsi.gauge.neutralValue+diff)),
+                color,
+                2,
+                gaugeOptionsi.gauge.background.color);
         }
 
         /**
@@ -529,6 +584,13 @@
                     drawThresholdValue(gaugeOptionsi, layout, cellLayout, i + "_" + j, threshold.value, a);
                 }
             }
+            
+            var neutral = gaugeOptionsi.gauge.neutralValue;
+            if (neutral != null && 
+                neutral>gaugeOptionsi.gauge.min && 
+                neutral<gaugeOptionsi.gauge.max) {
+                drawThresholdValue(gaugeOptionsi, layout, cellLayout, "Neutral" + i, neutral, calculateAngle(gaugeOptionsi, layout, neutral));
+            }
         }
 
         /**

From e37fc888c0366109eb41c3a11c9ad5114f0a2242 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Fri, 18 Nov 2022 15:37:18 +0200
Subject: [PATCH 011/153] CI: Move `upload-cdn` subcommand from `grabpl`
 (#58957)

Move upload-cdn from grabpl
---
 .drone.yml                   | 16 ++++----
 pkg/build/cmd/main.go        |  8 ++++
 pkg/build/cmd/uploadcdn.go   | 75 ++++++++++++++++++++++++++++++++++++
 scripts/drone/steps/lib.star |  2 +-
 4 files changed, 92 insertions(+), 9 deletions(-)
 create mode 100644 pkg/build/cmd/uploadcdn.go

diff --git a/.drone.yml b/.drone.yml
index 103256ecf2f..4b48aa009e0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1569,7 +1569,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss
+  - ./bin/build upload-cdn --edition oss
   depends_on:
   - grafana-server
   environment:
@@ -2135,7 +2135,7 @@ steps:
     event:
     - tag
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss
+  - ./bin/build upload-cdn --edition oss
   depends_on:
   - grafana-server
   environment:
@@ -2785,7 +2785,7 @@ steps:
     - success
     - failure
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise
+  - ./bin/build upload-cdn --edition enterprise
   depends_on:
   - package
   environment:
@@ -2826,7 +2826,7 @@ steps:
   image: grafana/build-container:1.6.4
   name: package-enterprise2
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2
+  - ./bin/build upload-cdn --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -4156,7 +4156,7 @@ steps:
       include:
       - packages/grafana-ui/**
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss
+  - ./bin/build upload-cdn --edition oss
   depends_on:
   - grafana-server
   environment:
@@ -4764,7 +4764,7 @@ steps:
     - success
     - failure
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise
+  - ./bin/build upload-cdn --edition enterprise
   depends_on:
   - package
   environment:
@@ -4812,7 +4812,7 @@ steps:
   image: grafana/build-container:1.6.4
   name: package-enterprise2
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2
+  - ./bin/build upload-cdn --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -5512,6 +5512,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 77ae647c9addfcd9966d462ca9967b85a87e18adfe0e9e0a2c6b1cf5d7f42493
+hmac: bdde811590573d22162d8305ced15080e8b20f2180b7491891c461427810a4b3
 
 ...
diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index 46d8ef8f32a..ba4f1f6eb0a 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -96,6 +96,14 @@ func main() {
 				},
 			},
 		},
+		{
+			Name:   "upload-cdn",
+			Usage:  "Upload public/* to a cdn bucket",
+			Action: UploadCDN,
+			Flags: []cli.Flag{
+				&editionFlag,
+			},
+		},
 		{
 			Name:   "shellcheck",
 			Usage:  "Run shellcheck on shell scripts",
diff --git a/pkg/build/cmd/uploadcdn.go b/pkg/build/cmd/uploadcdn.go
new file mode 100644
index 00000000000..e9c4b72acab
--- /dev/null
+++ b/pkg/build/cmd/uploadcdn.go
@@ -0,0 +1,75 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/gcloud/storage"
+	"github.com/urfave/cli/v2"
+)
+
+// UploadCDN implements the sub-command "upload-cdn".
+func UploadCDN(c *cli.Context) error {
+	if c.NArg() > 0 {
+		if err := cli.ShowSubcommandHelp(c); err != nil {
+			return cli.NewExitError(err.Error(), 1)
+		}
+		return cli.NewExitError("", 1)
+	}
+
+	metadata, err := GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	version := metadata.GrafanaVersion
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+
+	buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
+	if err != nil {
+		return err
+	}
+
+	edition := os.Getenv("EDITION")
+	log.Printf("Uploading Grafana CDN Assets, version %s, %s edition...", version, edition)
+
+	editionPath := ""
+
+	switch config.Edition(edition) {
+	case config.EditionOSS:
+		editionPath = "grafana-oss"
+	case config.EditionEnterprise:
+		editionPath = "grafana"
+	case config.EditionEnterprise2:
+		editionPath = os.Getenv("ENTERPRISE2_CDN_PATH")
+	default:
+		panic(fmt.Sprintf("unrecognized edition %q", edition))
+	}
+
+	gcs, err := storage.New()
+	if err != nil {
+		return err
+	}
+
+	bucket := gcs.Bucket(buildConfig.Buckets.CDNAssets)
+	srcPath := buildConfig.Buckets.CDNAssetsDir
+	srcPath = filepath.Join(srcPath, editionPath, version)
+
+	if err := gcs.DeleteDir(c.Context, bucket, srcPath); err != nil {
+		return err
+	}
+	log.Printf("Successfully cleaned source: %s/%s\n", buildConfig.Buckets.CDNAssets, srcPath)
+
+	if err := gcs.CopyLocalDir(c.Context, "./public", bucket, srcPath, false); err != nil {
+		return err
+	}
+
+	log.Printf("Successfully uploaded cdn static assets to: %s/%s!\n", buildConfig.Buckets.CDNAssets, srcPath)
+
+	return nil
+}
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index d185b6fe567..bf45fc1a63d 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -354,7 +354,7 @@ def upload_cdn_step(edition, ver_mode, trigger=None):
             'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
         },
         'commands': [
-            './bin/grabpl upload-cdn --edition {}'.format(edition),
+            './bin/build upload-cdn --edition {}'.format(edition),
         ],
     }
     if trigger and ver_mode in ("release-branch", "main"):

From b3406a8273122cca702fd2e13c550bb1b0befc99 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Fri, 18 Nov 2022 14:40:26 +0100
Subject: [PATCH 012/153] Auth: Remove userauth service (#58941)

* Auth: remove userauth service

* Use Revoke user tokens from UserAuthTokenService
* Add function to delete user auth info to UserAuthInfo service
---
 pkg/api/admin_users.go                        |  4 +-
 pkg/api/http_server.go                        |  6 +--
 pkg/cmd/grafana-cli/runner/wire.go            |  4 +-
 pkg/server/wire.go                            |  2 -
 pkg/services/login/authinfo.go                |  1 +
 .../authinfoservice/database/database.go      |  8 ++++
 pkg/services/login/authinfoservice/service.go |  4 ++
 pkg/services/login/logintest/logintest.go     |  4 ++
 pkg/services/userauth/userauth.go             |  8 ----
 pkg/services/userauth/userauthimpl/store.go   | 32 ----------------
 .../userauth/userauthimpl/store_test.go       | 31 ----------------
 .../userauth/userauthimpl/userauth.go         | 28 --------------
 .../userauth/userauthimpl/userauth_test.go    | 37 -------------------
 pkg/services/userauth/userauthtest/fake.go    | 19 ----------
 14 files changed, 21 insertions(+), 167 deletions(-)
 delete mode 100644 pkg/services/userauth/userauth.go
 delete mode 100644 pkg/services/userauth/userauthimpl/store.go
 delete mode 100644 pkg/services/userauth/userauthimpl/store_test.go
 delete mode 100644 pkg/services/userauth/userauthimpl/userauth.go
 delete mode 100644 pkg/services/userauth/userauthimpl/userauth_test.go
 delete mode 100644 pkg/services/userauth/userauthtest/fake.go

diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go
index bf284cddb33..54855e7d281 100644
--- a/pkg/api/admin_users.go
+++ b/pkg/api/admin_users.go
@@ -239,13 +239,13 @@ func (hs *HTTPServer) AdminDeleteUser(c *models.ReqContext) response.Response {
 		return nil
 	})
 	g.Go(func() error {
-		if err := hs.userAuthService.Delete(ctx, cmd.UserID); err != nil {
+		if err := hs.authInfoService.DeleteUserAuthInfo(ctx, cmd.UserID); err != nil {
 			return err
 		}
 		return nil
 	})
 	g.Go(func() error {
-		if err := hs.userAuthService.DeleteToken(ctx, cmd.UserID); err != nil {
+		if err := hs.AuthTokenService.RevokeAllUserTokens(ctx, cmd.UserID); err != nil {
 			return err
 		}
 		return nil
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 7320b71b2cd..222b6923990 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -21,7 +21,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/querylibrary"
 	"github.com/grafana/grafana/pkg/services/searchV2"
 	"github.com/grafana/grafana/pkg/services/store/object/httpobjectstore"
-	"github.com/grafana/grafana/pkg/services/userauth"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -207,7 +206,6 @@ type HTTPServer struct {
 	accesscontrolService   accesscontrol.Service
 	annotationsRepo        annotations.Repository
 	tagService             tag.Service
-	userAuthService        userauth.Service
 	oauthTokenService      oauthtoken.OAuthTokenService
 }
 
@@ -250,8 +248,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	loginAttemptService loginAttempt.Service, orgService org.Service, teamService team.Service,
 	accesscontrolService accesscontrol.Service, dashboardThumbsService thumbs.DashboardThumbService, navTreeService navtree.Service,
 	annotationRepo annotations.Repository, tagService tag.Service, searchv2HTTPService searchV2.SearchHTTPService,
-	userAuthService userauth.Service, queryLibraryHTTPService querylibrary.HTTPService, queryLibraryService querylibrary.Service,
-	oauthTokenService oauthtoken.OAuthTokenService,
+	queryLibraryHTTPService querylibrary.HTTPService, queryLibraryService querylibrary.Service, oauthTokenService oauthtoken.OAuthTokenService,
 ) (*HTTPServer, error) {
 	web.Env = cfg.Env
 	m := web.New()
@@ -353,7 +350,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		accesscontrolService:         accesscontrolService,
 		annotationsRepo:              annotationRepo,
 		tagService:                   tagService,
-		userAuthService:              userAuthService,
 		QueryLibraryHTTPService:      queryLibraryHTTPService,
 		QueryLibraryService:          queryLibraryService,
 		oauthTokenService:            oauthTokenService,
diff --git a/pkg/cmd/grafana-cli/runner/wire.go b/pkg/cmd/grafana-cli/runner/wire.go
index 8ee0af3f6a5..975264bba82 100644
--- a/pkg/cmd/grafana-cli/runner/wire.go
+++ b/pkg/cmd/grafana-cli/runner/wire.go
@@ -7,7 +7,6 @@ import (
 	"context"
 
 	"github.com/google/wire"
-	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/tsdb/parca"
 	"github.com/grafana/grafana/pkg/tsdb/phlare"
 
@@ -53,6 +52,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/auth/jwt"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/comments"
@@ -129,7 +129,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/thumbs"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
-	"github.com/grafana/grafana/pkg/services/userauth/userauthimpl"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor"
 	"github.com/grafana/grafana/pkg/tsdb/cloudmonitoring"
@@ -327,7 +326,6 @@ var wireSet = wire.NewSet(
 	userimpl.ProvideService,
 	orgimpl.ProvideService,
 	teamimpl.ProvideService,
-	userauthimpl.ProvideService,
 	ngmetrics.ProvideServiceForTest,
 	notifications.MockNotificationService,
 	objectdummyserver.ProvideFakeObjectServer,
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 4d2802abbe8..45c2c8f3d12 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -143,7 +143,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/thumbs/dashboardthumbsimpl"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
-	"github.com/grafana/grafana/pkg/services/userauth/userauthimpl"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor"
 	"github.com/grafana/grafana/pkg/tsdb/cloudmonitoring"
@@ -368,7 +367,6 @@ var wireBasicSet = wire.NewSet(
 	teamimpl.ProvideService,
 	tempuserimpl.ProvideService,
 	loginattemptimpl.ProvideService,
-	userauthimpl.ProvideService,
 	secretsMigrations.ProvideDataSourceMigrationService,
 	secretsMigrations.ProvideMigrateToPluginService,
 	secretsMigrations.ProvideMigrateFromPluginService,
diff --git a/pkg/services/login/authinfo.go b/pkg/services/login/authinfo.go
index 3568b883c46..e8484c781ba 100644
--- a/pkg/services/login/authinfo.go
+++ b/pkg/services/login/authinfo.go
@@ -13,6 +13,7 @@ type AuthInfoService interface {
 	GetExternalUserInfoByLogin(ctx context.Context, query *models.GetExternalUserInfoByLoginQuery) error
 	SetAuthInfo(ctx context.Context, cmd *models.SetAuthInfoCommand) error
 	UpdateAuthInfo(ctx context.Context, cmd *models.UpdateAuthInfoCommand) error
+	DeleteUserAuthInfo(ctx context.Context, userID int64) error
 }
 
 const (
diff --git a/pkg/services/login/authinfoservice/database/database.go b/pkg/services/login/authinfoservice/database/database.go
index 395818e662e..a7fdf2fd65c 100644
--- a/pkg/services/login/authinfoservice/database/database.go
+++ b/pkg/services/login/authinfoservice/database/database.go
@@ -218,6 +218,14 @@ func (s *AuthInfoStore) DeleteAuthInfo(ctx context.Context, cmd *models.DeleteAu
 	})
 }
 
+func (s *AuthInfoStore) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		var rawSQL = "DELETE FROM user_auth WHERE user_id = ?"
+		_, err := sess.Exec(rawSQL, userID)
+		return err
+	})
+}
+
 func (s *AuthInfoStore) GetUserById(ctx context.Context, id int64) (*user.User, error) {
 	query := user.GetUserByIDQuery{ID: id}
 	user, err := s.userService.GetByID(ctx, &query)
diff --git a/pkg/services/login/authinfoservice/service.go b/pkg/services/login/authinfoservice/service.go
index ac713a7345b..3a6025bd491 100644
--- a/pkg/services/login/authinfoservice/service.go
+++ b/pkg/services/login/authinfoservice/service.go
@@ -197,6 +197,10 @@ func (s *Implementation) GetExternalUserInfoByLogin(ctx context.Context, query *
 	return s.authInfoStore.GetExternalUserInfoByLogin(ctx, query)
 }
 
+func (s *Implementation) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	return nil
+}
+
 func (s *Implementation) Run(ctx context.Context) error {
 	s.logger.Debug("Started AuthInfo Metrics collection service")
 	return s.authInfoStore.RunMetricsCollection(ctx)
diff --git a/pkg/services/login/logintest/logintest.go b/pkg/services/login/logintest/logintest.go
index 5c2ce4005df..023ae063f13 100644
--- a/pkg/services/login/logintest/logintest.go
+++ b/pkg/services/login/logintest/logintest.go
@@ -57,6 +57,10 @@ func (a *AuthInfoServiceFake) GetExternalUserInfoByLogin(ctx context.Context, qu
 	return a.ExpectedError
 }
 
+func (a *AuthInfoServiceFake) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	return a.ExpectedError
+}
+
 type AuthenticatorFake struct {
 	ExpectedUser  *user.User
 	ExpectedError error
diff --git a/pkg/services/userauth/userauth.go b/pkg/services/userauth/userauth.go
deleted file mode 100644
index e0cb1f5c7ee..00000000000
--- a/pkg/services/userauth/userauth.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package userauth
-
-import "context"
-
-type Service interface {
-	Delete(context.Context, int64) error
-	DeleteToken(context.Context, int64) error
-}
diff --git a/pkg/services/userauth/userauthimpl/store.go b/pkg/services/userauth/userauthimpl/store.go
deleted file mode 100644
index e563eb396fe..00000000000
--- a/pkg/services/userauth/userauthimpl/store.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package userauthimpl
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-)
-
-type store interface {
-	Delete(context.Context, int64) error
-	DeleteToken(context.Context, int64) error
-}
-
-type sqlStore struct {
-	db db.DB
-}
-
-func (ss *sqlStore) Delete(ctx context.Context, userID int64) error {
-	return ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		var rawSQL = "DELETE FROM user_auth WHERE user_id = ?"
-		_, err := sess.Exec(rawSQL, userID)
-		return err
-	})
-}
-
-func (ss *sqlStore) DeleteToken(ctx context.Context, userID int64) error {
-	return ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		var rawSQL = "DELETE FROM user_auth_token WHERE user_id = ?"
-		_, err := sess.Exec(rawSQL, userID)
-		return err
-	})
-}
diff --git a/pkg/services/userauth/userauthimpl/store_test.go b/pkg/services/userauth/userauthimpl/store_test.go
deleted file mode 100644
index 5b29b735666..00000000000
--- a/pkg/services/userauth/userauthimpl/store_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package userauthimpl
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-)
-
-func TestIntegrationUserAuthDataAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	ss := db.InitTestDB(t)
-	userAuthStore := sqlStore{
-		db: ss,
-	}
-
-	t.Run("delete user auth", func(t *testing.T) {
-		err := userAuthStore.Delete(context.Background(), 1)
-		require.NoError(t, err)
-	})
-
-	t.Run("delete user auth token", func(t *testing.T) {
-		err := userAuthStore.DeleteToken(context.Background(), 1)
-		require.NoError(t, err)
-	})
-}
diff --git a/pkg/services/userauth/userauthimpl/userauth.go b/pkg/services/userauth/userauthimpl/userauth.go
deleted file mode 100644
index 23367fb9ea6..00000000000
--- a/pkg/services/userauth/userauthimpl/userauth.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package userauthimpl
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/userauth"
-)
-
-type Service struct {
-	store store
-}
-
-func ProvideService(db db.DB) userauth.Service {
-	return &Service{
-		store: &sqlStore{
-			db: db,
-		},
-	}
-}
-
-func (s *Service) Delete(ctx context.Context, userID int64) error {
-	return s.store.Delete(ctx, userID)
-}
-
-func (s *Service) DeleteToken(ctx context.Context, userID int64) error {
-	return s.store.DeleteToken(ctx, userID)
-}
diff --git a/pkg/services/userauth/userauthimpl/userauth_test.go b/pkg/services/userauth/userauthimpl/userauth_test.go
deleted file mode 100644
index 7c29f57d422..00000000000
--- a/pkg/services/userauth/userauthimpl/userauth_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package userauthimpl
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestUserAuthService(t *testing.T) {
-	userAuthStore := &FakeUserAuthStore{}
-	userAuthService := Service{
-		store: userAuthStore,
-	}
-
-	t.Run("delete user", func(t *testing.T) {
-		err := userAuthService.Delete(context.Background(), 1)
-		require.NoError(t, err)
-	})
-
-	t.Run("delete token", func(t *testing.T) {
-		err := userAuthService.DeleteToken(context.Background(), 1)
-		require.NoError(t, err)
-	})
-}
-
-type FakeUserAuthStore struct {
-	ExpectedError error
-}
-
-func (f *FakeUserAuthStore) Delete(ctx context.Context, userID int64) error {
-	return f.ExpectedError
-}
-
-func (f *FakeUserAuthStore) DeleteToken(ctx context.Context, userID int64) error {
-	return f.ExpectedError
-}
diff --git a/pkg/services/userauth/userauthtest/fake.go b/pkg/services/userauth/userauthtest/fake.go
deleted file mode 100644
index d7a3b0bb7d7..00000000000
--- a/pkg/services/userauth/userauthtest/fake.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package userauthtest
-
-import "context"
-
-type FakeUserAuthService struct {
-	ExpectedError error
-}
-
-func NewFakeUserAuthService() *FakeUserAuthService {
-	return &FakeUserAuthService{}
-}
-
-func (f *FakeUserAuthService) Delete(ctx context.Context, userID int64) error {
-	return f.ExpectedError
-}
-
-func (f *FakeUserAuthService) DeleteToken(ctx context.Context, userID int64) error {
-	return f.ExpectedError
-}

From 44e8fb628ed2dbb66361813b0d480941a879bf5c Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Fri, 18 Nov 2022 14:52:54 +0100
Subject: [PATCH 013/153] Explore: Fix a11y issue with show all series button
 in Graph (#58943)

* Explore: Fix a11y issue with show all series button in Graph

* remove extra space

* add spacing
---
 .../features/explore/Graph/ExploreGraph.tsx   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/app/features/explore/Graph/ExploreGraph.tsx b/public/app/features/explore/Graph/ExploreGraph.tsx
index f8a0e02f0d4..ce4ec43e2c3 100644
--- a/public/app/features/explore/Graph/ExploreGraph.tsx
+++ b/public/app/features/explore/Graph/ExploreGraph.tsx
@@ -22,6 +22,7 @@ import {
 import { PanelRenderer } from '@grafana/runtime';
 import { GraphDrawStyle, LegendDisplayMode, TooltipDisplayMode, SortOrder } from '@grafana/schema';
 import {
+  Button,
   Icon,
   PanelContext,
   PanelContextProvider,
@@ -166,13 +167,15 @@ export function ExploreGraph({
       {dataWithConfig.length > MAX_NUMBER_OF_TIME_SERIES && !showAllTimeSeries && (
         <div className={cx([style.timeSeriesDisclaimer])}>
           <Icon className={style.disclaimerIcon} name="exclamation-triangle" />
-          {`Showing only ${MAX_NUMBER_OF_TIME_SERIES} time series. `}
-          <span
-            className={cx([style.showAllTimeSeries])}
-            onClick={() => {
-              setShowAllTimeSeries(true);
-            }}
-          >{`Show all ${dataWithConfig.length}`}</span>
+          Showing only {MAX_NUMBER_OF_TIME_SERIES} time series.
+          <Button
+            variant="primary"
+            fill="text"
+            onClick={() => setShowAllTimeSeries(true)}
+            className={style.showAllButton}
+          >
+            Show all {dataWithConfig.length}
+          </Button>
         </div>
       )}
       <PanelRenderer
@@ -192,7 +195,6 @@ export function ExploreGraph({
 const getStyles = (theme: GrafanaTheme2) => ({
   timeSeriesDisclaimer: css`
     label: time-series-disclaimer;
-    width: 300px;
     margin: ${theme.spacing(1)} auto;
     padding: 10px 0;
     border-radius: ${theme.spacing(2)};
@@ -204,9 +206,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     color: ${theme.colors.warning.main};
     margin-right: ${theme.spacing(0.5)};
   `,
-  showAllTimeSeries: css`
-    label: show-all-time-series;
-    cursor: pointer;
-    color: ${theme.colors.text.link};
+  showAllButton: css`
+    margin-left: ${theme.spacing(0.5)};
   `,
 });

From b68fe6336a89cdb17cf0eb2b97ecf590f0c9b9a5 Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Fri, 18 Nov 2022 14:54:20 +0100
Subject: [PATCH 014/153] Chore: move keydown handler in rich history card
 (#58945)

Chore: move kedown handler in rich history card
---
 public/app/features/explore/RichHistory/RichHistoryCard.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index d67432a6226..882057b2928 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -260,6 +260,7 @@ export function RichHistoryCard(props: Props) {
   const updateComment = (
     <div className={styles.updateCommentContainer} aria-label={comment ? 'Update comment form' : 'Add comment form'}>
       <TextArea
+        onKeyDown={onKeyDown}
         value={comment}
         placeholder={comment ? undefined : 'An optional description of what the query does.'}
         onChange={(e) => setComment(e.currentTarget.value)}
@@ -298,7 +299,7 @@ export function RichHistoryCard(props: Props) {
   );
 
   return (
-    <div className={styles.queryCard} onKeyDown={onKeyDown}>
+    <div className={styles.queryCard}>
       <div className={styles.cardRow}>
         <div className={styles.datasourceContainer}>
           <img src={dsImg} aria-label="Data source icon" />

From 27b5e5f7816f4ac62df2bebc230a1881263745a0 Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Fri, 18 Nov 2022 14:54:56 +0100
Subject: [PATCH 015/153] Explore: Fix a11y issue with logs navigation buttons
 (#58944)

---
 public/app/features/explore/LogsNavigationPages.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/app/features/explore/LogsNavigationPages.tsx b/public/app/features/explore/LogsNavigationPages.tsx
index b4ab4153d92..2e3a35570db 100644
--- a/public/app/features/explore/LogsNavigationPages.tsx
+++ b/public/app/features/explore/LogsNavigationPages.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { dateTimeFormat, systemDateFormats, TimeZone, AbsoluteTimeRange, GrafanaTheme2 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { CustomScrollbar, Spinner, useTheme2 } from '@grafana/ui';
+import { CustomScrollbar, Spinner, useTheme2, clearButtonStyles } from '@grafana/ui';
 
 import { LogsPage } from './LogsNavigation';
 
@@ -48,7 +48,8 @@ export function LogsNavigationPages({
       <div className={styles.pagesWrapper} data-testid="logsNavigationPages">
         <div className={styles.pagesContainer}>
           {pages.map((page: LogsPage, index: number) => (
-            <div
+            <button
+              type="button"
               data-testid={`page${index + 1}`}
               className={styles.page}
               key={page.queryRange.to}
@@ -64,7 +65,7 @@ export function LogsNavigationPages({
               <div className={cx(styles.time, { selectedText: currentPageIndex === index })}>
                 {createPageContent(page, index)}
               </div>
-            </div>
+            </button>
           ))}
         </div>
       </div>
@@ -101,6 +102,7 @@ const getStyles = (theme: GrafanaTheme2, loading: boolean) => {
       flex-direction: column;
     `,
     page: css`
+      ${clearButtonStyles(theme)}
       display: flex;
       margin: ${theme.spacing(2)} 0;
       cursor: ${loading ? 'auto' : 'pointer'};

From 766867735da9cfa7f7a4db3aecdbee24cf7e14cb Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Fri, 18 Nov 2022 14:55:34 +0100
Subject: [PATCH 016/153] E2E: Fix flakiness for dashboard-search spec (#58950)

---
 e2e/dashboards-suite/dashboard-search.spec.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/e2e/dashboards-suite/dashboard-search.spec.ts b/e2e/dashboards-suite/dashboard-search.spec.ts
index 2ec8b6327f5..f2ec3136c6e 100644
--- a/e2e/dashboards-suite/dashboard-search.spec.ts
+++ b/e2e/dashboards-suite/dashboard-search.spec.ts
@@ -21,8 +21,5 @@ e2e.scenario({
 
     e2e.components.Search.folderContent('General').should('be.visible');
     e2e.components.Search.dashboardItem('E2E Test - Import Dashboard').should('be.visible');
-
-    // verify the imported dashboard is the only dashboard present in the folder
-    e2e().get('[data-testid^="data-testid Dashboard search item "]').should('have.length', 1);
   },
 });

From 0bf3c98eec4acb65464c04a00346bb89f293700d Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Fri, 18 Nov 2022 16:15:04 +0200
Subject: [PATCH 017/153] CI: Add environment variables for edition to all
 pipelines (#58964)

Add environment variables to pipelines
---
 .drone.yml                                    | 60 ++++++++++++++++++-
 scripts/drone/events/release.star             | 11 ++--
 scripts/drone/pipelines/build.star            |  3 +-
 scripts/drone/pipelines/docs.star             |  3 +-
 .../drone/pipelines/integration_tests.star    |  3 +-
 scripts/drone/pipelines/lint_backend.star     |  3 +-
 scripts/drone/pipelines/lint_frontend.star    |  3 +-
 scripts/drone/pipelines/publish_images.star   |  6 +-
 scripts/drone/pipelines/shellcheck.star       |  3 +-
 scripts/drone/pipelines/test_frontend.star    |  2 +-
 .../drone/pipelines/trigger_downstream.star   |  3 +-
 scripts/drone/pipelines/verify_drone.star     |  3 +-
 scripts/drone/pipelines/windows.star          |  3 +-
 13 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4b48aa009e0..6f120401d38 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,6 +2,8 @@
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -56,6 +58,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -117,6 +121,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -253,6 +259,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -313,6 +321,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -627,6 +637,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -760,6 +772,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -830,6 +844,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -873,6 +889,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -944,6 +962,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -1002,6 +1022,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -1128,6 +1150,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -1188,6 +1212,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -1600,6 +1626,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -1731,6 +1759,8 @@ depends_on:
 - main-test-backend
 - main-build-e2e-publish
 - main-integration-tests
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -1828,6 +1858,8 @@ clone:
 depends_on:
 - main-build-e2e-publish
 - main-integration-tests
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -2210,6 +2242,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -2879,6 +2913,8 @@ volumes:
 clone:
   disable: true
 depends_on: []
+environment:
+  EDITION: enterprise
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3324,6 +3360,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3412,6 +3450,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: enterprise
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3483,6 +3523,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: enterprise
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3554,6 +3596,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: all
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3596,6 +3640,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: all
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3638,6 +3684,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: all
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3699,6 +3747,8 @@ depends_on:
 - publish-artifacts-public
 - publish-docker-oss-public
 - publish-docker-enterprise-public
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3794,6 +3844,8 @@ depends_on:
 - publish-artifacts-public
 - publish-docker-oss-public
 - publish-docker-enterprise-public
+environment:
+  EDITION: enterprise
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -3886,6 +3938,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: all
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -4204,6 +4258,8 @@ volumes:
 clone:
   retries: 3
 depends_on: []
+environment:
+  EDITION: oss
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -4851,6 +4907,8 @@ volumes:
 clone:
   disable: true
 depends_on: []
+environment:
+  EDITION: enterprise
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -5512,6 +5570,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: bdde811590573d22162d8305ced15080e8b20f2180b7491891c461427810a4b3
+hmac: 49c89d01105450cc0ae03afc0dc5aec89d61a758cb1e3a4da9fec1434a49da5c
 
 ...
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index 1339bfcba81..ce5442e555c 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -376,7 +376,7 @@ def publish_artifacts_pipelines(mode):
     ]
 
     return [pipeline(
-        name='publish-artifacts-{}'.format(mode), trigger=trigger, steps=steps, edition="all"
+        name='publish-artifacts-{}'.format(mode), trigger=trigger, steps=steps, edition="all", environment = {'EDITION': 'all'}
     )]
 
 def publish_packages_pipeline():
@@ -406,9 +406,9 @@ def publish_packages_pipeline():
     ]
 
     return [pipeline(
-        name='publish-packages-oss', trigger=trigger, steps=oss_steps, edition="all", depends_on=deps
+        name='publish-packages-oss', trigger=trigger, steps=oss_steps, edition="all", depends_on=deps, environment = {'EDITION': 'oss'},
     ), pipeline(
-        name='publish-packages-enterprise', trigger=trigger, steps=enterprise_steps, edition="all", depends_on=deps
+        name='publish-packages-enterprise', trigger=trigger, steps=enterprise_steps, edition="all", depends_on=deps, environment = {'EDITION': 'enterprise'}
     )]
 
 def publish_npm_pipelines(mode):
@@ -424,7 +424,7 @@ def publish_npm_pipelines(mode):
     ]
 
     return [pipeline(
-        name='publish-npm-packages-{}'.format(mode), trigger=trigger, steps = steps, edition="all"
+        name='publish-npm-packages-{}'.format(mode), trigger=trigger, steps = steps, edition="all", environment = {'EDITION': 'all'},
     )]
 
 def artifacts_page_pipeline():
@@ -432,7 +432,8 @@ def artifacts_page_pipeline():
         'event': ['promote'],
         'target': 'security',
     }
-    return [pipeline(name='publish-artifacts-page', trigger=trigger, steps = [download_grabpl_step(), artifacts_page_step()], edition="all")]
+    return [pipeline(name='publish-artifacts-page', trigger=trigger, steps = [download_grabpl_step(), artifacts_page_step()], edition="all", environment = {'EDITION': 'all'}
+    )]
 
 def release_pipelines(ver_mode='release', trigger=None):
     # 'enterprise' edition services contain both OSS and enterprise services
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index 081c2a0e0d0..a09122ae65b 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -45,6 +45,7 @@ load(
 )
 
 def build_e2e(trigger, ver_mode, edition):
+    environment = {'EDITION': edition}
     variants = ['linux-amd64', 'linux-amd64-musl', 'darwin-amd64', 'windows-amd64',]
     init_steps = [
         identify_runner_step(),
@@ -106,5 +107,5 @@ def build_e2e(trigger, ver_mode, edition):
         publish_suffix = '-publish'
 
     return pipeline(
-        name='{}-build-e2e{}'.format(ver_mode, publish_suffix), edition="oss", trigger=trigger, services=[], steps=init_steps + build_steps,
+        name='{}-build-e2e{}'.format(ver_mode, publish_suffix), edition="oss", trigger=trigger, services=[], steps=init_steps + build_steps, environment=environment,
     )
diff --git a/scripts/drone/pipelines/docs.star b/scripts/drone/pipelines/docs.star
index eefecd599e7..32f9eb97826 100644
--- a/scripts/drone/pipelines/docs.star
+++ b/scripts/drone/pipelines/docs.star
@@ -32,6 +32,7 @@ docs_paths = {
 }
 
 def docs_pipelines(edition, ver_mode, trigger):
+    environment = {'EDITION': edition}
     steps = [
         download_grabpl_step(),
         identify_runner_step(),
@@ -42,7 +43,7 @@ def docs_pipelines(edition, ver_mode, trigger):
     ]
 
     return pipeline(
-        name='{}-docs'.format(ver_mode), edition=edition, trigger=trigger, services=[], steps=steps,
+        name='{}-docs'.format(ver_mode), edition=edition, trigger=trigger, services=[], steps=steps, environment=environment,
     )
 
 def lint_docs():
diff --git a/scripts/drone/pipelines/integration_tests.star b/scripts/drone/pipelines/integration_tests.star
index 9d064e77ffc..6994d00a2f0 100644
--- a/scripts/drone/pipelines/integration_tests.star
+++ b/scripts/drone/pipelines/integration_tests.star
@@ -23,6 +23,7 @@ load(
 )
 
 def integration_tests(trigger, ver_mode, edition):
+    environment = {'EDITION': edition}
     services = integration_test_services(edition)
     volumes = integration_test_services_volumes()
     init_steps = [
@@ -40,5 +41,5 @@ def integration_tests(trigger, ver_mode, edition):
 
     return pipeline(
         name='{}-integration-tests'.format(ver_mode), edition="oss", trigger=trigger, services=services, steps=init_steps + test_steps,
-        volumes=volumes
+        environment=environment, volumes=volumes
     )
diff --git a/scripts/drone/pipelines/lint_backend.star b/scripts/drone/pipelines/lint_backend.star
index f127f655db4..08112f28868 100644
--- a/scripts/drone/pipelines/lint_backend.star
+++ b/scripts/drone/pipelines/lint_backend.star
@@ -13,6 +13,7 @@ load(
 )
 
 def lint_backend_pipeline(trigger, ver_mode):
+    environment = {'EDITION': 'oss'}
     wire_step = wire_install_step()
     wire_step.update({ 'depends_on': [] })
     init_steps = [
@@ -27,5 +28,5 @@ def lint_backend_pipeline(trigger, ver_mode):
         test_steps.extend([lint_drone_step()])
 
     return pipeline(
-        name='{}-lint-backend'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps,
+        name='{}-lint-backend'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment,
     )
diff --git a/scripts/drone/pipelines/lint_frontend.star b/scripts/drone/pipelines/lint_frontend.star
index f40621c1d9a..bb99a9e0d21 100644
--- a/scripts/drone/pipelines/lint_frontend.star
+++ b/scripts/drone/pipelines/lint_frontend.star
@@ -11,6 +11,7 @@ load(
 )
 
 def lint_frontend_pipeline(trigger, ver_mode):
+    environment = {'EDITION': 'oss'}
     yarn_step = yarn_install_step()
     yarn_step.update({ 'depends_on': [] })
     init_steps = [
@@ -21,5 +22,5 @@ def lint_frontend_pipeline(trigger, ver_mode):
         lint_frontend_step(),
     ]
     return pipeline(
-        name='{}-lint-frontend'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps,
+        name='{}-lint-frontend'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment,
     )
diff --git a/scripts/drone/pipelines/publish_images.star b/scripts/drone/pipelines/publish_images.star
index 5365880d169..7e760ef8ff0 100644
--- a/scripts/drone/pipelines/publish_images.star
+++ b/scripts/drone/pipelines/publish_images.star
@@ -34,9 +34,9 @@ def publish_image_pipelines_public():
         'target': [mode],
     }
     return [pipeline(
-        name='publish-docker-oss-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='oss',  mode=mode, docker_repo='grafana/grafana'), edition=""
+        name='publish-docker-oss-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='oss',  mode=mode, docker_repo='grafana/grafana'), edition="", environment = {'EDITION': 'oss'}
     ), pipeline(
-        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana/grafana-enterprise'), edition=""
+        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana/grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
     ),]
 
 def publish_image_pipelines_security():
@@ -46,5 +46,5 @@ def publish_image_pipelines_security():
         'target': [mode],
     }
     return [pipeline(
-        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana/grafana-enterprise'), edition=""
+        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana/grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
     ),]
diff --git a/scripts/drone/pipelines/shellcheck.star b/scripts/drone/pipelines/shellcheck.star
index 808d7329ba9..95bf84ac732 100644
--- a/scripts/drone/pipelines/shellcheck.star
+++ b/scripts/drone/pipelines/shellcheck.star
@@ -38,11 +38,12 @@ def shellcheck_step():
     }
 
 def shellcheck_pipeline():
+    environment = {'EDITION': 'oss'}
     steps = [
         compile_build_cmd(),
         shellcheck_step(),
     ]
     return pipeline(
-            name='pr-shellcheck', edition="oss", trigger=trigger, services=[], steps=steps,
+            name='pr-shellcheck', edition="oss", trigger=trigger, services=[], steps=steps, environment=environment,
     )
 
diff --git a/scripts/drone/pipelines/test_frontend.star b/scripts/drone/pipelines/test_frontend.star
index 7490c66c2e2..6c72ccc8a00 100644
--- a/scripts/drone/pipelines/test_frontend.star
+++ b/scripts/drone/pipelines/test_frontend.star
@@ -32,5 +32,5 @@ def test_frontend(trigger, ver_mode, edition="oss"):
     if ver_mode in ("release-branch", "release"):
         pipeline_name = '{}-{}-test-frontend'.format(ver_mode, edition)
     return pipeline(
-        name=pipeline_name, edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps,
+        name=pipeline_name, edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment,
     )
diff --git a/scripts/drone/pipelines/trigger_downstream.star b/scripts/drone/pipelines/trigger_downstream.star
index 36ab3f1ff0d..c1bc672905e 100644
--- a/scripts/drone/pipelines/trigger_downstream.star
+++ b/scripts/drone/pipelines/trigger_downstream.star
@@ -21,8 +21,9 @@ trigger = {
 }
 
 def enterprise_downstream_pipeline(edition, ver_mode):
+    environment = {'EDITION': edition}
     steps = [enterprise_downstream_step(edition, ver_mode)]
     deps = ['main-build-e2e-publish', 'main-integration-tests']
     return pipeline(
-                name='main-trigger-downstream', edition=edition, trigger=trigger, services=[], steps=steps, depends_on=deps
+                name='main-trigger-downstream', edition=edition, trigger=trigger, services=[], steps=steps, depends_on=deps, environment=environment,
         )
diff --git a/scripts/drone/pipelines/verify_drone.star b/scripts/drone/pipelines/verify_drone.star
index e350c8e0a7e..6d55044d12c 100644
--- a/scripts/drone/pipelines/verify_drone.star
+++ b/scripts/drone/pipelines/verify_drone.star
@@ -12,6 +12,7 @@ load(
 )
 
 def verify_drone(trigger, ver_mode):
+    environment = {'EDITION': 'oss'}
     steps = [
         identify_runner_step(),
         download_grabpl_step(),
@@ -19,5 +20,5 @@ def verify_drone(trigger, ver_mode):
         lint_drone_step(),
     ]
     return pipeline(
-        name='{}-verify-drone'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=steps,
+        name='{}-verify-drone'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=steps, environment=environment,
     )
diff --git a/scripts/drone/pipelines/windows.star b/scripts/drone/pipelines/windows.star
index c0e0f61f7f6..357346e8829 100644
--- a/scripts/drone/pipelines/windows.star
+++ b/scripts/drone/pipelines/windows.star
@@ -13,6 +13,7 @@ load(
 load('scripts/drone/vault.star', 'from_secret', 'prerelease_bucket', 'github_token')
 
 def windows(trigger, edition, ver_mode):
+    environment = {'EDITION': edition}
     init_cmds = []
     sfx = ''
     if edition in ('enterprise', 'enterprise2'):
@@ -130,5 +131,5 @@ def windows(trigger, edition, ver_mode):
     return pipeline(
         name='main-windows', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']),
         steps=[identify_runner_step('windows')] + steps,
-        depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests'], platform='windows',
+        depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests'], platform='windows', environment=environment,
     )

From 5226a61f679cbbccdd1bb2a4c4c7f351dab4ec82 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 18 Nov 2022 14:17:59 +0000
Subject: [PATCH 018/153] Navigation: Stop clearing search state when opening a
 result in a new tab (#58880)

search: only clear search state if not opening in a new tab
---
 public/app/features/search/state/SearchStateManager.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index e03a4f00fbf..5a218372349 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -220,10 +220,11 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   /**
    * When item is selected clear some filters and report interaction
    */
-  onSearchItemClicked = () => {
-    // Clear some filters
-    this.setState({ tag: [], starred: false, sort: null, query: '', folderUid: undefined });
-    this.onCloseSearch();
+  onSearchItemClicked = (e: React.MouseEvent<HTMLElement>) => {
+    // Clear some filters only if we're not opening a search item in a new tab
+    if (!e.altKey && !e.ctrlKey && !e.metaKey) {
+      this.setState({ tag: [], starred: false, sort: null, query: '', folderUid: undefined });
+    }
 
     reportSearchResultInteraction(this.state.eventTrackingNamespace, {
       layout: this.state.layout,

From 8c72d19bccf3bbc6724baccd6724b9d497a31ae2 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Fri, 18 Nov 2022 09:24:12 -0500
Subject: [PATCH 019/153] Alerting: Refactor MS teams, Pushover and Webhook
 notifiers to use encoding/json to parse settings (#56834)

* update teams
* update sensugo
* update pushover
* update webhook to use json.Number
---
 .../ngalert/notifier/channels/pushover.go     | 135 +++++++++++-------
 .../notifier/channels/pushover_test.go        |  47 +++++-
 .../ngalert/notifier/channels/sensugo.go      | 130 ++++++++---------
 .../ngalert/notifier/channels/sensugo_test.go |  12 +-
 .../ngalert/notifier/channels/teams.go        |  97 ++++++-------
 .../ngalert/notifier/channels/teams_test.go   |  11 +-
 .../ngalert/notifier/channels/webhook.go      | 102 ++++++-------
 7 files changed, 312 insertions(+), 222 deletions(-)

diff --git a/pkg/services/ngalert/notifier/channels/pushover.go b/pkg/services/ngalert/notifier/channels/pushover.go
index 0df40f44a7f..b795f7c6d18 100644
--- a/pkg/services/ngalert/notifier/channels/pushover.go
+++ b/pkg/services/ngalert/notifier/channels/pushover.go
@@ -3,6 +3,7 @@ package channels
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -42,10 +43,10 @@ type PushoverNotifier struct {
 type pushoverSettings struct {
 	userKey          string
 	apiToken         string
-	alertingPriority int
-	okPriority       int
-	retry            int
-	expire           int
+	alertingPriority int64
+	okPriority       int64
+	retry            int64
+	expire           int64
 	device           string
 	alertingSound    string
 	okSound          string
@@ -54,40 +55,91 @@ type pushoverSettings struct {
 	message          string
 }
 
+func buildPushoverSettings(fc FactoryConfig) (pushoverSettings, error) {
+	settings := pushoverSettings{}
+	rawSettings := struct {
+		UserKey          string      `json:"userKey,omitempty" yaml:"userKey,omitempty"`
+		APIToken         string      `json:"apiToken,omitempty" yaml:"apiToken,omitempty"`
+		AlertingPriority json.Number `json:"priority,omitempty" yaml:"priority,omitempty"`
+		OKPriority       json.Number `json:"okPriority,omitempty" yaml:"okPriority,omitempty"`
+		Retry            json.Number `json:"retry,omitempty" yaml:"retry,omitempty"`
+		Expire           json.Number `json:"expire,omitempty" yaml:"expire,omitempty"`
+		Device           string      `json:"device,omitempty" yaml:"device,omitempty"`
+		AlertingSound    string      `json:"sound,omitempty" yaml:"sound,omitempty"`
+		OKSound          string      `json:"okSound,omitempty" yaml:"okSound,omitempty"`
+		Upload           *bool       `json:"uploadImage,omitempty" yaml:"uploadImage,omitempty"`
+		Title            string      `json:"title,omitempty" yaml:"title,omitempty"`
+		Message          string      `json:"message,omitempty" yaml:"message,omitempty"`
+	}{}
+
+	err := fc.Config.unmarshalSettings(&rawSettings)
+	if err != nil {
+		return settings, fmt.Errorf("failed to unmarshal settings: %w", err)
+	}
+
+	settings.userKey = fc.DecryptFunc(context.Background(), fc.Config.SecureSettings, "userKey", rawSettings.UserKey)
+	if settings.userKey == "" {
+		return settings, errors.New("user key not found")
+	}
+	settings.apiToken = fc.DecryptFunc(context.Background(), fc.Config.SecureSettings, "apiToken", rawSettings.APIToken)
+	if settings.apiToken == "" {
+		return settings, errors.New("API token not found")
+	}
+	if rawSettings.AlertingPriority != "" {
+		settings.alertingPriority, err = rawSettings.AlertingPriority.Int64()
+		if err != nil {
+			return settings, fmt.Errorf("failed to convert alerting priority to integer: %w", err)
+		}
+	}
+
+	if rawSettings.OKPriority != "" {
+		settings.okPriority, err = rawSettings.OKPriority.Int64()
+		if err != nil {
+			return settings, fmt.Errorf("failed to convert OK priority to integer: %w", err)
+		}
+	}
+
+	settings.retry, _ = rawSettings.Retry.Int64()
+	settings.expire, _ = rawSettings.Expire.Int64()
+
+	settings.device = rawSettings.Device
+	settings.alertingSound = rawSettings.AlertingSound
+	settings.okSound = rawSettings.OKSound
+
+	if rawSettings.Upload == nil || *rawSettings.Upload {
+		settings.upload = true
+	}
+
+	settings.message = rawSettings.Message
+	if settings.message == "" {
+		settings.message = DefaultMessageEmbed
+	}
+
+	settings.title = rawSettings.Title
+	if settings.title == "" {
+		settings.title = DefaultMessageTitleEmbed
+	}
+
+	return settings, nil
+}
+
 func PushoverFactory(fc FactoryConfig) (NotificationChannel, error) {
-	pn, err := newPushoverNotifier(fc)
+	notifier, err := NewPushoverNotifier(fc)
 	if err != nil {
 		return nil, receiverInitError{
 			Reason: err.Error(),
 			Cfg:    *fc.Config,
 		}
 	}
-	return pn, nil
+	return notifier, nil
 }
 
-// newPushoverNotifier is the constructor for the Pushover notifier
-func newPushoverNotifier(fc FactoryConfig) (*PushoverNotifier, error) {
-	decryptFunc := fc.DecryptFunc
-	userKey := decryptFunc(context.Background(), fc.Config.SecureSettings, "userKey", fc.Config.Settings.Get("userKey").MustString())
-	if userKey == "" {
-		return nil, errors.New("user key not found")
-	}
-	apiToken := decryptFunc(context.Background(), fc.Config.SecureSettings, "apiToken", fc.Config.Settings.Get("apiToken").MustString())
-	if apiToken == "" {
-		return nil, errors.New("API token not found")
-	}
-
-	alertingPriority, err := strconv.Atoi(fc.Config.Settings.Get("priority").MustString("0")) // default Normal
+// NewSlackNotifier is the constructor for the Slack notifier
+func NewPushoverNotifier(fc FactoryConfig) (*PushoverNotifier, error) {
+	settings, err := buildPushoverSettings(fc)
 	if err != nil {
-		return nil, fmt.Errorf("failed to convert alerting priority to integer: %w", err)
+		return nil, err
 	}
-	okPriority, err := strconv.Atoi(fc.Config.Settings.Get("okPriority").MustString("0")) // default Normal
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert OK priority to integer: %w", err)
-	}
-	retry, _ := strconv.Atoi(fc.Config.Settings.Get("retry").MustString())
-	expire, _ := strconv.Atoi(fc.Config.Settings.Get("expire").MustString())
-
 	return &PushoverNotifier{
 		Base: NewBase(&models.AlertNotification{
 			Uid:                   fc.Config.UID,
@@ -97,24 +149,11 @@ func newPushoverNotifier(fc FactoryConfig) (*PushoverNotifier, error) {
 			Settings:              fc.Config.Settings,
 			SecureSettings:        fc.Config.SecureSettings,
 		}),
-		tmpl:   fc.Template,
-		log:    log.New("alerting.notifier.pushover"),
-		images: fc.ImageStore,
-		ns:     fc.NotificationService,
-		settings: pushoverSettings{
-			userKey:          userKey,
-			apiToken:         apiToken,
-			alertingPriority: alertingPriority,
-			okPriority:       okPriority,
-			retry:            retry,
-			expire:           expire,
-			device:           fc.Config.Settings.Get("device").MustString(),
-			alertingSound:    fc.Config.Settings.Get("sound").MustString(),
-			okSound:          fc.Config.Settings.Get("okSound").MustString(),
-			upload:           fc.Config.Settings.Get("uploadImage").MustBool(true),
-			title:            fc.Config.Settings.Get("title").MustString(DefaultMessageTitleEmbed),
-			message:          fc.Config.Settings.Get("message").MustString(DefaultMessageEmbed),
-		},
+		tmpl:     fc.Template,
+		log:      log.New("alerting.notifier.pushover"),
+		images:   fc.ImageStore,
+		ns:       fc.NotificationService,
+		settings: settings,
 	}, nil
 }
 
@@ -172,16 +211,16 @@ func (pn *PushoverNotifier) genPushoverBody(ctx context.Context, as ...*types.Al
 	if status == model.AlertResolved {
 		priority = pn.settings.okPriority
 	}
-	if err := w.WriteField("priority", strconv.Itoa(priority)); err != nil {
+	if err := w.WriteField("priority", strconv.FormatInt(priority, 10)); err != nil {
 		return nil, b, fmt.Errorf("failed to write the priority: %w", err)
 	}
 
 	if priority == 2 {
-		if err := w.WriteField("retry", strconv.Itoa(pn.settings.retry)); err != nil {
+		if err := w.WriteField("retry", strconv.FormatInt(pn.settings.retry, 10)); err != nil {
 			return nil, b, fmt.Errorf("failed to write retry: %w", err)
 		}
 
-		if err := w.WriteField("expire", strconv.Itoa(pn.settings.expire)); err != nil {
+		if err := w.WriteField("expire", strconv.FormatInt(pn.settings.expire, 10)); err != nil {
 			return nil, b, fmt.Errorf("failed to write expire: %w", err)
 		}
 	}
diff --git a/pkg/services/ngalert/notifier/channels/pushover_test.go b/pkg/services/ngalert/notifier/channels/pushover_test.go
index f9c0daa9e9e..d4a80092ae2 100644
--- a/pkg/services/ngalert/notifier/channels/pushover_test.go
+++ b/pkg/services/ngalert/notifier/channels/pushover_test.go
@@ -140,6 +140,50 @@ func TestPushoverNotifier(t *testing.T) {
 			},
 			expMsgError: nil,
 		},
+		{
+			name: "Integer fields as integers",
+			settings: `{
+					"userKey": "<userKey>",
+					"apiToken": "<apiToken>",
+					"device": "device",
+					"priority": 2,
+					"okpriority": 0,
+					"retry": 30,
+					"expire": 86400,
+					"sound": "echo",
+					"oksound": "magic",
+					"message": "{{ len .Alerts.Firing }} alerts are firing, {{ len .Alerts.Resolved }} are resolved"
+				}`,
+			alerts: []*types.Alert{
+				{
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1", "lbl1": "val1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
+					},
+				}, {
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
+					},
+				},
+			},
+			expMsg: map[string]string{
+				"user":       "<userKey>",
+				"token":      "<apiToken>",
+				"priority":   "2",
+				"sound":      "echo",
+				"title":      "[FIRING:2]  ",
+				"url":        "http://localhost/alerting/list",
+				"url_title":  "Show alert rule",
+				"message":    "2 alerts are firing, 0 are resolved",
+				"attachment": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\b\x04\x00\x00\x00\xb5\x1c\f\x02\x00\x00\x00\vIDATx\xdacd`\x00\x00\x00\x06\x00\x020\x81\xd0/\x00\x00\x00\x00IEND\xaeB`\x82",
+				"html":       "1",
+				"retry":      "30",
+				"expire":     "86400",
+				"device":     "device",
+			},
+			expMsgError: nil,
+		},
 		{
 			name: "Missing user key",
 			settings: `{
@@ -186,7 +230,8 @@ func TestPushoverNotifier(t *testing.T) {
 				DecryptFunc:         decryptFn,
 				Template:            tmpl,
 			}
-			pn, err := newPushoverNotifier(fc)
+
+			pn, err := NewPushoverNotifier(fc)
 			if c.expInitError != "" {
 				require.Error(t, err)
 				require.Equal(t, c.expInitError, err.Error())
diff --git a/pkg/services/ngalert/notifier/channels/sensugo.go b/pkg/services/ngalert/notifier/channels/sensugo.go
index 66de07cf0a4..ead78de5a36 100644
--- a/pkg/services/ngalert/notifier/channels/sensugo.go
+++ b/pkg/services/ngalert/notifier/channels/sensugo.go
@@ -19,86 +19,74 @@ import (
 
 type SensuGoNotifier struct {
 	*Base
-	log    log.Logger
-	images ImageStore
-	ns     notifications.WebhookSender
-	tmpl   *template.Template
-
-	URL       string
-	Entity    string
-	Check     string
-	Namespace string
-	Handler   string
-	APIKey    string
-	Message   string
+	log      log.Logger
+	images   ImageStore
+	ns       notifications.WebhookSender
+	tmpl     *template.Template
+	settings sensuGoSettings
 }
 
-type SensuGoConfig struct {
-	*NotificationChannelConfig
-	URL       string
-	Entity    string
-	Check     string
-	Namespace string
-	Handler   string
-	APIKey    string
-	Message   string
+type sensuGoSettings struct {
+	URL       string `json:"url,omitempty" yaml:"url,omitempty"`
+	Entity    string `json:"entity,omitempty" yaml:"entity,omitempty"`
+	Check     string `json:"check,omitempty" yaml:"check,omitempty"`
+	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	Handler   string `json:"handler,omitempty" yaml:"handler,omitempty"`
+	APIKey    string `json:"apikey,omitempty" yaml:"apikey,omitempty"`
+	Message   string `json:"message,omitempty" yaml:"message,omitempty"`
+}
+
+func buildSensuGoConfig(fc FactoryConfig) (sensuGoSettings, error) {
+	settings := sensuGoSettings{}
+	err := fc.Config.unmarshalSettings(&settings)
+	if err != nil {
+		return settings, fmt.Errorf("failed to unmarshal settings: %w", err)
+	}
+	if settings.URL == "" {
+		return settings, errors.New("could not find URL property in settings")
+	}
+	settings.APIKey = fc.DecryptFunc(context.Background(), fc.Config.SecureSettings, "apikey", settings.APIKey)
+	if settings.APIKey == "" {
+		return settings, errors.New("could not find the API key property in settings")
+	}
+	if settings.Message == "" {
+		settings.Message = DefaultMessageEmbed
+	}
+	return settings, nil
 }
 
 func SensuGoFactory(fc FactoryConfig) (NotificationChannel, error) {
-	cfg, err := NewSensuGoConfig(fc.Config, fc.DecryptFunc)
+	notifier, err := NewSensuGoNotifier(fc)
 	if err != nil {
 		return nil, receiverInitError{
 			Reason: err.Error(),
 			Cfg:    *fc.Config,
 		}
 	}
-	return NewSensuGoNotifier(cfg, fc.ImageStore, fc.NotificationService, fc.Template), nil
-}
-
-func NewSensuGoConfig(config *NotificationChannelConfig, decryptFunc GetDecryptedValueFn) (*SensuGoConfig, error) {
-	url := config.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, errors.New("could not find URL property in settings")
-	}
-	apikey := decryptFunc(context.Background(), config.SecureSettings, "apikey", config.Settings.Get("apikey").MustString())
-	if apikey == "" {
-		return nil, errors.New("could not find the API key property in settings")
-	}
-	return &SensuGoConfig{
-		NotificationChannelConfig: config,
-		URL:                       url,
-		Entity:                    config.Settings.Get("entity").MustString(),
-		Check:                     config.Settings.Get("check").MustString(),
-		Namespace:                 config.Settings.Get("namespace").MustString(),
-		Handler:                   config.Settings.Get("handler").MustString(),
-		APIKey:                    apikey,
-		Message:                   config.Settings.Get("message").MustString(DefaultMessageEmbed),
-	}, nil
+	return notifier, nil
 }
 
 // NewSensuGoNotifier is the constructor for the SensuGo notifier
-func NewSensuGoNotifier(config *SensuGoConfig, images ImageStore, ns notifications.WebhookSender, t *template.Template) *SensuGoNotifier {
+func NewSensuGoNotifier(fc FactoryConfig) (*SensuGoNotifier, error) {
+	settings, err := buildSensuGoConfig(fc)
+	if err != nil {
+		return nil, err
+	}
 	return &SensuGoNotifier{
 		Base: NewBase(&models.AlertNotification{
-			Uid:                   config.UID,
-			Name:                  config.Name,
-			Type:                  config.Type,
-			DisableResolveMessage: config.DisableResolveMessage,
-			Settings:              config.Settings,
-			SecureSettings:        config.SecureSettings,
+			Uid:                   fc.Config.UID,
+			Name:                  fc.Config.Name,
+			Type:                  fc.Config.Type,
+			DisableResolveMessage: fc.Config.DisableResolveMessage,
+			Settings:              fc.Config.Settings,
+			SecureSettings:        fc.Config.SecureSettings,
 		}),
-		URL:       config.URL,
-		Entity:    config.Entity,
-		Check:     config.Check,
-		Namespace: config.Namespace,
-		Handler:   config.Handler,
-		APIKey:    config.APIKey,
-		Message:   config.Message,
-		log:       log.New("alerting.notifier.sensugo"),
-		images:    images,
-		ns:        ns,
-		tmpl:      t,
-	}
+		log:      log.New("alerting.notifier.sensugo"),
+		images:   fc.ImageStore,
+		ns:       fc.NotificationService,
+		tmpl:     fc.Template,
+		settings: settings,
+	}, nil
 }
 
 // Notify sends an alert notification to Sensu Go
@@ -110,12 +98,12 @@ func (sn *SensuGoNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 
 	// Sensu Go alerts require an entity and a check. We set it to the user-specified
 	// value (optional), else we fallback and use the grafana rule anme  and ruleID.
-	entity := tmpl(sn.Entity)
+	entity := tmpl(sn.settings.Entity)
 	if entity == "" {
 		entity = "default"
 	}
 
-	check := tmpl(sn.Check)
+	check := tmpl(sn.settings.Check)
 	if check == "" {
 		check = "default"
 	}
@@ -127,14 +115,14 @@ func (sn *SensuGoNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 		status = 2
 	}
 
-	namespace := tmpl(sn.Namespace)
+	namespace := tmpl(sn.settings.Namespace)
 	if namespace == "" {
 		namespace = "default"
 	}
 
 	var handlers []string
-	if sn.Handler != "" {
-		handlers = []string{tmpl(sn.Handler)}
+	if sn.settings.Handler != "" {
+		handlers = []string{tmpl(sn.settings.Handler)}
 	}
 
 	labels := make(map[string]string)
@@ -166,7 +154,7 @@ func (sn *SensuGoNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 				"name":   check,
 				"labels": labels,
 			},
-			"output":   tmpl(sn.Message),
+			"output":   tmpl(sn.settings.Message),
 			"issued":   timeNow().Unix(),
 			"interval": 86400,
 			"status":   status,
@@ -185,12 +173,12 @@ func (sn *SensuGoNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 	}
 
 	cmd := &models.SendWebhookSync{
-		Url:        fmt.Sprintf("%s/api/core/v2/namespaces/%s/events", strings.TrimSuffix(sn.URL, "/"), namespace),
+		Url:        fmt.Sprintf("%s/api/core/v2/namespaces/%s/events", strings.TrimSuffix(sn.settings.URL, "/"), namespace),
 		Body:       string(body),
 		HttpMethod: "POST",
 		HttpHeader: map[string]string{
 			"Content-Type":  "application/json",
-			"Authorization": fmt.Sprintf("Key %s", sn.APIKey),
+			"Authorization": fmt.Sprintf("Key %s", sn.settings.APIKey),
 		},
 	}
 	if err := sn.ns.SendWebhookSync(ctx, cmd); err != nil {
diff --git a/pkg/services/ngalert/notifier/channels/sensugo_test.go b/pkg/services/ngalert/notifier/channels/sensugo_test.go
index ea0a8a9a863..74bbdf0c5fa 100644
--- a/pkg/services/ngalert/notifier/channels/sensugo_test.go
+++ b/pkg/services/ngalert/notifier/channels/sensugo_test.go
@@ -151,7 +151,16 @@ func TestSensuGoNotifier(t *testing.T) {
 			webhookSender := mockNotificationService()
 			secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 			decryptFn := secretsService.GetDecryptedValue
-			cfg, err := NewSensuGoConfig(m, decryptFn)
+
+			fc := FactoryConfig{
+				Config:              m,
+				ImageStore:          images,
+				NotificationService: webhookSender,
+				Template:            tmpl,
+				DecryptFunc:         decryptFn,
+			}
+
+			sn, err := NewSensuGoNotifier(fc)
 			if c.expInitError != "" {
 				require.Error(t, err)
 				require.Equal(t, c.expInitError, err.Error())
@@ -161,7 +170,6 @@ func TestSensuGoNotifier(t *testing.T) {
 
 			ctx := notify.WithGroupKey(context.Background(), "alertname")
 			ctx = notify.WithGroupLabels(ctx, model.LabelSet{"alertname": ""})
-			sn := NewSensuGoNotifier(cfg, images, webhookSender, tmpl)
 			ok, err := sn.Notify(ctx, c.alerts...)
 			if c.expMsgError != nil {
 				require.False(t, ok)
diff --git a/pkg/services/ngalert/notifier/channels/teams.go b/pkg/services/ngalert/notifier/channels/teams.go
index d924ca98f82..690b9f7919a 100644
--- a/pkg/services/ngalert/notifier/channels/teams.go
+++ b/pkg/services/ngalert/notifier/channels/teams.go
@@ -224,70 +224,71 @@ func (i AdaptiveCardOpenURLActionItem) MarshalJSON() ([]byte, error) {
 	})
 }
 
-type TeamsConfig struct {
-	*NotificationChannelConfig
-	URL          string
-	Message      string
-	Title        string
-	SectionTitle string
+type teamsSettings struct {
+	URL          string `json:"url,omitempty" yaml:"url,omitempty"`
+	Message      string `json:"message,omitempty" yaml:"message,omitempty"`
+	Title        string `json:"title,omitempty" yaml:"title,omitempty"`
+	SectionTitle string `json:"sectiontitle,omitempty" yaml:"sectiontitle,omitempty"`
 }
 
-func NewTeamsConfig(config *NotificationChannelConfig) (*TeamsConfig, error) {
-	URL := config.Settings.Get("url").MustString()
-	if URL == "" {
-		return nil, errors.New("could not find url property in settings")
+func buildTeamsSettings(fc FactoryConfig) (teamsSettings, error) {
+	settings := teamsSettings{}
+	err := fc.Config.unmarshalSettings(&settings)
+	if err != nil {
+		return settings, fmt.Errorf("failed to unmarshal settings: %w", err)
 	}
-	return &TeamsConfig{
-		NotificationChannelConfig: config,
-		URL:                       URL,
-		Message:                   config.Settings.Get("message").MustString(`{{ template "teams.default.message" .}}`),
-		Title:                     config.Settings.Get("title").MustString(DefaultMessageTitleEmbed),
-		SectionTitle:              config.Settings.Get("sectiontitle").MustString(""),
-	}, nil
+	if settings.URL == "" {
+		return settings, errors.New("could not find url property in settings")
+	}
+	if settings.Message == "" {
+		settings.Message = `{{ template "teams.default.message" .}}`
+	}
+	if settings.Title == "" {
+		settings.Title = DefaultMessageTitleEmbed
+	}
+	return settings, nil
 }
 
 type TeamsNotifier struct {
 	*Base
-	URL          string
-	Message      string
-	Title        string
-	SectionTitle string
-	tmpl         *template.Template
-	log          log.Logger
-	ns           notifications.WebhookSender
-	images       ImageStore
+	tmpl     *template.Template
+	log      log.Logger
+	ns       notifications.WebhookSender
+	images   ImageStore
+	settings teamsSettings
 }
 
 // NewTeamsNotifier is the constructor for Teams notifier.
-func NewTeamsNotifier(config *TeamsConfig, ns notifications.WebhookSender, images ImageStore, t *template.Template) *TeamsNotifier {
+func NewTeamsNotifier(fc FactoryConfig) (*TeamsNotifier, error) {
+	settings, err := buildTeamsSettings(fc)
+	if err != nil {
+		return nil, err
+	}
 	return &TeamsNotifier{
 		Base: NewBase(&models.AlertNotification{
-			Uid:                   config.UID,
-			Name:                  config.Name,
-			Type:                  config.Type,
-			DisableResolveMessage: config.DisableResolveMessage,
-			Settings:              config.Settings,
+			Uid:                   fc.Config.UID,
+			Name:                  fc.Config.Name,
+			Type:                  fc.Config.Type,
+			DisableResolveMessage: fc.Config.DisableResolveMessage,
+			Settings:              fc.Config.Settings,
 		}),
-		URL:          config.URL,
-		Message:      config.Message,
-		Title:        config.Title,
-		SectionTitle: config.SectionTitle,
-		log:          log.New("alerting.notifier.teams"),
-		ns:           ns,
-		images:       images,
-		tmpl:         t,
-	}
+		log:      log.New("alerting.notifier.teams"),
+		ns:       fc.NotificationService,
+		images:   fc.ImageStore,
+		tmpl:     fc.Template,
+		settings: settings,
+	}, nil
 }
 
 func TeamsFactory(fc FactoryConfig) (NotificationChannel, error) {
-	cfg, err := NewTeamsConfig(fc.Config)
+	notifier, err := NewTeamsNotifier(fc)
 	if err != nil {
 		return nil, receiverInitError{
 			Reason: err.Error(),
 			Cfg:    *fc.Config,
 		}
 	}
-	return NewTeamsNotifier(cfg, fc.NotificationService, fc.ImageStore, fc.Template), nil
+	return notifier, nil
 }
 
 func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
@@ -297,13 +298,13 @@ func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 	card := NewAdaptiveCard()
 	card.AppendItem(AdaptiveCardTextBlockItem{
 		Color:  getTeamsTextColor(types.Alerts(as...)),
-		Text:   tmpl(tn.Title),
+		Text:   tmpl(tn.settings.Title),
 		Size:   TextSizeLarge,
 		Weight: TextWeightBolder,
 		Wrap:   true,
 	})
 	card.AppendItem(AdaptiveCardTextBlockItem{
-		Text: tmpl(tn.Message),
+		Text: tmpl(tn.settings.Message),
 		Wrap: true,
 	})
 
@@ -335,7 +336,7 @@ func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 	})
 
 	msg := NewAdaptiveCardsMessage(card)
-	msg.Summary = tmpl(tn.Title)
+	msg.Summary = tmpl(tn.settings.Title)
 
 	// This check for tmplErr must happen before templating the URL
 	if tmplErr != nil {
@@ -343,10 +344,10 @@ func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 		tmplErr = nil
 	}
 
-	u := tmpl(tn.URL)
+	u := tmpl(tn.settings.URL)
 	if tmplErr != nil {
-		tn.log.Warn("failed to template Teams URL", "error", tmplErr.Error(), "fallback", tn.URL)
-		u = tn.URL
+		tn.log.Warn("failed to template Teams URL", "error", tmplErr.Error(), "fallback", tn.settings.URL)
+		u = tn.settings.URL
 	}
 
 	b, err := json.Marshal(msg)
diff --git a/pkg/services/ngalert/notifier/channels/teams_test.go b/pkg/services/ngalert/notifier/channels/teams_test.go
index 3d0c28a10a7..b704fbb70f3 100644
--- a/pkg/services/ngalert/notifier/channels/teams_test.go
+++ b/pkg/services/ngalert/notifier/channels/teams_test.go
@@ -289,7 +289,14 @@ func TestTeamsNotifier(t *testing.T) {
 			clientStub := newMockClient(c.response)
 			notifications.SetWebhookClient(clientStub)
 
-			cfg, err := NewTeamsConfig(m)
+			fc := FactoryConfig{
+				Config:              m,
+				ImageStore:          &UnavailableImageStore{},
+				NotificationService: webhookSender,
+				Template:            tmpl,
+			}
+
+			pn, err := NewTeamsNotifier(fc)
 			if c.expInitError != "" {
 				require.Error(t, err)
 				require.Equal(t, c.expInitError, err.Error())
@@ -299,7 +306,7 @@ func TestTeamsNotifier(t *testing.T) {
 
 			ctx := notify.WithGroupKey(context.Background(), "alertname")
 			ctx = notify.WithGroupLabels(ctx, model.LabelSet{"alertname": ""})
-			pn := NewTeamsNotifier(cfg, webhookSender, &UnavailableImageStore{}, tmpl)
+
 			ok, err := pn.Notify(ctx, c.alerts...)
 			if c.expMsgError != nil {
 				require.False(t, ok)
diff --git a/pkg/services/ngalert/notifier/channels/webhook.go b/pkg/services/ngalert/notifier/channels/webhook.go
index d5aaff281a1..e1e7cc0d0d4 100644
--- a/pkg/services/ngalert/notifier/channels/webhook.go
+++ b/pkg/services/ngalert/notifier/channels/webhook.go
@@ -23,55 +23,76 @@ import (
 // alert notifications as webhooks.
 type WebhookNotifier struct {
 	*Base
-	log       log.Logger
-	ns        notifications.WebhookSender
-	images    ImageStore
-	tmpl      *template.Template
-	orgID     int64
-	maxAlerts int
-	settings  webhookSettings
+	log      log.Logger
+	ns       notifications.WebhookSender
+	images   ImageStore
+	tmpl     *template.Template
+	orgID    int64
+	settings webhookSettings
 }
 
 type webhookSettings struct {
-	URL        string      `json:"url,omitempty" yaml:"url,omitempty"`
-	HTTPMethod string      `json:"httpMethod,omitempty" yaml:"httpMethod,omitempty"`
-	MaxAlerts  interface{} `json:"maxAlerts,omitempty" yaml:"maxAlerts,omitempty"`
-
+	URL        string
+	HTTPMethod string
+	MaxAlerts  int
 	// Authorization Header.
-	AuthorizationScheme      string `json:"authorization_scheme,omitempty" yaml:"authorization_scheme,omitempty"`
-	AuthorizationCredentials string `json:"authorization_credentials,omitempty" yaml:"authorization_credentials,omitempty"`
+	AuthorizationScheme      string
+	AuthorizationCredentials string
 	// HTTP Basic Authentication.
-	User     string `json:"username,omitempty" yaml:"username,omitempty"`
-	Password string `json:"password,omitempty" yaml:"password,omitempty"`
+	User     string
+	Password string
 
-	Title   string `json:"title,omitempty" yaml:"title,omitempty"`
-	Message string `json:"message,omitempty" yaml:"message,omitempty"`
+	Title   string
+	Message string
 }
 
 func buildWebhookSettings(factoryConfig FactoryConfig) (webhookSettings, error) {
 	settings := webhookSettings{}
-	err := factoryConfig.Config.unmarshalSettings(&settings)
+	rawSettings := struct {
+		URL                      string      `json:"url,omitempty" yaml:"url,omitempty"`
+		HTTPMethod               string      `json:"httpMethod,omitempty" yaml:"httpMethod,omitempty"`
+		MaxAlerts                json.Number `json:"maxAlerts,omitempty" yaml:"maxAlerts,omitempty"`
+		AuthorizationScheme      string      `json:"authorization_scheme,omitempty" yaml:"authorization_scheme,omitempty"`
+		AuthorizationCredentials string      `json:"authorization_credentials,omitempty" yaml:"authorization_credentials,omitempty"`
+		User                     string      `json:"username,omitempty" yaml:"username,omitempty"`
+		Password                 string      `json:"password,omitempty" yaml:"password,omitempty"`
+		Title                    string      `json:"title,omitempty" yaml:"title,omitempty"`
+		Message                  string      `json:"message,omitempty" yaml:"message,omitempty"`
+	}{}
+
+	err := factoryConfig.Config.unmarshalSettings(&rawSettings)
 	if err != nil {
 		return settings, fmt.Errorf("failed to unmarshal settings: %w", err)
 	}
-	if settings.URL == "" {
+	if rawSettings.URL == "" {
 		return settings, errors.New("required field 'url' is not specified")
 	}
-	if settings.HTTPMethod == "" {
-		settings.HTTPMethod = http.MethodPost
+	settings.URL = rawSettings.URL
+
+	if rawSettings.HTTPMethod == "" {
+		rawSettings.HTTPMethod = http.MethodPost
 	}
-	settings.User = factoryConfig.DecryptFunc(context.Background(), factoryConfig.Config.SecureSettings, "username", settings.User)
-	settings.Password = factoryConfig.DecryptFunc(context.Background(), factoryConfig.Config.SecureSettings, "password", settings.Password)
-	settings.AuthorizationCredentials = factoryConfig.DecryptFunc(context.Background(), factoryConfig.Config.SecureSettings, "authorization_scheme", settings.AuthorizationCredentials)
+	settings.HTTPMethod = rawSettings.HTTPMethod
+
+	if rawSettings.MaxAlerts != "" {
+		settings.MaxAlerts, _ = strconv.Atoi(rawSettings.MaxAlerts.String())
+	}
+
+	settings.User = factoryConfig.DecryptFunc(context.Background(), factoryConfig.Config.SecureSettings, "username", rawSettings.User)
+	settings.Password = factoryConfig.DecryptFunc(context.Background(), factoryConfig.Config.SecureSettings, "password", rawSettings.Password)
+	settings.AuthorizationCredentials = factoryConfig.DecryptFunc(context.Background(), factoryConfig.Config.SecureSettings, "authorization_scheme", rawSettings.AuthorizationCredentials)
+
 	if settings.AuthorizationCredentials != "" && settings.AuthorizationScheme == "" {
 		settings.AuthorizationScheme = "Bearer"
 	}
 	if settings.User != "" && settings.Password != "" && settings.AuthorizationScheme != "" && settings.AuthorizationCredentials != "" {
 		return settings, errors.New("both HTTP Basic Authentication and Authorization Header are set, only 1 is permitted")
 	}
+	settings.Title = rawSettings.Title
 	if settings.Title == "" {
 		settings.Title = DefaultMessageTitleEmbed
 	}
+	settings.Message = rawSettings.Message
 	if settings.Message == "" {
 		settings.Message = DefaultMessageEmbed
 	}
@@ -96,24 +117,6 @@ func buildWebhookNotifier(factoryConfig FactoryConfig) (*WebhookNotifier, error)
 	if err != nil {
 		return nil, err
 	}
-
-	logger := log.New("alerting.notifier.webhook")
-	maxAlerts := 0
-	if settings.MaxAlerts != nil {
-		switch value := settings.MaxAlerts.(type) {
-		case int:
-			maxAlerts = value
-		case string:
-			maxAlerts, err = strconv.Atoi(value)
-			if err != nil {
-				logger.Warn("failed to convert setting maxAlerts to integer. Using default", "error", err, "original", value)
-				maxAlerts = 0
-			}
-		default:
-			logger.Warn("unexpected type of setting maxAlerts. Expected integer. Using default", "type", fmt.Sprintf("%T", settings.MaxAlerts))
-		}
-	}
-
 	return &WebhookNotifier{
 		Base: NewBase(&models.AlertNotification{
 			Uid:                   factoryConfig.Config.UID,
@@ -122,13 +125,12 @@ func buildWebhookNotifier(factoryConfig FactoryConfig) (*WebhookNotifier, error)
 			DisableResolveMessage: factoryConfig.Config.DisableResolveMessage,
 			Settings:              factoryConfig.Config.Settings,
 		}),
-		orgID:     factoryConfig.Config.OrgID,
-		log:       logger,
-		ns:        factoryConfig.NotificationService,
-		images:    factoryConfig.ImageStore,
-		tmpl:      factoryConfig.Template,
-		maxAlerts: maxAlerts,
-		settings:  settings,
+		orgID:    factoryConfig.Config.OrgID,
+		log:      log.New("alerting.notifier.webhook"),
+		ns:       factoryConfig.NotificationService,
+		images:   factoryConfig.ImageStore,
+		tmpl:     factoryConfig.Template,
+		settings: settings,
 	}, nil
 }
 
@@ -153,7 +155,7 @@ func (wn *WebhookNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 		return false, err
 	}
 
-	as, numTruncated := truncateAlerts(wn.maxAlerts, as)
+	as, numTruncated := truncateAlerts(wn.settings.MaxAlerts, as)
 	var tmplErr error
 	tmpl, data := TmplText(ctx, wn.tmpl, as, wn.log, &tmplErr)
 

From 5978dc138ea1df9972b148cefd9866a5e7628528 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 18 Nov 2022 15:11:59 +0000
Subject: [PATCH 020/153] Nav: Split Admin into three sections for new IA
 (#58229)

* start to split admin into two sections

* most of new admin nav implemented

* landing pages

* hide admin for non-admins

* update admin redirects if not topnav

* clean up

* updated IA for admin (still WIP)

* move plugin pages into correct admin sections

* fix backend unit test

* move correlations into the correct section

* add translations for admin sections

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 pkg/services/navtree/models.go                | 113 +++++++++++++++---
 pkg/services/navtree/models_test.go           |   8 +-
 pkg/services/navtree/navtreeimpl/admin.go     |  10 +-
 pkg/services/navtree/navtreeimpl/applinks.go  |   1 +
 .../NavBar/navBarItem-translations.ts         |  14 ++-
 public/app/routes/routes.tsx                  |  21 +++-
 public/locales/de-DE/grafana.json             |  15 ++-
 public/locales/en-US/grafana.json             |  15 ++-
 public/locales/es-ES/grafana.json             |  15 ++-
 public/locales/fr-FR/grafana.json             |  15 ++-
 public/locales/pseudo-LOCALE/grafana.json     |  15 ++-
 public/locales/zh-Hans/grafana.json           |  15 ++-
 12 files changed, 213 insertions(+), 44 deletions(-)

diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 8f521be5a46..728dc6cda51 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -41,6 +41,9 @@ const (
 	NavIDDashboardsBrowse   = "dashboards/browse"
 	NavIDCfg                = "cfg" // NavIDCfg is the id for org configuration navigation node
 	NavIDAdmin              = "admin"
+	NavIDAdminGeneral       = "admin/general"
+	NavIDAdminPlugins       = "admin/plugins"
+	NavIDAdminAccess        = "admin/access"
 	NavIDAlertsAndIncidents = "alerts-and-incidents"
 	NavIDAlerting           = "alerting"
 	NavIDMonitoring         = "monitoring"
@@ -111,22 +114,7 @@ func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture(t
 	}
 
 	if topNavEnabled {
-		orgAdminNode := root.FindById(NavIDCfg)
-
-		if orgAdminNode != nil {
-			orgAdminNode.Url = "/admin"
-			orgAdminNode.Text = "Administration"
-		}
-
-		if serverAdminNode := root.FindById(NavIDAdmin); serverAdminNode != nil {
-			serverAdminNode.Url = "/admin/server"
-			serverAdminNode.SortWeight = 0
-
-			if orgAdminNode != nil {
-				orgAdminNode.Children = append(orgAdminNode.Children, serverAdminNode)
-				root.RemoveSection(serverAdminNode)
-			}
-		}
+		ApplyAdminIA(root)
 
 		// Move reports into dashboards
 		if reports := root.FindById(NavIDReporting); reports != nil {
@@ -181,6 +169,99 @@ func Sort(nodes []*NavLink) {
 	}
 }
 
+func ApplyAdminIA(root *NavTreeRoot) {
+	orgAdminNode := root.FindById(NavIDCfg)
+
+	if orgAdminNode != nil {
+		orgAdminNode.Url = "/admin"
+		orgAdminNode.Text = "Administration"
+
+		generalNodeLinks := []*NavLink{}
+		pluginsNodeLinks := []*NavLink{}
+		accessNodeLinks := []*NavLink{}
+
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading"))
+		if orgSettings := root.FindById("org-settings"); orgSettings != nil {
+			orgSettings.Text = "Default preferences"
+			generalNodeLinks = append(generalNodeLinks, orgSettings)
+		}
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("global-orgs"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("server-settings"))
+
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugins"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("datasources"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("correlations"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("recordedQueries")) // enterprise only
+
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("users"))
+		if globalUsers := root.FindById("global-users"); globalUsers != nil {
+			globalUsers.Text = "Users (All orgs)"
+			accessNodeLinks = append(accessNodeLinks, globalUsers)
+		}
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("plugin-page-grafana-auth-app")) // Cloud Access Policies
+
+		generalNode := &NavLink{
+			Text:     "General",
+			Id:       NavIDAdminGeneral,
+			Url:      "/admin/general",
+			Icon:     "shield",
+			Children: generalNodeLinks,
+		}
+
+		pluginsNode := &NavLink{
+			Text:     "Plugins and data",
+			Id:       NavIDAdminPlugins,
+			Url:      "/admin/plugins",
+			Icon:     "shield",
+			Children: pluginsNodeLinks,
+		}
+
+		accessNode := &NavLink{
+			Text:     "Users and access",
+			Id:       NavIDAdminAccess,
+			Url:      "/admin/access",
+			Icon:     "shield",
+			Children: accessNodeLinks,
+		}
+
+		adminNodeLinks := []*NavLink{}
+
+		if len(generalNode.Children) > 0 {
+			adminNodeLinks = append(adminNodeLinks, generalNode)
+		}
+
+		if len(pluginsNode.Children) > 0 {
+			adminNodeLinks = append(adminNodeLinks, pluginsNode)
+		}
+
+		if len(accessNode.Children) > 0 {
+			adminNodeLinks = append(adminNodeLinks, accessNode)
+		}
+
+		if len(adminNodeLinks) > 0 {
+			orgAdminNode.Children = adminNodeLinks
+		} else {
+			root.RemoveSection(orgAdminNode)
+		}
+	}
+
+	if serverAdminNode := root.FindById(NavIDAdmin); serverAdminNode != nil {
+		root.RemoveSection(serverAdminNode)
+	}
+}
+
+func AppendIfNotNil(children []*NavLink, newChild *NavLink) []*NavLink {
+	if newChild != nil {
+		return append(children, newChild)
+	}
+
+	return children
+}
+
 func FindById(nodes []*NavLink, id string) *NavLink {
 	for _, child := range nodes {
 		if child.Id == id {
diff --git a/pkg/services/navtree/models_test.go b/pkg/services/navtree/models_test.go
index 21cd52a8dce..66f8a01ab55 100644
--- a/pkg/services/navtree/models_test.go
+++ b/pkg/services/navtree/models_test.go
@@ -33,18 +33,20 @@ func TestNavTreeRoot(t *testing.T) {
 		require.Equal(t, 2, len(treeRoot.Children))
 	})
 
-	t.Run("Should move admin section into cfg and rename when topnav is enabled", func(t *testing.T) {
+	t.Run("Should create 3 new sections in the Admin node when topnav is enabled", func(t *testing.T) {
 		treeRoot := NavTreeRoot{
 			Children: []*NavLink{
 				{Id: NavIDCfg},
-				{Id: NavIDAdmin, Children: []*NavLink{{Id: "child"}}},
+				{Id: NavIDAdmin, Children: []*NavLink{{Id: "upgrading"}, {Id: "plugins"}, {Id: "teams"}}},
 			},
 		}
 
 		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture(true)
 
 		require.Equal(t, "Administration", treeRoot.Children[0].Text)
-		require.Equal(t, NavIDAdmin, treeRoot.Children[0].Children[0].Id)
+		require.Equal(t, NavIDAdminGeneral, treeRoot.Children[0].Children[0].Id)
+		require.Equal(t, NavIDAdminPlugins, treeRoot.Children[0].Children[1].Id)
+		require.Equal(t, NavIDAdminAccess, treeRoot.Children[0].Children[2].Id)
 	})
 
 	t.Run("Should move reports into Dashboards", func(t *testing.T) {
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index c024aeb7f97..7bf7a95ec46 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -166,16 +166,8 @@ func (s *ServiceImpl) getServerAdminNode(c *models.ReqContext) *navtree.NavLink
 		Children:   adminNavLinks,
 	}
 
-	if s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagTopnav) {
-		adminNode.SubTitle = "Manage server-wide settings and access to resources such as organizations, users, and licenses"
-	}
-
 	if len(adminNavLinks) > 0 {
-		if s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagTopnav) {
-			adminNode.Url = s.cfg.AppSubURL + "/admin/server"
-		} else {
-			adminNode.Url = adminNavLinks[0].Url
-		}
+		adminNode.Url = adminNavLinks[0].Url
 	}
 
 	return adminNode
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index e59a4d6bd09..189315b8e1f 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -262,6 +262,7 @@ func (s *ServiceImpl) readNavigationSettings() {
 		"grafana-incident-app":             {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incident"},
 		"grafana-ml-app":                   {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"},
 		"grafana-cloud-link-app":           {SectionID: navtree.NavIDCfg},
+		"grafana-auth-app":                 {SectionID: navtree.NavIDCfg},
 		"grafana-easystart-app":            {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightSavedItems + 1, Text: "Connections"},
 	}
 
diff --git a/public/app/core/components/NavBar/navBarItem-translations.ts b/public/app/core/components/NavBar/navBarItem-translations.ts
index db6a018ebb4..ea674073cf7 100644
--- a/public/app/core/components/NavBar/navBarItem-translations.ts
+++ b/public/app/core/components/NavBar/navBarItem-translations.ts
@@ -69,6 +69,12 @@ export function getNavTitle(navId: string | undefined) {
       return config.featureToggles.topnav
         ? t('nav.config.title', 'Administration')
         : t('nav.config.titleBeforeTopnav', 'Configuration');
+    case 'admin/general':
+      return t('nav.admin-general.title', 'General');
+    case 'admin/plugins':
+      return t('nav.admin-plugins.title', 'Plugins and data');
+    case 'admin/access':
+      return t('nav.admin-access.title', 'Users and access');
     case 'datasources':
       return t('nav.datasources.title', 'Data sources');
     case 'correlations':
@@ -80,7 +86,9 @@ export function getNavTitle(navId: string | undefined) {
     case 'plugins':
       return t('nav.plugins.title', 'Plugins');
     case 'org-settings':
-      return t('nav.org-settings.title', 'Preferences');
+      return config.featureToggles.topnav
+        ? t('nav.org-settings.title', 'Default preferences')
+        : t('nav.org-settings.titleBeforeTopnav', 'Preferences');
     case 'apikeys':
       return t('nav.api-keys.title', 'API keys');
     case 'serviceaccounts':
@@ -88,7 +96,9 @@ export function getNavTitle(navId: string | undefined) {
     case 'admin':
       return t('nav.admin.title', 'Server admin');
     case 'global-users':
-      return t('nav.global-users.title', 'Users');
+      return config.featureToggles.topnav
+        ? t('nav.global-users.title', 'Users (All orgs)')
+        : t('nav.global-users.titleBeforeTopnav', 'Users');
     case 'global-orgs':
       return t('nav.global-orgs.title', 'Organizations');
     case 'server-settings':
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 17b5d38a063..9fda8c87041 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -38,6 +38,18 @@ export function getAppRoutes(): RouteDescriptor[] {
           path: '/monitoring',
           component: () => <NavLandingPage navId="monitoring" />,
         },
+        {
+          path: '/admin/general',
+          component: () => <NavLandingPage navId="admin/general" />,
+        },
+        {
+          path: '/admin/plugins',
+          component: () => <NavLandingPage navId="admin/plugins" />,
+        },
+        {
+          path: '/admin/access',
+          component: () => <NavLandingPage navId="admin/access" />,
+        },
       ]
     : [];
 
@@ -294,9 +306,14 @@ export function getAppRoutes(): RouteDescriptor[] {
       component: () => (config.featureToggles.topnav ? <NavLandingPage navId="cfg" /> : <Redirect to="/admin/users" />),
     },
     {
-      path: '/admin/server',
+      path: '/admin/access',
       component: () =>
-        config.featureToggles.topnav ? <NavLandingPage navId="admin" /> : <Redirect to="/admin/users" />,
+        config.featureToggles.topnav ? <NavLandingPage navId="admin/access" /> : <Redirect to="/admin/users" />,
+    },
+    {
+      path: '/admin/config',
+      component: () =>
+        config.featureToggles.topnav ? <NavLandingPage navId="admin/config" /> : <Redirect to="/admin/org" />,
     },
     {
       path: '/admin/settings',
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 940eb77aa34..e3d9a9abaab 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -99,6 +99,15 @@
       "subtitle": "Serverweite Einstellungen und Zugriff auf Ressourcen wie Organisationen, Benutzer und Lizenzen verwalten",
       "title": "Server-Administrator"
     },
+    "admin-access": {
+      "title": ""
+    },
+    "admin-general": {
+      "title": ""
+    },
+    "admin-plugins": {
+      "title": ""
+    },
     "alerting": {
       "subtitle": "Informiere dich über Probleme in deinen Systemen kurz nach deren Auftreten",
       "title": "Meldungen"
@@ -184,7 +193,8 @@
     },
     "global-users": {
       "subtitle": "Erstelle und verwalte Benutzer auf dem gesamten Grafana-Server",
-      "title": "Benutzer"
+      "title": "Benutzer",
+      "titleBeforeTopnav": ""
     },
     "help": {
       "title": "Hilfe"
@@ -227,7 +237,8 @@
     },
     "org-settings": {
       "subtitle": "Verwalte Einstellungen in der gesamten Organisation",
-      "title": "Einstellungen"
+      "title": "Einstellungen",
+      "titleBeforeTopnav": ""
     },
     "playlists": {
       "subtitle": "Gruppen von Dashboards, die in einer bestimmten Reihenfolge angezeigt werden",
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index c3d7bab249e..2a68c15a74c 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -99,6 +99,15 @@
       "subtitle": "Manage server-wide settings and access to resources such as organizations, users, and licenses",
       "title": "Server admin"
     },
+    "admin-access": {
+      "title": "Users and access"
+    },
+    "admin-general": {
+      "title": "General"
+    },
+    "admin-plugins": {
+      "title": "Plugins and data"
+    },
     "alerting": {
       "subtitle": "Learn about problems in your systems moments after they occur",
       "title": "Alerting"
@@ -184,7 +193,8 @@
     },
     "global-users": {
       "subtitle": "Manage and create users across the whole Grafana server",
-      "title": "Users"
+      "title": "Users (All orgs)",
+      "titleBeforeTopnav": "Users"
     },
     "help": {
       "title": "Help"
@@ -227,7 +237,8 @@
     },
     "org-settings": {
       "subtitle": "Manage preferences across an organization",
-      "title": "Preferences"
+      "title": "Default preferences",
+      "titleBeforeTopnav": "Preferences"
     },
     "playlists": {
       "subtitle": "Groups of dashboards that are displayed in a sequence",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index b6020ca1118..f3bd4e0cc7b 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -99,6 +99,15 @@
       "subtitle": "Administrar la configuración de todo el servidor y el acceso a recursos como organizaciones, usuarios y licencias",
       "title": "Administrador del servidor"
     },
+    "admin-access": {
+      "title": ""
+    },
+    "admin-general": {
+      "title": ""
+    },
+    "admin-plugins": {
+      "title": ""
+    },
     "alerting": {
       "subtitle": "Conozca los problemas de sus sistemas justo después de que se produzcan",
       "title": "Alertas"
@@ -184,7 +193,8 @@
     },
     "global-users": {
       "subtitle": "Gestione y cree usuarios en todo el servidor Grafana",
-      "title": "Usuarios"
+      "title": "Usuarios",
+      "titleBeforeTopnav": ""
     },
     "help": {
       "title": "Ayuda"
@@ -227,7 +237,8 @@
     },
     "org-settings": {
       "subtitle": "Gestionar las preferencias en una organización",
-      "title": "Preferencias"
+      "title": "Preferencias",
+      "titleBeforeTopnav": ""
     },
     "playlists": {
       "subtitle": "Grupos de paneles de control que se muestran en una secuencia",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 50ee9d5efa8..1bcdb9254ca 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -99,6 +99,15 @@
       "subtitle": "Gérer les paramètres à l'échelle du serveur et l'accès aux ressources telles que les organisations, les utilisateurs et les licences",
       "title": "Administrateur de serveur"
     },
+    "admin-access": {
+      "title": ""
+    },
+    "admin-general": {
+      "title": ""
+    },
+    "admin-plugins": {
+      "title": ""
+    },
     "alerting": {
       "subtitle": "En savoir plus sur les problèmes dans vos systèmes quelques instants après qu'ils se produisent",
       "title": "Alertes"
@@ -184,7 +193,8 @@
     },
     "global-users": {
       "subtitle": "Gérer et créer des utilisateurs sur l'ensemble du serveur Grafana",
-      "title": "Utilisateurs"
+      "title": "Utilisateurs",
+      "titleBeforeTopnav": ""
     },
     "help": {
       "title": "Aide"
@@ -227,7 +237,8 @@
     },
     "org-settings": {
       "subtitle": "Gérer les préférences au sein d'une organisation",
-      "title": "Préférences"
+      "title": "Préférences",
+      "titleBeforeTopnav": ""
     },
     "playlists": {
       "subtitle": "Groupes de tableaux de bord affichés dans une séquence",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index cef669c3987..1ec222378bf 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -99,6 +99,15 @@
       "subtitle": "Mäʼnäģę şęřvęř-ŵįđę şęŧŧįʼnģş äʼnđ äččęşş ŧő řęşőūřčęş şūčĥ äş őřģäʼnįžäŧįőʼnş, ūşęřş, äʼnđ ľįčęʼnşęş",
       "title": "Ŝęřvęř äđmįʼn"
     },
+    "admin-access": {
+      "title": "Ůşęřş äʼnđ äččęşş"
+    },
+    "admin-general": {
+      "title": "Ğęʼnęřäľ"
+    },
+    "admin-plugins": {
+      "title": "Pľūģįʼnş äʼnđ đäŧä"
+    },
     "alerting": {
       "subtitle": "Ŀęäřʼn äþőūŧ přőþľęmş įʼn yőūř şyşŧęmş mőmęʼnŧş äƒŧęř ŧĥęy őččūř",
       "title": "Åľęřŧįʼnģ"
@@ -184,7 +193,8 @@
     },
     "global-users": {
       "subtitle": "Mäʼnäģę äʼnđ čřęäŧę ūşęřş äčřőşş ŧĥę ŵĥőľę Ğřäƒäʼnä şęřvęř",
-      "title": "Ůşęřş"
+      "title": "Ůşęřş (Åľľ őřģş)",
+      "titleBeforeTopnav": "Ůşęřş"
     },
     "help": {
       "title": "Ħęľp"
@@ -227,7 +237,8 @@
     },
     "org-settings": {
       "subtitle": "Mäʼnäģę přęƒęřęʼnčęş äčřőşş äʼn őřģäʼnįžäŧįőʼn",
-      "title": "Přęƒęřęʼnčęş"
+      "title": "Đęƒäūľŧ přęƒęřęʼnčęş",
+      "titleBeforeTopnav": "Přęƒęřęʼnčęş"
     },
     "playlists": {
       "subtitle": "Ğřőūpş őƒ đäşĥþőäřđş ŧĥäŧ äřę đįşpľäyęđ įʼn ä şęqūęʼnčę",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index c1623c71043..4122d706209 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -99,6 +99,15 @@
       "subtitle": "管理整个服务器范围的设置，以及对组织、用户和许可证等资源的访问权限",
       "title": "服务器管理员"
     },
+    "admin-access": {
+      "title": ""
+    },
+    "admin-general": {
+      "title": ""
+    },
+    "admin-plugins": {
+      "title": ""
+    },
     "alerting": {
       "subtitle": "在系统发生问题后立即获悉",
       "title": "警报"
@@ -184,7 +193,8 @@
     },
     "global-users": {
       "subtitle": "在整个 Grafana 服务器上管理和创建用户",
-      "title": "用户"
+      "title": "用户",
+      "titleBeforeTopnav": ""
     },
     "help": {
       "title": "帮助"
@@ -227,7 +237,8 @@
     },
     "org-settings": {
       "subtitle": "管理整个组织的首选项",
-      "title": "首选项"
+      "title": "首选项",
+      "titleBeforeTopnav": ""
     },
     "playlists": {
       "subtitle": "以序列显示的仪表板组",

From 01afe9fbd4cb635d664590930bcd2bdb750aa634 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Fri, 18 Nov 2022 17:22:14 +0200
Subject: [PATCH 021/153] CI: Move `upload-packages` subcmd from `grabpl`
 (#58960)

* Move upload-packages subcmd from grabpl

# Conflicts:
#	.drone.yml

# Conflicts:
#	.drone.yml

* Fix lint - add ActivateServiceAccount

* Fix lint
---
 .drone.yml                      |  16 +--
 pkg/build/cmd/main.go           |   9 ++
 pkg/build/cmd/uploadpackages.go | 172 ++++++++++++++++++++++++++++++++
 scripts/drone/steps/lib.star    |   2 +-
 4 files changed, 190 insertions(+), 9 deletions(-)
 create mode 100644 pkg/build/cmd/uploadpackages.go

diff --git a/.drone.yml b/.drone.yml
index 6f120401d38..35a0338455a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1578,7 +1578,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-packages --edition oss
+  - ./bin/build upload-packages --edition oss
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -2178,7 +2178,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.3
   name: upload-cdn-assets
 - commands:
-  - ./bin/grabpl upload-packages --edition oss
+  - ./bin/build upload-packages --edition oss
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -2830,7 +2830,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.3
   name: upload-cdn-assets
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise
+  - ./bin/build upload-packages --edition enterprise
   depends_on:
   - package
   environment:
@@ -2882,7 +2882,7 @@ steps:
   image: grafana/build-container:1.6.4
   name: store-npm-packages
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise2
+  - ./bin/build upload-packages --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -4224,7 +4224,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-packages --edition oss
+  - ./bin/build upload-packages --edition oss
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -4834,7 +4834,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise
+  - ./bin/build upload-packages --edition enterprise
   depends_on:
   - package
   environment:
@@ -4879,7 +4879,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.3
   name: upload-cdn-assets-enterprise2
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise2
+  - ./bin/build upload-packages --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -5570,6 +5570,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 49c89d01105450cc0ae03afc0dc5aec89d61a758cb1e3a4da9fec1434a49da5c
+hmac: 2f3c13716c7cd1e42004a0f0d7057d5024d38bceedb22370b3554a79e786a46c
 
 ...
diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index ba4f1f6eb0a..c523b2a755c 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -161,6 +161,15 @@ func main() {
 				},
 			},
 		},
+		{
+			Name:   "upload-packages",
+			Usage:  "Upload Grafana packages",
+			Action: UploadPackages,
+			Flags: []cli.Flag{
+				&jobsFlag,
+				&editionFlag,
+			},
+		},
 		{
 			Name:  "artifacts",
 			Usage: "Handle Grafana artifacts",
diff --git a/pkg/build/cmd/uploadpackages.go b/pkg/build/cmd/uploadpackages.go
new file mode 100644
index 00000000000..01a43a43bdf
--- /dev/null
+++ b/pkg/build/cmd/uploadpackages.go
@@ -0,0 +1,172 @@
+package main
+
+import (
+	"encoding/base64"
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/gcloud"
+	"github.com/grafana/grafana/pkg/build/packaging"
+	"github.com/urfave/cli/v2"
+)
+
+const releaseFolder = "release"
+const mainFolder = "main"
+const releaseBranchFolder = "prerelease"
+
+type uploadConfig struct {
+	config.Config
+
+	edition     config.Edition
+	versionMode config.VersionMode
+	gcpKey      string
+	distDir     string
+}
+
+// UploadPackages implements the sub-command "upload-packages".
+func UploadPackages(c *cli.Context) error {
+	if c.NArg() > 0 {
+		if err := cli.ShowSubcommandHelp(c); err != nil {
+			return cli.NewExitError(err.Error(), 1)
+		}
+		return cli.NewExitError("", 1)
+	}
+
+	gcpKeyB64 := strings.TrimSpace(os.Getenv("GCP_KEY"))
+	if gcpKeyB64 == "" {
+		return cli.NewExitError("the environment variable GCP_KEY must be set", 1)
+	}
+	gcpKeyB, err := base64.StdEncoding.DecodeString(gcpKeyB64)
+	if err != nil {
+		return cli.NewExitError("failed to base64 decode $GCP_KEY", 1)
+	}
+	gcpKey := string(gcpKeyB)
+
+	distDir, err := filepath.Abs("dist")
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+
+	metadata, err := GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	version := metadata.GrafanaVersion
+
+	releaseMode, err := metadata.GetReleaseMode()
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+
+	releaseModeConfig, err := config.GetBuildConfig(releaseMode.Mode)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+
+	edition, ok := os.LookupEnv("EDITION")
+	if !ok {
+		return fmt.Errorf("EDITION envvar is missing, exitting")
+	}
+
+	// TODO: Verify config values
+	cfg := uploadConfig{
+		Config: config.Config{
+			Version: version,
+			Bucket:  releaseModeConfig.Buckets.Artifacts,
+		},
+		edition:     config.Edition(edition),
+		versionMode: releaseMode.Mode,
+		gcpKey:      gcpKey,
+		distDir:     distDir,
+	}
+
+	if cfg.edition == config.EditionEnterprise2 {
+		if releaseModeConfig.Buckets.ArtifactsEnterprise2 != "" {
+			cfg.Config.Bucket = releaseModeConfig.Buckets.ArtifactsEnterprise2
+		} else {
+			return fmt.Errorf("enterprise2 bucket var doesn't exist")
+		}
+	}
+
+	if err := uploadPackages(cfg); err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+
+	log.Println("Successfully uploaded packages!")
+	return nil
+}
+
+func uploadPackages(cfg uploadConfig) error {
+	log.Printf("Uploading Grafana packages, version %s, %s edition, %s mode...\n", cfg.Version, cfg.edition,
+		cfg.versionMode)
+
+	if err := gcloud.ActivateServiceAccount(); err != nil {
+		return fmt.Errorf("couldn't activate service account, err: %w", err)
+	}
+
+	edition := strings.ToLower(string(cfg.edition))
+
+	var sfx string
+	switch cfg.edition {
+	case config.EditionOSS:
+	case config.EditionEnterprise:
+		sfx = "-enterprise"
+	case config.EditionEnterprise2:
+		sfx = "-enterprise2"
+	default:
+		panic(fmt.Sprintf("unrecognized edition %q", cfg.edition))
+	}
+	matches, err := filepath.Glob(filepath.Join(cfg.distDir, fmt.Sprintf("grafana%s*", sfx)))
+	if err != nil {
+		return fmt.Errorf("failed to list packages: %w", err)
+	}
+	fpaths := []string{}
+	rePkg := packaging.PackageRegexp(cfg.edition)
+	for _, fpath := range matches {
+		fname := filepath.Base(fpath)
+		if strings.Contains(fname, "latest") || !rePkg.MatchString(fname) {
+			log.Printf("Ignoring file %q\n", fpath)
+			continue
+		}
+
+		fpaths = append(fpaths, fpath)
+	}
+
+	var versionFolder string
+	switch cfg.versionMode {
+	case config.TagMode:
+		versionFolder = releaseFolder
+	case config.MainMode, config.CustomMode:
+		versionFolder = mainFolder
+	case config.ReleaseBranchMode:
+		versionFolder = releaseBranchFolder
+	default:
+		panic(fmt.Sprintf("Unrecognized version mode: %s", cfg.versionMode))
+	}
+
+	var tag, gcsPath string
+	droneTag := strings.TrimSpace(os.Getenv("DRONE_TAG"))
+	if droneTag != "" {
+		tag = droneTag
+		gcsPath = fmt.Sprintf("gs://%s/%s/%s/%s", cfg.Bucket, tag, edition, versionFolder)
+	} else {
+		gcsPath = fmt.Sprintf("gs://%s/%s/%s/", cfg.Bucket, edition, versionFolder)
+	}
+	log.Printf("Uploading %d file(s) to GCS (%s)...\n", len(fpaths), gcsPath)
+
+	args := []string{"-m", "cp"}
+	args = append(args, fpaths...)
+	args = append(args, gcsPath)
+	cmd := exec.Command("gsutil", args...)
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to upload files to GCS: %s", output)
+	}
+
+	return nil
+}
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index bf45fc1a63d..3ee32a19cb3 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -995,7 +995,7 @@ def upload_packages_step(edition, ver_mode, trigger=None):
             'GCP_KEY': from_secret('gcp_key'),
             'PRERELEASE_BUCKET': from_secret('prerelease_bucket'),
         },
-        'commands': ['./bin/grabpl upload-packages --edition {}'.format(edition),],
+        'commands': ['./bin/build upload-packages --edition {}'.format(edition),],
     }
     if trigger and ver_mode in ("release-branch", "main"):
         step = dict(step, when=trigger)

From e19957bbc8949f4f69a62b91b1baa66aa478ad05 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 18 Nov 2022 15:29:50 +0000
Subject: [PATCH 022/153] Accessibility: Improve keyboard accessibility in
 `GettingStarted` panel (#58966)

fix keyboard a11y in `GettingStarted` panel
---
 .../panel/gettingstarted/GettingStarted.tsx   | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
index 1687e268844..4941d87f6c5 100644
--- a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
+++ b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
@@ -90,21 +90,29 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
           </div>
         ) : (
           <>
-            <div className={styles.dismiss}>
-              <div onClick={this.dismiss}>Remove this panel</div>
-            </div>
+            <Button variant="secondary" fill="text" className={styles.dismiss} onClick={this.dismiss}>
+              Remove this panel
+            </Button>
             {currentStep === steps.length - 1 && (
-              <div className={cx(styles.backForwardButtons, styles.previous)} onClick={this.onPreviousClick}>
-                <Button aria-label="To advanced tutorials" icon="angle-left" variant="secondary" />
-              </div>
+              <Button
+                className={cx(styles.backForwardButtons, styles.previous)}
+                onClick={this.onPreviousClick}
+                aria-label="To advanced tutorials"
+                icon="angle-left"
+                variant="secondary"
+              />
             )}
             <div className={styles.content}>
               <Step step={step} />
             </div>
             {currentStep < steps.length - 1 && (
-              <div className={cx(styles.backForwardButtons, styles.forward)} onClick={this.onForwardClick}>
-                <Button aria-label="To basic tutorials" icon="angle-right" variant="secondary" />
-              </div>
+              <Button
+                className={cx(styles.backForwardButtons, styles.forward)}
+                onClick={this.onForwardClick}
+                aria-label="To basic tutorials"
+                icon="angle-right"
+                variant="secondary"
+              />
             )}
           </>
         )}
@@ -166,9 +174,8 @@ const getStyles = stylesFactory(() => {
     `,
     backForwardButtons: css`
       position: absolute;
-      bottom: 50%;
       top: 50%;
-      height: 50px;
+      transform: translateY(-50%);
     `,
     previous: css`
       left: 10px;
@@ -185,11 +192,8 @@ const getStyles = stylesFactory(() => {
       }
     `,
     dismiss: css`
-      display: flex;
-      justify-content: flex-end;
-      cursor: pointer;
+      align-self: flex-end;
       text-decoration: underline;
-      margin-right: ${theme.spacing(2)};
       margin-bottom: ${theme.spacing(1)};
     `,
     loading: css`

From 4da97aef7dc202f8fc671ef2f925bb14f3c90ad6 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Fri, 18 Nov 2022 16:28:00 +0000
Subject: [PATCH 023/153] Alerting: Fix metric in Images in Notifications docs
 (#58954)

---
 .../alerting/manage-notifications/images-in-notifications.md  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/alerting/manage-notifications/images-in-notifications.md b/docs/sources/alerting/manage-notifications/images-in-notifications.md
index e2dc58e7778..4d0fa1606fc 100644
--- a/docs/sources/alerting/manage-notifications/images-in-notifications.md
+++ b/docs/sources/alerting/manage-notifications/images-in-notifications.md
@@ -88,8 +88,8 @@ Include images from URL refers to using the external image store.
 Grafana provides the following metrics to observe the performance and failure rate of images in notifications.
 For example, if a screenshot could not be taken within the expected time (10 seconds) then the counter `grafana_screenshot_failures_total` is updated.
 
-- `grafana_screenshot_cache_hits_total`
-- `grafana_screenshot_cache_misses_total`
+- `grafana_alerting_image_cache_hits_total`
+- `grafana_alerting_image_cache_misses_total`
 - `grafana_screenshot_duration_seconds`
 - `grafana_screenshot_failures_total`
 - `grafana_screenshot_successes_total`

From e7b5bd34bdc126f696a9b13ecfcab19f660cfde9 Mon Sep 17 00:00:00 2001
From: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Date: Fri, 18 Nov 2022 10:46:07 -0600
Subject: [PATCH 024/153] Docs: adjusts link to kms integration (#58981)

adjusts link to kms integration
---
 docs/sources/introduction/grafana-enterprise.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/introduction/grafana-enterprise.md b/docs/sources/introduction/grafana-enterprise.md
index a1ed663bb12..3b14918828d 100644
--- a/docs/sources/introduction/grafana-enterprise.md
+++ b/docs/sources/introduction/grafana-enterprise.md
@@ -61,7 +61,7 @@ Grafana Enterprise adds the following features:
 - [Custom branding]({{< relref "../setup-grafana/configure-grafana/configure-custom-branding/" >}}) to customize Grafana from the brand and logo to the footer links.
 - [Usage insights]({{< relref "../dashboards/assess-dashboard-usage/" >}}) to understand how your Grafana instance is used.
 - [Recorded queries]({{< relref "../administration/recorded-queries" >}}) to see trends over time for your data sources.
-- [Vault integration]({{< relref "../setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/" >}}) to manage your configuration or provisioning secrets with Vault.
+- [Vault integration]({{< relref "../setup-grafana/configure-security/configure-database-encryption/#encrypting-your-database-with-a-key-from-a-key-management-service-kms" >}}) to manage your configuration or provisioning secrets with Vault.
 - [Auditing]({{< relref "../setup-grafana/configure-security/audit-grafana/" >}}) tracks important changes to your Grafana instance to help you manage and mitigate suspicious activity and meet compliance requirements.
 - [Request security]({{< relref "../setup-grafana/configure-security/configure-request-security/" >}}) makes it possible to restrict outgoing requests from the Grafana server.
 - [Settings updates at runtime]({{< relref "../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}) allows you to update Grafana settings at runtime without requiring a restart.

From 19ff3645e8e2826593db6fdc1b86d31dd0b91407 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 18 Nov 2022 16:47:13 +0000
Subject: [PATCH 025/153] Update verify-release script (#58812)

Update verify-release script with required arg
---
 e2e/verify-release | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2e/verify-release b/e2e/verify-release
index 2bb9df037fa..304a68a6b53 100755
--- a/e2e/verify-release
+++ b/e2e/verify-release
@@ -2,4 +2,5 @@
 
 . scripts/grafana-server/variables
 
-./e2e/run-suite verify/specs
+# The run-suite script requires a second argument to determine if videos should be recorded
+./e2e/run-suite verify/specs true

From 780efa57917c2951054a7558710e53d19f140f22 Mon Sep 17 00:00:00 2001
From: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Date: Fri, 18 Nov 2022 12:06:09 -0600
Subject: [PATCH 026/153] Docs: adds permission validation setting (#58970)

* adds permission validation setting

* Update docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* makes prettier

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
---
 .../access-control/configure-rbac/index.md                 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md b/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
index 99cbacf35a9..05f9e61cbce 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
@@ -14,9 +14,10 @@ weight: 30
 
 The table below describes all RBAC configuration options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../../../../setup-grafana/configure-grafana/#configure-with-environment-variables" >}}).
 
-| Setting            | Required | Description                                                                  | Default |
-| ------------------ | -------- | ---------------------------------------------------------------------------- | ------- |
-| `permission_cache` | No       | Enable to use in memory cache for loading and evaluating users' permissions. | `true`  |
+| Setting                         | Required | Description                                                                                                                                                                                                                                                                                                                     | Default |
+| ------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `permission_cache`              | No       | Enable to use in memory cache for loading and evaluating users' permissions.                                                                                                                                                                                                                                                    | `true`  |
+| `permission_validation_enabled` | No       | Grafana enforces validation for permissions when a user creates or updates a role. The system checks the internal list of scopes and actions for each permission to determine they are valid. By default, if a scope or action is not recognized, Grafana logs a warning message. When set to `true`, Grafana returns an error. | `false` |
 
 ## Example RBAC configuration
 

From 8ac197b11c22e9d8672d969c07a76678b6d5fb5a Mon Sep 17 00:00:00 2001
From: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Date: Fri, 18 Nov 2022 15:55:46 -0600
Subject: [PATCH 027/153] Docs/removes admin screenshots (#58994)

* removes screenshots in the admin docs

* removes unneeded screenshot
---
 .../administration/data-source-management/index.md  | 13 +------------
 .../administration/organization-management/index.md |  4 ----
 .../administration/plugin-management/index.md       |  8 --------
 .../access-control/assign-rbac-roles/index.md       |  4 ----
 .../sources/administration/team-management/index.md |  4 ----
 .../user-management/manage-org-users/index.md       |  8 --------
 .../server-user-management/_index.md                | 10 ----------
 7 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/docs/sources/administration/data-source-management/index.md b/docs/sources/administration/data-source-management/index.md
index 3f2b5d7521a..42d56c8fda3 100644
--- a/docs/sources/administration/data-source-management/index.md
+++ b/docs/sources/administration/data-source-management/index.md
@@ -27,9 +27,6 @@ Before you can create your first dashboard, you need to add your data source.
 **To add a data source:**
 
 1. Select the cog icon on the side menu to show the configuration options.
-
-   {{< figure src="/static/img/docs/v75/sidemenu-datasource-7-5.png" max-width="150px" class="docs-image--no-shadow">}}
-
 1. Select **Data sources**.
 
    This opens the data sources page, which displays a list of previously configured data sources for the Grafana instance.
@@ -44,9 +41,7 @@ Before you can create your first dashboard, you need to add your data source.
 
 1. Move the cursor over the data source you want to add.
 
-   {{< figure src="/static/img/docs/v75/select-data-source-7-5.png" max-width="700px" class="docs-image--no-shadow">}}
-
-1. Select **Select**.
+1. Click **Select**.
 
    This opens the data source configuration page.
 
@@ -63,8 +58,6 @@ Each data source's configuration includes a permissions page where you can enabl
 
 ### Enable data source permissions
 
-{{< figure src="/static/img/docs/enterprise/datasource_permissions_enable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_enable.gif" >}}
-
 By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just
 queries that exist on dashboards they have access to.
 
@@ -82,8 +75,6 @@ When permissions are enabled for a data source in an organization, the user who
 
 ### Allow users and teams to query a data source
 
-{{< figure src="/static/img/docs/enterprise/datasource_permissions_add_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_add.gif" >}}
-
 After you have enabled permissions for a data source you can assign query permissions to users and teams which will allow access to query the data source.
 
 **Assign query permission to users and teams:**
@@ -98,8 +89,6 @@ After you have enabled permissions for a data source you can assign query permis
 
 ### Disable data source permissions
 
-{{< figure src="/static/img/docs/enterprise/datasource_permissions_disable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_disable.gif" >}}
-
 If you have enabled permissions for a data source and want to return data source permissions to the default, then you can disable permissions with a click of a button.
 
 Note that _all_ existing permissions created for the data source will be deleted.
diff --git a/docs/sources/administration/organization-management/index.md b/docs/sources/administration/organization-management/index.md
index f8e8fa37cad..9e9724bb639 100644
--- a/docs/sources/administration/organization-management/index.md
+++ b/docs/sources/administration/organization-management/index.md
@@ -60,8 +60,6 @@ Complete this task when you want to view a list of existing organizations.
 
 A list of organizations appears.
 
-![Server Admin organization list](/static/img/docs/manage-users/server-org-list-7-3.png)
-
 ## Create an organization
 
 Create an organization when you want to isolate dashboards and other resources from each other.
@@ -117,5 +115,3 @@ Edit an organization when you want to change its name.
 1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**.
 1. Click the organization you want to edit.
 1. Update the organization name and click **Update**.
-
-![Server admin Edit Organization](/static/img/docs/manage-users/server-admin-edit-org-7-3.png)
diff --git a/docs/sources/administration/plugin-management/index.md b/docs/sources/administration/plugin-management/index.md
index 5bd9ad9df65..f23ca023be1 100644
--- a/docs/sources/administration/plugin-management/index.md
+++ b/docs/sources/administration/plugin-management/index.md
@@ -88,8 +88,6 @@ To browse for available plugins:
 1. Click the **All** filter to browse all available plugins.
 1. Click the **Data sources**, **Panels**, or **Applications** buttons to filter by plugin type.
 
-![Plugin catalog browse](/static/img/docs/plugins/plugins-catalog-browse-9.2.png)
-
 ### Install a plugin
 
 To install a plugin:
@@ -101,8 +99,6 @@ To install a plugin:
 
 When the update is complete, you see a confirmation message that the installation was successful.
 
-![Plugin catalog install](/static/img/docs/plugins/plugins-catalog-install-8-1.png)
-
 ### Update a plugin
 
 To update a plugin:
@@ -113,8 +109,6 @@ To update a plugin:
 
 When the update is complete, you see a confirmation message that the update was successful.
 
-![Plugin catalog update](/static/img/docs/plugins/plugins-catalog-update-8-1.png)
-
 ### Uninstall a plugin
 
 To uninstall a plugin:
@@ -125,8 +119,6 @@ To uninstall a plugin:
 
 When the update is complete, you see a confirmation message that the uninstall was successful.
 
-![Plugin catalog uninstall](/static/img/docs/plugins/plugins-catalog-uninstall-8-1.png)
-
 ## Install Grafana plugins
 
 Grafana supports data source, panel, and app plugins. Having panels as plugins makes it easy to create and add any kind of panel, to show your data, or improve your favorite dashboards. Apps enable the bundling of data sources, panels, dashboards, and Grafana pages into a cohesive experience.
diff --git a/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md b/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md
index b3c0120479a..a46b511a8b2 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md
@@ -53,8 +53,6 @@ In both cases, the assignment applies only to the user, team or service account
 4. In the **Role** column, select the fixed role that you want to assign to the user, team or service account.
 5. Click **Update**.
 
-![User role picker in an organization](/static/img/docs/enterprise/user_role_picker_in_org.png)
-
 **To assign a fixed role as a server administrator:**
 
 1. Sign in to Grafana, hover your cursor over **Server Admin** (the shield icon) in the left navigation menu, and click **Users**.
@@ -62,8 +60,6 @@ In both cases, the assignment applies only to the user, team or service account
 1. In the **Organizations** section, select a role within an organization that you want to assign to the user.
 1. Click **Update**.
 
-![User role picker in Organization](/static/img/docs/enterprise/user_role_picker_global.png)
-
 ## Assign fixed or custom roles to a team using provisioning
 
 Instead of using the Grafana role picker, you can use file-based provisioning to assign fixed roles to teams. If you have a large number of teams, provisioning can provide an easier approach to assigning and managing role assignments.
diff --git a/docs/sources/administration/team-management/index.md b/docs/sources/administration/team-management/index.md
index 38c157e622e..3259eac267a 100644
--- a/docs/sources/administration/team-management/index.md
+++ b/docs/sources/administration/team-management/index.md
@@ -62,8 +62,6 @@ To add a team member:
 1. Choose if you want to add the user as a team Member or an Admin.
 1. Click **Add to team**.
 
-![Add team member](/static/img/docs/manage-users/add-team-member-7-3.png)
-
 ## Grant team member permissions
 
 Complete this task when you want to add or modify team member permissions.
@@ -76,8 +74,6 @@ To grant team member permissions:
 1. In the team member list, find and click the user that you want to change. You can use the search field to filter the list if necessary.
 1. Click the **Permission** list, and then click the new user permission level.
 
-![Change team member permissions](/static/img/docs/manage-users/change-team-permissions-7-3.png)
-
 ## Remove a team member
 
 You can remove a team member when you no longer want to apply team permissions to the user
diff --git a/docs/sources/administration/user-management/manage-org-users/index.md b/docs/sources/administration/user-management/manage-org-users/index.md
index 349cbbb8b2e..a0c2118393d 100644
--- a/docs/sources/administration/user-management/manage-org-users/index.md
+++ b/docs/sources/administration/user-management/manage-org-users/index.md
@@ -33,8 +33,6 @@ You can see a list of users with accounts in your Grafana organization. If neces
 1. Sign in to Grafana as an organization administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
 
-![Org Admin user list](/static/img/docs/manage-users/org-user-list-7-3.png)
-
 > **Note:** If you have [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../server-user-management#view-a-list-of-users" >}}) in the Server Admin section of Grafana.
 
 ## Change a user's organization permissions
@@ -96,8 +94,6 @@ When you invite users to join an organization, you assign the **Admin**, **Edito
 
 If the invitee is not already a user, the system adds them.
 
-![Invite User](/static/img/docs/manage-users/org-invite-user-7-3.png).
-
 ## Manage a pending invitation
 
 Periodically review invitations you have sent so that you can see a list of users that have not yet accepted the invitation or cancel a pending invitation.
@@ -116,14 +112,10 @@ Periodically review invitations you have sent so that you can see a list of user
 
    The **Pending Invites** button appears only when there are unaccepted invitations.
 
-   ![Pending Invites button](/static/img/docs/manage-users/pending-invites-button-7-3.png)
-
 To cancel an invitation, click the red **X** next to the invitation.
 
 To copy an invitation link and send it directly to a user, click Copy Invite. You can then paste the invite link into a message.
 
-![Pending Invites list](/static/img/docs/manage-users/pending-invites-list-7-3.png)
-
 ## Remove a user from an organization
 
 You can remove a user from an organization when they no longer require access to the dashboard or data sources owned by the organization. No longer requiring access to an organization might occur when the user has left your company or has internally moved to another organization.
diff --git a/docs/sources/administration/user-management/server-user-management/_index.md b/docs/sources/administration/user-management/server-user-management/_index.md
index c75da586f05..47fba204f1f 100644
--- a/docs/sources/administration/user-management/server-user-management/_index.md
+++ b/docs/sources/administration/user-management/server-user-management/_index.md
@@ -38,8 +38,6 @@ You can see a list of users with accounts on your Grafana server. This action mi
 1. Sign in to Grafana as a server administrator.
 1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
 
-![Server Admin user list](/static/img/docs/manage-users/server-user-list-7-3.png)
-
 > **Note:** If you have [organization administrator]({{< relref "../../roles-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../manage-org-users/#view-a-list-of-organization-users" >}}).
 
 ## View user details
@@ -62,26 +60,18 @@ A user account contains the following sections.
 
 This section contains basic user information, which users can update.
 
-![Server Admin user information section](/static/img/docs/manage-users/server-admin-user-information-7-3.png)
-
 #### Permissions
 
 This indicates whether the user account has the Grafana administrator flag applied. If the flag is set to **Yes**, then the user is a Grafana server administrator.
 
-![Server Admin Permissions section](/static/img/docs/manage-users/server-admin-permissions-7-3.png)
-
 #### Organizations
 
 This section lists the organizations the user belongs to and their assigned role.
 
-![Server Admin Organizations section](/static/img/docs/manage-users/server-admin-organisations-7-3.png)
-
 #### Sessions
 
 This section includes recent user sessions and information about the time the user logged in and they system they used. You can force logouts, if necessary.
 
-![Server Admin Sessions section](/static/img/docs/manage-users/server-admin-sessions-7-3.png)
-
 ## Edit a user account
 
 Edit a user account when you want to modify user login credentials, or delete, disable, or enable a user.

From 97bf3c1dca0a7929bd6ed08eb29823d84b1fa206 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Mon, 21 Nov 2022 09:11:02 +0100
Subject: [PATCH 028/153] Alerting: Move alert rule name to the top left in
 alert form (#58579)

* Move alert rule name to the top left in alert form, and add a placeholder

* Update docs

* Fix lint error
---
 .../create-grafana-managed-rule.md            |  9 +--
 ...reate-mimir-loki-managed-recording-rule.md | 14 +++--
 .../create-mimir-loki-managed-rule.md         |  9 +--
 .../alerting/unified/RuleEditor.test.tsx      |  4 +-
 .../components/rule-editor/AlertRuleForm.tsx  | 61 ++++++++++++++++++-
 .../rule-editor/CloudEvaluationBehavior.tsx   |  2 +-
 .../components/rule-editor/DetailsStep.tsx    | 33 +---------
 .../rule-editor/GrafanaEvaluationBehavior.tsx |  2 +-
 .../rule-editor/NotificationsStep.tsx         |  7 ++-
 .../QueryAndExpressionsStep.tsx               |  2 +-
 10 files changed, 87 insertions(+), 56 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 786de9cf53b..b00268b51d1 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -23,21 +23,22 @@ Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 
 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 alerts option is selected by default.
-1. In Step 1, add queries and expressions to evaluate, and then select the alert condition.
+1. In Step 1, add the rule name.
+   - 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.
+1. In Step 2, 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-visualizations/query-transform-data/#add-a-query/" >}}) or [expressions]({{< relref "../../panels-visualizations/query-transform-data/expression-queries/" >}}).
    - 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.
    - Next, select the query or expression for your alert condition.
-1. In Step 2, specify the alert evaluation interval.
+1. In Step 3, 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, 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 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.
+1. In Step 4, add the storage location, rule group, as well as additional metadata associated with the 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/" >}}).
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 43a6fe19584..9f61d11a7df 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
@@ -37,11 +37,12 @@ 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.
+1. In Step 1, add the rule name.
+   - 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.
+1. In Step 2, 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.
+1. In Step 3, add the namespace, rule group, as well as additional metadata associated with the 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/" >}}).
    - 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/" >}}).
@@ -52,17 +53,18 @@ 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**.
-1. In Step 1, add the rule name, type, and storage location.
+1. In Step 1, add the rule name.
    - 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.
+1. In Step 2, add the type, and storage location.
    - 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.
    - 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.
+1. In Step 3, 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 additional metadata associated with the rule.
+1. In Step 4, add additional metadata associated with the rule.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
    - Add custom labels.
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 379c0df080d..c57f82e9839 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
@@ -37,14 +37,15 @@ Watch this video to learn more about how to create a Mimir managed alert 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 alerts option is selected by default.
-1. In Step 1, select **Mimir or Loki alert** option.
+1. In Step 1, add the rule name.
+   - 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.
+1. In Step 2, 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.
+1. In Step 3, 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 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.
+1. In Step 4, add the namespace, rule group, as well as additional metadata associated with the 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/" >}}).
    - 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/" >}}).
diff --git a/public/app/features/alerting/unified/RuleEditor.test.tsx b/public/app/features/alerting/unified/RuleEditor.test.tsx
index f57a299869a..3db03b1bdcd 100644
--- a/public/app/features/alerting/unified/RuleEditor.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.test.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { Route, Router } from 'react-router-dom';
 import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
-import { byLabelText, byRole, byTestId, byText } from 'testing-library-selector';
+import { byRole, byTestId, byText } from 'testing-library-selector';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -76,7 +76,7 @@ function renderRuleEditor(identifier?: string) {
 
 const ui = {
   inputs: {
-    name: byLabelText('Rule name'),
+    name: byRole('textbox', { name: /rule name name for the alert rule\./i }),
     alertType: byTestId('alert-type-picker'),
     dataSource: byTestId('datasource-picker'),
     folder: byTestId('folder-picker'),
diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
index 6fa8e77b6bf..692ee68955d 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
@@ -1,11 +1,11 @@
 import { css } from '@emotion/css';
 import React, { FC, useMemo, useState } from 'react';
-import { FormProvider, useForm, UseFormWatch } from 'react-hook-form';
+import { FormProvider, useForm, useFormContext, UseFormWatch } from 'react-hook-form';
 import { Link } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { logInfo } from '@grafana/runtime';
-import { Button, ConfirmModal, CustomScrollbar, Spinner, useStyles2, HorizontalGroup } from '@grafana/ui';
+import { Button, ConfirmModal, CustomScrollbar, Spinner, useStyles2, HorizontalGroup, Field, Input } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { useCleanup } from 'app/core/hooks/useCleanup';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
@@ -24,8 +24,57 @@ import { CloudEvaluationBehavior } from './CloudEvaluationBehavior';
 import { DetailsStep } from './DetailsStep';
 import { GrafanaEvaluationBehavior } from './GrafanaEvaluationBehavior';
 import { NotificationsStep } from './NotificationsStep';
+import { RuleEditorSection } from './RuleEditorSection';
 import { RuleInspector } from './RuleInspector';
 import { QueryAndExpressionsStep } from './query-and-alert-condition/QueryAndExpressionsStep';
+import { checkForPathSeparator } from './util';
+
+const recordingRuleNameValidationPattern = {
+  message:
+    'Recording rule name must be valid metric name. It may only contain letters, numbers, and colons. It may not contain whitespace.',
+  value: /^[a-zA-Z_:][a-zA-Z0-9_:]*$/,
+};
+
+const AlertRuleNameInput = () => {
+  const styles = useStyles2(getStyles);
+  const {
+    register,
+    watch,
+    formState: { errors },
+  } = useFormContext<RuleFormValues & { location?: string }>();
+
+  const ruleFormType = watch('type');
+  return (
+    <RuleEditorSection stepNo={1} title="Set an alert rule name">
+      <Field
+        className={styles.formInput}
+        label="Rule name"
+        description="Name for the alert rule."
+        error={errors?.name?.message}
+        invalid={!!errors.name?.message}
+      >
+        <Input
+          id="name"
+          {...register('name', {
+            required: { value: true, message: 'Must enter an alert name' },
+            pattern: ruleFormType === RuleFormType.cloudRecording ? recordingRuleNameValidationPattern : undefined,
+            validate: {
+              pathSeparator: (value: string) => {
+                // we use the alert rule name as the "groupname" for Grafana managed alerts, so we can't allow path separators
+                if (ruleFormType === RuleFormType.grafana) {
+                  return checkForPathSeparator(value);
+                }
+
+                return true;
+              },
+            },
+          })}
+          placeholder="Give your alert rule a name."
+        />
+      </Field>
+    </RuleEditorSection>
+  );
+};
 
 type Props = {
   existing?: RuleWithLocation;
@@ -160,6 +209,7 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
         <div className={styles.contentOuter}>
           <CustomScrollbar autoHeightMin="100%" hideHorizontalTrack={true}>
             <div className={styles.contentInner}>
+              <AlertRuleNameInput />
               <QueryAndExpressionsStep editingExistingRule={!!existing} />
               {showStep2 && (
                 <>
@@ -222,5 +272,12 @@ const getStyles = (theme: GrafanaTheme2) => {
       flex-direction: row;
       justify-content: flex-start;
     `,
+    formInput: css`
+      width: 275px;
+
+      & + & {
+        margin-left: ${theme.spacing(3)};
+      }
+    `,
   };
 };
diff --git a/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
index fbe226a9c6c..c74eff45c59 100644
--- a/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
@@ -28,7 +28,7 @@ export const CloudEvaluationBehavior = () => {
   }
 
   return (
-    <RuleEditorSection stepNo={2} title="Alert evaluation behavior">
+    <RuleEditorSection stepNo={3} title="Alert evaluation behavior">
       <Field label="For" description="Expression has to be true for this long for the alert to be fired.">
         <div className={styles.flexRow}>
           <Field invalid={!!errors.forTime?.message} error={errors.forTime?.message} className={styles.inlineField}>
diff --git a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
index b53405ca357..099654102a7 100644
--- a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
@@ -19,12 +19,6 @@ import { RuleEditorSection } from './RuleEditorSection';
 import { RuleFolderPicker, Folder, containsSlashes } from './RuleFolderPicker';
 import { checkForPathSeparator } from './util';
 
-const recordingRuleNameValidationPattern = {
-  message:
-    'Recording rule name must be valid metric name. It may only contain letters, numbers, and colons. It may not contain whitespace.',
-  value: /^[a-zA-Z_:][a-zA-Z0-9_:]*$/,
-};
-
 interface DetailsStepProps {
   initialFolder: RuleForm | null;
 }
@@ -46,7 +40,7 @@ export const DetailsStep = ({ initialFolder }: DetailsStepProps) => {
 
   return (
     <RuleEditorSection
-      stepNo={type === RuleFormType.cloudRecording ? 2 : 3}
+      stepNo={type === RuleFormType.cloudRecording ? 3 : 4}
       title={
         type === RuleFormType.cloudRecording ? 'Add details for your recording rule' : 'Add details for your alert'
       }
@@ -56,31 +50,6 @@ export const DetailsStep = ({ initialFolder }: DetailsStepProps) => {
           : 'Write a summary and add labels to help you better manage your alerts'
       }
     >
-      <Field
-        className={styles.formInput}
-        label="Rule name"
-        error={errors?.name?.message}
-        invalid={!!errors.name?.message}
-      >
-        <Input
-          id="name"
-          {...register('name', {
-            required: { value: true, message: 'Must enter an alert name' },
-            pattern: ruleFormType === RuleFormType.cloudRecording ? recordingRuleNameValidationPattern : undefined,
-            validate: {
-              pathSeparator: (value: string) => {
-                // we use the alert rule name as the "groupname" for Grafana managed alerts, so we can't allow path separators
-                if (ruleFormType === RuleFormType.grafana) {
-                  return checkForPathSeparator(value);
-                }
-
-                return true;
-              },
-            },
-          })}
-        />
-      </Field>
-
       {(ruleFormType === RuleFormType.cloudRecording || ruleFormType === RuleFormType.cloudAlerting) &&
         dataSourceName && <GroupAndNamespaceFields rulesSourceName={dataSourceName} />}
 
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
index 5e8e590db6b..19453d7f81f 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
@@ -91,7 +91,7 @@ export const GrafanaEvaluationBehavior = () => {
 
   return (
     // TODO remove "and alert condition" for recording rules
-    <RuleEditorSection stepNo={2} title="Alert evaluation behavior">
+    <RuleEditorSection stepNo={3} title="Alert evaluation behavior">
       <Field
         label="Evaluate"
         description="Evaluation interval applies to every rule within a group. It can overwrite the interval of an existing alert rule."
diff --git a/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
index 8c9cedac09c..fc1ff41babb 100644
--- a/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
@@ -5,7 +5,7 @@ import { useFormContext } from 'react-hook-form';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Card, Link, useStyles2, useTheme2 } from '@grafana/ui';
 
-import { RuleFormValues } from '../../types/rule-form';
+import { RuleFormType, RuleFormValues } from '../../types/rule-form';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 
 import LabelsField from './LabelsField';
@@ -15,14 +15,15 @@ export const NotificationsStep = () => {
   const [hideFlowChart, setHideFlowChart] = useState(false);
   const styles = useStyles2(getStyles);
   const theme = useTheme2();
+  const { watch } = useFormContext<RuleFormValues & { location?: string }>();
 
-  const { watch } = useFormContext<RuleFormValues>();
+  const type = watch('type');
 
   const dataSourceName = watch('dataSourceName') ?? GRAFANA_RULES_SOURCE_NAME;
 
   return (
     <RuleEditorSection
-      stepNo={4}
+      stepNo={type === RuleFormType.cloudRecording ? 4 : 5}
       title="Notifications"
       description="Grafana handles the notifications for alerts by assigning labels to alerts. These labels connect alerts to contact points and silence alert instances that have matching labels."
     >
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
index d329a1d3de7..974635f8352 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
@@ -147,7 +147,7 @@ export const QueryAndExpressionsStep: FC<Props> = ({ editingExistingRule }) => {
   }, [condition, queries, setValue]);
 
   return (
-    <RuleEditorSection stepNo={1} title="Set a query and alert condition">
+    <RuleEditorSection stepNo={2} title="Set a query and alert condition">
       <AlertType editingExistingRule={editingExistingRule} />
 
       {/* This is the PromQL Editor for Cloud rules and recording rules */}

From 14fbd44ac0f18b5a3dc1706aef0fca929bbb3c7d Mon Sep 17 00:00:00 2001
From: Leo <108552997+lpskdl@users.noreply.github.com>
Date: Mon, 21 Nov 2022 09:42:58 +0100
Subject: [PATCH 029/153] Navigation: Prevent viewer role accessing dashboard
 creation, import and folder creation (#58842)

hide pages related dashboard import create and folder creation for viewer role
---
 public/app/routes/routes.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 9fda8c87041..4e10c837f3e 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -83,6 +83,7 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/dashboard/new',
+      roles: () => ['Editor', 'Admin'],
       pageClass: 'page-dashboard',
       routeName: DashboardRoutes.New,
       component: SafeDynamicImport(
@@ -119,6 +120,7 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/dashboard/import',
+      roles: () => ['Editor', 'Admin'],
       component: SafeDynamicImport(
         () => import(/* webpackChunkName: "DashboardImport"*/ 'app/features/manage-dashboards/DashboardImportPage')
       ),
@@ -168,6 +170,7 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/dashboards/folder/new',
+      roles: () => ['Editor', 'Admin'],
       component: SafeDynamicImport(
         () => import(/* webpackChunkName: "NewDashboardsFolder"*/ 'app/features/folders/components/NewDashboardsFolder')
       ),

From 4aa5dea96bd2f9bb137be704e1f69c09c00cdfb3 Mon Sep 17 00:00:00 2001
From: Leo <108552997+lpskdl@users.noreply.github.com>
Date: Mon, 21 Nov 2022 09:43:21 +0100
Subject: [PATCH 030/153] Navigation: Set navtree to  an empty array instead of
 null (#58919)

set navtree to  an empty array instead of null
---
 pkg/services/navtree/models.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 728dc6cda51..0ff907e17fa 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -140,6 +140,10 @@ func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture(t
 			node.Url = node.Children[0].Url
 		}
 	}
+
+	if len(root.Children) < 1 {
+		root.Children = make([]*NavLink, 0)
+	}
 }
 
 func (root *NavTreeRoot) Sort() {

From b57689e07edf7851def521164d904b24ec8c4fdc Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Mon, 21 Nov 2022 04:13:44 -0500
Subject: [PATCH 031/153] Alerting: Add header X-Grafana-Org-Id to evaluation
 requests (#58972)

---
 pkg/services/ngalert/eval/eval.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/services/ngalert/eval/eval.go b/pkg/services/ngalert/eval/eval.go
index c7725c0a396..5dcbbb030f6 100644
--- a/pkg/services/ngalert/eval/eval.go
+++ b/pkg/services/ngalert/eval/eval.go
@@ -226,6 +226,7 @@ func buildDatasourceHeaders(ctx EvaluationContext) map[string]string {
 	key, ok := models.RuleKeyFromContext(ctx.Ctx)
 	if ok {
 		headers["X-Rule-Uid"] = key.UID
+		headers["X-Grafana-Org-Id"] = strconv.FormatInt(key.OrgID, 10)
 	}
 
 	return headers

From 598935cb3426f899b4add000f20b9b8b5b03db49 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 21 Nov 2022 09:25:56 +0000
Subject: [PATCH 032/153] Accessibility: Improve keyboard accessibility in
 `AnnoListPanel` (#58971)

fix keyboard accessibility in AnnoListPanel
---
 .../plugins/panel/annolist/AnnoListPanel.tsx  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
index bdfa85e45f4..8da05dae51e 100644
--- a/public/app/plugins/panel/annolist/AnnoListPanel.tsx
+++ b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
@@ -1,5 +1,4 @@
 import { css } from '@emotion/css';
-import { FocusScope } from '@react-aria/focus';
 import React, { PureComponent } from 'react';
 import { Subscription } from 'rxjs';
 
@@ -14,7 +13,7 @@ import {
   PanelProps,
 } from '@grafana/data';
 import { config, getBackendSrv, locationService } from '@grafana/runtime';
-import { CustomScrollbar, stylesFactory, TagList } from '@grafana/ui';
+import { Button, CustomScrollbar, stylesFactory, TagList } from '@grafana/ui';
 import { AbstractList } from '@grafana/ui/src/components/List/AbstractList';
 import appEvents from 'app/core/app_events';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
@@ -263,21 +262,25 @@ export class AnnoListPanel extends PureComponent<Props, State> {
           <div className={this.style.filter}>
             <b>Filter:</b>
             {queryUser && (
-              <span onClick={this.onClearUser} className="pointer">
+              <Button
+                size="sm"
+                variant="secondary"
+                fill="text"
+                onClick={this.onClearUser}
+                aria-label={`Remove filter: ${queryUser.email}`}
+              >
                 {queryUser.email}
-              </span>
+              </Button>
             )}
             {queryTags.length > 0 && (
-              <FocusScope restoreFocus>
-                <TagList
-                  icon="times"
-                  tags={queryTags}
-                  onClick={(tag) => this.onTagClick(tag, true)}
-                  getAriaLabel={(name) => `Remove ${name} tag`}
-                  className={this.style.tagList}
-                  ref={this.tagListRef}
-                />
-              </FocusScope>
+              <TagList
+                icon="times"
+                tags={queryTags}
+                onClick={(tag) => this.onTagClick(tag, true)}
+                getAriaLabel={(name) => `Remove ${name} tag`}
+                className={this.style.tagList}
+                ref={this.tagListRef}
+              />
             )}
           </div>
         )}
@@ -299,11 +302,11 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
     height: calc(100% - 30px);
   `,
   filter: css({
+    alignItems: 'center',
     display: 'flex',
-    padding: `0px ${theme.spacing(0.5)}`,
-    b: {
-      paddingRight: theme.spacing(1),
-    },
+    flexWrap: 'wrap',
+    gap: theme.spacing(0.5),
+    padding: theme.spacing(0.5),
   }),
   tagList: css({
     justifyContent: 'flex-start',

From 8aa74fe9ee93722e585f4d0e6011997e6d4c97f0 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 21 Nov 2022 09:29:41 +0000
Subject: [PATCH 033/153] Accessibility: Improve keyboard accessibility of
 `FilterPill` (#58976)

fix keyboard a11y in FilterPill
---
 .../src/components/FilterPill/FilterPill.tsx          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/grafana-ui/src/components/FilterPill/FilterPill.tsx b/packages/grafana-ui/src/components/FilterPill/FilterPill.tsx
index c1a36603a06..6797f0cf3b9 100644
--- a/packages/grafana-ui/src/components/FilterPill/FilterPill.tsx
+++ b/packages/grafana-ui/src/components/FilterPill/FilterPill.tsx
@@ -5,6 +5,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes';
 import { IconName } from '../../types';
+import { clearButtonStyles } from '../Button';
 import { Icon } from '../Icon/Icon';
 
 export interface FilterPillProps {
@@ -16,28 +17,28 @@ export interface FilterPillProps {
 
 export const FilterPill: React.FC<FilterPillProps> = ({ label, selected, onClick, icon = 'check' }) => {
   const styles = useStyles2(getStyles);
+  const clearButton = useStyles2(clearButtonStyles);
   return (
-    <div className={cx(styles.wrapper, selected && styles.selected)} onClick={onClick}>
+    <button type="button" className={cx(clearButton, styles.wrapper, selected && styles.selected)} onClick={onClick}>
       <span>{label}</span>
       {selected && <Icon name={icon} className={styles.icon} />}
-    </div>
+    </button>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     wrapper: css`
-      padding: ${theme.spacing(0.25)} ${theme.spacing(1)};
       background: ${theme.colors.background.secondary};
       border-radius: ${theme.shape.borderRadius(8)};
       padding: ${theme.spacing(0, 2)};
+      font-size: ${theme.typography.bodySmall.fontSize};
       font-weight: ${theme.typography.fontWeightMedium};
-      font-size: ${theme.typography.size.sm};
+      line-height: ${theme.typography.bodySmall.lineHeight};
       color: ${theme.colors.text.secondary};
       display: flex;
       align-items: center;
       height: 32px;
-      cursor: pointer;
 
       &:hover {
         background: ${theme.colors.action.hover};

From b0fc736e7a91c04639e30bc3a0281bacdaa364ad Mon Sep 17 00:00:00 2001
From: Mitch Seaman <mjseaman@users.noreply.github.com>
Date: Mon, 21 Nov 2022 05:07:59 -0500
Subject: [PATCH 034/153] Remove Annotations API version reference (#57057)

Remove minimum version reference in Annotations API docs, since docs are versioned and this feature has been released for years.
---
 docs/sources/developers/http_api/annotations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/developers/http_api/annotations.md b/docs/sources/developers/http_api/annotations.md
index a7314df7905..08a1d432760 100644
--- a/docs/sources/developers/http_api/annotations.md
+++ b/docs/sources/developers/http_api/annotations.md
@@ -16,7 +16,7 @@ title: 'Annotations HTTP API'
 
 # Annotations API
 
-This is the API documentation for the new Grafana Annotations feature released in Grafana 4.6. Annotations are saved in the Grafana database (sqlite, mysql or postgres). Annotations can be organization annotations that can be shown on any dashboard by configuring an annotation data source - they are filtered by tags. Or they can be tied to a panel on a dashboard and are then only shown on that panel.
+Annotations are saved in the Grafana database (sqlite, mysql or postgres). Annotations can be organization annotations that can be shown on any dashboard by configuring an annotation data source - they are filtered by tags. Or they can be tied to a panel on a dashboard and are then only shown on that panel.
 
 > If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
 

From ee9057a5fac629914a2916a6449f62f2c391f4b0 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Mon, 21 Nov 2022 11:15:00 +0100
Subject: [PATCH 035/153] Alerting: Remove checkForPathSeparator validation in
 alert rule name (#59014)

Remove checkForPathSeparator validation in alert rule name
---
 .../unified/components/rule-editor/AlertRuleForm.tsx  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
index 692ee68955d..270fdf07d1d 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
@@ -27,7 +27,6 @@ import { NotificationsStep } from './NotificationsStep';
 import { RuleEditorSection } from './RuleEditorSection';
 import { RuleInspector } from './RuleInspector';
 import { QueryAndExpressionsStep } from './query-and-alert-condition/QueryAndExpressionsStep';
-import { checkForPathSeparator } from './util';
 
 const recordingRuleNameValidationPattern = {
   message:
@@ -58,16 +57,6 @@ const AlertRuleNameInput = () => {
           {...register('name', {
             required: { value: true, message: 'Must enter an alert name' },
             pattern: ruleFormType === RuleFormType.cloudRecording ? recordingRuleNameValidationPattern : undefined,
-            validate: {
-              pathSeparator: (value: string) => {
-                // we use the alert rule name as the "groupname" for Grafana managed alerts, so we can't allow path separators
-                if (ruleFormType === RuleFormType.grafana) {
-                  return checkForPathSeparator(value);
-                }
-
-                return true;
-              },
-            },
           })}
           placeholder="Give your alert rule a name."
         />

From 4d1504d16014ce9ca869a625cb76d224d1098d8f Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Mon, 21 Nov 2022 11:32:47 +0100
Subject: [PATCH 036/153] Change codeowner of login and login attempt packages
 (#59020)

Set grafana authnz team as CODEOWNERS for /pkg/services/loginattempt and /pkg/login
---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 92dfa9ee7c5..b37118ec8a7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -205,6 +205,7 @@ lerna.json @grafana/frontend-ops
 /grafana-mixin/ @grafana/hosted-grafana-team
 
 # Grafana authentication and authorization
+/pkg/login @grafana/grafana-authnz-team
 /pkg/services/accesscontrol @grafana/grafana-authnz-team
 /pkg/services/auth @grafana/grafana-authnz-team
 /pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
@@ -217,6 +218,7 @@ lerna.json @grafana/frontend-ops
 /pkg/services/oauthtoken @grafana/grafana-authnz-team
 /pkg/services/teamguardian @grafana/grafana-authnz-team
 /pkg/services/serviceaccounts @grafana/grafana-authnz-team
+/pkg/services/loginattempt @grafana/grafana-authnz-team
 
 # Grafana Partnerships Team
 /pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-partnerships-team

From 2f878acd9df99881f5a92456ec987c6548f07ec7 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Mon, 21 Nov 2022 11:21:59 +0000
Subject: [PATCH 037/153] Alerting: Add Troubleshooting to Images in
 notifications docs (#58955)

---
 .../manage-notifications/images-in-notifications.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/sources/alerting/manage-notifications/images-in-notifications.md b/docs/sources/alerting/manage-notifications/images-in-notifications.md
index 4d0fa1606fc..5db84b342fb 100644
--- a/docs/sources/alerting/manage-notifications/images-in-notifications.md
+++ b/docs/sources/alerting/manage-notifications/images-in-notifications.md
@@ -54,7 +54,7 @@ If Grafana has been set up to use an external image store, `upload_external_imag
     # will be persisted to disk for up to temp_data_lifetime.
     upload_external_image_storage = false
 
-Restart Grafana for the changes to take affect.
+Restart Grafana for the changes to take effect.
 
 ## Supported notifiers
 
@@ -101,3 +101,14 @@ For example, if a screenshot could not be taken within the expected time (10 sec
 - Images in notifications are not available for Grafana Mimir and Loki managed alert rules, or when Grafana is set up to send alert notifications to an external Alertmanager.
 - When alerts generated by different alert rules are sent in a single notification, there may be screenshots for each alert rule. This happens if an alert group contains multiple alerting rules. The order the images are attached is random. If you need to guarantee the ordering of images, make sure that your alert groups contain a single alerting rule.
 - Some contact points only handle a single image. In this case, the first image associated with an alert will be attached. Because the ordering is random, this may not always be an image for the same alert rule. If you need to guarantee you receive a screenshot for a particular rule, make sure that your alert groups contain a single alerting rule.
+
+## Troubleshooting
+
+If Grafana has been set up to send images in notifications, however notifications are still being received without images, then check the troubleshooting instructions below.
+
+1. Check that Grafana has been set up as per the instructions
+2. Check that the notifier supports images in notifications as per the table of supported notifiers
+3. Enable debug logging in Grafana and look for logs with the logger `ngalert.image`
+4. If the alert is not associated with a dashboard there will be logs for `Cannot take screenshot for alert rule as it is not associated with a dashboard`
+5. If the alert is associated with a dashboard, but no panel in the dashboard, there will be logs for `Cannot take screenshot for alert rule as it is not associated with a panel`
+6. If images cannot be taken because of mis-configuration or an issue with image rendering there will be logs for `Failed to take an image` including the Dashboard UID, Panel ID, and the error message

From f8656d269de017efc3cba71e1476ea7fa9570481 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Mon, 21 Nov 2022 12:03:16 +0000
Subject: [PATCH 038/153] AzureMonitor: Separate subscription health check API
 version (#58253)

Separate subscription health check API version
---
 pkg/tsdb/azuremonitor/azuremonitor.go      | 3 ++-
 pkg/tsdb/azuremonitor/azuremonitor_test.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/azuremonitor/azuremonitor.go b/pkg/tsdb/azuremonitor/azuremonitor.go
index 826b63e4246..b56256ad808 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor.go
@@ -216,7 +216,8 @@ func (s *Service) getDSInfo(pluginCtx backend.PluginContext) (types.DatasourceIn
 }
 
 func checkAzureMonitorMetricsHealth(dsInfo types.DatasourceInfo) (*http.Response, error) {
-	url := fmt.Sprintf("%v/subscriptions?api-version=%v", dsInfo.Routes["Azure Monitor"].URL, metrics.AzureMonitorAPIVersion)
+	subscriptionsApiVersion := "2020-01-01"
+	url := fmt.Sprintf("%v/subscriptions?api-version=%v", dsInfo.Routes["Azure Monitor"].URL, subscriptionsApiVersion)
 	request, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return nil, err
diff --git a/pkg/tsdb/azuremonitor/azuremonitor_test.go b/pkg/tsdb/azuremonitor/azuremonitor_test.go
index e2d428b9ddd..74a479564af 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor_test.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor_test.go
@@ -425,7 +425,7 @@ func TestCheckHealth(t *testing.T) {
 				Status:  backend.HealthStatusError,
 				Message: "One or more health checks failed. See details below.",
 				JSONDetails: []byte(
-					`{"verboseMessage": "1. Error connecting to Azure Monitor endpoint: health check failed: Get \"https://management.azure.com/subscriptions?api-version=2021-05-01\": not found\n2. Error connecting to Azure Log Analytics endpoint: health check failed: Get \"https://management.azure.com/subscriptions//providers/Microsoft.OperationalInsights/workspaces?api-version=2017-04-26-preview\": not found\n3. Error connecting to Azure Resource Graph endpoint: health check failed: Post \"https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2021-06-01-preview\": not found" }`),
+					`{"verboseMessage": "1. Error connecting to Azure Monitor endpoint: health check failed: Get \"https://management.azure.com/subscriptions?api-version=2020-01-01\": not found\n2. Error connecting to Azure Log Analytics endpoint: health check failed: Get \"https://management.azure.com/subscriptions//providers/Microsoft.OperationalInsights/workspaces?api-version=2017-04-26-preview\": not found\n3. Error connecting to Azure Resource Graph endpoint: health check failed: Post \"https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2021-06-01-preview\": not found" }`),
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {

From 448358ac669eeb7b38a83919e97b6f19b275e25e Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Mon, 21 Nov 2022 13:09:43 +0100
Subject: [PATCH 039/153] @grafana/runtime: Avoid calling
 applyTemplateVariables for the wrong datasource (#57921)

---
 .../src/utils/DataSourceWithBackend.test.ts   | 27 +++++++++++++------
 .../src/utils/DataSourceWithBackend.ts        | 14 +++++++---
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
index 7c996cea7c5..db7a43baa03 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
@@ -42,7 +42,8 @@ jest.mock('../services', () => ({
 
 describe('DataSourceWithBackend', () => {
   test('check the executed queries', () => {
-    const mock = runQueryAndReturnFetchMock({
+    const { mock, ds } = createMockDatasource();
+    ds.query({
       maxDataPoints: 10,
       intervalMs: 5000,
       targets: [{ refId: 'A' }, { refId: 'B', datasource: { type: 'sample' } }],
@@ -93,8 +94,22 @@ describe('DataSourceWithBackend', () => {
     `);
   });
 
+  test('should apply template variables only for the current data source', () => {
+    const { mock, ds } = createMockDatasource();
+    ds.applyTemplateVariables = jest.fn();
+    ds.query({
+      maxDataPoints: 10,
+      intervalMs: 5000,
+      targets: [{ refId: 'A' }, { refId: 'B', datasource: { type: 'sample' } }],
+    } as DataQueryRequest);
+
+    expect(mock.calls.length).toBe(1);
+    expect(ds.applyTemplateVariables).toHaveBeenCalledTimes(1);
+  });
+
   test('check that the executed queries is hidden from inspector', () => {
-    const mock = runQueryAndReturnFetchMock({
+    const { mock, ds } = createMockDatasource();
+    ds.query({
       maxDataPoints: 10,
       intervalMs: 5000,
       targets: [{ refId: 'A' }, { refId: 'B', datasource: { type: 'sample' } }],
@@ -169,9 +184,7 @@ describe('DataSourceWithBackend', () => {
   });
 });
 
-function runQueryAndReturnFetchMock(
-  request: DataQueryRequest
-): jest.MockContext<Promise<FetchResponse>, BackendSrvRequest[]> {
+function createMockDatasource() {
   const settings = {
     name: 'test',
     id: 1234,
@@ -184,7 +197,5 @@ function runQueryAndReturnFetchMock(
   mockDatasourceRequest.mockReturnValue(Promise.resolve({} as FetchResponse));
 
   const ds = new MyDataSource(settings);
-  ds.query(request);
-
-  return mockDatasourceRequest.mock;
+  return { ds, mock: mockDatasourceRequest.mock };
 }
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
index 9cdc73b7d72..15c2bd947e3 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
@@ -133,6 +133,7 @@ class DataSourceWithBackend<
     const queries = targets.map((q) => {
       let datasource = this.getRef();
       let datasourceId = this.id;
+      let shouldApplyTemplateVariables = true;
 
       if (isExpressionReference(q.datasource)) {
         hasExpr = true;
@@ -149,8 +150,15 @@ class DataSourceWithBackend<
           throw new Error(`Unknown Datasource: ${JSON.stringify(q.datasource)}`);
         }
 
-        datasource = ds.rawRef ?? getDataSourceRef(ds);
-        datasourceId = ds.id;
+        const dsRef = ds.rawRef ?? getDataSourceRef(ds);
+        const dsId = ds.id;
+        if (dsRef.uid !== datasource.uid || datasourceId !== dsId) {
+          datasource = dsRef;
+          datasourceId = dsId;
+          // If the query is using a different datasource, we would need to retrieve the datasource
+          // instance (async) and apply the template variables but it seems it's not necessary for now.
+          shouldApplyTemplateVariables = false;
+        }
       }
       if (datasource.type?.length) {
         pluginIDs.add(datasource.type);
@@ -159,7 +167,7 @@ class DataSourceWithBackend<
         dsUIDs.add(datasource.uid);
       }
       return {
-        ...this.applyTemplateVariables(q, request.scopedVars),
+        ...(shouldApplyTemplateVariables ? this.applyTemplateVariables(q, request.scopedVars) : q),
         datasource,
         datasourceId, // deprecated!
         intervalMs,

From b1ffe18599005ba9baaf334f696e288b8801176c Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Mon, 21 Nov 2022 13:05:55 +0000
Subject: [PATCH 040/153] Chore: Fix some as HTMLElement type assertions
 (#58667)

---
 .betterer.results                             | 34 ++++++-------------
 .../search/state/SearchStateManager.ts        |  2 +-
 .../prometheus/components/PromQueryEditor.tsx |  2 +-
 .../datasource/testdata/QueryEditor.tsx       |  8 ++---
 .../components/SimulationQueryEditor.tsx      |  2 +-
 .../components/SimulationSchemaForm.tsx       |  2 +-
 public/app/plugins/panel/barchart/bars.ts     |  4 ++-
 .../panel/canvas/CanvasContextMenu.tsx        |  7 ++--
 .../timeseries/plugins/ContextMenuPlugin.tsx  |  5 ++-
 9 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index b09b00781de..b5d57820a1c 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4651,8 +4651,7 @@ exports[`better eslint`] = {
     "public/app/features/search/state/SearchStateManager.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
     "public/app/features/search/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6349,8 +6348,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/components/PromQueryEditorByApp.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6850,13 +6848,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
     "public/app/plugins/datasource/testdata/components/PredictablePulseEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -6876,13 +6871,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/testdata/components/StreamingClientEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -7005,11 +6998,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
     "public/app/plugins/panel/barchart/module.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -7067,9 +7059,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "10"],
       [0, 0, 0, "Do not use any type assertions.", "11"]
     ],
-    "public/app/plugins/panel/canvas/CanvasContextMenu.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/panel/canvas/CanvasPanel.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
@@ -8185,9 +8174,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
     ],
-    "public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 5a218372349..06f7b589d72 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -105,7 +105,7 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   };
 
   onStarredFilterChange = (e: FormEvent<HTMLInputElement>) => {
-    const starred = (e.target as HTMLInputElement).checked;
+    const starred = e.currentTarget.checked;
     this.setStateAndDoSearch({ starred });
   };
 
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx
index edb1af34bfc..0ba79277e90 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx
@@ -75,7 +75,7 @@ export class PromQueryEditor extends PureComponent<PromQueryEditorProps, State>
   };
 
   onInstantChange = (e: React.SyntheticEvent<HTMLInputElement>) => {
-    const instant = (e.target as HTMLInputElement).checked;
+    const instant = e.currentTarget.checked;
     this.query.instant = instant;
     this.setState({ instant }, this.onRunQuery);
   };
diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx
index dbd72aadc9c..084a6e0d125 100644
--- a/public/app/plugins/datasource/testdata/QueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx
@@ -124,22 +124,22 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
   };
 
   const onInputChange = (e: FormEvent<HTMLInputElement | HTMLTextAreaElement>) => {
-    const { name, value, type } = e.target as HTMLInputElement | HTMLTextAreaElement;
+    const { name, value, type } = e.currentTarget;
     let newValue: any = value;
 
     if (type === 'number') {
       newValue = Number(value);
     }
 
-    if (name === 'levelColumn') {
-      newValue = (e.target as HTMLInputElement).checked;
+    if (name === 'levelColumn' && e.currentTarget instanceof HTMLInputElement) {
+      newValue = e.currentTarget.checked;
     }
 
     onUpdate({ ...query, [name]: newValue });
   };
 
   const onFieldChange = (field: string) => (e: ChangeEvent<HTMLInputElement>) => {
-    const { name, value, type } = e.target as HTMLInputElement;
+    const { name, value, type } = e.currentTarget;
     let newValue: any = value;
 
     if (type === 'number') {
diff --git a/public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx b/public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx
index fef2b7c00dc..d836a8307ea 100644
--- a/public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx
@@ -64,7 +64,7 @@ export const SimulationQueryEditor = ({ onChange, query, ds }: EditorProps) => {
   };
 
   const onUIDChanged = (e: FormEvent<HTMLInputElement>) => {
-    const { value } = e.target as HTMLInputElement;
+    const { value } = e.currentTarget;
     onUpdateKey({ ...simKey, uid: value ?? undefined });
   };
 
diff --git a/public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx b/public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx
index af84321a89a..7e33eb61eeb 100644
--- a/public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx
+++ b/public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx
@@ -60,7 +60,7 @@ export const SimulationSchemaForm = ({ config, schema, onChange }: SchemaFormPro
   const styles = useStyles2(getStyles);
 
   const onUpdateTextArea = (event: FormEvent<HTMLTextAreaElement>) => {
-    const element = event.target as HTMLInputElement;
+    const element = event.currentTarget;
     onChange(JSON.parse(element.value));
   };
 
diff --git a/public/app/plugins/panel/barchart/bars.ts b/public/app/plugins/panel/barchart/bars.ts
index 119d8e22ae0..a0b636e1fa6 100644
--- a/public/app/plugins/panel/barchart/bars.ts
+++ b/public/app/plugins/panel/barchart/bars.ts
@@ -417,7 +417,9 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
     let over = u.over;
     over.style.overflow = 'hidden';
     u.root.querySelectorAll('.u-cursor-pt').forEach((el) => {
-      (el as HTMLElement).style.borderRadius = '0';
+      if (el instanceof HTMLElement) {
+        el.style.borderRadius = '0';
+      }
     });
   };
 
diff --git a/public/app/plugins/panel/canvas/CanvasContextMenu.tsx b/public/app/plugins/panel/canvas/CanvasContextMenu.tsx
index 8e299e8446d..29990ff9f60 100644
--- a/public/app/plugins/panel/canvas/CanvasContextMenu.tsx
+++ b/public/app/plugins/panel/canvas/CanvasContextMenu.tsx
@@ -36,8 +36,11 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
       panel.setActivePanel();
 
       const shouldSelectElement = event.currentTarget !== scene.div;
-      if (shouldSelectElement) {
-        scene.select({ targets: [event.currentTarget as HTMLElement | SVGElement] });
+      if (
+        shouldSelectElement &&
+        (event.currentTarget instanceof HTMLElement || event.currentTarget instanceof SVGElement)
+      ) {
+        scene.select({ targets: [event.currentTarget] });
       }
       setAnchorPoint({ x: event.pageX, y: event.pageY });
       setIsMenuVisible(true);
diff --git a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
index 4e19f11ce24..31d44bd3ef5 100644
--- a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
@@ -119,9 +119,8 @@ export const ContextMenuPlugin: React.FC<ContextMenuPluginProps> = ({
         }
         isClick = true;
 
-        if (e.target) {
-          const target = e.target as HTMLElement;
-          if (!target.classList.contains('u-cursor-pt')) {
+        if (e.target instanceof HTMLElement) {
+          if (!e.target.classList.contains('u-cursor-pt')) {
             pluginLog('ContextMenuPlugin', false, 'canvas click');
             setPoint({ seriesIdx: null, dataIdx: null });
           }

From bdfa127ee5c11948568d83579e60351792e65f4f Mon Sep 17 00:00:00 2001
From: Kristina <kristina.durivage@grafana.com>
Date: Mon, 21 Nov 2022 08:03:50 -0600
Subject: [PATCH 041/153] Explore: Notify when compact URL is used (#58684)

* Add explore compact url notices

* Add error checking around data links urls

* Fix tests

* remove global flag, add test for warning in title

* Move feature tracking to initialization, add better error messaging

* Fix test

* Add compact url tests, fix styling bug, remove warning tooltip

* Fix broken check, move tests to util file
---
 packages/grafana-data/src/types/explore.ts    |  1 +
 .../components/DataLinks/DataLinkEditor.tsx   |  7 ++++-
 .../DataLinksListItem.test.tsx                | 11 +++++++
 .../DataLinksListItem.tsx                     | 18 +++++++++--
 .../grafana-ui/src/utils/dataLinks.test.ts    | 31 +++++++++++++++++++
 packages/grafana-ui/src/utils/dataLinks.ts    |  5 +++
 public/app/core/utils/explore.test.ts         |  2 ++
 public/app/core/utils/explore.ts              |  5 +--
 public/app/features/explore/Explore.test.tsx  |  1 +
 public/app/features/explore/Explore.tsx       | 18 ++++++++++-
 .../features/explore/ExplorePaneContainer.tsx | 20 ++++++++++--
 .../app/features/explore/state/explorePane.ts |  9 ++++--
 public/app/types/explore.ts                   |  2 ++
 13 files changed, 120 insertions(+), 10 deletions(-)
 create mode 100644 packages/grafana-ui/src/utils/dataLinks.test.ts

diff --git a/packages/grafana-data/src/types/explore.ts b/packages/grafana-data/src/types/explore.ts
index abc73743db0..ef3a44f7775 100644
--- a/packages/grafana-data/src/types/explore.ts
+++ b/packages/grafana-data/src/types/explore.ts
@@ -11,6 +11,7 @@ export interface ExploreUrlState<T extends DataQuery = AnyQuery> {
   range: RawTimeRange;
   context?: string;
   panelsState?: ExplorePanelsState;
+  isFromCompactUrl?: boolean;
 }
 
 export interface ExplorePanelsState extends Partial<Record<PreferredVisualisationType, {}>> {
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx
index 820fae0b5bb..46bad70bd34 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx
@@ -4,6 +4,7 @@ import React, { ChangeEvent } from 'react';
 import { VariableSuggestion, GrafanaTheme2, DataLink } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/index';
+import { isCompactUrl } from '../../utils/dataLinks';
 import { Field } from '../Forms/Field';
 import { Input } from '../Input/Input';
 import { Switch } from '../Switch/Switch';
@@ -50,7 +51,11 @@ export const DataLinkEditor: React.FC<DataLinkEditorProps> = React.memo(
           <Input value={value.title} onChange={onTitleChange} placeholder="Show details" />
         </Field>
 
-        <Field label="URL">
+        <Field
+          label="URL"
+          invalid={isCompactUrl(value.url)}
+          error="Data link is an Explore URL in a deprecated format. Please visit the URL to be redirected, and edit this data link to use that URL."
+        >
           <DataLinkInput value={value.url} onChange={onUrlChange} suggestions={suggestions} />
         </Field>
 
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.test.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.test.tsx
index 4e9d27d7f3d..b0877f8bcba 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.test.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.test.tsx
@@ -50,6 +50,17 @@ describe('DataLinksListItem', () => {
       expect(screen.getByText(/http:\/\/localhost\:3000/i)).toBeInTheDocument();
       expect(screen.getByTitle(/http:\/\/localhost\:3000/i)).toBeInTheDocument();
     });
+
+    it('that is a explore compact url, then the title should be a warning', () => {
+      const link = {
+        ...baseLink,
+        url: 'http://localhost:3000/explore?orgId=1&left=[%22now-1h%22,%22now%22,%22gdev-loki%22,{%22expr%22:%22{place=%22luna%22}%22,%22refId%22:%22A%22}]',
+      };
+      setupTestContext({ link });
+
+      expect(screen.getByText(/http:\/\/localhost\:3000/i)).toBeInTheDocument();
+      expect(screen.getByText(/Explore data link may not work in the future. Please edit./i)).toBeInTheDocument();
+    });
   });
 
   describe('when link is missing title', () => {
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
index 03fcfdd6623..2c9e721d332 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
@@ -4,6 +4,8 @@ import React, { FC } from 'react';
 import { DataFrame, DataLink, GrafanaTheme2 } from '@grafana/data';
 
 import { stylesFactory, useTheme2 } from '../../../themes';
+import { isCompactUrl } from '../../../utils/dataLinks';
+import { FieldValidationMessage } from '../../Forms/FieldValidationMessage';
 import { IconButton } from '../../IconButton/IconButton';
 import { HorizontalGroup, VerticalGroup } from '../../Layout/Layout';
 
@@ -25,11 +27,13 @@ export const DataLinksListItem: FC<DataLinksListItemProps> = ({ link, onEdit, on
   const hasTitle = title.trim() !== '';
   const hasUrl = url.trim() !== '';
 
+  const isCompactExploreUrl = isCompactUrl(url);
+
   return (
     <div className={styles.wrapper}>
       <VerticalGroup spacing="xs">
         <HorizontalGroup justify="space-between" align="flex-start" width="100%">
-          <div className={cx(styles.title, !hasTitle && styles.notConfigured)}>
+          <div className={cx(styles.url, !hasUrl && styles.notConfigured, isCompactExploreUrl && styles.errored)}>
             {hasTitle ? title : 'Data link title not provided'}
           </div>
           <HorizontalGroup>
@@ -37,9 +41,15 @@ export const DataLinksListItem: FC<DataLinksListItemProps> = ({ link, onEdit, on
             <IconButton name="times" onClick={onRemove} />
           </HorizontalGroup>
         </HorizontalGroup>
-        <div className={cx(styles.url, !hasUrl && styles.notConfigured)} title={url}>
+        <div
+          className={cx(styles.url, !hasUrl && styles.notConfigured, isCompactExploreUrl && styles.errored)}
+          title={url}
+        >
           {hasUrl ? url : 'Data link url not provided'}
         </div>
+        {isCompactExploreUrl && (
+          <FieldValidationMessage>Explore data link may not work in the future. Please edit.</FieldValidationMessage>
+        )}
       </VerticalGroup>
     </div>
   );
@@ -54,6 +64,10 @@ const getDataLinkListItemStyles = stylesFactory((theme: GrafanaTheme2) => {
         margin-bottom: 0;
       }
     `,
+    errored: css`
+      color: ${theme.colors.error.text};
+      font-style: italic;
+    `,
     notConfigured: css`
       font-style: italic;
     `,
diff --git a/packages/grafana-ui/src/utils/dataLinks.test.ts b/packages/grafana-ui/src/utils/dataLinks.test.ts
new file mode 100644
index 00000000000..a4f5ae1a61b
--- /dev/null
+++ b/packages/grafana-ui/src/utils/dataLinks.test.ts
@@ -0,0 +1,31 @@
+import { isCompactUrl } from './dataLinks';
+
+describe('Datalinks', () => {
+  it('isCompactUrl matches compact URL with segments', () => {
+    expect(
+      isCompactUrl(
+        'http://localhost:3000/explore?orgId=1&left=[%22now-1h%22,%22now%22,%22gdev-loki%22,{%22expr%22:%22{place=%22luna%22}%22,%22refId%22:%22A%22}]'
+      )
+    ).toEqual(true);
+  });
+
+  it('isCompactUrl matches compact URL without segments', () => {
+    expect(isCompactUrl('http://localhost:3000/explore?orgId=1&left=[%22now-1h%22,%22now%22,%22gdev-loki%22]')).toEqual(
+      true
+    );
+  });
+
+  it('isCompactUrl matches compact URL with right pane', () => {
+    expect(
+      isCompactUrl('http://localhost:3000/explore?orgId=1&right=[%22now-1h%22,%22now%22,%22gdev-loki%22]')
+    ).toEqual(true);
+  });
+
+  it('isCompactUrl does not match non-compact url', () => {
+    expect(
+      isCompactUrl(
+        'http://localhost:3000/explore?orgId=1&left={"datasource":"test[datasource]","queries":[{"refId":"A","datasource":{"type":"prometheus","uid":"gdev-prometheus"}}],"range":{"from":"now-1h","to":"now"}}'
+      )
+    ).toEqual(false);
+  });
+});
diff --git a/packages/grafana-ui/src/utils/dataLinks.ts b/packages/grafana-ui/src/utils/dataLinks.ts
index 5d2a6db23fd..e5111f90851 100644
--- a/packages/grafana-ui/src/utils/dataLinks.ts
+++ b/packages/grafana-ui/src/utils/dataLinks.ts
@@ -18,3 +18,8 @@ export const linkModelToContextMenuItems: (links: () => LinkModel[]) => MenuItem
     };
   });
 };
+
+export const isCompactUrl = (url: string) => {
+  const compactExploreUrlRegex = /\/explore\?.*&(left|right)=\[(.*\,){2,}(.*){1}\]/;
+  return compactExploreUrlRegex.test(url);
+};
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index 63e99705130..0410a47f1d3 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -122,6 +122,7 @@ describe('state functions', () => {
       const state = {
         ...DEFAULT_EXPLORE_STATE,
         datasource: 'foo',
+        isFromCompactUrl: false,
         queries: [
           {
             expr: 'metric{test="a/b"}',
@@ -146,6 +147,7 @@ describe('state functions', () => {
       const state = {
         ...DEFAULT_EXPLORE_STATE,
         datasource: 'foo',
+        isFromCompactUrl: false,
         queries: [
           {
             expr: 'metric{test="a/b"}',
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index dce6c2e66ad..2237ee3eb56 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -219,7 +219,8 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
   }
 
   if (!Array.isArray(parsed)) {
-    return parsed;
+    const urlState = { ...parsed, isFromCompactUrl: false };
+    return urlState;
   }
 
   if (parsed.length <= ParseUrlStateIndex.SegmentsStart) {
@@ -236,7 +237,7 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
   const queries = parsedSegments.filter((segment) => !isSegment(segment, 'ui', 'mode', '__panelsState'));
 
   const panelsState = parsedSegments.find((segment) => isSegment(segment, '__panelsState'))?.__panelsState;
-  return { datasource, queries, range, panelsState };
+  return { datasource, queries, range, panelsState, isFromCompactUrl: true };
 }
 
 export function generateKey(index = 0): string {
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index 619ef022261..db4aec6269a 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -84,6 +84,7 @@ const dummyProps: Props = {
   showFlameGraph: true,
   splitOpen: (() => {}) as any,
   splitted: false,
+  isFromCompactUrl: false,
   eventBus: new EventBusSrv(),
 };
 
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index e4b3f488fac..128266630d5 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -18,9 +18,10 @@ import {
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
-import { CustomScrollbar, ErrorBoundaryAlert, Themeable2, withTheme2, PanelContainer } from '@grafana/ui';
+import { CustomScrollbar, ErrorBoundaryAlert, Themeable2, withTheme2, PanelContainer, Alert } from '@grafana/ui';
 import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR, FilterItem } from '@grafana/ui/src/components/Table/types';
 import appEvents from 'app/core/app_events';
+import { FadeIn } from 'app/core/components/Animations/FadeIn';
 import { supportedFeatures } from 'app/core/history/richHistoryStorageProvider';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { getNodeGraphDataFrames } from 'app/plugins/panel/nodeGraph/utils';
@@ -270,6 +271,17 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     return <NoData />;
   }
 
+  renderCompactUrlWarning() {
+    return (
+      <FadeIn in={true} duration={100}>
+        <Alert severity="warning" title="Compact URL Deprecation Notice" topSpacing={2}>
+          The URL that brought you here was a compact URL - this format will soon be deprecated. Please replace the URL
+          previously saved with the URL available now.
+        </Alert>
+      </FadeIn>
+    );
+  }
+
   renderGraphPanel(width: number) {
     const { graphResult, absoluteRange, timeZone, queryResponse, loading, showFlameGraph } = this.props;
 
@@ -382,6 +394,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
       showFlameGraph,
       splitted,
       timeZone,
+      isFromCompactUrl,
     } = this.props;
     const { openDrawer } = this.state;
     const styles = getStyles(theme);
@@ -407,6 +420,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
         scrollRefCallback={(scrollElement) => (this.scrollElement = scrollElement || undefined)}
       >
         <ExploreToolbar exploreId={exploreId} onChangeTime={this.onChangeTime} topOfViewRef={this.topOfViewRef} />
+        {isFromCompactUrl ? this.renderCompactUrlWarning() : null}
         {datasourceMissing ? this.renderEmptyState(styles.exploreContainer) : null}
         {datasourceInstance && (
           <div
@@ -503,6 +517,7 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     showNodeGraph,
     showFlameGraph,
     loading,
+    isFromCompactUrl,
   } = item;
 
   return {
@@ -525,6 +540,7 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     showFlameGraph,
     splitted: isSplit(state),
     loading,
+    isFromCompactUrl: isFromCompactUrl || false,
   };
 }
 
diff --git a/public/app/features/explore/ExplorePaneContainer.tsx b/public/app/features/explore/ExplorePaneContainer.tsx
index 68c248eddc7..048dbd1f3fa 100644
--- a/public/app/features/explore/ExplorePaneContainer.tsx
+++ b/public/app/features/explore/ExplorePaneContainer.tsx
@@ -5,6 +5,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { ExploreUrlState, EventBusExtended, EventBusSrv, GrafanaTheme2, EventBus } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
 import { Themeable2, withTheme2 } from '@grafana/ui';
 import { config } from 'app/core/config';
 import store from 'app/core/store';
@@ -70,7 +71,16 @@ class ExplorePaneContainerUnconnected extends React.PureComponent<Props> {
   }
 
   async componentDidMount() {
-    const { initialized, exploreId, initialDatasource, initialQueries, initialRange, panelsState, orgId } = this.props;
+    const {
+      initialized,
+      exploreId,
+      initialDatasource,
+      initialQueries,
+      initialRange,
+      panelsState,
+      orgId,
+      isFromCompactUrl,
+    } = this.props;
     const width = this.el?.offsetWidth ?? 0;
     // initialize the whole explore first time we mount and if browser history contains a change in datasource
     if (!initialized) {
@@ -108,6 +118,10 @@ class ExplorePaneContainerUnconnected extends React.PureComponent<Props> {
         }
       }
 
+      if (isFromCompactUrl) {
+        reportInteraction('grafana_explore_compact_notice');
+      }
+
       this.props.initializeExplore(
         exploreId,
         rootDatasourceOverride || queries[0]?.datasource || initialDatasource,
@@ -115,7 +129,8 @@ class ExplorePaneContainerUnconnected extends React.PureComponent<Props> {
         initialRange,
         width,
         this.exploreEvents,
-        panelsState
+        panelsState,
+        isFromCompactUrl
       );
     }
   }
@@ -172,6 +187,7 @@ function mapStateToProps(state: StoreState, props: OwnProps) {
     initialRange,
     panelsState,
     orgId: state.user.orgId,
+    isFromCompactUrl: urlState.isFromCompactUrl || false,
   };
 }
 
diff --git a/public/app/features/explore/state/explorePane.ts b/public/app/features/explore/state/explorePane.ts
index ecbfa669b7f..20cff532e12 100644
--- a/public/app/features/explore/state/explorePane.ts
+++ b/public/app/features/explore/state/explorePane.ts
@@ -98,6 +98,7 @@ export interface InitializeExplorePayload {
   range: TimeRange;
   history: HistoryItem[];
   datasourceInstance?: DataSourceApi;
+  isFromCompactUrl?: boolean;
 }
 export const initializeExploreAction = createAction<InitializeExplorePayload>('explore/initializeExplore');
 
@@ -132,7 +133,8 @@ export function initializeExplore(
   range: TimeRange,
   containerWidth: number,
   eventBridge: EventBusExtended,
-  panelsState?: ExplorePanelsState
+  panelsState?: ExplorePanelsState,
+  isFromCompactUrl?: boolean
 ): ThunkResult<void> {
   return async (dispatch, getState) => {
     const exploreDatasources = getDataSourceSrv().getList();
@@ -155,6 +157,7 @@ export function initializeExplore(
         range,
         datasourceInstance: instance,
         history,
+        isFromCompactUrl,
       })
     );
     if (panelsState !== undefined) {
@@ -272,7 +275,8 @@ export const paneReducer = (state: ExploreItemState = makeExplorePaneState(), ac
   }
 
   if (initializeExploreAction.match(action)) {
-    const { containerWidth, eventBridge, queries, range, datasourceInstance, history } = action.payload;
+    const { containerWidth, eventBridge, queries, range, datasourceInstance, history, isFromCompactUrl } =
+      action.payload;
 
     return {
       ...state,
@@ -287,6 +291,7 @@ export const paneReducer = (state: ExploreItemState = makeExplorePaneState(), ac
       datasourceMissing: !datasourceInstance,
       queryResponse: createEmptyQueryResponse(),
       cache: [],
+      isFromCompactUrl: isFromCompactUrl || false,
     };
   }
 
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 7891519890a..c0936606eb6 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -203,6 +203,8 @@ export interface ExploreItemState {
   logsVolumeData?: DataQueryResponse;
 
   panelsState: ExplorePanelsState;
+
+  isFromCompactUrl?: boolean;
 }
 
 export interface ExploreUpdateState {

From 15561b83e49879e0ede0b8e80a300ae060605c1a Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Mon, 21 Nov 2022 15:24:20 +0100
Subject: [PATCH 042/153] Nested Folders: Make parent_uid column nullable
 (#59035)

Nested Folders: Make parent UID column nullable
---
 pkg/services/sqlstore/migrations/folder_mig.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/migrations/folder_mig.go b/pkg/services/sqlstore/migrations/folder_mig.go
index 71938ed791b..4ef08d198e8 100644
--- a/pkg/services/sqlstore/migrations/folder_mig.go
+++ b/pkg/services/sqlstore/migrations/folder_mig.go
@@ -33,7 +33,7 @@ func folderv1() migrator.Table {
 			{Name: "org_id", Type: migrator.DB_BigInt, Nullable: false},
 			{Name: "title", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "description", Type: migrator.DB_NVarchar, Length: 255, Nullable: true},
-			{Name: "parent_uid", Type: migrator.DB_NVarchar, Length: 40, Default: ""},
+			{Name: "parent_uid", Type: migrator.DB_NVarchar, Length: 40, Nullable: true},
 			{Name: "created", Type: migrator.DB_DateTime, Nullable: false},
 			{Name: "updated", Type: migrator.DB_DateTime, Nullable: false},
 		},

From 156ed4b56c6cfe08cf6c50b9b479df32e9b5d5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 21 Nov 2022 15:31:01 +0100
Subject: [PATCH 043/153] VizPanel: Support panel migrations and state changes 
 (#58501)

* VizPanel: Make it more real

* Updates

* Progress on query runner and max data points from width

* Updated

* Update

* Tests

* Fixed issue with migration

* Moving VizPanel

* Fixed migration issue due to pluginVersion not being set

* Update public/app/features/scenes/querying/SceneQueryRunner.test.ts

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>

* Some minor review fixes

* Added expect

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
---
 .betterer.results                             |   3 +
 .../panel/components/PanelRenderer.tsx        |   7 +-
 .../features/plugins/__mocks__/pluginMocks.ts |   2 +-
 .../features/scenes/components/VizPanel.tsx   |  99 -------------
 .../components/VizPanel/VizPanel.test.tsx     | 136 ++++++++++++++++++
 .../scenes/components/VizPanel/VizPanel.tsx   | 125 ++++++++++++++++
 .../components/VizPanel/VizPanelRenderer.tsx  |  94 ++++++++++++
 .../app/features/scenes/components/index.ts   |  10 ++
 .../features/scenes/core/SceneTimeRange.tsx   |  10 +-
 public/app/features/scenes/core/sceneGraph.ts |   2 +-
 public/app/features/scenes/core/types.ts      |   6 +-
 .../scenes/dashboard/DashboardsLoader.ts      |  63 +++-----
 .../scenes/querying/SceneQueryRunner.test.ts  |  83 +++++++++++
 .../scenes/querying/SceneQueryRunner.ts       |  84 ++++++++---
 public/app/features/scenes/scenes/demo.tsx    |  24 ++--
 public/app/features/scenes/scenes/grid.tsx    |   6 +-
 .../scenes/scenes/gridMultiTimeRange.tsx      |   6 +-
 .../features/scenes/scenes/gridMultiple.tsx   |   6 +-
 .../scenes/scenes/gridWithMultipleData.tsx    |   8 +-
 .../features/scenes/scenes/gridWithRow.tsx    |   6 +-
 .../features/scenes/scenes/gridWithRows.tsx   |   6 +-
 public/app/features/scenes/scenes/nested.tsx  |   8 +-
 public/app/features/scenes/scenes/queries.ts  |   8 +-
 .../features/scenes/scenes/sceneWithRows.tsx  |   6 +-
 .../features/scenes/scenes/variablesDemo.tsx  |   6 +-
 25 files changed, 595 insertions(+), 219 deletions(-)
 delete mode 100644 public/app/features/scenes/components/VizPanel.tsx
 create mode 100644 public/app/features/scenes/components/VizPanel/VizPanel.test.tsx
 create mode 100644 public/app/features/scenes/components/VizPanel/VizPanel.tsx
 create mode 100644 public/app/features/scenes/components/VizPanel/VizPanelRenderer.tsx
 create mode 100644 public/app/features/scenes/components/index.ts
 create mode 100644 public/app/features/scenes/querying/SceneQueryRunner.test.ts

diff --git a/.betterer.results b/.betterer.results
index b5d57820a1c..b05e872e997 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4554,6 +4554,9 @@ exports[`better eslint`] = {
     "public/app/features/sandbox/TestStuffPage.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
+    "public/app/features/scenes/components/VizPanel/VizPanelRenderer.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/features/scenes/components/layout/SceneFlexLayout.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
diff --git a/public/app/features/panel/components/PanelRenderer.tsx b/public/app/features/panel/components/PanelRenderer.tsx
index f05db6fac24..b841e210c00 100644
--- a/public/app/features/panel/components/PanelRenderer.tsx
+++ b/public/app/features/panel/components/PanelRenderer.tsx
@@ -38,7 +38,7 @@ export function PanelRenderer<P extends object = any, F extends object = any>(pr
   const [plugin, setPlugin] = useState(syncGetPanelPlugin(pluginId));
   const [error, setError] = useState<string | undefined>();
   const optionsWithDefaults = useOptionDefaults(plugin, options, fieldConfig);
-  const dataWithOverrides = useFieldOverrides(plugin, optionsWithDefaults, data, timeZone);
+  const dataWithOverrides = useFieldOverrides(plugin, optionsWithDefaults?.fieldConfig, data, timeZone);
 
   useEffect(() => {
     // If we already have a plugin and it's correct one do nothing
@@ -117,13 +117,12 @@ function useOptionDefaults<P extends object = any, F extends object = any>(
   }, [plugin, fieldConfig, options]);
 }
 
-function useFieldOverrides(
+export function useFieldOverrides(
   plugin: PanelPlugin | undefined,
-  defaultOptions: OptionDefaults | undefined,
+  fieldConfig: FieldConfigSource | undefined,
   data: PanelData | undefined,
   timeZone: string
 ): PanelData | undefined {
-  const fieldConfig = defaultOptions?.fieldConfig;
   const fieldConfigRegistry = plugin?.fieldConfigRegistry;
   const theme = useTheme2();
   const structureRev = useRef(0);
diff --git a/public/app/features/plugins/__mocks__/pluginMocks.ts b/public/app/features/plugins/__mocks__/pluginMocks.ts
index 372e2f49c2e..b59d49777b3 100644
--- a/public/app/features/plugins/__mocks__/pluginMocks.ts
+++ b/public/app/features/plugins/__mocks__/pluginMocks.ts
@@ -63,7 +63,7 @@ export function getPanelPlugin(
       version: '',
     },
     hideFromList: options.hideFromList === true,
-    module: '',
+    module: options.module ?? '',
     baseUrl: '',
   };
   return plugin;
diff --git a/public/app/features/scenes/components/VizPanel.tsx b/public/app/features/scenes/components/VizPanel.tsx
deleted file mode 100644
index 2ffb21bfd90..00000000000
--- a/public/app/features/scenes/components/VizPanel.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import React from 'react';
-import AutoSizer from 'react-virtualized-auto-sizer';
-
-import { AbsoluteTimeRange, FieldConfigSource, toUtc } from '@grafana/data';
-import { PanelRenderer } from '@grafana/runtime';
-import { Field, PanelChrome, Input } from '@grafana/ui';
-
-import { SceneObjectBase } from '../core/SceneObjectBase';
-import { sceneGraph } from '../core/sceneGraph';
-import { SceneComponentProps, SceneLayoutChildState } from '../core/types';
-import { VariableDependencyConfig } from '../variables/VariableDependencyConfig';
-
-import { SceneDragHandle } from './SceneDragHandle';
-
-export interface VizPanelState extends SceneLayoutChildState {
-  title?: string;
-  pluginId: string;
-  options?: object;
-  fieldConfig?: FieldConfigSource;
-}
-
-export class VizPanel extends SceneObjectBase<VizPanelState> {
-  public static Component = ScenePanelRenderer;
-  public static Editor = VizPanelEditor;
-
-  protected _variableDependency = new VariableDependencyConfig(this, {
-    statePaths: ['title'],
-  });
-
-  public onSetTimeRange = (timeRange: AbsoluteTimeRange) => {
-    const sceneTimeRange = sceneGraph.getTimeRange(this);
-    sceneTimeRange.setState({
-      raw: {
-        from: toUtc(timeRange.from),
-        to: toUtc(timeRange.to),
-      },
-      from: toUtc(timeRange.from),
-      to: toUtc(timeRange.to),
-    });
-  };
-}
-
-function ScenePanelRenderer({ model }: SceneComponentProps<VizPanel>) {
-  const { title, pluginId, options, fieldConfig, ...state } = model.useState();
-  const { data } = sceneGraph.getData(model).useState();
-
-  const layout = sceneGraph.getLayout(model);
-  const isDraggable = layout.state.isDraggable ? state.isDraggable : false;
-  const dragHandle = <SceneDragHandle layoutKey={layout.state.key!} />;
-
-  const titleInterpolated = sceneGraph.interpolate(model, title);
-
-  return (
-    <AutoSizer>
-      {({ width, height }) => {
-        if (width < 3 || height < 3) {
-          return null;
-        }
-
-        return (
-          <PanelChrome
-            title={titleInterpolated}
-            width={width}
-            height={height}
-            leftItems={isDraggable ? [dragHandle] : undefined}
-          >
-            {(innerWidth, innerHeight) => (
-              <>
-                <PanelRenderer
-                  title="Raw data"
-                  pluginId={pluginId}
-                  width={innerWidth}
-                  height={innerHeight}
-                  data={data}
-                  options={options}
-                  fieldConfig={fieldConfig}
-                  onOptionsChange={() => {}}
-                  onChangeTimeRange={model.onSetTimeRange}
-                />
-              </>
-            )}
-          </PanelChrome>
-        );
-      }}
-    </AutoSizer>
-  );
-}
-
-ScenePanelRenderer.displayName = 'ScenePanelRenderer';
-
-function VizPanelEditor({ model }: SceneComponentProps<VizPanel>) {
-  const { title } = model.useState();
-
-  return (
-    <Field label="Title">
-      <Input defaultValue={title} onBlur={(evt) => model.setState({ title: evt.currentTarget.value })} />
-    </Field>
-  );
-}
diff --git a/public/app/features/scenes/components/VizPanel/VizPanel.test.tsx b/public/app/features/scenes/components/VizPanel/VizPanel.test.tsx
new file mode 100644
index 00000000000..cdbe87edff6
--- /dev/null
+++ b/public/app/features/scenes/components/VizPanel/VizPanel.test.tsx
@@ -0,0 +1,136 @@
+import React from 'react';
+
+import { FieldConfigProperty, PanelPlugin } from '@grafana/data';
+import { getPanelPlugin } from 'app/features/plugins/__mocks__/pluginMocks';
+
+import { VizPanel } from './VizPanel';
+
+let pluginToLoad: PanelPlugin | undefined;
+
+jest.mock('app/features/plugins/importPanelPlugin', () => ({
+  syncGetPanelPlugin: jest.fn(() => pluginToLoad),
+}));
+
+interface OptionsPlugin1 {
+  showThresholds: boolean;
+  option2?: string;
+}
+
+interface FieldConfigPlugin1 {
+  customProp?: boolean;
+  customProp2?: boolean;
+  junkProp?: boolean;
+}
+
+function getTestPlugin1() {
+  const pluginToLoad = getPanelPlugin(
+    {
+      id: 'custom-plugin-id',
+    },
+    () => <div>My custom panel</div>
+  );
+
+  pluginToLoad.meta.info.version = '1.0.0';
+  pluginToLoad.setPanelOptions((builder) => {
+    builder.addBooleanSwitch({
+      name: 'Show thresholds',
+      path: 'showThresholds',
+      defaultValue: true,
+    });
+    builder.addTextInput({
+      name: 'option2',
+      path: 'option2',
+      defaultValue: undefined,
+    });
+  });
+
+  pluginToLoad.useFieldConfig({
+    standardOptions: {
+      [FieldConfigProperty.Unit]: {
+        defaultValue: 'flop',
+      },
+      [FieldConfigProperty.Decimals]: {
+        defaultValue: 2,
+      },
+    },
+    useCustomConfig: (builder) => {
+      builder.addBooleanSwitch({
+        name: 'CustomProp',
+        path: 'customProp',
+        defaultValue: false,
+      });
+      builder.addBooleanSwitch({
+        name: 'customProp2',
+        path: 'customProp2',
+        defaultValue: false,
+      });
+    },
+  });
+
+  pluginToLoad.setMigrationHandler((panel) => {
+    if (panel.fieldConfig.defaults.custom) {
+      panel.fieldConfig.defaults.custom.customProp2 = true;
+    }
+
+    return { option2: 'hello' };
+  });
+
+  return pluginToLoad;
+}
+
+describe('VizPanel', () => {
+  describe('when activated', () => {
+    let panel: VizPanel<OptionsPlugin1, FieldConfigPlugin1>;
+
+    beforeAll(async () => {
+      panel = new VizPanel<OptionsPlugin1, FieldConfigPlugin1>({
+        pluginId: 'custom-plugin-id',
+        fieldConfig: {
+          defaults: { custom: { junkProp: true } },
+          overrides: [],
+        },
+      });
+
+      pluginToLoad = getTestPlugin1();
+      panel.activate();
+    });
+
+    it('load plugin', () => {
+      expect(panel.getPlugin()).toBe(pluginToLoad);
+    });
+
+    it('should call panel migration handler', () => {
+      expect(panel.state.options.option2).toEqual('hello');
+      expect(panel.state.fieldConfig.defaults.custom?.customProp2).toEqual(true);
+    });
+
+    it('should apply option defaults', () => {
+      expect(panel.state.options.showThresholds).toEqual(true);
+    });
+
+    it('should apply fieldConfig defaults', () => {
+      expect(panel.state.fieldConfig.defaults.unit).toBe('flop');
+      expect(panel.state.fieldConfig.defaults.custom!.customProp).toBe(false);
+    });
+
+    it('should should remove props that are not defined for plugin', () => {
+      expect(panel.state.fieldConfig.defaults.custom?.junkProp).toEqual(undefined);
+    });
+  });
+
+  describe('When calling on onPanelMigration', () => {
+    const onPanelMigration = jest.fn();
+    let panel: VizPanel<OptionsPlugin1, FieldConfigPlugin1>;
+
+    beforeAll(async () => {
+      panel = new VizPanel<OptionsPlugin1, FieldConfigPlugin1>({ pluginId: 'custom-plugin-id' });
+      pluginToLoad = getTestPlugin1();
+      pluginToLoad.onPanelMigration = onPanelMigration;
+      panel.activate();
+    });
+
+    it('should call onPanelMigration with pluginVersion set to initial state (undefined)', () => {
+      expect(onPanelMigration.mock.calls[0][0].pluginVersion).toBe(undefined);
+    });
+  });
+});
diff --git a/public/app/features/scenes/components/VizPanel/VizPanel.tsx b/public/app/features/scenes/components/VizPanel/VizPanel.tsx
new file mode 100644
index 00000000000..c468b27709c
--- /dev/null
+++ b/public/app/features/scenes/components/VizPanel/VizPanel.tsx
@@ -0,0 +1,125 @@
+import React from 'react';
+
+import { AbsoluteTimeRange, FieldConfigSource, PanelModel, PanelPlugin, toUtc } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Field, Input } from '@grafana/ui';
+import { importPanelPlugin, syncGetPanelPlugin } from 'app/features/plugins/importPanelPlugin';
+
+import { getPanelOptionsWithDefaults } from '../../../dashboard/state/getPanelOptionsWithDefaults';
+import { SceneObjectBase } from '../../core/SceneObjectBase';
+import { sceneGraph } from '../../core/sceneGraph';
+import { SceneComponentProps, SceneLayoutChildState } from '../../core/types';
+
+import { VizPanelRenderer } from './VizPanelRenderer';
+
+export interface VizPanelState<TOptions = {}, TFieldConfig = {}> extends SceneLayoutChildState {
+  title: string;
+  pluginId: string;
+  options: TOptions;
+  fieldConfig: FieldConfigSource<TFieldConfig>;
+  pluginVersion?: string;
+  // internal state
+  pluginLoadError?: string;
+}
+
+export class VizPanel<TOptions = {}, TFieldConfig = {}> extends SceneObjectBase<
+  VizPanelState<Partial<TOptions>, TFieldConfig>
+> {
+  public static Component = VizPanelRenderer;
+  public static Editor = VizPanelEditor;
+
+  // Not part of state as this is not serializable
+  private _plugin?: PanelPlugin;
+
+  public constructor(state: Partial<VizPanelState<Partial<TOptions>, TFieldConfig>>) {
+    super({
+      options: {},
+      fieldConfig: { defaults: {}, overrides: [] },
+      title: 'Title',
+      pluginId: 'timeseries',
+      ...state,
+    });
+  }
+
+  public activate() {
+    super.activate();
+
+    const plugin = syncGetPanelPlugin(this.state.pluginId);
+
+    if (plugin) {
+      this.pluginLoaded(plugin);
+    } else {
+      importPanelPlugin(this.state.pluginId)
+        .then((result) => this.pluginLoaded(result))
+        .catch((err: Error) => {
+          this.setState({ pluginLoadError: err.message });
+        });
+    }
+  }
+
+  private pluginLoaded(plugin: PanelPlugin) {
+    const { options, fieldConfig, title, pluginId, pluginVersion } = this.state;
+
+    const panel: PanelModel = { title, options, fieldConfig, id: 1, type: pluginId, pluginVersion: pluginVersion };
+    const currentVersion = this.getPluginVersion(plugin);
+
+    if (plugin.onPanelMigration) {
+      if (currentVersion !== this.state.pluginVersion) {
+        // These migration handlers also mutate panel.fieldConfig to migrate fieldConfig
+        panel.options = plugin.onPanelMigration(panel);
+      }
+    }
+
+    const withDefaults = getPanelOptionsWithDefaults({
+      plugin,
+      currentOptions: panel.options,
+      currentFieldConfig: panel.fieldConfig,
+      isAfterPluginChange: false,
+    });
+
+    this._plugin = plugin;
+    this.setState({
+      options: withDefaults.options,
+      fieldConfig: withDefaults.fieldConfig,
+      pluginVersion: currentVersion,
+    });
+  }
+
+  private getPluginVersion(plugin: PanelPlugin): string {
+    return plugin && plugin.meta.info.version ? plugin.meta.info.version : config.buildInfo.version;
+  }
+
+  public getPlugin(): PanelPlugin | undefined {
+    return this._plugin;
+  }
+
+  public onChangeTimeRange = (timeRange: AbsoluteTimeRange) => {
+    const sceneTimeRange = sceneGraph.getTimeRange(this);
+    sceneTimeRange.setState({
+      raw: {
+        from: toUtc(timeRange.from),
+        to: toUtc(timeRange.to),
+      },
+      from: toUtc(timeRange.from),
+      to: toUtc(timeRange.to),
+    });
+  };
+
+  public onOptionsChange = (options: TOptions) => {
+    this.setState({ options });
+  };
+
+  public onFieldConfigChange = (fieldConfig: FieldConfigSource) => {
+    this.setState({ fieldConfig });
+  };
+}
+
+function VizPanelEditor({ model }: SceneComponentProps<VizPanel>) {
+  const { title } = model.useState();
+
+  return (
+    <Field label="Title">
+      <Input defaultValue={title} onBlur={(evt) => model.setState({ title: evt.currentTarget.value })} />
+    </Field>
+  );
+}
diff --git a/public/app/features/scenes/components/VizPanel/VizPanelRenderer.tsx b/public/app/features/scenes/components/VizPanel/VizPanelRenderer.tsx
new file mode 100644
index 00000000000..a120f3fda44
--- /dev/null
+++ b/public/app/features/scenes/components/VizPanel/VizPanelRenderer.tsx
@@ -0,0 +1,94 @@
+import React, { RefCallback } from 'react';
+import { useMeasure } from 'react-use';
+
+import { PluginContextProvider } from '@grafana/data';
+import { PanelChrome, ErrorBoundaryAlert } from '@grafana/ui';
+import { appEvents } from 'app/core/core';
+import { useFieldOverrides } from 'app/features/panel/components/PanelRenderer';
+
+import { sceneGraph } from '../../core/sceneGraph';
+import { SceneComponentProps } from '../../core/types';
+import { SceneQueryRunner } from '../../querying/SceneQueryRunner';
+import { SceneDragHandle } from '../SceneDragHandle';
+
+import { VizPanel } from './VizPanel';
+
+export function VizPanelRenderer({ model }: SceneComponentProps<VizPanel>) {
+  const { title, options, fieldConfig, pluginId, pluginLoadError, $data, ...state } = model.useState();
+  const [ref, { width, height }] = useMeasure();
+  const plugin = model.getPlugin();
+  const { data } = sceneGraph.getData(model).useState();
+  const layout = sceneGraph.getLayout(model);
+
+  const isDraggable = layout.state.isDraggable ? state.isDraggable : false;
+  const dragHandle = <SceneDragHandle layoutKey={layout.state.key!} />;
+
+  const titleInterpolated = sceneGraph.interpolate(model, title);
+
+  // Not sure we need to subscribe to this state
+  const timeZone = sceneGraph.getTimeRange(model).state.timeZone;
+
+  const dataWithOverrides = useFieldOverrides(plugin, fieldConfig, data, timeZone);
+
+  if (pluginLoadError) {
+    return <div>Failed to load plugin: {pluginLoadError}</div>;
+  }
+
+  if (!plugin || !plugin.hasPluginId(pluginId)) {
+    return <div>Loading plugin panel...</div>;
+  }
+
+  if (!plugin.panel) {
+    return <div>Panel plugin has no panel component</div>;
+  }
+
+  const PanelComponent = plugin.panel;
+
+  // Query runner needs to with for auto maxDataPoints
+  if ($data instanceof SceneQueryRunner) {
+    $data.setContainerWidth(width);
+  }
+
+  return (
+    <div ref={ref as RefCallback<HTMLDivElement>} style={{ width: '100%', height: '100%' }}>
+      <PanelChrome
+        title={titleInterpolated}
+        width={width}
+        height={height}
+        leftItems={isDraggable ? [dragHandle] : undefined}
+      >
+        {(innerWidth, innerHeight) => (
+          <>
+            {!dataWithOverrides && <div>No data...</div>}
+            {dataWithOverrides && (
+              <ErrorBoundaryAlert dependencies={[plugin, data]}>
+                <PluginContextProvider meta={plugin.meta}>
+                  <PanelComponent
+                    id={1}
+                    data={dataWithOverrides}
+                    title={title}
+                    timeRange={dataWithOverrides.timeRange}
+                    timeZone={timeZone}
+                    options={options}
+                    fieldConfig={fieldConfig}
+                    transparent={false}
+                    width={innerWidth}
+                    height={innerHeight}
+                    renderCounter={0}
+                    replaceVariables={(str: string) => str}
+                    onOptionsChange={model.onOptionsChange}
+                    onFieldConfigChange={model.onFieldConfigChange}
+                    onChangeTimeRange={model.onChangeTimeRange}
+                    eventBus={appEvents}
+                  />
+                </PluginContextProvider>
+              </ErrorBoundaryAlert>
+            )}
+          </>
+        )}
+      </PanelChrome>
+    </div>
+  );
+}
+
+VizPanelRenderer.displayName = 'ScenePanelRenderer';
diff --git a/public/app/features/scenes/components/index.ts b/public/app/features/scenes/components/index.ts
new file mode 100644
index 00000000000..89aafc6064f
--- /dev/null
+++ b/public/app/features/scenes/components/index.ts
@@ -0,0 +1,10 @@
+export { VizPanel } from './VizPanel/VizPanel';
+export { NestedScene } from './NestedScene';
+export { Scene } from './Scene';
+export { SceneCanvasText } from './SceneCanvasText';
+export { SceneToolbarButton, SceneToolbarInput } from './SceneToolbarButton';
+export { SceneTimePicker } from './SceneTimePicker';
+export { ScenePanelRepeater } from './ScenePanelRepeater';
+export { SceneSubMenu } from './SceneSubMenu';
+export { SceneFlexLayout } from './layout/SceneFlexLayout';
+export { SceneGridLayout, SceneGridRow } from './layout/SceneGridLayout';
diff --git a/public/app/features/scenes/core/SceneTimeRange.tsx b/public/app/features/scenes/core/SceneTimeRange.tsx
index 596b2337637..c790d5f739c 100644
--- a/public/app/features/scenes/core/SceneTimeRange.tsx
+++ b/public/app/features/scenes/core/SceneTimeRange.tsx
@@ -1,9 +1,17 @@
-import { TimeRange, UrlQueryMap } from '@grafana/data';
+import { getDefaultTimeRange, getTimeZone, TimeRange, UrlQueryMap } from '@grafana/data';
 
 import { SceneObjectBase } from './SceneObjectBase';
 import { SceneObjectWithUrlSync, SceneTimeRangeState } from './types';
 
 export class SceneTimeRange extends SceneObjectBase<SceneTimeRangeState> implements SceneObjectWithUrlSync {
+  public constructor(state: Partial<SceneTimeRangeState> = {}) {
+    super({
+      ...getDefaultTimeRange(),
+      timeZone: getTimeZone(),
+      ...state,
+    });
+  }
+
   public onTimeRangeChange = (timeRange: TimeRange) => {
     this.setState(timeRange);
   };
diff --git a/public/app/features/scenes/core/sceneGraph.ts b/public/app/features/scenes/core/sceneGraph.ts
index 6cd7e4606d4..0cee433477e 100644
--- a/public/app/features/scenes/core/sceneGraph.ts
+++ b/public/app/features/scenes/core/sceneGraph.ts
@@ -108,7 +108,7 @@ export const EmptyDataNode = new SceneDataNode({
   },
 });
 
-export const DefaultTimeRange = new SceneTimeRangeImpl(getDefaultTimeRange());
+export const DefaultTimeRange = new SceneTimeRangeImpl();
 
 export const sceneGraph = {
   getVariables,
diff --git a/public/app/features/scenes/core/types.ts b/public/app/features/scenes/core/types.ts
index d818e5bba4b..3363da75d0d 100644
--- a/public/app/features/scenes/core/types.ts
+++ b/public/app/features/scenes/core/types.ts
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Observer, Subscription, Unsubscribable } from 'rxjs';
 
-import { BusEvent, BusEventHandler, BusEventType, PanelData, TimeRange, UrlQueryMap } from '@grafana/data';
+import { BusEvent, BusEventHandler, BusEventType, PanelData, TimeRange, TimeZone, UrlQueryMap } from '@grafana/data';
 
 import { SceneVariableDependencyConfigLike, SceneVariables } from '../variables/types';
 
@@ -128,7 +128,9 @@ interface SceneComponentEditWrapperProps {
   children: React.ReactNode;
 }
 
-export interface SceneTimeRangeState extends SceneObjectStatePlain, TimeRange {}
+export interface SceneTimeRangeState extends SceneObjectStatePlain, TimeRange {
+  timeZone: TimeZone;
+}
 
 export interface SceneTimeRange extends SceneObject<SceneTimeRangeState> {
   onTimeRangeChange(timeRange: TimeRange): void;
diff --git a/public/app/features/scenes/dashboard/DashboardsLoader.ts b/public/app/features/scenes/dashboard/DashboardsLoader.ts
index 7d56b5a78d5..94197ca42d3 100644
--- a/public/app/features/scenes/dashboard/DashboardsLoader.ts
+++ b/public/app/features/scenes/dashboard/DashboardsLoader.ts
@@ -1,12 +1,9 @@
-import { getDefaultTimeRange } from '@grafana/data';
 import { StateManagerBase } from 'app/core/services/StateManagerBase';
 import { dashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { DashboardDTO } from 'app/types';
 
-import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
-import { SceneGridLayout, SceneGridRow } from '../components/layout/SceneGridLayout';
+import { VizPanel, SceneTimePicker, SceneGridLayout, SceneGridRow } from '../components';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { SceneObject } from '../core/types';
 import { SceneQueryRunner } from '../querying/SceneQueryRunner';
@@ -54,7 +51,7 @@ export class DashboardLoader extends StateManagerBase<DashboardLoaderState> {
       layout: new SceneGridLayout({
         children: this.buildSceneObjectsFromDashboard(oldModel),
       }),
-      $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+      $timeRange: new SceneTimeRange(),
       actions: [new SceneTimePicker({})],
     });
 
@@ -83,26 +80,7 @@ export class DashboardLoader extends StateManagerBase<DashboardLoaderState> {
                 size: {
                   y: panel.gridPos.y,
                 },
-                children: panel.panels
-                  ? panel.panels.map(
-                      (p) =>
-                        new VizPanel({
-                          title: p.title,
-                          pluginId: p.type,
-                          size: {
-                            x: p.gridPos.x,
-                            y: p.gridPos.y,
-                            width: p.gridPos.w,
-                            height: p.gridPos.h,
-                          },
-                          options: p.options,
-                          fieldConfig: p.fieldConfig,
-                          $data: new SceneQueryRunner({
-                            queries: p.targets,
-                          }),
-                        })
-                    )
-                  : [],
+                children: panel.panels ? panel.panels.map(createVizPanelFromPanelModel) : [],
               })
             );
           } else {
@@ -128,21 +106,7 @@ export class DashboardLoader extends StateManagerBase<DashboardLoaderState> {
           }
         }
       } else {
-        const panelObject = new VizPanel({
-          title: panel.title,
-          pluginId: panel.type,
-          size: {
-            x: panel.gridPos.x,
-            y: panel.gridPos.y,
-            width: panel.gridPos.w,
-            height: panel.gridPos.h,
-          },
-          options: panel.options,
-          fieldConfig: panel.fieldConfig,
-          $data: new SceneQueryRunner({
-            queries: panel.targets,
-          }),
-        });
+        const panelObject = createVizPanelFromPanelModel(panel);
 
         // when processing an expanded row, collect its panels
         if (currentRow) {
@@ -170,6 +134,25 @@ export class DashboardLoader extends StateManagerBase<DashboardLoaderState> {
   }
 }
 
+function createVizPanelFromPanelModel(panel: PanelModel) {
+  return new VizPanel({
+    title: panel.title,
+    pluginId: panel.type,
+    size: {
+      x: panel.gridPos.x,
+      y: panel.gridPos.y,
+      width: panel.gridPos.w,
+      height: panel.gridPos.h,
+    },
+    options: panel.options,
+    fieldConfig: panel.fieldConfig,
+    pluginVersion: panel.pluginVersion,
+    $data: new SceneQueryRunner({
+      queries: panel.targets,
+    }),
+  });
+}
+
 let loader: DashboardLoader | null = null;
 
 export function getDashboardLoader(): DashboardLoader {
diff --git a/public/app/features/scenes/querying/SceneQueryRunner.test.ts b/public/app/features/scenes/querying/SceneQueryRunner.test.ts
new file mode 100644
index 00000000000..2e3de13a862
--- /dev/null
+++ b/public/app/features/scenes/querying/SceneQueryRunner.test.ts
@@ -0,0 +1,83 @@
+import { of } from 'rxjs';
+
+import { DataQueryRequest, DataSourceApi, getDefaultTimeRange, LoadingState, PanelData } from '@grafana/data';
+
+import { SceneTimeRange } from '../core/SceneTimeRange';
+
+import { SceneQueryRunner } from './SceneQueryRunner';
+
+const getDatasource = () => {
+  return {
+    getRef: () => ({ uid: 'test' }),
+  };
+};
+
+jest.mock('app/features/plugins/datasource_srv', () => ({
+  getDatasourceSrv: jest.fn(() => ({
+    get: getDatasource,
+  })),
+}));
+
+const runRequest = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [],
+    timeRange: getDefaultTimeRange(),
+  })
+);
+
+let sentRequest: DataQueryRequest | undefined;
+
+jest.mock('app/features/query/state/runRequest', () => ({
+  runRequest: (ds: DataSourceApi, request: DataQueryRequest) => {
+    sentRequest = request;
+    return runRequest(ds, request);
+  },
+}));
+
+describe('SceneQueryRunner', () => {
+  describe('when activated and got no data', () => {
+    it('should run queries', async () => {
+      const queryRunner = new SceneQueryRunner({
+        queries: [{ refId: 'A' }],
+        $timeRange: new SceneTimeRange(),
+      });
+
+      expect(queryRunner.state.data).toBeUndefined();
+
+      queryRunner.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(queryRunner.state.data?.state).toBe(LoadingState.Done);
+      // Default max data points
+      expect(sentRequest?.maxDataPoints).toBe(500);
+    });
+  });
+
+  describe('when activated and maxDataPointsFromWidth set to true', () => {
+    it('should run queries', async () => {
+      const queryRunner = new SceneQueryRunner({
+        queries: [{ refId: 'A' }],
+        $timeRange: new SceneTimeRange(),
+        maxDataPointsFromWidth: true,
+      });
+
+      expect(queryRunner.state.data).toBeUndefined();
+
+      queryRunner.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(queryRunner.state.data?.state).toBeUndefined();
+
+      queryRunner.setContainerWidth(1000);
+
+      expect(queryRunner.state.data?.state).toBeUndefined();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(queryRunner.state.data?.state).toBe(LoadingState.Done);
+    });
+  });
+});
diff --git a/public/app/features/scenes/querying/SceneQueryRunner.ts b/public/app/features/scenes/querying/SceneQueryRunner.ts
index ba9312f6c43..bd93f611f42 100644
--- a/public/app/features/scenes/querying/SceneQueryRunner.ts
+++ b/public/app/features/scenes/querying/SceneQueryRunner.ts
@@ -24,6 +24,11 @@ import { VariableDependencyConfig } from '../variables/VariableDependencyConfig'
 export interface QueryRunnerState extends SceneObjectStatePlain {
   data?: PanelData;
   queries: DataQueryExtended[];
+  datasource?: DataSourceRef;
+  minInterval?: string;
+  maxDataPoints?: number;
+  // Non persisted state
+  maxDataPointsFromWidth?: boolean;
 }
 
 export interface DataQueryExtended extends DataQuery {
@@ -31,7 +36,8 @@ export interface DataQueryExtended extends DataQuery {
 }
 
 export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
-  private querySub?: Unsubscribable;
+  private _querySub?: Unsubscribable;
+  private _containerWidth?: number;
 
   protected _variableDependency = new VariableDependencyConfig(this, {
     statePaths: ['queries'],
@@ -51,17 +57,52 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
       })
     );
 
-    if (!this.state.data) {
+    if (this.shouldRunQueriesOnActivate()) {
       this.runQueries();
     }
   }
 
+  private shouldRunQueriesOnActivate() {
+    // If we already have data, no need
+    // TODO validate that time range is similar and if not we should run queries again
+    if (this.state.data) {
+      return false;
+    }
+
+    // If no maxDataPoints specified we need might to wait for container width to be set from the outside
+    if (!this.state.maxDataPoints && this.state.maxDataPointsFromWidth && !this._containerWidth) {
+      return false;
+    }
+
+    return true;
+  }
+
   public deactivate(): void {
     super.deactivate();
 
-    if (this.querySub) {
-      this.querySub.unsubscribe();
-      this.querySub = undefined;
+    if (this._querySub) {
+      this._querySub.unsubscribe();
+      this._querySub = undefined;
+    }
+  }
+
+  public setContainerWidth(width: number) {
+    // If we don't have a width we should run queries
+    if (!this._containerWidth) {
+      this._containerWidth = width;
+
+      // If we don't have maxDataPoints specifically set and maxDataPointsFromWidth is true
+      if (this.state.maxDataPointsFromWidth && !this.state.maxDataPoints) {
+        // As this is called from render path we need to wait for next tick before running queries
+        setTimeout(() => {
+          if (this.isActive && !this._querySub) {
+            this.runQueries();
+          }
+        }, 0);
+      }
+    } else {
+      // let's just remember the width until next query issue
+      this._containerWidth = width;
     }
   }
 
@@ -70,8 +111,12 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
     this.runWithTimeRange(timeRange.state);
   }
 
+  private getMaxDataPoints() {
+    return this.state.maxDataPoints ?? this._containerWidth ?? 500;
+  }
+
   private async runWithTimeRange(timeRange: TimeRange) {
-    const queries = cloneDeep(this.state.queries);
+    const { datasource, minInterval, queries } = this.state;
 
     const request: DataQueryRequest = {
       app: CoreApp.Dashboard,
@@ -82,14 +127,14 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
       range: timeRange,
       interval: '1s',
       intervalMs: 1000,
-      targets: cloneDeep(this.state.queries),
-      maxDataPoints: 500,
+      targets: cloneDeep(queries),
+      maxDataPoints: this.getMaxDataPoints(),
       scopedVars: {},
       startTime: Date.now(),
     };
 
     try {
-      const ds = await getDataSource(queries[0].datasource!, request.scopedVars);
+      const ds = await getDataSource(datasource, request.scopedVars);
 
       // Attach the data source name to each query
       request.targets = request.targets.map((query) => {
@@ -99,8 +144,9 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
         return query;
       });
 
-      const lowerIntervalLimit = ds.interval;
-      const norm = rangeUtil.calculateInterval(timeRange, request.maxDataPoints ?? 1000, lowerIntervalLimit);
+      // TODO interpolate minInterval
+      const lowerIntervalLimit = minInterval ? minInterval : ds.interval;
+      const norm = rangeUtil.calculateInterval(timeRange, request.maxDataPoints!, lowerIntervalLimit);
 
       // make shallow copy of scoped vars,
       // and add built in variables interval and interval_ms
@@ -112,22 +158,20 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
       request.interval = norm.interval;
       request.intervalMs = norm.intervalMs;
 
-      this.querySub = runRequest(ds, request).subscribe({
-        next: (data) => {
-          console.log('set data', data, data.state);
-          this.setState({ data });
-        },
+      this._querySub = runRequest(ds, request).subscribe({
+        next: this.onDataReceived,
       });
     } catch (err) {
       console.error('PanelQueryRunner Error', err);
     }
   }
+
+  private onDataReceived = (data: PanelData) => {
+    this.setState({ data });
+  };
 }
 
-async function getDataSource(
-  datasource: DataSourceRef | string | DataSourceApi | null,
-  scopedVars: ScopedVars
-): Promise<DataSourceApi> {
+async function getDataSource(datasource: DataSourceRef | undefined, scopedVars: ScopedVars): Promise<DataSourceApi> {
   if (datasource && (datasource as any).query) {
     return datasource as DataSourceApi;
   }
diff --git a/public/app/features/scenes/scenes/demo.tsx b/public/app/features/scenes/scenes/demo.tsx
index a4e96b97a70..bbc6bbc09f2 100644
--- a/public/app/features/scenes/scenes/demo.tsx
+++ b/public/app/features/scenes/scenes/demo.tsx
@@ -1,12 +1,12 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
-import { Scene } from '../components/Scene';
-import { SceneCanvasText } from '../components/SceneCanvasText';
-import { ScenePanelRepeater } from '../components/ScenePanelRepeater';
-import { SceneTimePicker } from '../components/SceneTimePicker';
-import { SceneToolbarInput } from '../components/SceneToolbarButton';
-import { VizPanel } from '../components/VizPanel';
-import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
+import {
+  Scene,
+  SceneCanvasText,
+  ScenePanelRepeater,
+  SceneTimePicker,
+  SceneToolbarInput,
+  SceneFlexLayout,
+  VizPanel,
+} from '../components';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { SceneEditManager } from '../editor/SceneEditManager';
 
@@ -22,8 +22,8 @@ export function getFlexLayoutTest(): Scene {
           size: { minWidth: '70%' },
           pluginId: 'timeseries',
           title: 'Dynamic height and width',
+          $data: getQueryRunnerWithRandomWalkQuery({}, { maxDataPointsFromWidth: true }),
         }),
-
         new SceneFlexLayout({
           direction: 'column',
           children: [
@@ -51,7 +51,7 @@ export function getFlexLayoutTest(): Scene {
       ],
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
@@ -97,7 +97,7 @@ export function getScenePanelRepeaterTest(): Scene {
       }),
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: queryRunner,
     actions: [
       new SceneToolbarInput({
diff --git a/public/app/features/scenes/scenes/grid.tsx b/public/app/features/scenes/scenes/grid.tsx
index 4cf629fade4..3516ff8969c 100644
--- a/public/app/features/scenes/scenes/grid.tsx
+++ b/public/app/features/scenes/scenes/grid.tsx
@@ -1,8 +1,6 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneGridLayout } from '../components/layout/SceneGridLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
@@ -57,7 +55,7 @@ export function getGridLayoutTest(): Scene {
       ],
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/gridMultiTimeRange.tsx b/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
index cb730ce1dbb..8ed865aa812 100644
--- a/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
+++ b/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
@@ -1,8 +1,8 @@
-import { dateTime, getDefaultTimeRange } from '@grafana/data';
+import { dateTime } from '@grafana/data';
 
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneGridLayout, SceneGridRow } from '../components/layout/SceneGridLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { SceneEditManager } from '../editor/SceneEditManager';
@@ -10,7 +10,7 @@ import { SceneEditManager } from '../editor/SceneEditManager';
 import { getQueryRunnerWithRandomWalkQuery } from './queries';
 
 export function getGridWithMultipleTimeRanges(): Scene {
-  const globalTimeRange = new SceneTimeRange(getDefaultTimeRange());
+  const globalTimeRange = new SceneTimeRange();
 
   const now = dateTime();
   const row1TimeRange = new SceneTimeRange({
diff --git a/public/app/features/scenes/scenes/gridMultiple.tsx b/public/app/features/scenes/scenes/gridMultiple.tsx
index 087081e576b..b16e2eb6bde 100644
--- a/public/app/features/scenes/scenes/gridMultiple.tsx
+++ b/public/app/features/scenes/scenes/gridMultiple.tsx
@@ -1,8 +1,6 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneGridLayout } from '../components/layout/SceneGridLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
@@ -101,7 +99,7 @@ export function getMultipleGridLayoutTest(): Scene {
     }),
 
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/gridWithMultipleData.tsx b/public/app/features/scenes/scenes/gridWithMultipleData.tsx
index f4752793079..43960d9b6da 100644
--- a/public/app/features/scenes/scenes/gridWithMultipleData.tsx
+++ b/public/app/features/scenes/scenes/gridWithMultipleData.tsx
@@ -1,8 +1,6 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneGridLayout, SceneGridRow } from '../components/layout/SceneGridLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { SceneEditManager } from '../editor/SceneEditManager';
@@ -15,7 +13,7 @@ export function getGridWithMultipleData(): Scene {
     layout: new SceneGridLayout({
       children: [
         new SceneGridRow({
-          $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+          $timeRange: new SceneTimeRange(),
           $data: getQueryRunnerWithRandomWalkQuery({ scenarioId: 'random_walk_table' }),
           title: 'Row A - has its own query',
           key: 'Row A',
@@ -95,7 +93,7 @@ export function getGridWithMultipleData(): Scene {
       ],
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/gridWithRow.tsx b/public/app/features/scenes/scenes/gridWithRow.tsx
index 38dadce9cf1..85826d52b5b 100644
--- a/public/app/features/scenes/scenes/gridWithRow.tsx
+++ b/public/app/features/scenes/scenes/gridWithRow.tsx
@@ -1,8 +1,6 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneGridLayout, SceneGridRow } from '../components/layout/SceneGridLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { SceneEditManager } from '../editor/SceneEditManager';
@@ -78,7 +76,7 @@ export function getGridWithRowLayoutTest(): Scene {
       ],
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/gridWithRows.tsx b/public/app/features/scenes/scenes/gridWithRows.tsx
index 1f47a22e708..1aef68fb5d4 100644
--- a/public/app/features/scenes/scenes/gridWithRows.tsx
+++ b/public/app/features/scenes/scenes/gridWithRows.tsx
@@ -1,8 +1,6 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneGridLayout, SceneGridRow } from '../components/layout/SceneGridLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
@@ -83,7 +81,7 @@ export function getGridWithRowsTest(): Scene {
       children: [cell1, cell2, row1, row2],
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/nested.tsx b/public/app/features/scenes/scenes/nested.tsx
index cd4e60889fa..728346f4138 100644
--- a/public/app/features/scenes/scenes/nested.tsx
+++ b/public/app/features/scenes/scenes/nested.tsx
@@ -1,9 +1,7 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { NestedScene } from '../components/NestedScene';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 
@@ -23,7 +21,7 @@ export function getNestedScene(): Scene {
         }),
       ],
     }),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
@@ -46,7 +44,7 @@ export function getInnerScene(title: string) {
         }),
       ],
     }),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/queries.ts b/public/app/features/scenes/scenes/queries.ts
index 66f411c8b74..2aab365b2ad 100644
--- a/public/app/features/scenes/scenes/queries.ts
+++ b/public/app/features/scenes/scenes/queries.ts
@@ -1,8 +1,11 @@
 import { TestDataQuery } from 'app/plugins/datasource/testdata/types';
 
-import { SceneQueryRunner } from '../querying/SceneQueryRunner';
+import { QueryRunnerState, SceneQueryRunner } from '../querying/SceneQueryRunner';
 
-export function getQueryRunnerWithRandomWalkQuery(overrides?: Partial<TestDataQuery>) {
+export function getQueryRunnerWithRandomWalkQuery(
+  overrides?: Partial<TestDataQuery>,
+  queryRunnerOverrides?: Partial<QueryRunnerState>
+) {
   return new SceneQueryRunner({
     queries: [
       {
@@ -15,5 +18,6 @@ export function getQueryRunnerWithRandomWalkQuery(overrides?: Partial<TestDataQu
         ...overrides,
       },
     ],
+    ...queryRunnerOverrides,
   });
 }
diff --git a/public/app/features/scenes/scenes/sceneWithRows.tsx b/public/app/features/scenes/scenes/sceneWithRows.tsx
index efcc172f053..6548103f91c 100644
--- a/public/app/features/scenes/scenes/sceneWithRows.tsx
+++ b/public/app/features/scenes/scenes/sceneWithRows.tsx
@@ -1,9 +1,7 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { NestedScene } from '../components/NestedScene';
 import { Scene } from '../components/Scene';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { SceneEditManager } from '../editor/SceneEditManager';
@@ -55,7 +53,7 @@ export function getSceneWithRows(): Scene {
       ],
     }),
     $editor: new SceneEditManager({}),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     $data: getQueryRunnerWithRandomWalkQuery(),
     actions: [new SceneTimePicker({})],
   });
diff --git a/public/app/features/scenes/scenes/variablesDemo.tsx b/public/app/features/scenes/scenes/variablesDemo.tsx
index a005d6796c1..74aec941ef3 100644
--- a/public/app/features/scenes/scenes/variablesDemo.tsx
+++ b/public/app/features/scenes/scenes/variablesDemo.tsx
@@ -1,10 +1,8 @@
-import { getDefaultTimeRange } from '@grafana/data';
-
+import { VizPanel } from '../components';
 import { Scene } from '../components/Scene';
 import { SceneCanvasText } from '../components/SceneCanvasText';
 import { SceneSubMenu } from '../components/SceneSubMenu';
 import { SceneTimePicker } from '../components/SceneTimePicker';
-import { VizPanel } from '../components/VizPanel';
 import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { VariableValueSelectors } from '../variables/components/VariableValueSelectors';
@@ -68,7 +66,7 @@ export function getVariablesDemo(): Scene {
         }),
       ],
     }),
-    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $timeRange: new SceneTimeRange(),
     actions: [new SceneTimePicker({})],
     subMenu: new SceneSubMenu({
       children: [new VariableValueSelectors({})],

From ba8124ef9306377723dad9790a3e8ddf120a8141 Mon Sep 17 00:00:00 2001
From: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
Date: Mon, 21 Nov 2022 15:53:56 +0100
Subject: [PATCH 044/153] Chore: Fix SQLx failure when starting the server with
 newDBLibrary enabled (#58985)

change the weekstart to pointer

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
---
 pkg/api/index.go                              |  7 +++-
 pkg/api/preferences.go                        |  7 +++-
 pkg/services/preference/model.go              |  2 +-
 pkg/services/preference/prefimpl/pref.go      | 10 ++---
 pkg/services/preference/prefimpl/pref_test.go | 39 ++++++++++++-------
 .../preference/prefimpl/store_test.go         |  8 ++--
 6 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index c322b0d489d..e0d0b8de637 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -77,6 +77,11 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 		settings["isPublicDashboardView"] = true
 	}
 
+	weekStart := ""
+	if prefs.WeekStart != nil {
+		weekStart = *prefs.WeekStart
+	}
+
 	data := dtos.IndexViewData{
 		User: &dtos.CurrentUser{
 			Id:                         c.UserID,
@@ -93,7 +98,7 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 			IsGrafanaAdmin:             c.IsGrafanaAdmin,
 			LightTheme:                 prefs.Theme == lightName,
 			Timezone:                   prefs.Timezone,
-			WeekStart:                  prefs.WeekStart,
+			WeekStart:                  weekStart,
 			Locale:                     locale,
 			HelpFlags1:                 c.HelpFlags1,
 			HasEditPermissionInFolders: hasEditPerm,
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
index d505e05331e..4b119557a14 100644
--- a/pkg/api/preferences.go
+++ b/pkg/api/preferences.go
@@ -82,12 +82,17 @@ func (hs *HTTPServer) getPreferencesFor(ctx context.Context, orgID, userID, team
 		}
 	}
 
+	weekStart := ""
+	if preference.WeekStart != nil {
+		weekStart = *preference.WeekStart
+	}
+
 	dto := dtos.Prefs{
 		Theme:            preference.Theme,
 		HomeDashboardID:  preference.HomeDashboardID,
 		HomeDashboardUID: dashboardUID,
 		Timezone:         preference.Timezone,
-		WeekStart:        preference.WeekStart,
+		WeekStart:        weekStart,
 	}
 
 	if preference.JSONData != nil {
diff --git a/pkg/services/preference/model.go b/pkg/services/preference/model.go
index 43d8c759aa7..3f09da21d92 100644
--- a/pkg/services/preference/model.go
+++ b/pkg/services/preference/model.go
@@ -20,7 +20,7 @@ type Preference struct {
 	Version         int                 `db:"version"`
 	HomeDashboardID int64               `xorm:"home_dashboard_id" db:"home_dashboard_id"`
 	Timezone        string              `db:"timezone"`
-	WeekStart       string              `db:"week_start"`
+	WeekStart       *string             `db:"week_start"`
 	Theme           string              `db:"theme"`
 	Created         time.Time           `db:"created"`
 	Updated         time.Time           `db:"updated"`
diff --git a/pkg/services/preference/prefimpl/pref.go b/pkg/services/preference/prefimpl/pref.go
index 35839b643a2..7b9d0c5d10a 100644
--- a/pkg/services/preference/prefimpl/pref.go
+++ b/pkg/services/preference/prefimpl/pref.go
@@ -54,7 +54,7 @@ func (s *Service) GetWithDefaults(ctx context.Context, query *pref.GetPreference
 		if p.Timezone != "" {
 			res.Timezone = p.Timezone
 		}
-		if p.WeekStart != "" {
+		if p.WeekStart != nil && *p.WeekStart != "" {
 			res.WeekStart = p.WeekStart
 		}
 		if p.HomeDashboardID != 0 {
@@ -108,7 +108,7 @@ func (s *Service) Save(ctx context.Context, cmd *pref.SavePreferenceCommand) err
 				TeamID:          cmd.TeamID,
 				HomeDashboardID: cmd.HomeDashboardID,
 				Timezone:        cmd.Timezone,
-				WeekStart:       cmd.WeekStart,
+				WeekStart:       &cmd.WeekStart,
 				Theme:           cmd.Theme,
 				Created:         time.Now(),
 				Updated:         time.Now(),
@@ -125,7 +125,7 @@ func (s *Service) Save(ctx context.Context, cmd *pref.SavePreferenceCommand) err
 	}
 
 	preference.Timezone = cmd.Timezone
-	preference.WeekStart = cmd.WeekStart
+	preference.WeekStart = &cmd.WeekStart
 	preference.Theme = cmd.Theme
 	preference.Updated = time.Now()
 	preference.Version += 1
@@ -200,7 +200,7 @@ func (s *Service) Patch(ctx context.Context, cmd *pref.PatchPreferenceCommand) e
 	}
 
 	if cmd.WeekStart != nil {
-		preference.WeekStart = *cmd.WeekStart
+		preference.WeekStart = cmd.WeekStart
 	}
 
 	if cmd.Theme != nil {
@@ -232,7 +232,7 @@ func (s *Service) GetDefaults() *pref.Preference {
 	defaults := &pref.Preference{
 		Theme:           s.cfg.DefaultTheme,
 		Timezone:        s.cfg.DateFormats.DefaultTimezone,
-		WeekStart:       s.cfg.DateFormats.DefaultWeekStart,
+		WeekStart:       &s.cfg.DateFormats.DefaultWeekStart,
 		HomeDashboardID: 0,
 		JSONData:        &pref.PreferenceJSONData{},
 	}
diff --git a/pkg/services/preference/prefimpl/pref_test.go b/pkg/services/preference/prefimpl/pref_test.go
index 28749e715bc..6aa09fdf1f4 100644
--- a/pkg/services/preference/prefimpl/pref_test.go
+++ b/pkg/services/preference/prefimpl/pref_test.go
@@ -36,10 +36,12 @@ func TestGetDefaults(t *testing.T) {
 	prefService.cfg.DefaultLocale = "en-US"
 	prefService.cfg.DefaultTheme = "light"
 	prefService.cfg.DateFormats.DefaultTimezone = "UTC"
+	weekStart := ""
 
 	t.Run("GetDefaults", func(t *testing.T) {
 		preference := prefService.GetDefaults()
 		expected := &pref.Preference{
+			WeekStart:       &weekStart,
 			Theme:           "light",
 			Timezone:        "UTC",
 			HomeDashboardID: 0,
@@ -55,6 +57,7 @@ func TestGetDefaults(t *testing.T) {
 		preference, err := prefService.GetWithDefaults(context.Background(), query)
 		require.NoError(t, err)
 		expected := &pref.Preference{
+			WeekStart:       &weekStart,
 			Theme:           "light",
 			Timezone:        "UTC",
 			HomeDashboardID: 0,
@@ -72,6 +75,7 @@ func TestGetDefaultsWithI18nFeatureFlag(t *testing.T) {
 		cfg:      setting.NewCfg(),
 		features: featuremgmt.WithFeatures(featuremgmt.FlagInternationalization),
 	}
+	weekStart := ""
 	prefService.cfg.DefaultLocale = "en-US"
 	prefService.cfg.DefaultTheme = "light"
 	prefService.cfg.DateFormats.DefaultTimezone = "UTC"
@@ -79,6 +83,7 @@ func TestGetDefaultsWithI18nFeatureFlag(t *testing.T) {
 	t.Run("GetDefaults", func(t *testing.T) {
 		preference := prefService.GetDefaults()
 		expected := &pref.Preference{
+			WeekStart:       &weekStart,
 			Theme:           "light",
 			Timezone:        "UTC",
 			HomeDashboardID: 0,
@@ -100,13 +105,15 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 	}
 	prefService.cfg.DefaultLocale = "en-US"
 
+	weekStartOne := "1"
+	weekStartTwo := "2"
 	insertPrefs(t, prefService.store,
 		pref.Preference{
 			OrgID:           1,
 			HomeDashboardID: 1,
 			Theme:           "dark",
 			Timezone:        "UTC",
-			WeekStart:       "1",
+			WeekStart:       &weekStartOne,
 			JSONData: &pref.PreferenceJSONData{
 				Locale: "en-GB",
 			},
@@ -117,7 +124,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 			HomeDashboardID: 4,
 			Theme:           "light",
 			Timezone:        "browser",
-			WeekStart:       "2",
+			WeekStart:       &weekStartTwo,
 			JSONData: &pref.PreferenceJSONData{
 				Locale: "en-AU",
 			},
@@ -131,7 +138,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 		expected := &pref.Preference{
 			Theme:           "light",
 			Timezone:        "browser",
-			WeekStart:       "2",
+			WeekStart:       &weekStartTwo,
 			HomeDashboardID: 4,
 			JSONData: &pref.PreferenceJSONData{
 				Locale: "en-AU",
@@ -150,7 +157,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 		expected := &pref.Preference{
 			Theme:           "dark",
 			Timezone:        "UTC",
-			WeekStart:       "1",
+			WeekStart:       &weekStartOne,
 			HomeDashboardID: 1,
 			JSONData: &pref.PreferenceJSONData{
 				Locale: "en-GB",
@@ -163,6 +170,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 }
 
 func TestGetDefaults_JSONData(t *testing.T) {
+	weekStart := ""
 	queryPreference := pref.QueryHistoryPreference{
 		HomeTab: "hometab",
 	}
@@ -235,7 +243,8 @@ func TestGetDefaults_JSONData(t *testing.T) {
 		preference, err := prefService.GetWithDefaults(context.Background(), query)
 		require.NoError(t, err)
 		require.Equal(t, &pref.Preference{
-			JSONData: &userPreferencesJsonData,
+			WeekStart: &weekStart,
+			JSONData:  &userPreferencesJsonData,
 		}, preference)
 	})
 
@@ -262,6 +271,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 		preference, err := prefService.GetWithDefaults(context.Background(), query)
 		require.NoError(t, err)
 		require.Equal(t, &pref.Preference{
+			WeekStart: &weekStart,
 			JSONData: &pref.PreferenceJSONData{
 				Locale:       "en-GB",
 				Navbar:       userNavbarPreferences,
@@ -300,12 +310,15 @@ func TestGetDefaults_JSONData(t *testing.T) {
 		preference, err := prefService.GetWithDefaults(context.Background(), query)
 		require.NoError(t, err)
 		require.Equal(t, &pref.Preference{
-			JSONData: &team2PreferencesJsonData,
+			JSONData:  &team2PreferencesJsonData,
+			WeekStart: &weekStart,
 		}, preference)
 	})
 }
 
 func TestGetWithDefaults_teams(t *testing.T) {
+	weekStartOne := "1"
+	weekStartTwo := "2"
 	prefService := &Service{
 		store:    newFake(),
 		cfg:      setting.NewCfg(),
@@ -317,7 +330,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
 			HomeDashboardID: 1,
 			Theme:           "light",
 			Timezone:        "browser",
-			WeekStart:       "1",
+			WeekStart:       &weekStartOne,
 		},
 		pref.Preference{
 			OrgID:           1,
@@ -325,7 +338,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
 			HomeDashboardID: 3,
 			Theme:           "light",
 			Timezone:        "browser",
-			WeekStart:       "2",
+			WeekStart:       &weekStartTwo,
 		},
 		pref.Preference{
 			OrgID:           1,
@@ -333,7 +346,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
 			HomeDashboardID: 4,
 			Theme:           "light",
 			Timezone:        "browser",
-			WeekStart:       "2",
+			WeekStart:       &weekStartTwo,
 		},
 	)
 
@@ -343,7 +356,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
 	expected := &pref.Preference{
 		Theme:           "light",
 		Timezone:        "browser",
-		WeekStart:       "2",
+		WeekStart:       &weekStartTwo,
 		HomeDashboardID: 4,
 		JSONData:        &pref.PreferenceJSONData{},
 	}
@@ -399,7 +412,7 @@ func TestSave(t *testing.T) {
 		assert.Equal(t, "dark", stored.Theme)
 		assert.Equal(t, "browser", stored.Timezone)
 		assert.EqualValues(t, 5, stored.HomeDashboardID)
-		assert.Equal(t, "1", stored.WeekStart)
+		assert.Equal(t, "1", *stored.WeekStart)
 		assert.EqualValues(t, 0, stored.Version)
 	})
 
@@ -421,7 +434,7 @@ func TestSave(t *testing.T) {
 		assert.Empty(t, stored.Theme)
 		assert.Equal(t, "UTC", stored.Timezone)
 		assert.Zero(t, stored.HomeDashboardID)
-		assert.Equal(t, "1", stored.WeekStart)
+		assert.Equal(t, "1", *stored.WeekStart)
 		assert.EqualValues(t, 1, stored.Version)
 	})
 
@@ -440,7 +453,7 @@ func TestSave(t *testing.T) {
 		assert.Equal(t, themeValue, stored.Theme)
 		assert.Equal(t, "UTC", stored.Timezone)
 		assert.Zero(t, stored.HomeDashboardID)
-		assert.Equal(t, "1", stored.WeekStart)
+		assert.Equal(t, "1", *stored.WeekStart)
 		assert.EqualValues(t, 2, stored.Version)
 	})
 }
diff --git a/pkg/services/preference/prefimpl/store_test.go b/pkg/services/preference/prefimpl/store_test.go
index 5aaf283e32f..0773c1c7134 100644
--- a/pkg/services/preference/prefimpl/store_test.go
+++ b/pkg/services/preference/prefimpl/store_test.go
@@ -17,7 +17,7 @@ type getStore func(db.DB) store
 
 func testIntegrationPreferencesDataAccess(t *testing.T, fn getStore) {
 	t.Helper()
-
+	weekStartOne := "1"
 	ss := db.InitTestDB(t)
 	prefStore := fn(ss)
 	orgNavbarPreferences := pref.NavbarPreference{
@@ -123,7 +123,7 @@ func testIntegrationPreferencesDataAccess(t *testing.T, fn getStore) {
 			Theme:           "dark",
 			Timezone:        "browser",
 			HomeDashboardID: 5,
-			WeekStart:       "1",
+			WeekStart:       &weekStartOne,
 			JSONData:        &pref.PreferenceJSONData{Navbar: orgNavbarPreferences},
 			Created:         time.Now(),
 			Updated:         time.Now(),
@@ -135,7 +135,7 @@ func testIntegrationPreferencesDataAccess(t *testing.T, fn getStore) {
 			Theme:           "dark",
 			HomeDashboardID: 5,
 			Timezone:        "browser",
-			WeekStart:       "1",
+			WeekStart:       &weekStartOne,
 			Created:         time.Now(),
 			Updated:         time.Now(),
 			JSONData:        &pref.PreferenceJSONData{},
@@ -149,7 +149,7 @@ func testIntegrationPreferencesDataAccess(t *testing.T, fn getStore) {
 			Version:         prefs[0].Version,
 			HomeDashboardID: 5,
 			Timezone:        "browser",
-			WeekStart:       "1",
+			WeekStart:       &weekStartOne,
 			Theme:           "dark",
 			JSONData:        prefs[0].JSONData,
 			Created:         prefs[0].Created,

From a62e437eb397ad22ff9119a2f41299ccb955af22 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Mon, 21 Nov 2022 17:12:27 +0100
Subject: [PATCH 045/153] DevEnv: Add default loki configuration (#59058)

add local default config
---
 devenv/docker/blocks/loki/docker-compose.yaml |  3 ++
 devenv/docker/blocks/loki/loki-config.yaml    | 44 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 devenv/docker/blocks/loki/loki-config.yaml

diff --git a/devenv/docker/blocks/loki/docker-compose.yaml b/devenv/docker/blocks/loki/docker-compose.yaml
index ce7aeb20abc..b4985f53085 100644
--- a/devenv/docker/blocks/loki/docker-compose.yaml
+++ b/devenv/docker/blocks/loki/docker-compose.yaml
@@ -1,5 +1,8 @@
   loki:
     image: grafana/loki:latest
+    command: -config.file=/etc/loki/loki-config.yaml
+    volumes:
+      - ./docker/blocks/loki/loki-config.yaml:/etc/loki/loki-config.yaml
     ports:
       - "3100:3100"
 
diff --git a/devenv/docker/blocks/loki/loki-config.yaml b/devenv/docker/blocks/loki/loki-config.yaml
new file mode 100644
index 00000000000..9feccdfe545
--- /dev/null
+++ b/devenv/docker/blocks/loki/loki-config.yaml
@@ -0,0 +1,44 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+  grpc_listen_port: 9096
+
+common:
+  path_prefix: /tmp/loki
+  storage:
+    filesystem:
+      chunks_directory: /tmp/loki/chunks
+      rules_directory: /tmp/loki/rules
+  replication_factor: 1
+  ring:
+    instance_addr: 127.0.0.1
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: boltdb-shipper
+      object_store: filesystem
+      schema: v11
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false

From 8f567d57fa8d626e1bedbf8e7d308cff017ba19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Mon, 21 Nov 2022 17:37:53 +0100
Subject: [PATCH 046/153] Internationalization: Translate ViewJSONmodal and
 ClipboardButton (#58807)

---
 .../src/components/ClipboardButton/ClipboardButton.tsx    | 3 ++-
 .../dashboard/components/ShareModal/ViewJsonModal.tsx     | 3 ++-
 public/locales/de-DE/grafana.json                         | 8 ++++++++
 public/locales/en-US/grafana.json                         | 8 ++++++++
 public/locales/es-ES/grafana.json                         | 8 ++++++++
 public/locales/fr-FR/grafana.json                         | 8 ++++++++
 public/locales/pseudo-LOCALE/grafana.json                 | 8 ++++++++
 public/locales/zh-Hans/grafana.json                       | 8 ++++++++
 8 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx
index 9a37d35e210..0265dc5f8ac 100644
--- a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx
+++ b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx
@@ -3,6 +3,7 @@ import React, { useCallback, useRef, useState, useEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
+import { Trans } from '../../../src/utils/i18n';
 import { useStyles2 } from '../../themes';
 import { Button, ButtonProps } from '../Button';
 import { Icon } from '../Icon/Icon';
@@ -62,7 +63,7 @@ export function ClipboardButton({
     <>
       {showCopySuccess && (
         <InlineToast placement="top" referenceElement={buttonRef.current}>
-          Copied
+          <Trans i18nKey="clipboard-button.inline-toast.success">Copied</Trans>
         </InlineToast>
       )}
 
diff --git a/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx b/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx
index 9018ec6c026..2a5fa2a262e 100644
--- a/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx
@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { ClipboardButton, CodeEditor, Modal } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 
 export interface ViewJsonModalProps {
   json: string;
@@ -17,7 +18,7 @@ export function ViewJsonModal({ json, onDismiss }: ViewJsonModalProps): JSX.Elem
       </AutoSizer>
       <Modal.ButtonRow>
         <ClipboardButton icon="copy" getText={getClipboardText}>
-          Copy to Clipboard
+          <Trans i18nKey="share-modal.view-json.copy-button">Copy to Clipboard</Trans>
         </ClipboardButton>
       </Modal.ButtonRow>
     </Modal>
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index e3d9a9abaab..02df8d71da9 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -1,5 +1,10 @@
 {
   "_comment": "Do not manually edit this file. Translations must be made in Crowdin which will sync them back into this file",
+  "clipboard-button": {
+    "inline-toast": {
+      "success": ""
+    }
+  },
   "common": {
     "locale": {
       "default": "Standard"
@@ -412,6 +417,9 @@
       "dark": "Dunkel",
       "field-name": "Design",
       "light": "Hell"
+    },
+    "view-json": {
+      "copy-button": ""
     }
   },
   "shared-dashboard": {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 2a68c15a74c..d59f3850cf2 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -1,5 +1,10 @@
 {
   "_comment": "Do not manually edit this file, or update these source phrases in Crowdin. The source of truth for English strings are in the code source",
+  "clipboard-button": {
+    "inline-toast": {
+      "success": "Copied"
+    }
+  },
   "common": {
     "locale": {
       "default": "Default"
@@ -412,6 +417,9 @@
       "dark": "Dark",
       "field-name": "Theme",
       "light": "Light"
+    },
+    "view-json": {
+      "copy-button": "Copy to Clipboard"
     }
   },
   "shared-dashboard": {
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index f3bd4e0cc7b..3aef2967296 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -1,5 +1,10 @@
 {
   "_comment": "Do not manually edit this file. Translations must be made in Crowdin which will sync them back into this file",
+  "clipboard-button": {
+    "inline-toast": {
+      "success": ""
+    }
+  },
   "common": {
     "locale": {
       "default": "Por defecto"
@@ -412,6 +417,9 @@
       "dark": "Oscuro",
       "field-name": "Tema",
       "light": "Claro"
+    },
+    "view-json": {
+      "copy-button": ""
     }
   },
   "shared-dashboard": {
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 1bcdb9254ca..f6d9d51910e 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -1,5 +1,10 @@
 {
   "_comment": "Do not manually edit this file. Translations must be made in Crowdin which will sync them back into this file",
+  "clipboard-button": {
+    "inline-toast": {
+      "success": ""
+    }
+  },
   "common": {
     "locale": {
       "default": "Par défaut"
@@ -412,6 +417,9 @@
       "dark": "Sombre",
       "field-name": "Thème",
       "light": "Clair"
+    },
+    "view-json": {
+      "copy-button": ""
     }
   },
   "shared-dashboard": {
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 1ec222378bf..a757286d3ce 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -1,5 +1,10 @@
 {
   "_comment": "Đő ʼnőŧ mäʼnūäľľy ęđįŧ ŧĥįş ƒįľę, őř ūpđäŧę ŧĥęşę şőūřčę pĥřäşęş įʼn Cřőŵđįʼn. Ŧĥę şőūřčę őƒ ŧřūŧĥ ƒőř Ēʼnģľįşĥ şŧřįʼnģş äřę įʼn ŧĥę čőđę şőūřčę",
+  "clipboard-button": {
+    "inline-toast": {
+      "success": "Cőpįęđ"
+    }
+  },
   "common": {
     "locale": {
       "default": "Đęƒäūľŧ"
@@ -412,6 +417,9 @@
       "dark": "Đäřĸ",
       "field-name": "Ŧĥęmę",
       "light": "Ŀįģĥŧ"
+    },
+    "view-json": {
+      "copy-button": "Cőpy ŧő Cľįpþőäřđ"
     }
   },
   "shared-dashboard": {
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 4122d706209..c9ec58cdae6 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -1,5 +1,10 @@
 {
   "_comment": "Do not manually edit this file. Translations must be made in Crowdin which will sync them back into this file",
+  "clipboard-button": {
+    "inline-toast": {
+      "success": ""
+    }
+  },
   "common": {
     "locale": {
       "default": "默认"
@@ -412,6 +417,9 @@
       "dark": "深色",
       "field-name": "主题",
       "light": "浅色"
+    },
+    "view-json": {
+      "copy-button": ""
     }
   },
   "shared-dashboard": {

From 99725bf9d44ae2ba6e9c30d00c511ba51a877af9 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Mon, 21 Nov 2022 17:59:19 +0100
Subject: [PATCH 047/153] Alerting: Improve UI for making more clear that
 evaluation interval belongs to the group (#56397)

* In GrafanaEvaluationBehaviour component : Split evaluation interval from for duration and add button to edit to allow editing it and warning

* Move folder and group fields to the evaluation section in the alert form

* Include 'Group behaviour' info in a card and fix 'Edit group behaviour' button onClick.

* Create hook for  getting groups for a particular folder

* Use dropdown in group instead of input and fill it with groups that belong to the selected folder

* Add evaluation interval for each group in dropdown , and show warning in case user wants to update it

* Avoid saving evaluation interval when some rules in the same group would have invalid For with this change

* Clear group value when reseting the drop down

* Remove evaluationEvery from form values, show this as a label and add a button to edit the group

* Open EditRuleGroupModal for editing evaluation interval form the alert rule form

* Fix aligment in group behaviour card

* compact space in evaluation behaviour card and change group drop down label

* In EditgroupModal, in case of grafana managed group, show folder instead of namespcace label and disable the folder name input

* Add edge case in rulesInSameGroupHaveInvalidFor method when For value is zero

* Vertically align annotations input to the evaluation section in alert rule form

* Fix width when editing new group

* Add placeholder for group input

* Make folder and group in modal readonly from alert form and disable edit group button when new group

* Update texts

* Don't show evaluation behaviour section until folder and group are selected

* Update texts

* Fix merge conflits

* Fix wrong margin in evaluation label

* Remove non-used isRulerGrafanaRuleDTO method

* Remove negative margin to avoid overlaping on Firefox
---
 .../alerting/unified/RuleEditor.test.tsx      |  12 +-
 .../components/rule-editor/AlertRuleForm.tsx  |  20 +-
 .../rule-editor/AnnotationsField.tsx          |   2 +-
 .../components/rule-editor/DetailsStep.tsx    | 146 +--------
 .../components/rule-editor/FolderAndGroup.tsx | 226 ++++++++++++++
 .../rule-editor/GrafanaEvaluationBehavior.tsx | 288 +++++++++++++-----
 .../components/rule-editor/SelectWIthAdd.tsx  |   7 +-
 .../components/rules/EditRuleGroupModal.tsx   |  75 +++--
 .../unified/components/rules/RulesGroup.tsx   |  11 +-
 .../alerting/unified/state/actions.ts         |  14 +-
 .../alerting/unified/types/rule-form.ts       |   1 -
 .../alerting/unified/utils/rule-form.ts       |   2 -
 .../alerting/unified/utils/rulerClient.ts     |  19 +-
 13 files changed, 554 insertions(+), 269 deletions(-)
 create mode 100644 public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx

diff --git a/public/app/features/alerting/unified/RuleEditor.test.tsx b/public/app/features/alerting/unified/RuleEditor.test.tsx
index 3db03b1bdcd..bad0f3cc75d 100644
--- a/public/app/features/alerting/unified/RuleEditor.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.test.tsx
@@ -24,6 +24,7 @@ import { discoverFeatures } from './api/buildInfo';
 import { fetchRulerRules, fetchRulerRulesGroup, fetchRulerRulesNamespace, setRulerRuleGroup } from './api/ruler';
 import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor';
 import { disableRBAC, mockDataSource, MockDataSourceSrv, mockFolder } from './mocks';
+import { fetchRulerRulesIfNotFetchedYet } from './state/actions';
 import * as config from './utils/config';
 import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
 import { getDefaultQueries } from './utils/rule-form';
@@ -57,6 +58,7 @@ const mocks = {
     setRulerRuleGroup: jest.mocked(setRulerRuleGroup),
     fetchRulerRulesNamespace: jest.mocked(fetchRulerRulesNamespace),
     fetchRulerRules: jest.mocked(fetchRulerRules),
+    fetchRulerRulesIfNotFetchedYet: jest.mocked(fetchRulerRulesIfNotFetchedYet),
   },
 };
 
@@ -226,7 +228,7 @@ describe.skip('RuleEditor', () => {
       rules: [],
     });
     mocks.api.fetchRulerRules.mockResolvedValue({
-      namespace1: [
+      'Folder A': [
         {
           name: 'group1',
           rules: [],
@@ -270,9 +272,9 @@ describe.skip('RuleEditor', () => {
 
     const folderInput = await ui.inputs.folder.find();
     await clickSelectOption(folderInput, 'Folder A');
-
-    const groupInput = screen.getByRole('textbox', { name: /^Group/ });
-    await userEvent.type(groupInput, 'my group');
+    const groupInput = await ui.inputs.group.find();
+    await userEvent.click(byRole('combobox').get(groupInput));
+    await clickSelectOption(groupInput, 'group1 (1m)');
 
     await userEvent.type(ui.inputs.annotationValue(0).get(), 'some summary');
     await userEvent.type(ui.inputs.annotationValue(1).get(), 'some description');
@@ -293,7 +295,7 @@ describe.skip('RuleEditor', () => {
       'Folder A',
       {
         interval: '1m',
-        name: 'my group',
+        name: 'group1',
         rules: [
           {
             annotations: { description: 'some description', summary: 'some summary' },
diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
index 270fdf07d1d..f2d4df23756 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
@@ -65,6 +65,8 @@ const AlertRuleNameInput = () => {
   );
 };
 
+export const MINUTE = '1m';
+
 type Props = {
   existing?: RuleWithLocation;
 };
@@ -75,6 +77,7 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
   const notifyApp = useAppNotification();
   const [queryParams] = useQueryParams();
   const [showEditYaml, setShowEditYaml] = useState(false);
+  const [evaluateEvery, setEvaluateEvery] = useState(existing?.group.interval ?? MINUTE);
 
   const returnTo: string = (queryParams['returnTo'] as string | undefined) ?? '/alerting/list';
   const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false);
@@ -89,8 +92,9 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
       condition: 'C',
       ...(queryParams['defaults'] ? JSON.parse(queryParams['defaults'] as string) : {}),
       type: RuleFormType.grafana,
+      evaluateEvery: evaluateEvery,
     };
-  }, [existing, queryParams]);
+  }, [existing, queryParams, evaluateEvery]);
 
   const formAPI = useForm<RuleFormValues>({
     mode: 'onSubmit',
@@ -125,6 +129,8 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
         },
         existing,
         redirectOnSave: exitOnSave ? returnTo : undefined,
+        initialAlertRuleName: defaultValues.name,
+        evaluateEvery: evaluateEvery,
       })
     );
   };
@@ -202,8 +208,16 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
               <QueryAndExpressionsStep editingExistingRule={!!existing} />
               {showStep2 && (
                 <>
-                  {type === RuleFormType.grafana ? <GrafanaEvaluationBehavior /> : <CloudEvaluationBehavior />}
-                  <DetailsStep initialFolder={defaultValues.folder} />
+                  {type === RuleFormType.grafana ? (
+                    <GrafanaEvaluationBehavior
+                      initialFolder={defaultValues.folder}
+                      evaluateEvery={evaluateEvery}
+                      setEvaluateEvery={setEvaluateEvery}
+                    />
+                  ) : (
+                    <CloudEvaluationBehavior />
+                  )}
+                  <DetailsStep />
                   <NotificationsStep />
                 </>
               )}
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
index 774f1bb4506..be34a7d3e4c 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
@@ -99,7 +99,7 @@ const AnnotationsField = () => {
 
 const getStyles = (theme: GrafanaTheme2) => ({
   annotationValueInput: css`
-    width: 426px;
+    width: 394px;
   `,
   textarea: css`
     height: 76px;
diff --git a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
index 099654102a7..c40b8fa405f 100644
--- a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
@@ -1,43 +1,19 @@
-import { css } from '@emotion/css';
-import classNames from 'classnames';
-import React, { useCallback } from 'react';
+import React from 'react';
 import { useFormContext } from 'react-hook-form';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { useStyles2, Field, Input, InputControl, Label, Tooltip, Icon } from '@grafana/ui';
-import { FolderPickerFilter } from 'app/core/components/Select/FolderPicker';
-import { contextSrv } from 'app/core/services/context_srv';
-import { DashboardSearchHit } from 'app/features/search/types';
-import { AccessControlAction } from 'app/types';
-
-import { RuleForm, RuleFormType, RuleFormValues } from '../../types/rule-form';
+import { RuleFormType, RuleFormValues } from '../../types/rule-form';
 
 import AnnotationsField from './AnnotationsField';
 import { GroupAndNamespaceFields } from './GroupAndNamespaceFields';
 import { RuleEditorSection } from './RuleEditorSection';
-import { RuleFolderPicker, Folder, containsSlashes } from './RuleFolderPicker';
-import { checkForPathSeparator } from './util';
 
-interface DetailsStepProps {
-  initialFolder: RuleForm | null;
-}
-
-export const DetailsStep = ({ initialFolder }: DetailsStepProps) => {
-  const {
-    register,
-    watch,
-    formState: { errors },
-  } = useFormContext<RuleFormValues & { location?: string }>();
-
-  const styles = useStyles2(getStyles);
+export function DetailsStep() {
+  const { watch } = useFormContext<RuleFormValues & { location?: string }>();
 
   const ruleFormType = watch('type');
   const dataSourceName = watch('dataSourceName');
   const type = watch('type');
 
-  const folderFilter = useRuleFolderFilter(initialFolder);
-
   return (
     <RuleEditorSection
       stepNo={type === RuleFormType.cloudRecording ? 3 : 4}
@@ -53,119 +29,7 @@ export const DetailsStep = ({ initialFolder }: DetailsStepProps) => {
       {(ruleFormType === RuleFormType.cloudRecording || ruleFormType === RuleFormType.cloudAlerting) &&
         dataSourceName && <GroupAndNamespaceFields rulesSourceName={dataSourceName} />}
 
-      {ruleFormType === RuleFormType.grafana && (
-        <div className={classNames([styles.flexRow, styles.alignBaseline])}>
-          <Field
-            label={
-              <Label htmlFor="folder" description={'Select a folder to store your rule.'}>
-                <Stack gap={0.5}>
-                  Folder
-                  <Tooltip
-                    placement="top"
-                    content={
-                      <div>
-                        Each folder has unique folder permission. When you store multiple rules in a folder, the folder
-                        access permissions get assigned to the rules.
-                      </div>
-                    }
-                  >
-                    <Icon name="info-circle" size="xs" />
-                  </Tooltip>
-                </Stack>
-              </Label>
-            }
-            className={styles.formInput}
-            error={errors.folder?.message}
-            invalid={!!errors.folder?.message}
-            data-testid="folder-picker"
-          >
-            <InputControl
-              render={({ field: { ref, ...field } }) => (
-                <RuleFolderPicker
-                  inputId="folder"
-                  {...field}
-                  enableCreateNew={contextSrv.hasPermission(AccessControlAction.FoldersCreate)}
-                  enableReset={true}
-                  filter={folderFilter}
-                  dissalowSlashes={true}
-                />
-              )}
-              name="folder"
-              rules={{
-                required: { value: true, message: 'Please select a folder' },
-                validate: {
-                  pathSeparator: (folder: Folder) => checkForPathSeparator(folder.title),
-                },
-              }}
-            />
-          </Field>
-          <Field
-            label="Group"
-            data-testid="group-picker"
-            description="Rules within the same group are evaluated after the same time interval."
-            className={styles.formInput}
-            error={errors.group?.message}
-            invalid={!!errors.group?.message}
-          >
-            <Input
-              id="group"
-              {...register('group', {
-                required: { value: true, message: 'Must enter a group name' },
-              })}
-            />
-          </Field>
-        </div>
-      )}
       {type !== RuleFormType.cloudRecording && <AnnotationsField />}
     </RuleEditorSection>
   );
-};
-
-const useRuleFolderFilter = (existingRuleForm: RuleForm | null) => {
-  const isSearchHitAvailable = useCallback(
-    (hit: DashboardSearchHit) => {
-      const rbacDisabledFallback = contextSrv.hasEditPermissionInFolders;
-
-      const canCreateRuleInFolder = contextSrv.hasAccessInMetadata(
-        AccessControlAction.AlertingRuleCreate,
-        hit,
-        rbacDisabledFallback
-      );
-
-      const canUpdateInCurrentFolder =
-        existingRuleForm &&
-        hit.folderId === existingRuleForm.id &&
-        contextSrv.hasAccessInMetadata(AccessControlAction.AlertingRuleUpdate, hit, rbacDisabledFallback);
-      return canCreateRuleInFolder || canUpdateInCurrentFolder;
-    },
-    [existingRuleForm]
-  );
-
-  return useCallback<FolderPickerFilter>(
-    (folderHits) =>
-      folderHits
-        .filter(isSearchHitAvailable)
-        .filter((value: DashboardSearchHit) => !containsSlashes(value.title ?? '')),
-    [isSearchHitAvailable]
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  alignBaseline: css`
-    align-items: baseline;
-    margin-bottom: ${theme.spacing(3)};
-  `,
-  formInput: css`
-    width: 275px;
-
-    & + & {
-      margin-left: ${theme.spacing(3)};
-    }
-  `,
-  flexRow: css`
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: end;
-  `,
-});
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
new file mode 100644
index 00000000000..be1e2ee99b7
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -0,0 +1,226 @@
+import { css } from '@emotion/css';
+import React, { useState, useRef, useEffect, useCallback, useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
+import { Field, InputControl, Label, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { FolderPickerFilter } from 'app/core/components/Select/FolderPicker';
+import { contextSrv } from 'app/core/core';
+import { DashboardSearchHit } from 'app/features/search/types';
+import { AccessControlAction, useDispatch } from 'app/types';
+import { RulerRuleDTO, RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto';
+
+import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
+import { fetchRulerRulesIfNotFetchedYet } from '../../state/actions';
+import { RuleForm, RuleFormValues } from '../../types/rule-form';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+import { InfoIcon } from '../InfoIcon';
+
+import { getIntervalForGroup } from './GrafanaEvaluationBehavior';
+import { containsSlashes, Folder, RuleFolderPicker } from './RuleFolderPicker';
+import { SelectWithAdd } from './SelectWIthAdd';
+import { checkForPathSeparator } from './util';
+
+const useGetGroups = (groupfoldersForGrafana: RulerRulesConfigDTO | null | undefined, folderName: string) => {
+  const groupOptions = useMemo(() => {
+    const groupsForFolderResult: Array<RulerRuleGroupDTO<RulerRuleDTO>> = groupfoldersForGrafana
+      ? groupfoldersForGrafana[folderName] ?? []
+      : [];
+    return groupsForFolderResult.map((group) => group.name);
+  }, [groupfoldersForGrafana, folderName]);
+
+  return groupOptions;
+};
+
+function mapGroupsToOptions(groups: string[]): Array<SelectableValue<string>> {
+  return groups.map((group) => ({ label: group, value: group }));
+}
+interface FolderAndGroupProps {
+  initialFolder: RuleForm | null;
+}
+
+export const useGetGroupOptionsFromFolder = (folderTilte: string) => {
+  const rulerRuleRequests = useUnifiedAlertingSelector((state) => state.rulerRules);
+
+  const groupfoldersForGrafana = rulerRuleRequests[GRAFANA_RULES_SOURCE_NAME];
+
+  const groupOptions: Array<SelectableValue<string>> = mapGroupsToOptions(
+    useGetGroups(groupfoldersForGrafana?.result, folderTilte)
+  );
+  const groupsForFolder = groupfoldersForGrafana?.result;
+  return { groupOptions, groupsForFolder, loading: groupfoldersForGrafana?.loading };
+};
+
+const useRuleFolderFilter = (existingRuleForm: RuleForm | null) => {
+  const isSearchHitAvailable = useCallback(
+    (hit: DashboardSearchHit) => {
+      const rbacDisabledFallback = contextSrv.hasEditPermissionInFolders;
+
+      const canCreateRuleInFolder = contextSrv.hasAccessInMetadata(
+        AccessControlAction.AlertingRuleCreate,
+        hit,
+        rbacDisabledFallback
+      );
+
+      const canUpdateInCurrentFolder =
+        existingRuleForm &&
+        hit.folderId === existingRuleForm.id &&
+        contextSrv.hasAccessInMetadata(AccessControlAction.AlertingRuleUpdate, hit, rbacDisabledFallback);
+      return canCreateRuleInFolder || canUpdateInCurrentFolder;
+    },
+    [existingRuleForm]
+  );
+
+  return useCallback<FolderPickerFilter>(
+    (folderHits) =>
+      folderHits
+        .filter(isSearchHitAvailable)
+        .filter((value: DashboardSearchHit) => !containsSlashes(value.title ?? '')),
+    [isSearchHitAvailable]
+  );
+};
+
+export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
+  const {
+    formState: { errors },
+    watch,
+    control,
+  } = useFormContext<RuleFormValues>();
+
+  const styles = useStyles2(getStyles);
+  const dispatch = useDispatch();
+  const folderFilter = useRuleFolderFilter(initialFolder);
+  const [isAddingGroup, setIsAddingGroup] = useState(false);
+
+  const folder = watch('folder');
+  const group = watch('group');
+  const [selectedGroup, setSelectedGroup] = useState(group);
+  const initialRender = useRef(true);
+
+  const { groupOptions, groupsForFolder, loading } = useGetGroupOptionsFromFolder(folder?.title ?? '');
+
+  useEffect(() => setSelectedGroup(group), [group, setSelectedGroup]);
+
+  useEffect(() => {
+    dispatch(fetchRulerRulesIfNotFetchedYet(GRAFANA_RULES_SOURCE_NAME));
+  }, [dispatch]);
+
+  const resetGroup = useCallback(() => {
+    if (group && !initialRender.current && folder?.title) {
+      setSelectedGroup('');
+    }
+    initialRender.current = false;
+  }, [group, folder?.title]);
+
+  const groupIsInGroupOptions = useCallback(
+    (group_: string) => {
+      return groupOptions.includes((groupInList: SelectableValue<string>) => groupInList.label === group_);
+    },
+    [groupOptions]
+  );
+
+  return (
+    <div className={styles.container}>
+      <Field
+        label={
+          <Label htmlFor="folder" description={'Select a folder for your rule.'}>
+            <Stack gap={0.5}>
+              Folder
+              <InfoIcon
+                text={
+                  'Each folder has unique folder permission. When you store multiple rules in a folder, the folder access permissions are assigned to the rules.'
+                }
+              />
+            </Stack>
+          </Label>
+        }
+        className={styles.formInput}
+        error={errors.folder?.message}
+        invalid={!!errors.folder?.message}
+        data-testid="folder-picker"
+      >
+        <InputControl
+          render={({ field: { ref, ...field } }) => (
+            <RuleFolderPicker
+              inputId="folder"
+              {...field}
+              enableCreateNew={contextSrv.hasPermission(AccessControlAction.FoldersCreate)}
+              enableReset={true}
+              filter={folderFilter}
+              dissalowSlashes={true}
+              onChange={({ title, uid }) => {
+                field.onChange({ title, uid });
+                if (!groupIsInGroupOptions(selectedGroup)) {
+                  setIsAddingGroup(false);
+                  resetGroup();
+                }
+              }}
+            />
+          )}
+          name="folder"
+          rules={{
+            required: { value: true, message: 'Select a folder' },
+            validate: {
+              pathSeparator: (folder: Folder) => checkForPathSeparator(folder.title),
+            },
+          }}
+        />
+      </Field>
+
+      <Field
+        label="Evaluation group (interval)"
+        data-testid="group-picker"
+        description="Select a group to evaluate all rules in the same group over the same time interval."
+        className={styles.formInput}
+        error={errors.group?.message}
+        invalid={!!errors.group?.message}
+      >
+        <InputControl
+          render={({ field: { ref, ...field } }) =>
+            loading ? (
+              <LoadingPlaceholder text="Loading..." />
+            ) : (
+              <SelectWithAdd
+                key={`my_unique_select_key__${folder?.title ?? ''}`}
+                {...field}
+                options={groupOptions}
+                getOptionLabel={(option: SelectableValue<string>) =>
+                  `${option.label}  (${getIntervalForGroup(groupsForFolder, option.label ?? '', folder?.title ?? '')})`
+                }
+                value={selectedGroup}
+                custom={isAddingGroup}
+                onCustomChange={(custom: boolean) => setIsAddingGroup(custom)}
+                placeholder="Evaluation group name"
+                onChange={(value: string) => {
+                  field.onChange(value);
+                  setSelectedGroup(value);
+                }}
+              />
+            )
+          }
+          name="group"
+          control={control}
+          rules={{
+            required: { value: true, message: 'Must enter a group name' },
+          }}
+        />
+      </Field>
+    </div>
+  );
+}
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css`
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+    max-width: ${theme.breakpoints.values.sm}px;
+    justify-content: space-between;
+  `,
+  formInput: css`
+    width: 275px;
+    & + & {
+      margin-left: ${theme.spacing(3)};
+    }
+  `,
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
index 19453d7f81f..b52eaac7bd2 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
@@ -1,22 +1,39 @@
 import { css } from '@emotion/css';
-import React, { useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { RegisterOptions, useFormContext } from 'react-hook-form';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { Field, InlineLabel, Input, InputControl, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Button, Card, Field, InlineLabel, Input, InputControl, useStyles2 } from '@grafana/ui';
+import { RulerRuleDTO, RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto';
 
-import { RuleFormValues } from '../../types/rule-form';
-import { checkEvaluationIntervalGlobalLimit } from '../../utils/config';
+import { logInfo, LogMessages } from '../../Analytics';
+import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
+import { RuleForm, RuleFormValues } from '../../types/rule-form';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { parsePrometheusDuration } from '../../utils/time';
 import { CollapseToggle } from '../CollapseToggle';
-import { EvaluationIntervalLimitExceeded } from '../InvalidIntervalWarning';
+import { EditCloudGroupModal } from '../rules/EditRuleGroupModal';
 
+import { MINUTE } from './AlertRuleForm';
+import { FolderAndGroup, useGetGroupOptionsFromFolder } from './FolderAndGroup';
 import { GrafanaAlertStatePicker } from './GrafanaAlertStatePicker';
 import { RuleEditorSection } from './RuleEditorSection';
 
 export const MIN_TIME_RANGE_STEP_S = 10; // 10 seconds
 
-export const forValidationOptions = (evaluateEvery: string): RegisterOptions => ({
+export const getIntervalForGroup = (
+  rulerRules: RulerRulesConfigDTO | null | undefined,
+  group: string,
+  folder: string
+) => {
+  const folderObj: Array<RulerRuleGroupDTO<RulerRuleDTO>> = rulerRules ? rulerRules[folder] : [];
+  const groupObj = folderObj?.find((rule) => rule.name === group);
+
+  const interval = groupObj?.interval ?? MINUTE;
+  return interval;
+};
+
+const forValidationOptions = (evaluateEvery: string): RegisterOptions => ({
   required: {
     value: true,
     message: 'Required.',
@@ -51,90 +68,162 @@ export const forValidationOptions = (evaluateEvery: string): RegisterOptions =>
   },
 });
 
-export const evaluateEveryValidationOptions: RegisterOptions = {
-  required: {
-    value: true,
-    message: 'Required.',
-  },
-  validate: (value: string) => {
-    try {
-      const duration = parsePrometheusDuration(value);
+const useIsNewGroup = (folder: string, group: string) => {
+  const { groupOptions } = useGetGroupOptionsFromFolder(folder);
 
-      if (duration < MIN_TIME_RANGE_STEP_S * 1000) {
-        return `Cannot be less than ${MIN_TIME_RANGE_STEP_S} seconds.`;
-      }
-
-      if (duration % (MIN_TIME_RANGE_STEP_S * 1000) !== 0) {
-        return `Must be a multiple of ${MIN_TIME_RANGE_STEP_S} seconds.`;
-      }
-
-      return true;
-    } catch (error) {
-      return error instanceof Error ? error.message : 'Failed to parse duration';
-    }
-  },
+  const groupIsInGroupOptions = useCallback(
+    (group_: string) => groupOptions.some((groupInList: SelectableValue<string>) => groupInList.label === group_),
+    [groupOptions]
+  );
+  return !groupIsInGroupOptions(group);
 };
 
-export const GrafanaEvaluationBehavior = () => {
+function FolderGroupAndEvaluationInterval({
+  initialFolder,
+  evaluateEvery,
+  setEvaluateEvery,
+}: {
+  initialFolder: RuleForm | null;
+  evaluateEvery: string;
+  setEvaluateEvery: (value: string) => void;
+}) {
+  const styles = useStyles2(getStyles);
+  const { watch } = useFormContext<RuleFormValues>();
+  const [isEditingGroup, setIsEditingGroup] = useState(false);
+
+  const group = watch('group');
+  const folder = watch('folder');
+
+  const rulerRuleRequests = useUnifiedAlertingSelector((state) => state.rulerRules);
+  const groupfoldersForGrafana = rulerRuleRequests[GRAFANA_RULES_SOURCE_NAME];
+
+  const isNewGroup = useIsNewGroup(folder?.title ?? '', group);
+
+  useEffect(() => {
+    group &&
+      folder &&
+      setEvaluateEvery(getIntervalForGroup(groupfoldersForGrafana?.result, group, folder?.title ?? ''));
+  }, [group, folder, groupfoldersForGrafana?.result, setEvaluateEvery]);
+
+  const closeEditGroupModal = (saved = false) => {
+    if (!saved) {
+      logInfo(LogMessages.leavingRuleGroupEdit);
+    }
+    setIsEditingGroup(false);
+  };
+
+  const onOpenEditGroupModal = () => setIsEditingGroup(true);
+
+  const editGroupDisabled = groupfoldersForGrafana?.loading || isNewGroup || !folder || !group;
+
+  return (
+    <div>
+      <FolderAndGroup initialFolder={initialFolder} />
+      {isEditingGroup && (
+        <EditCloudGroupModal
+          groupInterval={evaluateEvery}
+          nameSpaceAndGroup={{ namespace: folder?.title ?? '', group: group }}
+          sourceName={GRAFANA_RULES_SOURCE_NAME}
+          onClose={() => closeEditGroupModal()}
+          folderAndGroupReadOnly
+        />
+      )}
+      {folder && group && (
+        <Card className={styles.cardContainer}>
+          <Card.Heading>Evaluation behavior</Card.Heading>
+          <Card.Meta>
+            <div className={styles.evaluationDescription}>
+              <div className={styles.evaluateLabel}>
+                {`Alert rules in the `} <span className={styles.bold}>{group}</span> group are evaluated every{' '}
+                <span className={styles.bold}>{evaluateEvery}</span>.
+              </div>
+
+              <br />
+              {!isNewGroup && (
+                <div>
+                  {`Evaluation group interval applies to every rule within a group. It overwrites intervals defined for existing alert rules.`}
+                </div>
+              )}
+              <br />
+            </div>
+          </Card.Meta>
+          <Card.Actions>
+            <div className={styles.editGroup}>
+              {isNewGroup && (
+                <div className={styles.warningMessage}>
+                  {`To edit the evaluation group interval, save the alert rule.`}
+                </div>
+              )}
+              <Button
+                icon={'edit'}
+                type="button"
+                variant="secondary"
+                disabled={editGroupDisabled}
+                onClick={onOpenEditGroupModal}
+              >
+                <span>{'Edit evaluation group'}</span>
+              </Button>
+            </div>
+          </Card.Actions>
+        </Card>
+      )}
+    </div>
+  );
+}
+
+function ForInput({ evaluateEvery }: { evaluateEvery: string }) {
   const styles = useStyles2(getStyles);
-  const [showErrorHandling, setShowErrorHandling] = useState(false);
   const {
     register,
     formState: { errors },
-    watch,
   } = useFormContext<RuleFormValues>();
 
-  const { exceedsLimit: exceedsGlobalEvaluationLimit } = checkEvaluationIntervalGlobalLimit(watch('evaluateEvery'));
-
-  const evaluateEveryId = 'eval-every-input';
   const evaluateForId = 'eval-for-input';
 
+  return (
+    <div className={styles.flexRow}>
+      <InlineLabel
+        htmlFor={evaluateForId}
+        width={7}
+        tooltip='Once the condition is breached, the alert goes into pending state. If the alert is pending longer than the "for" value, it becomes a firing alert.'
+      >
+        for
+      </InlineLabel>
+      <Field
+        className={styles.inlineField}
+        error={errors.evaluateFor?.message}
+        invalid={!!errors.evaluateFor?.message}
+        validationMessageHorizontalOverflow={true}
+      >
+        <Input id={evaluateForId} width={8} {...register('evaluateFor', forValidationOptions(evaluateEvery))} />
+      </Field>
+    </div>
+  );
+}
+
+export function GrafanaEvaluationBehavior({
+  initialFolder,
+  evaluateEvery,
+  setEvaluateEvery,
+}: {
+  initialFolder: RuleForm | null;
+  evaluateEvery: string;
+  setEvaluateEvery: (value: string) => void;
+}) {
+  const styles = useStyles2(getStyles);
+  const [showErrorHandling, setShowErrorHandling] = useState(false);
+
   return (
     // TODO remove "and alert condition" for recording rules
     <RuleEditorSection stepNo={3} title="Alert evaluation behavior">
-      <Field
-        label="Evaluate"
-        description="Evaluation interval applies to every rule within a group. It can overwrite the interval of an existing alert rule."
-      >
-        <div className={styles.flexRow}>
-          <InlineLabel
-            htmlFor={evaluateEveryId}
-            width={16}
-            tooltip="How often the alert will be evaluated to see if it fires"
-          >
-            Evaluate every
-          </InlineLabel>
-          <Field
-            className={styles.inlineField}
-            error={errors.evaluateEvery?.message}
-            invalid={!!errors.evaluateEvery}
-            validationMessageHorizontalOverflow={true}
-          >
-            <Input id={evaluateEveryId} width={8} {...register('evaluateEvery', evaluateEveryValidationOptions)} />
-          </Field>
-
-          <InlineLabel
-            htmlFor={evaluateForId}
-            width={7}
-            tooltip='Once condition is breached, alert will go into pending state. If it is pending for longer than the "for" value, it will become a firing alert.'
-          >
-            for
-          </InlineLabel>
-          <Field
-            className={styles.inlineField}
-            error={errors.evaluateFor?.message}
-            invalid={!!errors.evaluateFor?.message}
-            validationMessageHorizontalOverflow={true}
-          >
-            <Input
-              id={evaluateForId}
-              width={8}
-              {...register('evaluateFor', forValidationOptions(watch('evaluateEvery')))}
-            />
-          </Field>
-        </div>
-      </Field>
-      {exceedsGlobalEvaluationLimit && <EvaluationIntervalLimitExceeded />}
+      <div className={styles.flexColumn}>
+        <FolderGroupAndEvaluationInterval
+          initialFolder={initialFolder}
+          setEvaluateEvery={setEvaluateEvery}
+          evaluateEvery={evaluateEvery}
+        />
+        <ForInput evaluateEvery={evaluateEvery} />
+      </div>
       <CollapseToggle
         isCollapsed={!showErrorHandling}
         onToggle={(collapsed) => setShowErrorHandling(!collapsed)}
@@ -177,22 +266,55 @@ export const GrafanaEvaluationBehavior = () => {
       )}
     </RuleEditorSection>
   );
-};
+}
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  inlineField: css`
-    margin-bottom: 0;
-  `,
   flexRow: css`
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     align-items: flex-start;
   `,
+  inlineField: css`
+    margin-bottom: 0;
+  `,
+  flexColumn: css`
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: flex-start;
+  `,
   collapseToggle: css`
     margin: ${theme.spacing(2, 0, 2, -1)};
   `,
-  globalLimitValue: css`
-    font-weight: ${theme.typography.fontWeightBold};
+  evaluateLabel: css`
+    align-self: left;
+    margin-right: ${theme.spacing(1)};
+  `,
+  cardContainer: css`
+    max-width: ${theme.breakpoints.values.sm}px;
+  `,
+  intervalChangedLabel: css`
+    margin-bottom: ${theme.spacing(1)};
+  `,
+  warningIcon: css`
+    justify-self: center;
+    margin-right: ${theme.spacing(1)};
+    color: ${theme.colors.warning.text};
+  `,
+  warningMessage: css`
+    color: ${theme.colors.warning.text};
+  `,
+  editGroup: css`
+    display: flex;
+    align-items: center;
+    justify-content: right;
+  `,
+  bold: css`
+    font-weight: bold;
+  `,
+  evaluationDescription: css`
+    display: flex;
+    flex-direction: column;
   `,
 });
diff --git a/public/app/features/alerting/unified/components/rule-editor/SelectWIthAdd.tsx b/public/app/features/alerting/unified/components/rule-editor/SelectWIthAdd.tsx
index 351bb234a15..8a05c83cc0a 100644
--- a/public/app/features/alerting/unified/components/rule-editor/SelectWIthAdd.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/SelectWIthAdd.tsx
@@ -15,6 +15,7 @@ interface Props {
   width?: number;
   disabled?: boolean;
   'aria-label'?: string;
+  getOptionLabel?: ((item: SelectableValue<string>) => React.ReactNode) | undefined;
 }
 
 export const SelectWithAdd: FC<Props> = ({
@@ -29,13 +30,12 @@ export const SelectWithAdd: FC<Props> = ({
   disabled = false,
   addLabel = '+ Add new',
   'aria-label': ariaLabel,
+  getOptionLabel,
 }) => {
   const [isCustom, setIsCustom] = useState(custom);
 
   useEffect(() => {
-    if (custom) {
-      setIsCustom(custom);
-    }
+    setIsCustom(custom);
   }, [custom]);
 
   const _options = useMemo(
@@ -65,6 +65,7 @@ export const SelectWithAdd: FC<Props> = ({
         value={value}
         className={className}
         placeholder={placeholder}
+        getOptionLabel={getOptionLabel}
         disabled={disabled}
         onChange={(val: SelectableValue) => {
           const value = val?.value;
diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
index 2dafb3caf12..24376df0e68 100644
--- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
+++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
@@ -14,7 +14,7 @@ import { RulerRulesConfigDTO, RulerRuleGroupDTO, RulerRuleDTO } from 'app/types/
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { rulesInSameGroupHaveInvalidFor, updateLotexNamespaceAndGroupAction } from '../../state/actions';
 import { checkEvaluationIntervalGlobalLimit } from '../../utils/config';
-import { getRulesSourceName } from '../../utils/datasource';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { initialAsyncRequestState } from '../../utils/redux';
 import { isAlertingRulerRule, isGrafanaRulerRule } from '../../utils/rules';
 import { parsePrometheusDuration } from '../../utils/time';
@@ -186,10 +186,20 @@ export const RulesForGroupTable = ({
   );
 };
 
-interface ModalProps {
+interface CombinedGroupAndNameSpace {
   namespace: CombinedRuleNamespace;
   group: CombinedRuleGroup;
+}
+interface GroupAndNameSpaceNames {
+  namespace: string;
+  group: string;
+}
+interface ModalProps {
+  nameSpaceAndGroup: CombinedGroupAndNameSpace | GroupAndNameSpaceNames;
+  sourceName: string;
+  groupInterval: string;
   onClose: (saved?: boolean) => void;
+  folderAndGroupReadOnly?: boolean;
 }
 
 interface FormValues {
@@ -199,22 +209,42 @@ interface FormValues {
 }
 
 export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
-  const { namespace, group, onClose } = props;
+  const {
+    nameSpaceAndGroup: { namespace, group },
+    onClose,
+    groupInterval,
+    sourceName,
+    folderAndGroupReadOnly,
+  } = props;
+
   const styles = useStyles2(getStyles);
   const dispatch = useDispatch();
   const { loading, error, dispatched } =
     useUnifiedAlertingSelector((state) => state.updateLotexNamespaceAndGroup) ?? initialAsyncRequestState;
   const notifyApp = useAppNotification();
-
+  const nameSpaceName = typeof namespace === 'string' ? namespace : namespace.name;
+  const groupName = typeof group === 'string' ? group : group.name;
   const defaultValues = useMemo(
     (): FormValues => ({
-      namespaceName: namespace.name,
-      groupName: group.name,
-      groupInterval: group.interval ?? '',
+      namespaceName: nameSpaceName,
+      groupName: groupName,
+      groupInterval: groupInterval ?? '',
     }),
-    [namespace, group]
+    [nameSpaceName, groupName, groupInterval]
   );
 
+  const isGrafanaManagedGroup = sourceName === GRAFANA_RULES_SOURCE_NAME;
+  const nameSpaceLabel = isGrafanaManagedGroup ? 'Folder' : 'Namespace';
+  const nameSpaceInfoIconLabelEditable = isGrafanaManagedGroup
+    ? 'Folder name can be updated to a non-existing folder name'
+    : 'Name space can be updated to a non-existing name space';
+  const nameSpaceInfoIconLabelNonEditable = isGrafanaManagedGroup
+    ? 'Folder name can be updated in folder view'
+    : 'Name space can be updated folder view';
+
+  const spaceNameInfoIconLabel = folderAndGroupReadOnly
+    ? nameSpaceInfoIconLabelNonEditable
+    : nameSpaceInfoIconLabelEditable;
   // close modal if successfully saved
   useEffect(() => {
     if (dispatched && !loading && !error) {
@@ -223,14 +253,13 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
   }, [dispatched, loading, onClose, error]);
 
   useCleanup((state) => (state.unifiedAlerting.updateLotexNamespaceAndGroup = initialAsyncRequestState));
-
   const onSubmit = (values: FormValues) => {
     dispatch(
       updateLotexNamespaceAndGroupAction({
-        rulesSourceName: getRulesSourceName(namespace.rulesSource),
-        groupName: group.name,
+        rulesSourceName: sourceName,
+        groupName: groupName,
         newGroupName: values.groupName,
-        namespaceName: namespace.name,
+        namespaceName: nameSpaceName,
         newNamespaceName: values.namespaceName,
         groupInterval: values.groupInterval || undefined,
       })
@@ -254,7 +283,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
   };
 
   const rulerRuleRequests = useUnifiedAlertingSelector((state) => state.rulerRules);
-  const groupfoldersForSource = rulerRuleRequests[getRulesSourceName(namespace.rulesSource)];
+  const groupfoldersForSource = rulerRuleRequests[sourceName];
 
   const evaluateEveryValidationOptions: RegisterOptions = {
     required: {
@@ -273,7 +302,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
           return `Must be a multiple of ${MIN_TIME_RANGE_STEP_S} seconds.`;
         }
         if (
-          rulesInSameGroupHaveInvalidFor(groupfoldersForSource.result, group.name, namespace.name, value).length === 0
+          rulesInSameGroupHaveInvalidFor(groupfoldersForSource.result, groupName, nameSpaceName, value).length === 0
         ) {
           return true;
         } else {
@@ -289,7 +318,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
     <Modal
       className={styles.modal}
       isOpen={true}
-      title="Edit namespace or evaluation group"
+      title={folderAndGroupReadOnly ? 'Edit evaluation group' : `Edit ${nameSpaceLabel} or evaluation group`}
       onDismiss={onClose}
       onClickBackdrop={onClose}
     >
@@ -300,8 +329,8 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
               label={
                 <Label htmlFor="namespaceName">
                   <Stack gap={0.5}>
-                    NameSpace
-                    <InfoIcon text={'Name space can be updated'} />
+                    {nameSpaceLabel}
+                    <InfoIcon text={spaceNameInfoIconLabel} />
                   </Stack>
                 </Label>
               }
@@ -310,6 +339,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
             >
               <Input
                 id="namespaceName"
+                readOnly={folderAndGroupReadOnly}
                 {...register('namespaceName', {
                   required: 'Namespace name is required.',
                 })}
@@ -320,7 +350,11 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
                 <Label htmlFor="groupName">
                   <Stack gap={0.5}>
                     Evaluation group
-                    <InfoIcon text={'Group name can be updated'} />
+                    {isGrafanaManagedGroup ? (
+                      <InfoIcon text={'Group name can be updated on Group view.'} />
+                    ) : (
+                      <InfoIcon text={'Group name can be updated to a non existing group name.'} />
+                    )}
                   </Stack>
                 </Label>
               }
@@ -329,6 +363,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
             >
               <Input
                 id="groupName"
+                readOnly={folderAndGroupReadOnly}
                 {...register('groupName', {
                   required: 'Evaluation group name is required.',
                 })}
@@ -367,8 +402,8 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
                 </div>
                 <RulesForGroupTable
                   rulerRules={groupfoldersForSource?.result}
-                  groupName={group.name}
-                  folderName={namespace.name}
+                  groupName={groupName}
+                  folderName={nameSpaceName}
                 />
               </>
             )}
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
index c963e732964..eec77d0658b 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
@@ -13,7 +13,7 @@ import { useFolder } from '../../hooks/useFolder';
 import { useHasRuler } from '../../hooks/useHasRuler';
 import { deleteRulesGroupAction } from '../../state/actions';
 import { useRulesAccess } from '../../utils/accessControlHooks';
-import { GRAFANA_RULES_SOURCE_NAME, isCloudRulesSource } from '../../utils/datasource';
+import { getRulesSourceName, GRAFANA_RULES_SOURCE_NAME, isCloudRulesSource } from '../../utils/datasource';
 import { makeFolderLink } from '../../utils/misc';
 import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
 import { CollapseToggle } from '../CollapseToggle';
@@ -224,7 +224,14 @@ export const RulesGroup: FC<Props> = React.memo(({ group, namespace, expandAll,
       {!isCollapsed && (
         <RulesTable showSummaryColumn={true} className={styles.rulesTable} showGuidelines={true} rules={group.rules} />
       )}
-      {isEditingGroup && <EditCloudGroupModal group={group} namespace={namespace} onClose={() => closeEditModal()} />}
+      {isEditingGroup && (
+        <EditCloudGroupModal
+          groupInterval={group.interval ?? ''}
+          nameSpaceAndGroup={{ group: group, namespace: namespace }}
+          sourceName={getRulesSourceName(namespace.rulesSource)}
+          onClose={() => closeEditModal()}
+        />
+      )}
       {isReorderingGroup && (
         <ReorderCloudGroupModal group={group} namespace={namespace} onClose={() => setIsReorderingGroup(false)} />
       )}
diff --git a/public/app/features/alerting/unified/state/actions.ts b/public/app/features/alerting/unified/state/actions.ts
index b3c34b512c7..b2ed0b227ed 100644
--- a/public/app/features/alerting/unified/state/actions.ts
+++ b/public/app/features/alerting/unified/state/actions.ts
@@ -443,10 +443,13 @@ export const saveRuleFormAction = createAsyncThunk(
       values,
       existing,
       redirectOnSave,
+      evaluateEvery,
     }: {
       values: RuleFormValues;
       existing?: RuleWithLocation;
       redirectOnSave?: string;
+      initialAlertRuleName?: string;
+      evaluateEvery: string;
     },
     thunkAPI
   ): Promise<void> =>
@@ -463,15 +466,18 @@ export const saveRuleFormAction = createAsyncThunk(
             if (!values.dataSourceName) {
               throw new Error('The Data source has not been defined.');
             }
+
             const rulerConfig = getDataSourceRulerConfig(thunkAPI.getState, values.dataSourceName);
             const rulerClient = getRulerClient(rulerConfig);
-            identifier = await rulerClient.saveLotexRule(values, existing);
+            identifier = await rulerClient.saveLotexRule(values, evaluateEvery, existing);
+            await thunkAPI.dispatch(fetchRulerRulesAction({ rulesSourceName: values.dataSourceName }));
 
             // in case of grafana managed
           } else if (type === RuleFormType.grafana) {
             const rulerConfig = getDataSourceRulerConfig(thunkAPI.getState, GRAFANA_RULES_SOURCE_NAME);
             const rulerClient = getRulerClient(rulerConfig);
-            identifier = await rulerClient.saveGrafanaRule(values, existing);
+            identifier = await rulerClient.saveGrafanaRule(values, evaluateEvery, existing);
+            await thunkAPI.dispatch(fetchRulerRulesAction({ rulesSourceName: GRAFANA_RULES_SOURCE_NAME }));
           } else {
             throw new Error('Unexpected rule form type');
           }
@@ -765,7 +771,9 @@ export const rulesInSameGroupHaveInvalidFor = (
 
   return rulesSameGroup.filter((rule: RulerRuleDTO) => {
     const { forDuration } = getAlertInfo(rule, everyDuration);
-    return safeParseDurationstr(forDuration) < safeParseDurationstr(everyDuration);
+    const forNumber = safeParseDurationstr(forDuration);
+    const everyNumber = safeParseDurationstr(everyDuration);
+    return forNumber !== 0 && forNumber < everyNumber;
   });
 };
 
diff --git a/public/app/features/alerting/unified/types/rule-form.ts b/public/app/features/alerting/unified/types/rule-form.ts
index 3a097ab778b..b87fc0c2e5c 100644
--- a/public/app/features/alerting/unified/types/rule-form.ts
+++ b/public/app/features/alerting/unified/types/rule-form.ts
@@ -27,7 +27,6 @@ export interface RuleFormValues {
   noDataState: GrafanaAlertStateDecision;
   execErrState: GrafanaAlertStateDecision;
   folder: RuleForm | null;
-  evaluateEvery: string;
   evaluateFor: string;
 
   // cortex / loki rules
diff --git a/public/app/features/alerting/unified/utils/rule-form.ts b/public/app/features/alerting/unified/utils/rule-form.ts
index 8abb1698cf7..1d62bf960cf 100644
--- a/public/app/features/alerting/unified/utils/rule-form.ts
+++ b/public/app/features/alerting/unified/utils/rule-form.ts
@@ -59,7 +59,6 @@ export const getDefaultFormValues = (): RuleFormValues => {
     condition: '',
     noDataState: GrafanaAlertStateDecision.NoData,
     execErrState: GrafanaAlertStateDecision.Error,
-    evaluateEvery: '1m',
     evaluateFor: '5m',
 
     // cortex / loki
@@ -126,7 +125,6 @@ export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleF
         type: RuleFormType.grafana,
         group: group.name,
         evaluateFor: rule.for || '0',
-        evaluateEvery: group.interval || defaultFormValues.evaluateEvery,
         noDataState: ga.no_data_state,
         execErrState: ga.exec_err_state,
         queries: ga.data,
diff --git a/public/app/features/alerting/unified/utils/rulerClient.ts b/public/app/features/alerting/unified/utils/rulerClient.ts
index c7ed178ead0..ed5938020b8 100644
--- a/public/app/features/alerting/unified/utils/rulerClient.ts
+++ b/public/app/features/alerting/unified/utils/rulerClient.ts
@@ -22,8 +22,8 @@ import {
 export interface RulerClient {
   findEditableRule(ruleIdentifier: RuleIdentifier): Promise<RuleWithLocation | null>;
   deleteRule(ruleWithLocation: RuleWithLocation): Promise<void>;
-  saveLotexRule(values: RuleFormValues, existing?: RuleWithLocation): Promise<RuleIdentifier>;
-  saveGrafanaRule(values: RuleFormValues, existing?: RuleWithLocation): Promise<RuleIdentifier>;
+  saveLotexRule(values: RuleFormValues, evaluateEvery: string, existing?: RuleWithLocation): Promise<RuleIdentifier>;
+  saveGrafanaRule(values: RuleFormValues, evaluateEvery: string, existing?: RuleWithLocation): Promise<RuleIdentifier>;
 }
 
 export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient {
@@ -95,7 +95,11 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
     });
   };
 
-  const saveLotexRule = async (values: RuleFormValues, existing?: RuleWithLocation): Promise<RuleIdentifier> => {
+  const saveLotexRule = async (
+    values: RuleFormValues,
+    evaluateEvery: string,
+    existing?: RuleWithLocation
+  ): Promise<RuleIdentifier> => {
     const { dataSourceName, group, namespace } = values;
     const formRule = formValuesToRulerRuleDTO(values);
     if (dataSourceName && group && namespace) {
@@ -116,6 +120,7 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
             rules: freshExisting.group.rules.map((existingRule) =>
               existingRule === freshExisting.rule ? formRule : existingRule
             ),
+            evaluateEvery: evaluateEvery,
           };
           await setRulerRuleGroup(rulerConfig, namespace, payload);
           return ruleId.fromRulerRule(dataSourceName, namespace, group, formRule);
@@ -143,8 +148,12 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
     }
   };
 
-  const saveGrafanaRule = async (values: RuleFormValues, existingRule?: RuleWithLocation): Promise<RuleIdentifier> => {
-    const { folder, group, evaluateEvery } = values;
+  const saveGrafanaRule = async (
+    values: RuleFormValues,
+    evaluateEvery: string,
+    existingRule?: RuleWithLocation
+  ): Promise<RuleIdentifier> => {
+    const { folder, group } = values;
     if (!folder) {
       throw new Error('Folder must be specified');
     }

From 1f4834a144087fcdb408baec9db00075384e27cd Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Mon, 21 Nov 2022 11:29:37 -0600
Subject: [PATCH 048/153] Prometheus: fix Heatmap y buckets when legendFormat:
 auto (#59053)

---
 .../prometheus/result_transformer.test.ts      | 11 +++++++----
 .../prometheus/result_transformer.ts           | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index 0394e9de7b9..cd87c69e6f7 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -264,8 +264,8 @@ describe('Prometheus Result Transformer', () => {
               {
                 name: 'Value',
                 type: FieldType.number,
-                values: [20, 10, 30],
-                labels: { le: '2' },
+                values: [30, 10, 40],
+                labels: { le: '+Inf' },
               },
             ],
           }),
@@ -276,8 +276,8 @@ describe('Prometheus Result Transformer', () => {
               {
                 name: 'Value',
                 type: FieldType.number,
-                values: [30, 10, 40],
-                labels: { le: '3' },
+                values: [20, 10, 30],
+                labels: { le: '2' },
               },
             ],
           }),
@@ -289,6 +289,9 @@ describe('Prometheus Result Transformer', () => {
       expect(series.data[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
       expect(series.data[0].fields[2].values.toArray()).toEqual([10, 0, 30]);
       expect(series.data[0].fields[3].values.toArray()).toEqual([10, 0, 10]);
+      expect(series.data[0].fields[1].name).toEqual('1');
+      expect(series.data[0].fields[2].name).toEqual('2');
+      expect(series.data[0].fields[3].name).toEqual('+Inf');
     });
 
     it('results with heatmap format from multiple queries should be correctly transformed', () => {
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 3870b8aafce..3b8025e7afc 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -102,6 +102,24 @@ export function transformV2(
     (df) => isHeatmapResult(df, request)
   );
 
+  // this works around the fact that we only get back frame.name with le buckets when legendFormat == {{le}}...which is not the default
+  heatmapResults.forEach((df) => {
+    if (df.name == null) {
+      let f = df.fields.find((f) => f.name === 'Value');
+
+      if (f) {
+        let le = f.labels?.le;
+
+        if (le) {
+          // this is used for sorting the frames by numeric ascending le labels for de-accum
+          df.name = le;
+          // this is used for renaming the Value fields to le label
+          f.config.displayNameFromDS = le;
+        }
+      }
+    }
+  });
+
   // Group heatmaps by query
   const heatmapResultsGroupedByQuery = groupBy<DataFrame>(heatmapResults, (h) => h.refId);
 

From 44402ff7262c306c491daec54fd2e0de6473a671 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Mon, 21 Nov 2022 20:06:00 +0200
Subject: [PATCH 049/153] CI: Split `enterprise2` pipelines (#57997)

* Add publishimages_enterprise2.go file

* Add push.go

* Modify build files

* Modify starlark files

* Remove promotion pipeline

* Remove unused args

* Handle tag for custom events
---
 .drone.star                                 |   5 +-
 .drone.yml                                  | 775 +++++++++++++++++++-
 pkg/build/cmd/genversions.go                |  17 +-
 pkg/build/cmd/main.go                       |  12 +
 pkg/build/cmd/publishimages_enterprise2.go  | 100 +++
 pkg/build/docker/build.go                   |   9 +
 pkg/build/docker/push.go                    |  62 ++
 scripts/drone/events/release.star           | 108 ++-
 scripts/drone/pipelines/build.star          |   4 +-
 scripts/drone/pipelines/publish_images.star |   6 +-
 scripts/drone/steps/lib.star                |  48 +-
 scripts/drone/version.star                  |   9 +-
 12 files changed, 1084 insertions(+), 71 deletions(-)
 create mode 100644 pkg/build/cmd/publishimages_enterprise2.go
 create mode 100644 pkg/build/docker/push.go

diff --git a/.drone.star b/.drone.star
index 9d2a65ebc63..2504f1a394c 100644
--- a/.drone.star
+++ b/.drone.star
@@ -7,7 +7,7 @@
 load('scripts/drone/events/pr.star', 'pr_pipelines')
 load('scripts/drone/events/main.star', 'main_pipelines')
 load('scripts/drone/pipelines/docs.star', 'docs_pipelines')
-load('scripts/drone/events/release.star', 'release_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'artifacts_page_pipeline')
+load('scripts/drone/events/release.star', 'oss_pipelines', 'enterprise_pipelines', 'enterprise2_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'artifacts_page_pipeline')
 load('scripts/drone/pipelines/publish_images.star', 'publish_image_pipelines_public', 'publish_image_pipelines_security')
 load('scripts/drone/version.star', 'version_branch_pipelines')
 load('scripts/drone/events/cron.star', 'cronjobs')
@@ -15,7 +15,8 @@ load('scripts/drone/vault.star', 'secrets')
 
 def main(ctx):
     edition = 'oss'
-    return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \
+    return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + oss_pipelines() + enterprise_pipelines() + enterprise2_pipelines() + \
+        enterprise2_pipelines(prefix='custom-', trigger = {'event': ['custom']},) + \
         publish_image_pipelines_public() + publish_image_pipelines_security() + \
         publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \
         publish_npm_pipelines('public') + publish_packages_pipeline() + artifacts_page_pipeline() + \
diff --git a/.drone.yml b/.drone.yml
index 35a0338455a..5fb3cee20a8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1535,7 +1535,7 @@ steps:
     GCP_KEY:
       from_secret: gcp_key
   image: google/cloud-sdk
-  name: publish-images-grafana/grafana
+  name: publish-images-grafana
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -1555,7 +1555,7 @@ steps:
     GCP_KEY:
       from_secret: gcp_key
   image: google/cloud-sdk
-  name: publish-images-grafana/grafana-oss
+  name: publish-images-grafana-oss
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -2692,7 +2692,6 @@ steps:
   - build-backend
   - build-frontend
   - build-frontend-packages
-  - build-backend-enterprise2
   environment:
     GPG_KEY_PASSWORD:
       from_secret: gpg_key_password
@@ -2844,10 +2843,9 @@ steps:
   - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
   depends_on:
   - build-plugins
-  - build-backend
+  - build-backend-enterprise2
   - build-frontend
   - build-frontend-packages
-  - build-backend-enterprise2
   environment:
     GPG_KEY_PASSWORD:
       from_secret: gpg_key_password
@@ -3357,6 +3355,503 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
+clone:
+  disable: true
+depends_on: []
+environment:
+  EDITION: enterprise2
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: release-enterprise2-build-e2e-publish
+node:
+  type: no-parallel
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - mkdir -p bin
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.17/grabpl
+  - chmod +x bin/grabpl
+  image: byrnedo/alpine-curl:0.1.8
+  name: grabpl
+- commands:
+  - echo $DRONE_RUNNER_NAME
+  image: alpine:3.15.6
+  name: identify-runner
+- commands:
+  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
+  - cd grafana-enterprise
+  - git checkout ${DRONE_TAG}
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/build-container:1.6.4
+  name: clone-enterprise
+- commands:
+  - mv bin/grabpl /tmp/
+  - rmdir bin
+  - mv grafana-enterprise /tmp/
+  - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise
+    ${DRONE_TAG}
+  - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json
+  - mkdir bin
+  - mv /tmp/grabpl bin/
+  depends_on:
+  - clone-enterprise
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/build-container:1.6.4
+  name: init-enterprise
+- commands:
+  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
+  depends_on:
+  - init-enterprise
+  environment:
+    CGO_ENABLED: 0
+  image: golang:1.19.3
+  name: compile-build-cmd
+- commands:
+  - make gen-go
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: wire-install
+- commands:
+  - yarn install --immutable
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: yarn-install
+- commands:
+  - '# It is required that code generated from Thema/CUE be committed and in sync
+    with its inputs.'
+  - '# The following command will fail if running code generators produces any diff
+    in output.'
+  - CODEGEN_VERIFY=1 make gen-cue
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: verify-gen-cue
+- commands:
+  - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    NODE_OPTIONS: --max_old_space_size=8192
+  image: grafana/build-container:1.6.4
+  name: build-frontend
+- commands:
+  - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    NODE_OPTIONS: --max_old_space_size=8192
+  image: grafana/build-container:1.6.4
+  name: build-frontend-packages
+- commands:
+  - ./bin/build  build-plugins --jobs 8 --edition enterprise
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    GRAFANA_API_KEY:
+      from_secret: grafana_api_key
+  image: grafana/build-container:1.6.4
+  name: build-plugins
+- commands:
+  - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
+  depends_on:
+  - wire-install
+  - compile-build-cmd
+  image: grafana/build-container:1.6.4
+  name: build-backend-enterprise2
+- commands:
+  - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
+  depends_on:
+  - build-plugins
+  - build-backend-enterprise2
+  - build-frontend
+  - build-frontend-packages
+  environment:
+    GPG_KEY_PASSWORD:
+      from_secret: gpg_key_password
+    GPG_PRIV_KEY:
+      from_secret: gpg_priv_key
+    GPG_PUB_KEY:
+      from_secret: gpg_pub_key
+    GRAFANA_API_KEY:
+      from_secret: grafana_api_key
+  image: grafana/build-container:1.6.4
+  name: package-enterprise2
+- commands:
+  - ./bin/build upload-cdn --edition enterprise2
+  depends_on:
+  - package-enterprise2
+  environment:
+    ENTERPRISE2_CDN_PATH:
+      from_secret: enterprise2-cdn-path
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: upload-cdn-assets-enterprise2
+- commands:
+  - ls dist/*.tar.gz*
+  - cp dist/*.tar.gz* packaging/docker/
+  depends_on:
+  - package-enterprise2
+  image: grafana/build-container:1.6.4
+  name: copy-packages-for-docker
+- commands:
+  - ./bin/build build-docker --edition enterprise2 --shouldSave
+  depends_on:
+  - copy-packages-for-docker
+  - compile-build-cmd
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: build-docker-images
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build build-docker --edition enterprise2 --shouldSave --ubuntu
+  depends_on:
+  - copy-packages-for-docker
+  - compile-build-cmd
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: build-docker-images-ubuntu
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build artifacts docker fetch --edition enterprise2
+  depends_on:
+  - build-docker-images
+  - build-docker-images-ubuntu
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: fetch-images-enterprise2
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build artifacts docker publish-enterprise2 --dockerhub-repo $${DOCKER_ENTERPRISE2_REPO}
+  depends_on:
+  - fetch-images-enterprise2
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    GCP_KEY:
+      from_secret: gcp_key_hg
+  image: google/cloud-sdk
+  name: publish-images-enterprise2
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build upload-packages --edition enterprise2
+  depends_on:
+  - package-enterprise2
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: upload-packages-enterprise2
+trigger:
+  event:
+    exclude:
+    - promote
+  ref:
+  - refs/tags/v*
+type: docker
+volumes:
+- host:
+    path: /var/run/docker.sock
+  name: docker
+- name: postgres
+  temp:
+    medium: memory
+- name: mysql
+  temp:
+    medium: memory
+---
+clone:
+  disable: true
+depends_on: []
+environment:
+  EDITION: enterprise2
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: custom-release-enterprise2-build-e2e-publish
+node:
+  type: no-parallel
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - mkdir -p bin
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.17/grabpl
+  - chmod +x bin/grabpl
+  image: byrnedo/alpine-curl:0.1.8
+  name: grabpl
+- commands:
+  - echo $DRONE_RUNNER_NAME
+  image: alpine:3.15.6
+  name: identify-runner
+- commands:
+  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
+  - cd grafana-enterprise
+  - git checkout ${DRONE_TAG}
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/build-container:1.6.4
+  name: clone-enterprise
+- commands:
+  - mv bin/grabpl /tmp/
+  - rmdir bin
+  - mv grafana-enterprise /tmp/
+  - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise
+    ${DRONE_TAG}
+  - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json
+  - mkdir bin
+  - mv /tmp/grabpl bin/
+  depends_on:
+  - clone-enterprise
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/build-container:1.6.4
+  name: init-enterprise
+- commands:
+  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
+  depends_on:
+  - init-enterprise
+  environment:
+    CGO_ENABLED: 0
+  image: golang:1.19.3
+  name: compile-build-cmd
+- commands:
+  - make gen-go
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: wire-install
+- commands:
+  - yarn install --immutable
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: yarn-install
+- commands:
+  - '# It is required that code generated from Thema/CUE be committed and in sync
+    with its inputs.'
+  - '# The following command will fail if running code generators produces any diff
+    in output.'
+  - CODEGEN_VERIFY=1 make gen-cue
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: verify-gen-cue
+- commands:
+  - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    NODE_OPTIONS: --max_old_space_size=8192
+  image: grafana/build-container:1.6.4
+  name: build-frontend
+- commands:
+  - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    NODE_OPTIONS: --max_old_space_size=8192
+  image: grafana/build-container:1.6.4
+  name: build-frontend-packages
+- commands:
+  - ./bin/build  build-plugins --jobs 8 --edition enterprise
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    GRAFANA_API_KEY:
+      from_secret: grafana_api_key
+  image: grafana/build-container:1.6.4
+  name: build-plugins
+- commands:
+  - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
+  depends_on:
+  - wire-install
+  - compile-build-cmd
+  image: grafana/build-container:1.6.4
+  name: build-backend-enterprise2
+- commands:
+  - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
+  depends_on:
+  - build-plugins
+  - build-backend-enterprise2
+  - build-frontend
+  - build-frontend-packages
+  environment:
+    GPG_KEY_PASSWORD:
+      from_secret: gpg_key_password
+    GPG_PRIV_KEY:
+      from_secret: gpg_priv_key
+    GPG_PUB_KEY:
+      from_secret: gpg_pub_key
+    GRAFANA_API_KEY:
+      from_secret: grafana_api_key
+  image: grafana/build-container:1.6.4
+  name: package-enterprise2
+- commands:
+  - ./bin/build upload-cdn --edition enterprise2
+  depends_on:
+  - package-enterprise2
+  environment:
+    ENTERPRISE2_CDN_PATH:
+      from_secret: enterprise2-cdn-path
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: upload-cdn-assets-enterprise2
+- commands:
+  - ls dist/*.tar.gz*
+  - cp dist/*.tar.gz* packaging/docker/
+  depends_on:
+  - package-enterprise2
+  image: grafana/build-container:1.6.4
+  name: copy-packages-for-docker
+- commands:
+  - ./bin/build build-docker --edition enterprise2 --shouldSave
+  depends_on:
+  - copy-packages-for-docker
+  - compile-build-cmd
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: build-docker-images
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build build-docker --edition enterprise2 --shouldSave --ubuntu
+  depends_on:
+  - copy-packages-for-docker
+  - compile-build-cmd
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: build-docker-images-ubuntu
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build artifacts docker fetch --edition enterprise2
+  depends_on:
+  - build-docker-images
+  - build-docker-images-ubuntu
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: fetch-images-enterprise2
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build artifacts docker publish-enterprise2 --dockerhub-repo $${DOCKER_ENTERPRISE2_REPO}
+  depends_on:
+  - fetch-images-enterprise2
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    GCP_KEY:
+      from_secret: gcp_key_hg
+  image: google/cloud-sdk
+  name: publish-images-enterprise2
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build upload-packages --edition enterprise2
+  depends_on:
+  - package-enterprise2
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: upload-packages-enterprise2
+trigger:
+  event:
+  - custom
+type: docker
+volumes:
+- host:
+    path: /var/run/docker.sock
+  name: docker
+- name: postgres
+  temp:
+    medium: memory
+- name: mysql
+  temp:
+    medium: memory
+---
 clone:
   retries: 3
 depends_on: []
@@ -3391,6 +3886,8 @@ steps:
   depends_on:
   - compile-build-cmd
   environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
     DOCKER_PASSWORD:
       from_secret: docker_password
     DOCKER_USER:
@@ -3415,13 +3912,13 @@ steps:
     GCP_KEY:
       from_secret: gcp_key
   image: google/cloud-sdk
-  name: publish-images-grafana/grafana
+  name: publish-images-grafana
   volumes:
   - name: docker
     path: /var/run/docker.sock
 - commands:
-  - ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana-oss --version-tag
-    ${DRONE_TAG}
+  - ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana/grafana-oss
+    --version-tag ${DRONE_TAG}
   depends_on:
   - fetch-images-oss
   environment:
@@ -3481,6 +3978,8 @@ steps:
   depends_on:
   - compile-build-cmd
   environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
     DOCKER_PASSWORD:
       from_secret: docker_password
     DOCKER_USER:
@@ -3505,7 +4004,7 @@ steps:
     GCP_KEY:
       from_secret: gcp_key
   image: google/cloud-sdk
-  name: publish-images-grafana/grafana-enterprise
+  name: publish-images-grafana-enterprise
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -3554,6 +4053,8 @@ steps:
   depends_on:
   - compile-build-cmd
   environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
     DOCKER_PASSWORD:
       from_secret: docker_password
     DOCKER_USER:
@@ -3578,7 +4079,7 @@ steps:
     GCP_KEY:
       from_secret: gcp_key
   image: google/cloud-sdk
-  name: publish-images-grafana/grafana-enterprise
+  name: publish-images-grafana-enterprise
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -4693,7 +5194,6 @@ steps:
   - build-backend
   - build-frontend
   - build-frontend-packages
-  - build-backend-enterprise2
   environment:
     GPG_KEY_PASSWORD:
       from_secret: gpg_key_password
@@ -4852,10 +5352,9 @@ steps:
     --variants linux-amd64 --sign
   depends_on:
   - build-plugins
-  - build-backend
+  - build-backend-enterprise2
   - build-frontend
   - build-frontend-packages
-  - build-backend-enterprise2
   environment:
     GPG_KEY_PASSWORD:
       from_secret: gpg_key_password
@@ -5332,6 +5831,254 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
+clone:
+  disable: true
+depends_on: []
+environment:
+  EDITION: enterprise2
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: release-branch-enterprise2-build-e2e-publish
+node:
+  type: no-parallel
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - mkdir -p bin
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.17/grabpl
+  - chmod +x bin/grabpl
+  image: byrnedo/alpine-curl:0.1.8
+  name: grabpl
+- commands:
+  - echo $DRONE_RUNNER_NAME
+  image: alpine:3.15.6
+  name: identify-runner
+- commands:
+  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
+  - cd grafana-enterprise
+  - git checkout ${DRONE_BRANCH}
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/build-container:1.6.4
+  name: clone-enterprise
+- commands:
+  - mv bin/grabpl /tmp/
+  - rmdir bin
+  - mv grafana-enterprise /tmp/
+  - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise
+  - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json
+  - mkdir bin
+  - mv /tmp/grabpl bin/
+  depends_on:
+  - clone-enterprise
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/build-container:1.6.4
+  name: init-enterprise
+- commands:
+  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
+  depends_on:
+  - init-enterprise
+  environment:
+    CGO_ENABLED: 0
+  image: golang:1.19.3
+  name: compile-build-cmd
+- commands:
+  - make gen-go
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: wire-install
+- commands:
+  - yarn install --immutable
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: yarn-install
+- commands:
+  - '# It is required that code generated from Thema/CUE be committed and in sync
+    with its inputs.'
+  - '# The following command will fail if running code generators produces any diff
+    in output.'
+  - CODEGEN_VERIFY=1 make gen-cue
+  depends_on:
+  - init-enterprise
+  image: grafana/build-container:1.6.4
+  name: verify-gen-cue
+- commands:
+  - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    NODE_OPTIONS: --max_old_space_size=8192
+  image: grafana/build-container:1.6.4
+  name: build-frontend
+- commands:
+  - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    NODE_OPTIONS: --max_old_space_size=8192
+  image: grafana/build-container:1.6.4
+  name: build-frontend-packages
+- commands:
+  - ./bin/build  build-plugins --jobs 8 --edition enterprise
+  depends_on:
+  - compile-build-cmd
+  - yarn-install
+  environment:
+    GRAFANA_API_KEY:
+      from_secret: grafana_api_key
+  image: grafana/build-container:1.6.4
+  name: build-plugins
+- commands:
+  - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
+    --variants linux-amd64
+  depends_on:
+  - wire-install
+  - compile-build-cmd
+  image: grafana/build-container:1.6.4
+  name: build-backend-enterprise2
+- commands:
+  - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
+    --variants linux-amd64 --sign
+  depends_on:
+  - build-plugins
+  - build-backend-enterprise2
+  - build-frontend
+  - build-frontend-packages
+  environment:
+    GPG_KEY_PASSWORD:
+      from_secret: gpg_key_password
+    GPG_PRIV_KEY:
+      from_secret: gpg_priv_key
+    GPG_PUB_KEY:
+      from_secret: gpg_pub_key
+    GRAFANA_API_KEY:
+      from_secret: grafana_api_key
+  image: grafana/build-container:1.6.4
+  name: package-enterprise2
+- commands:
+  - ./bin/build upload-cdn --edition enterprise2
+  depends_on:
+  - package-enterprise2
+  environment:
+    ENTERPRISE2_CDN_PATH:
+      from_secret: enterprise2-cdn-path
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: upload-cdn-assets-enterprise2
+- commands:
+  - ls dist/*.tar.gz*
+  - cp dist/*.tar.gz* packaging/docker/
+  depends_on:
+  - package-enterprise2
+  image: grafana/build-container:1.6.4
+  name: copy-packages-for-docker
+- commands:
+  - ./bin/build build-docker --edition enterprise2 --shouldSave
+  depends_on:
+  - copy-packages-for-docker
+  - compile-build-cmd
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: build-docker-images
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build build-docker --edition enterprise2 --shouldSave --ubuntu
+  depends_on:
+  - copy-packages-for-docker
+  - compile-build-cmd
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: build-docker-images-ubuntu
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build artifacts docker fetch --edition enterprise2
+  depends_on:
+  - build-docker-images
+  - build-docker-images-ubuntu
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    GCP_KEY:
+      from_secret: gcp_key
+  image: google/cloud-sdk
+  name: fetch-images-enterprise2
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build artifacts docker publish-enterprise2 --dockerhub-repo $${DOCKER_ENTERPRISE2_REPO}
+  depends_on:
+  - fetch-images-enterprise2
+  environment:
+    DOCKER_ENTERPRISE2_REPO:
+      from_secret: docker_enterprise2_repo
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    GCP_KEY:
+      from_secret: gcp_key_hg
+  image: google/cloud-sdk
+  name: publish-images-enterprise2
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - ./bin/build upload-packages --edition enterprise2
+  depends_on:
+  - package-enterprise2
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: upload-packages-enterprise2
+trigger:
+  ref:
+  - refs/heads/v[0-9]*
+type: docker
+volumes:
+- host:
+    path: /var/run/docker.sock
+  name: docker
+- name: postgres
+  temp:
+    medium: memory
+- name: mysql
+  temp:
+    medium: memory
+---
 clone:
   retries: 3
 kind: pipeline
@@ -5570,6 +6317,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 2f3c13716c7cd1e42004a0f0d7057d5024d38bceedb22370b3554a79e786a46c
+hmac: 1eca02a75c7e67666e8be67a9f121b9a70f5c280ee4d231a647be9d696e267dc
 
 ...
diff --git a/pkg/build/cmd/genversions.go b/pkg/build/cmd/genversions.go
index 81879f42b55..0d293499430 100644
--- a/pkg/build/cmd/genversions.go
+++ b/pkg/build/cmd/genversions.go
@@ -19,6 +19,11 @@ func GenerateMetadata(c *cli.Context) (config.Metadata, error) {
 		return config.Metadata{}, err
 	}
 
+	tag, ok := os.LookupEnv("DRONE_TAG")
+	if !ok {
+		fmt.Println("DRONE_TAG envvar not present, %w", err)
+	}
+
 	var releaseMode config.ReleaseMode
 	switch event {
 	case string(config.PullRequestMode):
@@ -30,6 +35,13 @@ func GenerateMetadata(c *cli.Context) (config.Metadata, error) {
 		}
 		releaseMode = config.ReleaseMode{Mode: mode}
 	case config.Custom:
+		if edition, _ := os.LookupEnv("EDITION"); edition == string(config.EditionEnterprise2) {
+			releaseMode = config.ReleaseMode{Mode: config.TagMode}
+			if tag != "" {
+				version = strings.TrimPrefix(tag, "v")
+			}
+			break
+		}
 		mode, err := config.CheckDroneTargetBranch()
 		if err != nil {
 			return config.Metadata{}, err
@@ -41,9 +53,8 @@ func GenerateMetadata(c *cli.Context) (config.Metadata, error) {
 			releaseMode = config.ReleaseMode{Mode: mode}
 		}
 	case config.Tag, config.Promote:
-		tag, ok := os.LookupEnv("DRONE_TAG")
-		if !ok || tag == "" {
-			return config.Metadata{}, err
+		if tag == "" {
+			return config.Metadata{}, fmt.Errorf("DRONE_TAG envvar not present for a tag/promotion event, %w", err)
 		}
 		version = strings.TrimPrefix(tag, "v")
 		mode, err := config.CheckSemverSuffix()
diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index c523b2a755c..a75033a6ade 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -187,6 +187,18 @@ func main() {
 								&editionFlag,
 							},
 						},
+						{
+							Name:      "publish-enterprise2",
+							Usage:     "Handle Grafana Enterprise2 Docker images",
+							ArgsUsage: "[version]",
+							Action:    Enterprise2,
+							Flags: []cli.Flag{
+								&cli.StringFlag{
+									Name:  "dockerhub-repo",
+									Usage: "DockerHub repo to push images",
+								},
+							},
+						},
 					},
 				},
 			},
diff --git a/pkg/build/cmd/publishimages_enterprise2.go b/pkg/build/cmd/publishimages_enterprise2.go
new file mode 100644
index 00000000000..80ca4188684
--- /dev/null
+++ b/pkg/build/cmd/publishimages_enterprise2.go
@@ -0,0 +1,100 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/docker"
+	"github.com/grafana/grafana/pkg/build/gcloud"
+	"github.com/urfave/cli/v2"
+)
+
+func Enterprise2(c *cli.Context) error {
+	if c.NArg() > 0 {
+		if err := cli.ShowSubcommandHelp(c); err != nil {
+			return cli.NewExitError(err.Error(), 1)
+		}
+		return cli.NewExitError("", 1)
+	}
+
+	if err := gcloud.ActivateServiceAccount(); err != nil {
+		return fmt.Errorf("couldn't activate service account, err: %w", err)
+	}
+
+	metadata, err := GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
+	if err != nil {
+		return err
+	}
+
+	cfg := docker.Config{
+		Archs:         buildConfig.Docker.Architectures,
+		Distribution:  buildConfig.Docker.Distribution,
+		DockerHubRepo: c.String("dockerhub-repo"),
+		Tag:           metadata.GrafanaVersion,
+	}
+
+	err = dockerLoginEnterprise2()
+	if err != nil {
+		return err
+	}
+
+	var distributionStr []string
+	for _, distribution := range cfg.Distribution {
+		switch distribution {
+		case alpine:
+			distributionStr = append(distributionStr, "")
+		case ubuntu:
+			distributionStr = append(distributionStr, "-ubuntu")
+		default:
+			return fmt.Errorf("unrecognized distribution %q", distribution)
+		}
+	}
+
+	for _, distribution := range distributionStr {
+		var imageFileNames []string
+		for _, arch := range cfg.Archs {
+			imageFilename := fmt.Sprintf("%s:%s%s-%s", cfg.DockerHubRepo, cfg.Tag, distribution, arch)
+			err := docker.PushImage(imageFilename)
+			if err != nil {
+				return err
+			}
+			imageFileNames = append(imageFileNames, imageFilename)
+		}
+		manifest := fmt.Sprintf("%s:%s%s", cfg.DockerHubRepo, cfg.Tag, distribution)
+		args := []string{"manifest", "create", manifest}
+		args = append(args, imageFileNames...)
+
+		//nolint:gosec
+		cmd := exec.Command("docker", args...)
+		cmd.Env = append(os.Environ(), "DOCKER_CLI_EXPERIMENTAL=enabled")
+		if output, err := cmd.CombinedOutput(); err != nil {
+			return fmt.Errorf("failed to create Docker manifest: %w\n%s", err, output)
+		}
+
+		err = docker.PushManifest(manifest)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func dockerLoginEnterprise2() error {
+	log.Println("Docker login...")
+	cmd := exec.Command("gcloud", "auth", "configure-docker")
+	if out, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("error logging in to DockerHub: %s %q", out, err)
+	}
+
+	log.Println("Successful login!")
+	return nil
+}
diff --git a/pkg/build/docker/build.go b/pkg/build/docker/build.go
index f77d54cd43e..7267d4a094b 100644
--- a/pkg/build/docker/build.go
+++ b/pkg/build/docker/build.go
@@ -85,6 +85,11 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
 	var additionalDockerRepo string
 	var tags []string
 	var imageFileBase string
+	var dockerEnterprise2Repo string
+	if repo, ok := os.LookupEnv("DOCKER_ENTERPRISE2_REPO"); ok {
+		dockerEnterprise2Repo = repo
+	}
+
 	switch edition {
 	case config.EditionOSS:
 		dockerRepo = "grafana/grafana-image-tags"
@@ -94,6 +99,10 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
 		dockerRepo = "grafana/grafana-enterprise-image-tags"
 		imageFileBase = "grafana-enterprise"
 		editionStr = "-enterprise"
+	case config.EditionEnterprise2:
+		dockerRepo = dockerEnterprise2Repo
+		imageFileBase = "grafana-enterprise2"
+		editionStr = "-enterprise2"
 	default:
 		return []string{}, fmt.Errorf("unrecognized edition %s", edition)
 	}
diff --git a/pkg/build/docker/push.go b/pkg/build/docker/push.go
new file mode 100644
index 00000000000..da87ef2cb16
--- /dev/null
+++ b/pkg/build/docker/push.go
@@ -0,0 +1,62 @@
+package docker
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"time"
+)
+
+const (
+	tries     = 3
+	sleepTime = 30
+)
+
+func PushImage(newImage string) error {
+	var err error
+	for i := 0; i < tries; i++ {
+		log.Printf("push attempt #%d...", i+1)
+		var out []byte
+		cmd := exec.Command("docker", "push", newImage)
+		cmd.Dir = "."
+		out, err = cmd.CombinedOutput()
+		if err != nil {
+			log.Printf("output: %s", out)
+			log.Printf("sleep for %d, before retrying...", sleepTime)
+			time.Sleep(sleepTime * time.Second)
+		} else {
+			log.Printf("Successfully pushed %s!", newImage)
+			break
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("error pushing images to DockerHub: %q", err)
+	}
+	return nil
+}
+
+func PushManifest(manifest string) error {
+	log.Printf("Pushing Docker manifest %s...", manifest)
+
+	var err error
+	for i := 0; i < tries; i++ {
+		log.Printf("push attempt #%d...", i+1)
+		var out []byte
+		cmd := exec.Command("docker", "manifest", "push", manifest)
+		cmd.Env = append(os.Environ(), "DOCKER_CLI_EXPERIMENTAL=enabled")
+		out, err = cmd.CombinedOutput()
+		if err != nil {
+			log.Printf("output: %s", out)
+			log.Printf("sleep for %d, before retrying...", sleepTime)
+			time.Sleep(sleepTime * time.Second)
+		} else {
+			log.Printf("Successful manifest push! %s", string(out))
+			break
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("failed to push manifest, err: %w", err)
+	}
+	return nil
+}
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index ce5442e555c..a0049840a0d 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -73,6 +73,16 @@ load(
 
 load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
 
+ver_mode='release'
+release_trigger = {
+    'event': {
+        'exclude': [
+            'promote'
+        ]
+    },
+    'ref': ['refs/tags/v*',],
+}
+
 def store_npm_packages_step():
     return {
         'name': 'store-npm-packages',
@@ -122,7 +132,7 @@ def release_npm_packages_step():
         ],
     }
 
-def get_oss_pipelines(trigger, ver_mode):
+def oss_pipelines(ver_mode=ver_mode, trigger=release_trigger):
     environment = {'EDITION': 'oss'}
     edition = 'oss'
     services = integration_test_services(edition=edition)
@@ -223,7 +233,7 @@ def get_oss_pipelines(trigger, ver_mode):
     pipelines.extend([windows_pipeline])
     return pipelines
 
-def get_enterprise_pipelines(trigger, ver_mode):
+def enterprise_pipelines(ver_mode=ver_mode, trigger=release_trigger):
     environment = {'EDITION': 'enterprise'}
     edition = 'enterprise'
     services = integration_test_services(edition=edition)
@@ -350,6 +360,78 @@ def get_enterprise_pipelines(trigger, ver_mode):
 
     return pipelines
 
+def enterprise2_pipelines(prefix='', ver_mode=ver_mode, trigger=release_trigger):
+    environment = {
+        'EDITION': 'enterprise2',
+    }
+    edition = 'enterprise'
+    services = integration_test_services(edition=edition)
+    volumes = integration_test_services_volumes()
+    package_steps = []
+    publish_steps = []
+    should_publish = ver_mode == 'release'
+    should_upload = should_publish or ver_mode in ('release-branch',)
+    include_enterprise = edition == 'enterprise'
+    edition2 = 'enterprise2'
+    init_steps = [
+        download_grabpl_step(),
+        identify_runner_step(),
+        clone_enterprise_step(ver_mode),
+        init_enterprise_step(ver_mode),
+        compile_build_cmd(edition),
+    ]
+
+    build_steps = [
+        build_frontend_step(edition=edition, ver_mode=ver_mode),
+        build_frontend_package_step(edition=edition, ver_mode=ver_mode),
+        build_plugins_step(edition=edition, ver_mode=ver_mode),
+    ]
+
+    if include_enterprise:
+        build_steps.extend([
+            build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-amd64']),
+        ])
+
+    fetch_images = fetch_images_step(edition2)
+    fetch_images.update({'depends_on': ['build-docker-images', 'build-docker-images-ubuntu']})
+    upload_cdn = upload_cdn_step(edition=edition2, ver_mode=ver_mode)
+    upload_cdn['environment'].update({'ENTERPRISE2_CDN_PATH': from_secret('enterprise2-cdn-path')})
+
+    build_steps.extend([
+        package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise, variants=['linux-amd64']),
+        upload_cdn,
+        copy_packages_for_docker_step(edition=edition2),
+        build_docker_images_step(edition=edition2, ver_mode=ver_mode, publish=True),
+        build_docker_images_step(edition=edition2, ver_mode=ver_mode, ubuntu=True, publish=True),
+        fetch_images,
+        publish_images_step(edition2, 'release', mode=edition2, docker_repo='${{DOCKER_ENTERPRISE2_REPO}}'),
+    ])
+
+    if should_upload:
+        step = upload_packages_step(edition=edition2, ver_mode=ver_mode)
+        if step:
+            publish_steps.append(step)
+
+    deps_on_clone_enterprise_step = {
+        'depends_on': [
+            'init-enterprise',
+        ]
+    }
+
+    for step in [wire_install_step(), yarn_install_step(), verify_gen_cue_step(edition)]:
+        step.update(deps_on_clone_enterprise_step)
+        init_steps.extend([step])
+
+    pipelines = [
+        pipeline(
+            name='{}{}-enterprise2-build{}-publish'.format(prefix, ver_mode, get_e2e_suffix()), edition=edition, trigger=trigger, services=[],
+            steps=init_steps + build_steps + package_steps + publish_steps,
+            volumes=volumes, environment=environment,
+        ),
+    ]
+
+    return pipelines
+
 def publish_artifacts_step(mode):
     security = ''
     if mode == 'security':
@@ -435,28 +517,6 @@ def artifacts_page_pipeline():
     return [pipeline(name='publish-artifacts-page', trigger=trigger, steps = [download_grabpl_step(), artifacts_page_step()], edition="all", environment = {'EDITION': 'all'}
     )]
 
-def release_pipelines(ver_mode='release', trigger=None):
-    # 'enterprise' edition services contain both OSS and enterprise services
-    if not trigger:
-        trigger = {
-            'event': {
-                'exclude': [
-                    'promote'
-                ]
-            },
-            'ref': ['refs/tags/v*',],
-        }
-
-    # The release pipelines include also enterprise ones, so both editions are built for a release.
-    # We could also solve this by triggering a downstream build for the enterprise repo, but by including enterprise
-    # in OSS release builds, we simplify the UX for the release engineer.
-    oss_pipelines = get_oss_pipelines(ver_mode=ver_mode, trigger=trigger)
-    enterprise_pipelines = get_enterprise_pipelines(ver_mode=ver_mode, trigger=trigger)
-
-    pipelines = oss_pipelines + enterprise_pipelines
-
-    return pipelines
-
 def get_e2e_suffix():
     if not disable_tests:
         return '-e2e'
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index a09122ae65b..730efbd099b 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -93,8 +93,8 @@ def build_e2e(trigger, ver_mode, edition):
         build_steps.extend([
             build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=False),
             build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=False),
-            publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana/grafana', trigger=trigger_oss),
-            publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana/grafana-oss', trigger=trigger_oss),
+            publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana', trigger=trigger_oss),
+            publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana-oss', trigger=trigger_oss),
             release_canary_npm_packages_step(edition, trigger=trigger_oss),
             upload_packages_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss),
             upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss)
diff --git a/scripts/drone/pipelines/publish_images.star b/scripts/drone/pipelines/publish_images.star
index 7e760ef8ff0..3481dadcd73 100644
--- a/scripts/drone/pipelines/publish_images.star
+++ b/scripts/drone/pipelines/publish_images.star
@@ -34,9 +34,9 @@ def publish_image_pipelines_public():
         'target': [mode],
     }
     return [pipeline(
-        name='publish-docker-oss-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='oss',  mode=mode, docker_repo='grafana/grafana'), edition="", environment = {'EDITION': 'oss'}
+        name='publish-docker-oss-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='oss',  mode=mode, docker_repo='grafana'), edition="", environment = {'EDITION': 'oss'}
     ), pipeline(
-        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana/grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
+        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
     ),]
 
 def publish_image_pipelines_security():
@@ -46,5 +46,5 @@ def publish_image_pipelines_security():
         'target': [mode],
     }
     return [pipeline(
-        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana/grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
+        name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise',  mode=mode, docker_repo='grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
     ),]
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 3ee32a19cb3..b2513e5633e 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -622,15 +622,10 @@ def codespell_step():
 def package_step(edition, ver_mode, include_enterprise2=False, variants=None):
     deps = [
         'build-plugins',
-        'build-backend',
+        'build-backend' + enterprise2_suffix(edition),
         'build-frontend',
         'build-frontend-packages',
     ]
-    if include_enterprise2:
-        sfx = '-enterprise2'
-        deps.extend([
-            'build-backend' + sfx,
-        ])
 
     variants_str = ''
     if variants:
@@ -773,12 +768,12 @@ def build_docs_website_step():
     }
 
 
-def copy_packages_for_docker_step():
+def copy_packages_for_docker_step(edition=None):
     return {
         'name': 'copy-packages-for-docker',
         'image': build_image,
         'depends_on': [
-            'package',
+            'package' + enterprise2_suffix(edition),
         ],
         'commands': [
             'ls dist/*.tar.gz*',
@@ -800,6 +795,13 @@ def build_docker_images_step(edition, ver_mode, archs=None, ubuntu=False, publis
     if archs:
         cmd += ' -archs {}'.format(','.join(archs))
 
+    environment = {
+        'GCP_KEY': from_secret('gcp_key'),
+    }
+
+    if edition == 'enterprise2':
+        environment.update({'DOCKER_ENTERPRISE2_REPO': from_secret('docker_enterprise2_repo')})
+
     return {
         'name': 'build-docker-images' + ubuntu_sfx,
         'image': 'google/cloud-sdk',
@@ -814,9 +816,7 @@ def build_docker_images_step(edition, ver_mode, archs=None, ubuntu=False, publis
             'name': 'docker',
             'path': '/var/run/docker.sock'
         }],
-        'environment': {
-            'GCP_KEY': from_secret('gcp_key'),
-        },
+        'environment': environment
     }
 
 def fetch_images_step(edition):
@@ -827,6 +827,7 @@ def fetch_images_step(edition):
             'GCP_KEY': from_secret('gcp_key'),
             'DOCKER_USER': from_secret('docker_username'),
             'DOCKER_PASSWORD': from_secret('docker_password'),
+            'DOCKER_ENTERPRISE2_REPO': from_secret('docker_enterprise2_repo'),
         },
         'commands': ['./bin/build artifacts docker fetch --edition {}'.format(edition)],
         'depends_on': ['compile-build-cmd'],
@@ -838,13 +839,20 @@ def fetch_images_step(edition):
 
 
 def publish_images_step(edition, ver_mode, mode, docker_repo, trigger=None):
+    name = docker_repo
+    docker_repo = 'grafana/{}'.format(docker_repo)
     if mode == 'security':
         mode = '--{} '.format(mode)
     else:
         mode = ''
 
-    cmd = './bin/grabpl artifacts docker publish {}--dockerhub-repo {}'.format(
-        mode, docker_repo)
+    environment = {
+        'GCP_KEY': from_secret('gcp_key'),
+        'DOCKER_USER': from_secret('docker_username'),
+        'DOCKER_PASSWORD': from_secret('docker_password'),
+    }
+
+    cmd = './bin/grabpl artifacts docker publish {}--dockerhub-repo {}'.format(mode, docker_repo)
 
     if ver_mode == 'release':
         deps = ['fetch-images-{}'.format(edition)]
@@ -852,14 +860,16 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger=None):
     else:
         deps = ['build-docker-images', 'build-docker-images-ubuntu']
 
+    if edition == 'enterprise2':
+        name = edition
+        docker_repo = '$${DOCKER_ENTERPRISE2_REPO}'
+        environment.update({'GCP_KEY': from_secret('gcp_key_hg'), 'DOCKER_ENTERPRISE2_REPO': from_secret('docker_enterprise2_repo')})
+        cmd = './bin/build artifacts docker publish-enterprise2 --dockerhub-repo {}'.format(docker_repo)
+
     step = {
-        'name': 'publish-images-{}'.format(docker_repo),
+        'name': 'publish-images-{}'.format(name),
         'image': 'google/cloud-sdk',
-        'environment': {
-            'GCP_KEY': from_secret('gcp_key'),
-            'DOCKER_USER': from_secret('docker_username'),
-            'DOCKER_PASSWORD': from_secret('docker_password'),
-        },
+        'environment': environment,
         'commands': [cmd],
         'depends_on': deps,
         'volumes': [{
diff --git a/scripts/drone/version.star b/scripts/drone/version.star
index 80f0c6ac48f..651a557ec75 100644
--- a/scripts/drone/version.star
+++ b/scripts/drone/version.star
@@ -1,11 +1,12 @@
 load(
     'scripts/drone/events/release.star',
-    'release_pipelines',
+    'oss_pipelines',
+    'enterprise_pipelines',
+    'enterprise2_pipelines',
 )
 
 ver_mode = 'release-branch'
+trigger={'ref': ['refs/heads/v[0-9]*']}
 
 def version_branch_pipelines():
-    return release_pipelines(ver_mode=ver_mode, trigger={
-        'ref': ['refs/heads/v[0-9]*'],
-    })
+    return oss_pipelines(ver_mode=ver_mode, trigger=trigger) + enterprise_pipelines(ver_mode=ver_mode, trigger=trigger) + enterprise2_pipelines(ver_mode=ver_mode, trigger=trigger)

From 38f25a0bf56cc1727472dd9a2755d5206890fbce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Mon, 21 Nov 2022 19:46:04 +0100
Subject: [PATCH 050/153] MS/My/PostgresSQL: Migrate annotation query (#58847)

---
 .../plugins/sql/components/QueryEditor.tsx    |  4 +--
 .../plugins/sql/components/QueryHeader.tsx    |  4 +--
 .../plugins/sql/datasource/SqlDatasource.ts   |  7 ++++-
 public/app/features/plugins/sql/defaults.ts   |  4 ++-
 public/app/features/plugins/sql/types.ts      |  7 +----
 .../features/plugins/sql/utils/migration.ts   | 28 +++++++++++++++++++
 6 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 public/app/features/plugins/sql/utils/migration.ts

diff --git a/public/app/features/plugins/sql/components/QueryEditor.tsx b/public/app/features/plugins/sql/components/QueryEditor.tsx
index 961417552e3..89af73cf12c 100644
--- a/public/app/features/plugins/sql/components/QueryEditor.tsx
+++ b/public/app/features/plugins/sql/components/QueryEditor.tsx
@@ -2,11 +2,11 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useAsync } from 'react-use';
 
 import { QueryEditorProps } from '@grafana/data';
-import { Space } from '@grafana/experimental';
+import { EditorMode, Space } from '@grafana/experimental';
 
 import { SqlDatasource } from '../datasource/SqlDatasource';
 import { applyQueryDefaults } from '../defaults';
-import { SQLQuery, QueryRowFilter, SQLOptions, EditorMode } from '../types';
+import { SQLQuery, QueryRowFilter, SQLOptions } from '../types';
 import { haveColumns } from '../utils/sql.utils';
 
 import { QueryHeader, QueryHeaderProps } from './QueryHeader';
diff --git a/public/app/features/plugins/sql/components/QueryHeader.tsx b/public/app/features/plugins/sql/components/QueryHeader.tsx
index 1aa1201570b..3a18611e9f2 100644
--- a/public/app/features/plugins/sql/components/QueryHeader.tsx
+++ b/public/app/features/plugins/sql/components/QueryHeader.tsx
@@ -2,11 +2,11 @@ import React, { useCallback, useState } from 'react';
 import { useCopyToClipboard } from 'react-use';
 
 import { SelectableValue } from '@grafana/data';
-import { EditorField, EditorHeader, EditorRow, FlexItem, InlineSelect, Space } from '@grafana/experimental';
+import { EditorField, EditorHeader, EditorMode, EditorRow, FlexItem, InlineSelect, Space } from '@grafana/experimental';
 import { Button, InlineField, InlineSwitch, RadioButtonGroup, Select, Tooltip } from '@grafana/ui';
 
 import { QueryWithDefaults } from '../defaults';
-import { SQLQuery, QueryFormat, QueryRowFilter, QUERY_FORMAT_OPTIONS, DB, EditorMode } from '../types';
+import { SQLQuery, QueryFormat, QueryRowFilter, QUERY_FORMAT_OPTIONS, DB } from '../types';
 import { defaultToRawSql } from '../utils/sql.utils';
 
 import { ConfirmModal } from './ConfirmModal';
diff --git a/public/app/features/plugins/sql/datasource/SqlDatasource.ts b/public/app/features/plugins/sql/datasource/SqlDatasource.ts
index ab621f868d7..eda97b704f3 100644
--- a/public/app/features/plugins/sql/datasource/SqlDatasource.ts
+++ b/public/app/features/plugins/sql/datasource/SqlDatasource.ts
@@ -25,8 +25,10 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { VariableWithMultiSupport } from '../../../variables/types';
 import { getSearchFilterScopedVar, SearchFilterOptions } from '../../../variables/utils';
 import { ResponseParser } from '../ResponseParser';
+import { SqlQueryEditor } from '../components/QueryEditor';
 import { MACRO_NAMES } from '../constants';
 import { DB, SQLQuery, SQLOptions, SqlQueryModel, QueryFormat } from '../types';
+import migrateAnnotation from '../utils/migration';
 
 export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLOptions> {
   id: number;
@@ -34,7 +36,6 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
   name: string;
   interval: string;
   db: DB;
-  annotations = {};
 
   constructor(
     instanceSettings: DataSourceInstanceSettings<SQLOptions>,
@@ -47,6 +48,10 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
     const settingsData = instanceSettings.jsonData || {};
     this.interval = settingsData.timeInterval || '1m';
     this.db = this.getDB();
+    this.annotations = {
+      prepareAnnotation: migrateAnnotation,
+      QueryEditor: SqlQueryEditor,
+    };
   }
 
   abstract getDB(dsID?: number): DB;
diff --git a/public/app/features/plugins/sql/defaults.ts b/public/app/features/plugins/sql/defaults.ts
index cbd954bd3eb..e67a4128acb 100644
--- a/public/app/features/plugins/sql/defaults.ts
+++ b/public/app/features/plugins/sql/defaults.ts
@@ -1,4 +1,6 @@
-import { EditorMode, QueryFormat, SQLQuery } from './types';
+import { EditorMode } from '@grafana/experimental';
+
+import { QueryFormat, SQLQuery } from './types';
 import { createFunctionField, setGroupByField } from './utils/sql.utils';
 
 export function applyQueryDefaults(q?: SQLQuery): SQLQuery {
diff --git a/public/app/features/plugins/sql/types.ts b/public/app/features/plugins/sql/types.ts
index c3e1e55769b..2f630799d55 100644
--- a/public/app/features/plugins/sql/types.ts
+++ b/public/app/features/plugins/sql/types.ts
@@ -9,7 +9,7 @@ import {
   TimeRange,
   toOption as toOptionFromData,
 } from '@grafana/data';
-import { CompletionItemKind, LanguageCompletionProvider } from '@grafana/experimental';
+import { CompletionItemKind, EditorMode, LanguageCompletionProvider } from '@grafana/experimental';
 
 import { QueryWithDefaults } from './defaults';
 import {
@@ -49,11 +49,6 @@ export enum QueryFormat {
   Table = 'table',
 }
 
-export enum EditorMode {
-  Builder = 'builder',
-  Code = 'code',
-}
-
 export interface SQLQuery extends DataQuery {
   alias?: string;
   format?: QueryFormat;
diff --git a/public/app/features/plugins/sql/utils/migration.ts b/public/app/features/plugins/sql/utils/migration.ts
new file mode 100644
index 00000000000..0e39a7bbb1b
--- /dev/null
+++ b/public/app/features/plugins/sql/utils/migration.ts
@@ -0,0 +1,28 @@
+import { AnnotationQuery } from '@grafana/data';
+import { EditorMode } from '@grafana/experimental';
+
+import { SQLQuery } from '../types';
+
+export default function migrateAnnotation(annotation: AnnotationQuery<SQLQuery>) {
+  const oldQuery = typeof annotation.rawQuery === 'string' ? annotation.rawQuery : null;
+
+  if (!oldQuery) {
+    return annotation;
+  }
+
+  const newQuery: SQLQuery = {
+    ...(annotation.target ?? {}),
+    refId: annotation.target?.refId ?? 'Anno',
+    editorMode: EditorMode.Code,
+    rawSql: oldQuery,
+  };
+
+  return {
+    ...annotation,
+    rawQuery: undefined,
+    workspace: undefined,
+    subscription: undefined,
+    queryType: undefined,
+    target: newQuery,
+  };
+}

From 57d6adbc7c4008143ac18fc7076607be227e12d3 Mon Sep 17 00:00:00 2001
From: Bart Peeters <birtpeeters@hotmail.com>
Date: Mon, 21 Nov 2022 19:58:25 +0100
Subject: [PATCH 051/153] Alerting: Support Prometheus durations in
 Provisioning API (#58293)

Provisioning API should support Prometheus durations
---
 .../definitions/provisioning_alert_rules.go   |  6 +-----
 .../provisioning/alerting/rules_types.go      | 10 +++++----
 .../provisioning/alerting/rules_types_test.go | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
index 75c86d20b39..8924b6cc2a5 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
@@ -104,10 +104,6 @@ type ProvisionedAlertRule struct {
 }
 
 func (a *ProvisionedAlertRule) UpstreamModel() (models.AlertRule, error) {
-	forDur, err := time.ParseDuration(a.For.String())
-	if err != nil {
-		return models.AlertRule{}, err
-	}
 	return models.AlertRule{
 		ID:           a.ID,
 		UID:          a.UID,
@@ -120,7 +116,7 @@ func (a *ProvisionedAlertRule) UpstreamModel() (models.AlertRule, error) {
 		Updated:      a.Updated,
 		NoDataState:  a.NoDataState,
 		ExecErrState: a.ExecErrState,
-		For:          forDur,
+		For:          time.Duration(a.For),
 		Annotations:  a.Annotations,
 		Labels:       a.Labels,
 	}, nil
diff --git a/pkg/services/provisioning/alerting/rules_types.go b/pkg/services/provisioning/alerting/rules_types.go
index c74b9a2da1b..b300d918c46 100644
--- a/pkg/services/provisioning/alerting/rules_types.go
+++ b/pkg/services/provisioning/alerting/rules_types.go
@@ -9,6 +9,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
+
+	"github.com/prometheus/common/model"
 )
 
 type RuleDelete struct {
@@ -39,11 +41,11 @@ func (ruleGroupV1 *AlertRuleGroupV1) MapToModel() (AlertRuleGroup, error) {
 	if ruleGroup.OrgID < 1 {
 		ruleGroup.OrgID = 1
 	}
-	interval, err := time.ParseDuration(ruleGroupV1.Interval.Value())
+	interval, err := model.ParseDuration(ruleGroupV1.Interval.Value())
 	if err != nil {
 		return AlertRuleGroup{}, err
 	}
-	ruleGroup.Interval = interval
+	ruleGroup.Interval = time.Duration(interval)
 	ruleGroup.Folder = ruleGroupV1.Folder.Value()
 	if strings.TrimSpace(ruleGroup.Folder) == "" {
 		return AlertRuleGroup{}, errors.New("rule group has no folder set")
@@ -91,11 +93,11 @@ func (rule *AlertRuleV1) mapToModel(orgID int64) (models.AlertRule, error) {
 		return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse: no UID set", alertRule.Title)
 	}
 	alertRule.OrgID = orgID
-	duration, err := time.ParseDuration(rule.For.Value())
+	duration, err := model.ParseDuration(rule.For.Value())
 	if err != nil {
 		return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse: %w", alertRule.Title, err)
 	}
-	alertRule.For = duration
+	alertRule.For = time.Duration(duration)
 	dashboardUID := rule.DashboardUID.Value()
 	alertRule.DashboardUID = &dashboardUID
 	panelID := rule.PanelID.Value()
diff --git a/pkg/services/provisioning/alerting/rules_types_test.go b/pkg/services/provisioning/alerting/rules_types_test.go
index 877d4f84b14..0eac93e2404 100644
--- a/pkg/services/provisioning/alerting/rules_types_test.go
+++ b/pkg/services/provisioning/alerting/rules_types_test.go
@@ -2,6 +2,7 @@ package alerting
 
 import (
 	"testing"
+	"time"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
@@ -51,6 +52,16 @@ func TestRuleGroup(t *testing.T) {
 		_, err = rg.MapToModel()
 		require.Error(t, err)
 	})
+	t.Run("a rule group with an interval containing 'd' should work", func(t *testing.T) {
+		rg := validRuleGroupV1(t)
+		var interval values.StringValue
+		err := yaml.Unmarshal([]byte("2d"), &interval)
+		require.NoError(t, err)
+		rg.Interval = interval
+		rgMapped, err := rg.MapToModel()
+		require.NoError(t, err)
+		require.Equal(t, 48*time.Hour, rgMapped.Interval)
+	})
 	t.Run("a rule group with an empty org id should default to 1", func(t *testing.T) {
 		rg := validRuleGroupV1(t)
 		rg.OrgID = values.Int64Value{}
@@ -103,6 +114,16 @@ func TestRules(t *testing.T) {
 		_, err = rule.mapToModel(1)
 		require.Error(t, err)
 	})
+	t.Run("a rule with a for duration containing 'd' should work", func(t *testing.T) {
+		rule := validRuleV1(t)
+		forDuration := values.StringValue{}
+		err := yaml.Unmarshal([]byte("2d"), &forDuration)
+		rule.For = forDuration
+		require.NoError(t, err)
+		ruleMapped, err := rule.mapToModel(1)
+		require.NoError(t, err)
+		require.Equal(t, 48*time.Hour, ruleMapped.For)
+	})
 	t.Run("a rule with out a condition should error", func(t *testing.T) {
 		rule := validRuleV1(t)
 		rule.Condition = values.StringValue{}

From 6ac43c9cb49f0747d7ab94a674de3792a689ec8b Mon Sep 17 00:00:00 2001
From: sam boyer <sdboyer@grafana.com>
Date: Mon, 21 Nov 2022 17:50:06 -0500
Subject: [PATCH 052/153] kindsys: Return Decl from Kinds (#59075)

* kindsys: Return Decl from Kinds

* Add funcs to extract DeclForGen from kinds
---
 pkg/codegen/generators.go                 | 23 +++++++++++++++++++++++
 pkg/codegen/tmpl/kind_corestructured.tmpl |  5 +++--
 pkg/codegen/tmpl/kind_raw.tmpl            |  5 +++--
 pkg/kinds/dashboard/dashboard_kind_gen.go |  5 +++--
 pkg/kinds/playlist/playlist_kind_gen.go   |  5 +++--
 pkg/kinds/svg/svg_kind_gen.go             |  5 +++--
 pkg/kindsys/kind.go                       |  4 ++--
 pkg/kindsys/kindmetas.go                  |  2 +-
 8 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/pkg/codegen/generators.go b/pkg/codegen/generators.go
index a7b7aed83f8..11820333f7a 100644
--- a/pkg/codegen/generators.go
+++ b/pkg/codegen/generators.go
@@ -29,6 +29,29 @@ func ForGen(rt *thema.Runtime, decl *kindsys.SomeDecl) (*DeclForGen, error) {
 	}, nil
 }
 
+// RawForGen produces a [DeclForGen] from a [kindsys.Raw] kind.
+//
+// Useful for grafana-external code generators, which depend on the Kind
+// representation in registries produced by grafana core (such as
+// ["github.com/grafana/grafana/pkg/registry/corekind".NewBase]).
+func RawForGen(k kindsys.Raw) *DeclForGen {
+	return &DeclForGen{
+		SomeDecl: k.Decl().Some(),
+	}
+}
+
+// StructuredForGen produces a [DeclForGen] from a [kindsys.Structured] kind.
+//
+// Useful for grafana-external code generators, which depend on the Kind
+// representation in registries produced by grafana core (such as
+// ["github.com/grafana/grafana/pkg/registry/corekind".NewBase]).
+func StructuredForGen(k kindsys.Structured) *DeclForGen {
+	return &DeclForGen{
+		SomeDecl: k.Decl().Some(),
+		lin:      k.Lineage(),
+	}
+}
+
 // DeclForGen wraps [kindsys.SomeDecl] to provide trivial caching of
 // the lineage declared by the kind (nil for raw kinds).
 type DeclForGen struct {
diff --git a/pkg/codegen/tmpl/kind_corestructured.tmpl b/pkg/codegen/tmpl/kind_corestructured.tmpl
index 71fbac06074..a02a686b687 100644
--- a/pkg/codegen/tmpl/kind_corestructured.tmpl
+++ b/pkg/codegen/tmpl/kind_corestructured.tmpl
@@ -90,6 +90,7 @@ func (k *Kind) Maturity() kindsys.Maturity {
 }
 
 // TODO standard generated docs
-func (k *Kind) Meta() kindsys.CoreStructuredMeta {
-	return k.decl.Meta
+func (k *Kind) Decl() *kindsys.Decl[kindsys.CoreStructuredMeta] {
+	d := k.decl
+	return &d
 }
diff --git a/pkg/codegen/tmpl/kind_raw.tmpl b/pkg/codegen/tmpl/kind_raw.tmpl
index 479915c124e..a38070c67e3 100644
--- a/pkg/codegen/tmpl/kind_raw.tmpl
+++ b/pkg/codegen/tmpl/kind_raw.tmpl
@@ -42,6 +42,7 @@ func (k *Kind) Maturity() kindsys.Maturity {
 }
 
 // TODO standard generated docs
-func (k *Kind) Meta() kindsys.RawMeta {
-	return k.decl.Meta
+func (k *Kind) Decl() *kindsys.Decl[kindsys.RawMeta] {
+	d := k.decl
+	return &d
 }
diff --git a/pkg/kinds/dashboard/dashboard_kind_gen.go b/pkg/kinds/dashboard/dashboard_kind_gen.go
index ee275dc8426..71c47986121 100644
--- a/pkg/kinds/dashboard/dashboard_kind_gen.go
+++ b/pkg/kinds/dashboard/dashboard_kind_gen.go
@@ -99,6 +99,7 @@ func (k *Kind) Maturity() kindsys.Maturity {
 }
 
 // TODO standard generated docs
-func (k *Kind) Meta() kindsys.CoreStructuredMeta {
-	return k.decl.Meta
+func (k *Kind) Decl() *kindsys.Decl[kindsys.CoreStructuredMeta] {
+	d := k.decl
+	return &d
 }
diff --git a/pkg/kinds/playlist/playlist_kind_gen.go b/pkg/kinds/playlist/playlist_kind_gen.go
index eb82358c7bb..e67a4bc3dc2 100644
--- a/pkg/kinds/playlist/playlist_kind_gen.go
+++ b/pkg/kinds/playlist/playlist_kind_gen.go
@@ -99,6 +99,7 @@ func (k *Kind) Maturity() kindsys.Maturity {
 }
 
 // TODO standard generated docs
-func (k *Kind) Meta() kindsys.CoreStructuredMeta {
-	return k.decl.Meta
+func (k *Kind) Decl() *kindsys.Decl[kindsys.CoreStructuredMeta] {
+	d := k.decl
+	return &d
 }
diff --git a/pkg/kinds/svg/svg_kind_gen.go b/pkg/kinds/svg/svg_kind_gen.go
index 9722d91998b..b3f6a4f3150 100644
--- a/pkg/kinds/svg/svg_kind_gen.go
+++ b/pkg/kinds/svg/svg_kind_gen.go
@@ -49,6 +49,7 @@ func (k *Kind) Maturity() kindsys.Maturity {
 }
 
 // TODO standard generated docs
-func (k *Kind) Meta() kindsys.RawMeta {
-	return k.decl.Meta
+func (k *Kind) Decl() *kindsys.Decl[kindsys.RawMeta] {
+	d := k.decl
+	return &d
 }
diff --git a/pkg/kindsys/kind.go b/pkg/kindsys/kind.go
index ea02870ce26..9839954fb69 100644
--- a/pkg/kindsys/kind.go
+++ b/pkg/kindsys/kind.go
@@ -58,7 +58,7 @@ type Raw interface {
 	Interface
 
 	// TODO docs
-	Meta() RawMeta
+	Decl() *Decl[RawMeta]
 }
 
 type Structured interface {
@@ -68,7 +68,7 @@ type Structured interface {
 	Lineage() thema.Lineage
 
 	// TODO docs
-	Meta() CoreStructuredMeta // TODO figure out how to reconcile this interface with CustomStructuredMeta
+	Decl() *Decl[CoreStructuredMeta] // TODO figure out how to reconcile this interface with CustomStructuredMeta
 }
 
 // type Composable interface {
diff --git a/pkg/kindsys/kindmetas.go b/pkg/kindsys/kindmetas.go
index 946c07fbe76..5470d8e26d6 100644
--- a/pkg/kindsys/kindmetas.go
+++ b/pkg/kindsys/kindmetas.go
@@ -2,7 +2,7 @@ package kindsys
 
 import "github.com/grafana/thema"
 
-// CommonMeta contains the kind metadata common to all categories of kinds.
+// CommonMeta contains the metadata common to all categories of kinds.
 type CommonMeta struct {
 	Name              string   `json:"name"`
 	PluralName        string   `json:"pluralName"`

From c02003af3cfe62210861d2c38b6fd8cac930b857 Mon Sep 17 00:00:00 2001
From: Sasha Melentyev <sasha@melentyev.io>
Date: Tue, 22 Nov 2022 10:09:15 +0300
Subject: [PATCH 053/153] Refactor time durations (#58484)

This change uses `time.Second` in place of `1000 * time.Millisecond` and `time.Minute` in place of `60*time.Second`.
---
 pkg/components/imguploader/webdavuploader.go  |  2 +-
 .../alerting/store_notification_test.go       |  2 +-
 .../datasources/service/datasource_test.go    |  8 ++---
 pkg/services/live/pipeline/devdata.go         |  2 +-
 pkg/services/live/runstream/manager.go        |  2 +-
 pkg/services/ngalert/image/service.go         |  2 +-
 .../ngalert/notifier/alertmanager_test.go     |  2 +-
 pkg/services/ngalert/state/manager_test.go    |  2 +-
 pkg/services/ngalert/state/state_test.go      |  2 +-
 pkg/setting/setting_unified_alerting.go       |  4 +--
 pkg/setting/setting_unified_alerting_test.go  |  8 ++---
 .../alerting/api_admin_configuration_test.go  |  2 +-
 pkg/tsdb/cloudwatch/cloudwatch.go             |  2 +-
 pkg/tsdb/cloudwatch/response_parser_test.go   | 36 +++++++++----------
 pkg/tsdb/intervalv2/intervalv2_test.go        |  4 +--
 pkg/tsdb/mssql/mssql_test.go                  |  2 +-
 pkg/tsdb/mysql/mysql_test.go                  |  2 +-
 pkg/tsdb/postgres/postgres_test.go            |  2 +-
 18 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go
index 5099164516f..a1e2671e245 100644
--- a/pkg/components/imguploader/webdavuploader.go
+++ b/pkg/components/imguploader/webdavuploader.go
@@ -26,7 +26,7 @@ type WebdavUploader struct {
 var netTransport = &http.Transport{
 	Proxy: http.ProxyFromEnvironment,
 	Dial: (&net.Dialer{
-		Timeout: 60 * time.Second,
+		Timeout: time.Minute,
 	}).Dial,
 	TLSHandshakeTimeout: 5 * time.Second,
 }
diff --git a/pkg/services/alerting/store_notification_test.go b/pkg/services/alerting/store_notification_test.go
index a6d468f15e9..b2724ef946c 100644
--- a/pkg/services/alerting/store_notification_test.go
+++ b/pkg/services/alerting/store_notification_test.go
@@ -285,7 +285,7 @@ func TestIntegrationAlertNotificationSQLAccess(t *testing.T) {
 			err := store.UpdateAlertNotification(context.Background(), newCmd)
 			require.Nil(t, err)
 			require.Equal(t, "NewName", newCmd.Result.Name)
-			require.Equal(t, 60*time.Second, newCmd.Result.Frequency)
+			require.Equal(t, time.Minute, newCmd.Result.Frequency)
 			require.True(t, newCmd.Result.DisableResolveMessage)
 		})
 
diff --git a/pkg/services/datasources/service/datasource_test.go b/pkg/services/datasources/service/datasource_test.go
index b06cb9913fa..cd22275f6a0 100644
--- a/pkg/services/datasources/service/datasource_test.go
+++ b/pkg/services/datasources/service/datasource_test.go
@@ -542,7 +542,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 func TestService_getTimeout(t *testing.T) {
 	cfg := &setting.Cfg{}
 	originalTimeout := sdkhttpclient.DefaultTimeoutOptions.Timeout
-	sdkhttpclient.DefaultTimeoutOptions.Timeout = 60 * time.Second
+	sdkhttpclient.DefaultTimeoutOptions.Timeout = time.Minute
 	t.Cleanup(func() {
 		sdkhttpclient.DefaultTimeoutOptions.Timeout = originalTimeout
 	})
@@ -551,9 +551,9 @@ func TestService_getTimeout(t *testing.T) {
 		jsonData        *simplejson.Json
 		expectedTimeout time.Duration
 	}{
-		{jsonData: simplejson.New(), expectedTimeout: 60 * time.Second},
-		{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": nil}), expectedTimeout: 60 * time.Second},
-		{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 0}), expectedTimeout: 60 * time.Second},
+		{jsonData: simplejson.New(), expectedTimeout: time.Minute},
+		{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": nil}), expectedTimeout: time.Minute},
+		{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 0}), expectedTimeout: time.Minute},
 		{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 1}), expectedTimeout: time.Second},
 		{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": "2"}), expectedTimeout: 2 * time.Second},
 	}
diff --git a/pkg/services/live/pipeline/devdata.go b/pkg/services/live/pipeline/devdata.go
index 3d6b8ad7e54..db7c278bf79 100644
--- a/pkg/services/live/pipeline/devdata.go
+++ b/pkg/services/live/pipeline/devdata.go
@@ -32,7 +32,7 @@ type Data struct {
 func postTestData() {
 	i := 0
 	for {
-		time.Sleep(1000 * time.Millisecond)
+		time.Sleep(time.Second)
 		num1 := rand.Intn(10)
 		num2 := rand.Intn(10)
 		d := Data{
diff --git a/pkg/services/live/runstream/manager.go b/pkg/services/live/runstream/manager.go
index 8e96da34cfb..f4ab4d7b134 100644
--- a/pkg/services/live/runstream/manager.go
+++ b/pkg/services/live/runstream/manager.go
@@ -75,7 +75,7 @@ func WithCheckConfig(interval time.Duration, maxChecks int) ManagerOption {
 
 const (
 	defaultCheckInterval           = 5 * time.Second
-	defaultDatasourceCheckInterval = 60 * time.Second
+	defaultDatasourceCheckInterval = time.Minute
 	defaultMaxChecks               = 3
 )
 
diff --git a/pkg/services/ngalert/image/service.go b/pkg/services/ngalert/image/service.go
index 385375537cd..4f7a36a69a2 100644
--- a/pkg/services/ngalert/image/service.go
+++ b/pkg/services/ngalert/image/service.go
@@ -21,8 +21,8 @@ import (
 )
 
 const (
-	screenshotCacheTTL = 60 * time.Second
 	screenshotTimeout  = 10 * time.Second
+	screenshotCacheTTL = time.Minute
 )
 
 // DeleteExpiredService is a service to delete expired images.
diff --git a/pkg/services/ngalert/notifier/alertmanager_test.go b/pkg/services/ngalert/notifier/alertmanager_test.go
index 4b076ff8c31..48efde7c517 100644
--- a/pkg/services/ngalert/notifier/alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/alertmanager_test.go
@@ -38,7 +38,7 @@ func setupAMTest(t *testing.T) *Alertmanager {
 	s := &store.DBstore{
 		Cfg: setting.UnifiedAlertingSettings{
 			BaseInterval:                  10 * time.Second,
-			DefaultRuleEvaluationInterval: 60 * time.Second,
+			DefaultRuleEvaluationInterval: time.Minute,
 		},
 		SQLStore:         sqlStore,
 		Logger:           log.New("alertmanager-test"),
diff --git a/pkg/services/ngalert/state/manager_test.go b/pkg/services/ngalert/state/manager_test.go
index 06974b44089..69a8d792093 100644
--- a/pkg/services/ngalert/state/manager_test.go
+++ b/pkg/services/ngalert/state/manager_test.go
@@ -2170,7 +2170,7 @@ func printAllAnnotations(annos map[int64]annotations.Item) string {
 
 func TestStaleResultsHandler(t *testing.T) {
 	evaluationTime := time.Now()
-	interval := 60 * time.Second
+	interval := time.Minute
 
 	ctx := context.Background()
 	_, dbstore := tests.SetupTestEnv(t, 1)
diff --git a/pkg/services/ngalert/state/state_test.go b/pkg/services/ngalert/state/state_test.go
index b86037d4bc7..b99fd3e32ab 100644
--- a/pkg/services/ngalert/state/state_test.go
+++ b/pkg/services/ngalert/state/state_test.go
@@ -202,7 +202,7 @@ func TestSetEndsAt(t *testing.T) {
 			name:     "more than resend delay: for=1m,interval=5m - endsAt = interval * 3",
 			expected: evaluationTime.Add(time.Second * 300 * 3),
 			testRule: &ngmodels.AlertRule{
-				For:             60 * time.Second,
+				For:             time.Minute,
 				IntervalSeconds: 300,
 			},
 		},
diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go
index 1d8fcbb3ed7..6e0ee10df70 100644
--- a/pkg/setting/setting_unified_alerting.go
+++ b/pkg/setting/setting_unified_alerting.go
@@ -20,7 +20,7 @@ const (
 	alertmanagerDefaultPeerTimeout        = 15 * time.Second
 	alertmanagerDefaultGossipInterval     = cluster.DefaultGossipInterval
 	alertmanagerDefaultPushPullInterval   = cluster.DefaultPushPullInterval
-	alertmanagerDefaultConfigPollInterval = 60 * time.Second
+	alertmanagerDefaultConfigPollInterval = time.Minute
 	// To start, the alertmanager needs at least one route defined.
 	// TODO: we should move this to Grafana settings and define this as the default.
 	alertmanagerDefaultConfiguration = `{
@@ -45,7 +45,7 @@ const (
 }
 `
 	evaluatorDefaultEvaluationTimeout       = 30 * time.Second
-	schedulerDefaultAdminConfigPollInterval = 60 * time.Second
+	schedulerDefaultAdminConfigPollInterval = time.Minute
 	schedulereDefaultExecuteAlerts          = true
 	schedulerDefaultMaxAttempts             = 3
 	schedulerDefaultLegacyMinInterval       = 1
diff --git a/pkg/setting/setting_unified_alerting_test.go b/pkg/setting/setting_unified_alerting_test.go
index 5968688483c..92fa07648ad 100644
--- a/pkg/setting/setting_unified_alerting_test.go
+++ b/pkg/setting/setting_unified_alerting_test.go
@@ -17,14 +17,14 @@ func TestCfg_ReadUnifiedAlertingSettings(t *testing.T) {
 
 	// It sets the correct defaults.
 	{
-		require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval)
-		require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.AlertmanagerConfigPollInterval)
+		require.Equal(t, time.Minute, cfg.UnifiedAlerting.AdminConfigPollInterval)
+		require.Equal(t, time.Minute, cfg.UnifiedAlerting.AlertmanagerConfigPollInterval)
 		require.Equal(t, 15*time.Second, cfg.UnifiedAlerting.HAPeerTimeout)
 		require.Equal(t, "0.0.0.0:9094", cfg.UnifiedAlerting.HAListenAddr)
 		require.Equal(t, "", cfg.UnifiedAlerting.HAAdvertiseAddr)
 		require.Len(t, cfg.UnifiedAlerting.HAPeers, 0)
 		require.Equal(t, 200*time.Millisecond, cfg.UnifiedAlerting.HAGossipInterval)
-		require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.HAPushPullInterval)
+		require.Equal(t, time.Minute, cfg.UnifiedAlerting.HAPushPullInterval)
 	}
 
 	// With peers set, it correctly parses them.
@@ -66,7 +66,7 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 			verifyCfg: func(t *testing.T, cfg Cfg) {
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval)
 				require.Equal(t, int64(6), cfg.UnifiedAlerting.MaxAttempts)
-				require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.MinInterval)
+				require.Equal(t, time.Minute, cfg.UnifiedAlerting.MinInterval)
 				require.Equal(t, false, cfg.UnifiedAlerting.ExecuteAlerts)
 				require.Equal(t, 90*time.Second, cfg.UnifiedAlerting.EvaluationTimeout)
 				require.Equal(t, SchedulerBaseInterval, cfg.UnifiedAlerting.BaseInterval)
diff --git a/pkg/tests/api/alerting/api_admin_configuration_test.go b/pkg/tests/api/alerting/api_admin_configuration_test.go
index deeaec99eed..09d2be1a8ec 100644
--- a/pkg/tests/api/alerting/api_admin_configuration_test.go
+++ b/pkg/tests/api/alerting/api_admin_configuration_test.go
@@ -266,7 +266,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
 	{
 		require.Eventually(t, func() bool {
 			return fakeAM1.AlertsCount() == 1 && fakeAM2.AlertsCount() == 1
-		}, 60*time.Second, 5*time.Second)
+		}, time.Minute, 5*time.Second)
 	}
 
 	// Add an alertmanager datasource fot the other organisation
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index b93ba732f16..291715cce88 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -63,7 +63,7 @@ const (
 	logStreamIdentifierInternal = "__logstream__grafana_internal__"
 
 	alertMaxAttempts = 8
-	alertPollPeriod  = 1000 * time.Millisecond
+	alertPollPeriod  = time.Second
 	logsQueryMode    = "Logs"
 
 	// QueryTypes
diff --git a/pkg/tsdb/cloudwatch/response_parser_test.go b/pkg/tsdb/cloudwatch/response_parser_test.go
index 9cb2ff2980f..fb9c6494942 100644
--- a/pkg/tsdb/cloudwatch/response_parser_test.go
+++ b/pkg/tsdb/cloudwatch/response_parser_test.go
@@ -121,8 +121,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb1"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
@@ -136,8 +136,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb2"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
@@ -185,8 +185,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb1 Sum"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
@@ -200,8 +200,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb2 Average"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
@@ -248,8 +248,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb3"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
@@ -263,8 +263,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb4"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
@@ -307,8 +307,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb3"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values:     []*float64{},
 					StatusCode: aws.String("Complete"),
@@ -346,8 +346,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb3"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values:     []*float64{},
 					StatusCode: aws.String("Complete"),
@@ -432,8 +432,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
 					Label: aws.String("lb"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
-						aws.Time(timestamp.Add(60 * time.Second)),
-						aws.Time(timestamp.Add(180 * time.Second)),
+						aws.Time(timestamp.Add(time.Minute)),
+						aws.Time(timestamp.Add(3 * time.Minute)),
 					},
 					Values: []*float64{
 						aws.Float64(10),
diff --git a/pkg/tsdb/intervalv2/intervalv2_test.go b/pkg/tsdb/intervalv2/intervalv2_test.go
index d7adff32928..21b5a48abef 100644
--- a/pkg/tsdb/intervalv2/intervalv2_test.go
+++ b/pkg/tsdb/intervalv2/intervalv2_test.go
@@ -27,8 +27,8 @@ func TestIntervalCalculator_Calculate(t *testing.T) {
 		{"from 15m to now and 100 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 100, "10s"},
 		{"from 30m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 0, "1s"},
 		{"from 30m to now and 3000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 3000, "500ms"},
-		{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(60 * time.Minute)}, 0, "2s"},
-		{"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(60 * time.Minute)}, 1000, "5s"},
+		{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 0, "2s"},
+		{"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 1000, "5s"},
 	}
 
 	for _, tc := range testCases {
diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go
index 705b35c5896..55705b9a73a 100644
--- a/pkg/tsdb/mssql/mssql_test.go
+++ b/pkg/tsdb/mssql/mssql_test.go
@@ -933,7 +933,7 @@ func TestMSSQL(t *testing.T) {
 		}
 
 		events := []*event{}
-		for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) {
+		for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) {
 			events = append(events, &event{
 				TimeSec:     t.Unix(),
 				Description: "Someone deployed something",
diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go
index 043902ce527..58142d23190 100644
--- a/pkg/tsdb/mysql/mysql_test.go
+++ b/pkg/tsdb/mysql/mysql_test.go
@@ -905,7 +905,7 @@ func TestIntegrationMySQL(t *testing.T) {
 		require.NoError(t, err)
 
 		events := []*event{}
-		for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) {
+		for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) {
 			events = append(events, &event{
 				TimeSec:     t.Unix(),
 				Description: "Someone deployed something",
diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/postgres/postgres_test.go
index 3b5094231e6..e48c79c5ef9 100644
--- a/pkg/tsdb/postgres/postgres_test.go
+++ b/pkg/tsdb/postgres/postgres_test.go
@@ -1003,7 +1003,7 @@ func TestIntegrationPostgres(t *testing.T) {
 		require.NoError(t, err)
 
 		events := []*event{}
-		for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) {
+		for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) {
 			events = append(events, &event{
 				TimeSec:     t.Unix(),
 				Description: "Someone deployed something",

From c1eabb893fca88f503bb3f1da910ce30885b68ea Mon Sep 17 00:00:00 2001
From: jmatosgrafana <100539023+jmatosgrafana@users.noreply.github.com>
Date: Tue, 22 Nov 2022 10:07:59 +0100
Subject: [PATCH 054/153] Docs: Update RSS feed in security page (#56439)

* Update RSS security feed

* docs: update security.md to refer to blog

* Update SECURITY.md

Co-authored-by: Richard Hartmann <RichiH@users.noreply.github.com>

Co-authored-by: Daniel Lee <dan.limerick@gmail.com>
Co-authored-by: Richard Hartmann <RichiH@users.noreply.github.com>
---
 SECURITY.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index b8697c164d6..e5672d2316c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -14,7 +14,6 @@ Grafana Labs will send you a response indicating the next steps in handling your
 
 ## Security announcements
 
-We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/support/security-announcements),
-where we will post a summary, remediation, and mitigation details for any patch containing security fixes.
+We will post a summary, remediation, and mitigation details for any patch containing security fixes on the Grafana blog. The security announcement blog posts will be tagged with the [security tag](https://grafana.com/tags/security/).
 
-You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/support/security-announcements.rss).
+You can also track security announcements via the [RSS feed](https://grafana.com/tags/security/index.xml).

From f8f61c1a696b14b8c22a7a34b5376cc3bb775f8e Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Tue, 22 Nov 2022 10:08:40 +0100
Subject: [PATCH 055/153] Auth: Add expiry date for service accounts access
 tokens (#58885)

* Add new configuration option for SA tokens

* Add new expiry date option to frontend components

* Add backend validation


Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
---
 conf/defaults.ini                             |  4 +++
 conf/sample.ini                               |  5 +++
 .../administration/service-accounts/index.md  |  4 +++
 packages/grafana-runtime/src/config.ts        |  2 ++
 .../DateTimePickers/DatePicker/DatePicker.tsx |  4 ++-
 .../DatePickerWithInput.tsx                   |  4 +++
 pkg/api/frontendsettings.go                   |  7 ++--
 pkg/services/serviceaccounts/api/token.go     |  8 +++++
 pkg/setting/setting.go                        | 12 +++++++
 .../components/CreateTokenModal.tsx           | 32 ++++++++++++-------
 10 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 023d23a53cb..57b6abc9a10 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -435,6 +435,10 @@ user_invite_max_lifetime_duration = 24h
 # Enter a comma-separated list of usernames to hide them in the Grafana UI. These users are shown to Grafana admins and to themselves.
 hidden_users =
 
+[service_accounts]
+# When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
+token_expiration_day_limit =
+
 [auth]
 # Login cookie name
 login_cookie_name = grafana_session
diff --git a/conf/sample.ini b/conf/sample.ini
index aacf119127c..4bbd7bf97e7 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -435,6 +435,11 @@
 # Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
 ; hidden_users =
 
+[service_accounts]
+# Service account maximum expiration date in days.
+# When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
+; token_expiration_day_limit =
+
 [auth]
 # Login cookie name
 ;login_cookie_name = grafana_session
diff --git a/docs/sources/administration/service-accounts/index.md b/docs/sources/administration/service-accounts/index.md
index 7ed85d7a5a1..26f9429f50f 100644
--- a/docs/sources/administration/service-accounts/index.md
+++ b/docs/sources/administration/service-accounts/index.md
@@ -89,6 +89,10 @@ You can create a service account token using the Grafana UI or via the API. For
 
 - Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../roles-and-permissions/#" >}}).
 
+### Service account token expiration dates
+
+By default, service account tokens don't have an expiration date, meaning they won't expire at all. However, if `token_expiration_day_limit` is set to a value greater than 0, Grafana restricts the lifetime limit of new tokens to the configured value in days.
+
 ### To add a token to a service account
 
 1. Sign in to Grafana, then hover your cursor over **Configuration** (the gear icon) in the sidebar.
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index d92e8cab4cc..fa85ac4b2b2 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -142,6 +142,8 @@ export class GrafanaBootConfig implements GrafanaConfig {
   rudderstackSdkUrl: undefined;
   rudderstackConfigUrl: undefined;
 
+  tokenExpirationDayLimit: undefined;
+
   constructor(options: GrafanaBootConfig) {
     this.bootData = options.bootData;
     this.isPublicDashboardView = options.bootData.settings.isPublicDashboardView;
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
index e39ce8157ce..5b8f9e100cd 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
@@ -16,6 +16,7 @@ export interface DatePickerProps {
   onChange: (value: Date) => void;
   value?: Date;
   minDate?: Date;
+  maxDate?: Date;
 }
 
 /** @public */
@@ -38,7 +39,7 @@ export const DatePicker = memo<DatePickerProps>((props) => {
 
 DatePicker.displayName = 'DatePicker';
 
-const Body = memo<DatePickerProps>(({ value, minDate, onChange }) => {
+const Body = memo<DatePickerProps>(({ value, minDate, maxDate, onChange }) => {
   const styles = useStyles2(getBodyStyles);
 
   return (
@@ -47,6 +48,7 @@ const Body = memo<DatePickerProps>(({ value, minDate, onChange }) => {
       tileClassName={styles.title}
       value={value || new Date()}
       minDate={minDate}
+      maxDate={maxDate}
       nextLabel={<Icon name="angle-right" />}
       prevLabel={<Icon name="angle-left" />}
       onChange={(ev: Date | Date[]) => {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
index 129c47a254e..a9efa07a766 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
@@ -15,6 +15,8 @@ export interface DatePickerWithInputProps extends Omit<InputProps, 'ref' | 'valu
   value?: Date | string;
   /** The minimum date the value can be set to */
   minDate?: Date;
+  /** The maximum date the value can be set to */
+  maxDate?: Date;
   /** Handles changes when a new date is selected */
   onChange: (value: Date | string) => void;
   /** Hide the calendar when date is selected */
@@ -27,6 +29,7 @@ export interface DatePickerWithInputProps extends Omit<InputProps, 'ref' | 'valu
 export const DatePickerWithInput = ({
   value,
   minDate,
+  maxDate,
   onChange,
   closeOnSelect,
   placeholder = 'Date',
@@ -56,6 +59,7 @@ export const DatePickerWithInput = ({
         isOpen={open}
         value={value && typeof value !== 'string' ? value : dateTime().toDate()}
         minDate={minDate}
+        maxDate={maxDate}
         onChange={(ev) => {
           onChange(ev);
           if (closeOnSelect) {
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 855a9564243..1db72e6ef2e 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -198,9 +198,10 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
 		"unifiedAlerting": map[string]interface{}{
 			"minInterval": hs.Cfg.UnifiedAlerting.MinInterval.String(),
 		},
-		"oauth":       hs.getEnabledOAuthProviders(),
-		"samlEnabled": hs.samlEnabled(),
-		"samlName":    hs.samlName(),
+		"oauth":                   hs.getEnabledOAuthProviders(),
+		"samlEnabled":             hs.samlEnabled(),
+		"samlName":                hs.samlName(),
+		"tokenExpirationDayLimit": hs.Cfg.SATokenExpirationDayLimit,
 	}
 
 	if hs.ThumbService != nil {
diff --git a/pkg/services/serviceaccounts/api/token.go b/pkg/services/serviceaccounts/api/token.go
index c1f31191dbd..2327422c7eb 100644
--- a/pkg/services/serviceaccounts/api/token.go
+++ b/pkg/services/serviceaccounts/api/token.go
@@ -160,6 +160,14 @@ func (api *ServiceAccountsAPI) CreateToken(c *models.ReqContext) response.Respon
 		}
 	}
 
+	if api.cfg.SATokenExpirationDayLimit > 0 {
+		dayExpireLimit := time.Now().Add(time.Duration(api.cfg.SATokenExpirationDayLimit) * time.Hour * 24).Truncate(24 * time.Hour)
+		expirationDate := time.Now().Add(time.Duration(cmd.SecondsToLive) * time.Second).Truncate(24 * time.Hour)
+		if expirationDate.After(dayExpireLimit) {
+			return response.Respond(http.StatusBadRequest, "The expiration date input exceeds the limit for service account access tokens expiration date")
+		}
+	}
+
 	newKeyInfo, err := apikeygenprefix.New(ServiceID)
 	if err != nil {
 		return response.Error(http.StatusInternalServerError, "Generating service account token failed", err)
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 546974bbe8c..dc874143e40 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -385,6 +385,9 @@ type Cfg struct {
 	HiddenUsers           map[string]struct{}
 	CaseInsensitiveLogin  bool // Login and Email will be considered case insensitive
 
+	// Service Accounts
+	SATokenExpirationDayLimit int
+
 	// Annotations
 	AnnotationCleanupJobBatchSize      int64
 	AnnotationMaximumTagsLength        int64
@@ -978,6 +981,9 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	if err := readUserSettings(iniFile, cfg); err != nil {
 		return err
 	}
+	if err := readServiceAccountSettings(iniFile, cfg); err != nil {
+		return err
+	}
 	if err := readAuthSettings(iniFile, cfg); err != nil {
 		return err
 	}
@@ -1481,6 +1487,12 @@ func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
 	return nil
 }
 
+func readServiceAccountSettings(iniFile *ini.File, cfg *Cfg) error {
+	serviceAccount := iniFile.Section("service_accounts")
+	cfg.SATokenExpirationDayLimit = serviceAccount.Key("token_expiration_day_limit").MustInt(-1)
+	return nil
+}
+
 func (cfg *Cfg) readRenderingSettings(iniFile *ini.File) error {
 	renderSec := iniFile.Section("rendering")
 	cfg.RendererUrl = valueAsString(renderSec, "server_url", "")
diff --git a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
index 73bb9d23ace..d5f0f4707f5 100644
--- a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
+++ b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import {
   Button,
   ClipboardButton,
@@ -33,12 +34,18 @@ interface Props {
 }
 
 export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateToken, onClose }: Props) => {
-  let tomorrow = new Date();
+  const tomorrow = new Date();
   tomorrow.setDate(tomorrow.getDate() + 1);
 
+  const maxExpirationDate = new Date();
+  if (config.tokenExpirationDayLimit !== undefined) {
+    maxExpirationDate.setDate(maxExpirationDate.getDate() + config.tokenExpirationDayLimit + 1);
+  }
+  const defaultExpirationDate = config.tokenExpirationDayLimit !== undefined && config.tokenExpirationDayLimit > 0;
+
   const [defaultTokenName, setDefaultTokenName] = useState('');
   const [newTokenName, setNewTokenName] = useState('');
-  const [isWithExpirationDate, setIsWithExpirationDate] = useState(false);
+  const [isWithExpirationDate, setIsWithExpirationDate] = useState(defaultExpirationDate);
   const [newTokenExpirationDate, setNewTokenExpirationDate] = useState<Date | string>(tomorrow);
   const [isExpirationDateValid, setIsExpirationDateValid] = useState(newTokenExpirationDate !== '');
   const styles = useStyles2(getStyles);
@@ -66,7 +73,7 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
   const onCloseInternal = () => {
     setNewTokenName('');
     setDefaultTokenName('');
-    setIsWithExpirationDate(false);
+    setIsWithExpirationDate(defaultExpirationDate);
     setNewTokenExpirationDate(tomorrow);
     setIsExpirationDateValid(newTokenExpirationDate !== '');
     onClose();
@@ -100,14 +107,16 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
               }}
             />
           </Field>
-          <Field label="Expiration">
-            <RadioButtonGroup
-              options={EXPIRATION_OPTIONS}
-              value={isWithExpirationDate}
-              onChange={setIsWithExpirationDate}
-              size="md"
-            />
-          </Field>
+          {!isWithExpirationDate && (
+            <Field label="Expiration">
+              <RadioButtonGroup
+                options={EXPIRATION_OPTIONS}
+                value={isWithExpirationDate}
+                onChange={setIsWithExpirationDate}
+                size="md"
+              />
+            </Field>
+          )}
           {isWithExpirationDate && (
             <Field label="Expiration date">
               <DatePickerWithInput
@@ -115,6 +124,7 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
                 value={newTokenExpirationDate}
                 placeholder=""
                 minDate={tomorrow}
+                maxDate={maxExpirationDate}
               />
             </Field>
           )}

From 062c5b805ce0c54ce80743589672fdac507d5f60 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Tue, 22 Nov 2022 10:58:59 +0100
Subject: [PATCH 056/153] Auth: Merge ActiveAuthTokenService  into
 UserAuthTokenService (#59032)

* Auth: Merge UserTokenService and ActiveAuthTokenService

* Auth: Rename function
---
 pkg/api/common_test.go                        |   2 +-
 pkg/cmd/grafana-cli/runner/wire.go            |   4 -
 pkg/middleware/middleware_test.go             |   2 +-
 pkg/server/wire.go                            |   4 -
 pkg/services/auth/auth.go                     |   4 -
 pkg/services/auth/authimpl/auth_token.go      | 118 ++++++++----------
 pkg/services/auth/authimpl/auth_token_test.go |  23 ++--
 pkg/services/auth/authimpl/token_cleanup.go   |  10 +-
 .../auth/authimpl/token_cleanup_test.go       |   4 +-
 .../contexthandler/auth_proxy_test.go         |   2 +-
 pkg/services/contexthandler/contexthandler.go |   5 -
 pkg/services/quota/quotaimpl/quota_test.go    |   2 +-
 12 files changed, 70 insertions(+), 110 deletions(-)

diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 39be06adbc5..20650b3ff93 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -214,7 +214,7 @@ func getContextHandler(t *testing.T, cfg *setting.Cfg) *contexthandler.ContextHa
 	authProxy := authproxy.ProvideAuthProxy(cfg, remoteCacheSvc, loginservice.LoginServiceMock{}, &usertest.FakeUserService{}, sqlStore)
 	loginService := &logintest.LoginServiceFake{}
 	authenticator := &logintest.AuthenticatorFake{}
-	ctxHdlr := contexthandler.ProvideService(cfg, userAuthTokenSvc, authJWTSvc, remoteCacheSvc, renderSvc, sqlStore, tracer, authProxy, loginService, nil, authenticator, usertest.NewUserServiceFake(), orgtest.NewOrgServiceFake(), nil, featuremgmt.WithFeatures(), nil)
+	ctxHdlr := contexthandler.ProvideService(cfg, userAuthTokenSvc, authJWTSvc, remoteCacheSvc, renderSvc, sqlStore, tracer, authProxy, loginService, nil, authenticator, usertest.NewUserServiceFake(), orgtest.NewOrgServiceFake(), nil, featuremgmt.WithFeatures())
 
 	return ctxHdlr
 }
diff --git a/pkg/cmd/grafana-cli/runner/wire.go b/pkg/cmd/grafana-cli/runner/wire.go
index 975264bba82..7fd0801876d 100644
--- a/pkg/cmd/grafana-cli/runner/wire.go
+++ b/pkg/cmd/grafana-cli/runner/wire.go
@@ -51,8 +51,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/auth"
-	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/auth/jwt"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/comments"
@@ -253,8 +251,6 @@ var wireSet = wire.NewSet(
 	influxdb.ProvideService,
 	wire.Bind(new(social.Service), new(*social.SocialService)),
 	oauthtoken.ProvideService,
-	authimpl.ProvideActiveAuthTokenService,
-	wire.Bind(new(auth.ActiveTokenService), new(*authimpl.ActiveAuthTokenService)),
 	wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)),
 	tempo.ProvideService,
 	loki.ProvideService,
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 94efe1c7ee4..8c029c2f597 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -875,7 +875,7 @@ func getContextHandler(t *testing.T, cfg *setting.Cfg, mockSQLStore *dbtest.Fake
 	tracer := tracing.InitializeTracerForTest()
 	authProxy := authproxy.ProvideAuthProxy(cfg, remoteCacheSvc, loginService, userService, mockSQLStore)
 	authenticator := &logintest.AuthenticatorFake{ExpectedUser: &user.User{}}
-	return contexthandler.ProvideService(cfg, userAuthTokenSvc, authJWTSvc, remoteCacheSvc, renderSvc, mockSQLStore, tracer, authProxy, loginService, apiKeyService, authenticator, userService, orgService, oauthTokenService, featuremgmt.WithFeatures(featuremgmt.FlagAccessTokenExpirationCheck), nil)
+	return contexthandler.ProvideService(cfg, userAuthTokenSvc, authJWTSvc, remoteCacheSvc, renderSvc, mockSQLStore, tracer, authProxy, loginService, apiKeyService, authenticator, userService, orgService, oauthTokenService, featuremgmt.WithFeatures(featuremgmt.FlagAccessTokenExpirationCheck))
 }
 
 type fakeRenderService struct {
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 45c2c8f3d12..0c46d0529d3 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -48,8 +48,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeyimpl"
-	"github.com/grafana/grafana/pkg/services/auth"
-	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/auth/jwt"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/comments"
@@ -271,8 +269,6 @@ var wireBasicSet = wire.NewSet(
 	influxdb.ProvideService,
 	wire.Bind(new(social.Service), new(*social.SocialService)),
 	oauthtoken.ProvideService,
-	authimpl.ProvideActiveAuthTokenService,
-	wire.Bind(new(auth.ActiveTokenService), new(*authimpl.ActiveAuthTokenService)),
 	wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)),
 	tempo.ProvideService,
 	loki.ProvideService,
diff --git a/pkg/services/auth/auth.go b/pkg/services/auth/auth.go
index 77b21316707..28d17307047 100644
--- a/pkg/services/auth/auth.go
+++ b/pkg/services/auth/auth.go
@@ -16,10 +16,6 @@ const (
 	QuotaTarget    quota.Target    = "session"
 )
 
-type ActiveTokenService interface {
-	ActiveTokenCount(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error)
-}
-
 // Typed errors
 var (
 	ErrUserTokenNotFound = errors.New("user token not found")
diff --git a/pkg/services/auth/authimpl/auth_token.go b/pkg/services/auth/authimpl/auth_token.go
index c969686a2f8..7bf1d8bf332 100644
--- a/pkg/services/auth/authimpl/auth_token.go
+++ b/pkg/services/auth/authimpl/auth_token.go
@@ -18,40 +18,17 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-const ServiceName = "UserAuthTokenService"
+const urgentRotateTime = 1 * time.Minute
 
 var getTime = time.Now
 
-const urgentRotateTime = 1 * time.Minute
-
-func ProvideUserAuthTokenService(sqlStore db.DB, serverLockService *serverlock.ServerLockService,
-	cfg *setting.Cfg) *UserAuthTokenService {
+func ProvideUserAuthTokenService(sqlStore db.DB, cfg *setting.Cfg, serverLockService *serverlock.ServerLockService, quotaService quota.Service) (*UserAuthTokenService, error) {
 	s := &UserAuthTokenService{
-		SQLStore:          sqlStore,
-		ServerLockService: serverLockService,
-		Cfg:               cfg,
+		sqlStore:          sqlStore,
+		serverLockService: serverLockService,
+		cfg:               cfg,
 		log:               log.New("auth"),
 	}
-	return s
-}
-
-type UserAuthTokenService struct {
-	SQLStore          db.DB
-	ServerLockService *serverlock.ServerLockService
-	Cfg               *setting.Cfg
-	log               log.Logger
-}
-
-type ActiveAuthTokenService struct {
-	cfg      *setting.Cfg
-	sqlStore db.DB
-}
-
-func ProvideActiveAuthTokenService(cfg *setting.Cfg, sqlStore db.DB, quotaService quota.Service) (*ActiveAuthTokenService, error) {
-	s := &ActiveAuthTokenService{
-		cfg:      cfg,
-		sqlStore: sqlStore,
-	}
 
 	defaultLimits, err := readQuotaConfig(cfg)
 	if err != nil {
@@ -61,7 +38,7 @@ func ProvideActiveAuthTokenService(cfg *setting.Cfg, sqlStore db.DB, quotaServic
 	if err := quotaService.RegisterQuotaReporter(&quota.NewUsageReporter{
 		TargetSrv:     auth.QuotaTargetSrv,
 		DefaultLimits: defaultLimits,
-		Reporter:      s.ActiveTokenCount,
+		Reporter:      s.reportActiveTokenCount,
 	}); err != nil {
 		return s, err
 	}
@@ -69,27 +46,11 @@ func ProvideActiveAuthTokenService(cfg *setting.Cfg, sqlStore db.DB, quotaServic
 	return s, nil
 }
 
-func (a *ActiveAuthTokenService) ActiveTokenCount(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error) {
-	var count int64
-	var err error
-	err = a.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
-		var model userAuthToken
-		count, err = dbSession.Where(`created_at > ? AND rotated_at > ? AND revoked_at = 0`,
-			getTime().Add(-a.cfg.LoginMaxLifetime).Unix(),
-			getTime().Add(-a.cfg.LoginMaxInactiveLifetime).Unix()).
-			Count(&model)
-
-		return err
-	})
-
-	tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
-	if err != nil {
-		return nil, err
-	}
-	u := &quota.Map{}
-	u.Set(tag, count)
-
-	return u, err
+type UserAuthTokenService struct {
+	sqlStore          db.DB
+	serverLockService *serverlock.ServerLockService
+	cfg               *setting.Cfg
+	log               log.Logger
 }
 
 func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*auth.UserToken, error) {
@@ -120,7 +81,7 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User,
 		AuthTokenSeen: false,
 	}
 
-	err = s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	err = s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		_, err = dbSession.Insert(&userAuthToken)
 		return err
 	})
@@ -145,7 +106,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 	var model userAuthToken
 	var exists bool
 	var err error
-	err = s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	err = s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		exists, err = dbSession.Where("(auth_token = ? OR prev_auth_token = ?)",
 			hashedToken,
 			hashedToken).
@@ -185,7 +146,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 		expireBefore := getTime().Add(-urgentRotateTime).Unix()
 
 		var affectedRows int64
-		err = s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
+		err = s.sqlStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
 			affectedRows, err = dbSession.Where("id = ? AND prev_auth_token = ? AND rotated_at < ?",
 				modelCopy.Id,
 				modelCopy.PrevAuthToken,
@@ -212,7 +173,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 		modelCopy.SeenAt = getTime().Unix()
 
 		var affectedRows int64
-		err = s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
+		err = s.sqlStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
 			affectedRows, err = dbSession.Where("id = ? AND auth_token = ?",
 				modelCopy.Id,
 				modelCopy.AuthToken).
@@ -260,7 +221,7 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.U
 	var needsRotation bool
 	rotatedAt := time.Unix(model.RotatedAt, 0)
 	if model.AuthTokenSeen {
-		needsRotation = rotatedAt.Before(now.Add(-time.Duration(s.Cfg.TokenRotationIntervalMinutes) * time.Minute))
+		needsRotation = rotatedAt.Before(now.Add(-time.Duration(s.cfg.TokenRotationIntervalMinutes) * time.Minute))
 	} else {
 		needsRotation = rotatedAt.Before(now.Add(-urgentRotateTime))
 	}
@@ -296,9 +257,9 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.U
 		WHERE id = ? AND (auth_token_seen = ? OR rotated_at < ?)`
 
 	var affected int64
-	err = s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
-		res, err := dbSession.Exec(sql, userAgent, clientIPStr, s.SQLStore.GetDialect().BooleanStr(true), hashedToken,
-			s.SQLStore.GetDialect().BooleanStr(false), now.Unix(), model.Id, s.SQLStore.GetDialect().BooleanStr(true),
+	err = s.sqlStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
+		res, err := dbSession.Exec(sql, userAgent, clientIPStr, s.sqlStore.GetDialect().BooleanStr(true), hashedToken,
+			s.sqlStore.GetDialect().BooleanStr(false), now.Unix(), model.Id, s.sqlStore.GetDialect().BooleanStr(true),
 			now.Add(-30*time.Second).Unix())
 		if err != nil {
 			return err
@@ -338,12 +299,12 @@ func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *auth.User
 
 	if soft {
 		model.RevokedAt = getTime().Unix()
-		err = s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+		err = s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 			rowsAffected, err = dbSession.ID(model.Id).Update(model)
 			return err
 		})
 	} else {
-		err = s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+		err = s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 			rowsAffected, err = dbSession.Delete(model)
 			return err
 		})
@@ -366,7 +327,7 @@ func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *auth.User
 }
 
 func (s *UserAuthTokenService) RevokeAllUserTokens(ctx context.Context, userId int64) error {
-	return s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	return s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		sql := `DELETE from user_auth_token WHERE user_id = ?`
 		res, err := dbSession.Exec(sql, userId)
 		if err != nil {
@@ -385,7 +346,7 @@ func (s *UserAuthTokenService) RevokeAllUserTokens(ctx context.Context, userId i
 }
 
 func (s *UserAuthTokenService) BatchRevokeAllUserTokens(ctx context.Context, userIds []int64) error {
-	return s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
+	return s.sqlStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
 		if len(userIds) == 0 {
 			return nil
 		}
@@ -416,7 +377,7 @@ func (s *UserAuthTokenService) BatchRevokeAllUserTokens(ctx context.Context, use
 
 func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*auth.UserToken, error) {
 	var result auth.UserToken
-	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	err := s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		var token userAuthToken
 		exists, err := dbSession.Where("id = ? AND user_id = ?", userTokenId, userId).Get(&token)
 		if err != nil {
@@ -435,7 +396,7 @@ func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTok
 
 func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
 	result := []*auth.UserToken{}
-	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	err := s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		var tokens []*userAuthToken
 		err := dbSession.Where("user_id = ? AND created_at > ? AND rotated_at > ? AND revoked_at = 0",
 			userId,
@@ -462,7 +423,7 @@ func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64)
 
 func (s *UserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId int64) ([]*auth.UserToken, error) {
 	result := []*auth.UserToken{}
-	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	err := s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		var tokens []*userAuthToken
 		err := dbSession.Where("user_id = ? AND revoked_at > 0", userId).Find(&tokens)
 		if err != nil {
@@ -483,12 +444,35 @@ func (s *UserAuthTokenService) GetUserRevokedTokens(ctx context.Context, userId
 	return result, err
 }
 
+func (s *UserAuthTokenService) reportActiveTokenCount(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error) {
+	var count int64
+	var err error
+	err = s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+		var model userAuthToken
+		count, err = dbSession.Where(`created_at > ? AND rotated_at > ? AND revoked_at = 0`,
+			getTime().Add(-s.cfg.LoginMaxLifetime).Unix(),
+			getTime().Add(-s.cfg.LoginMaxInactiveLifetime).Unix()).
+			Count(&model)
+
+		return err
+	})
+
+	tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
+	if err != nil {
+		return nil, err
+	}
+	u := &quota.Map{}
+	u.Set(tag, count)
+
+	return u, err
+}
+
 func (s *UserAuthTokenService) createdAfterParam() int64 {
-	return getTime().Add(-s.Cfg.LoginMaxLifetime).Unix()
+	return getTime().Add(-s.cfg.LoginMaxLifetime).Unix()
 }
 
 func (s *UserAuthTokenService) rotatedAfterParam() int64 {
-	return getTime().Add(-s.Cfg.LoginMaxInactiveLifetime).Unix()
+	return getTime().Add(-s.cfg.LoginMaxInactiveLifetime).Unix()
 }
 
 func hashToken(token string) string {
diff --git a/pkg/services/auth/authimpl/auth_token_test.go b/pkg/services/auth/authimpl/auth_token_test.go
index 97528bf6be2..25358aed7dd 100644
--- a/pkg/services/auth/authimpl/auth_token_test.go
+++ b/pkg/services/auth/authimpl/auth_token_test.go
@@ -41,7 +41,7 @@ func TestUserAuthToken(t *testing.T) {
 		userToken := createToken()
 
 		t.Run("Can count active tokens", func(t *testing.T) {
-			m, err := ctx.activeTokenService.ActiveTokenCount(context.Background(), &quota.ScopeParameters{})
+			m, err := ctx.tokenService.reportActiveTokenCount(context.Background(), &quota.ScopeParameters{})
 			require.Nil(t, err)
 			tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
 			require.NoError(t, err)
@@ -213,7 +213,7 @@ func TestUserAuthToken(t *testing.T) {
 			require.Nil(t, notGood)
 
 			t.Run("should not find active token when expired", func(t *testing.T) {
-				m, err := ctx.activeTokenService.ActiveTokenCount(context.Background(), &quota.ScopeParameters{})
+				m, err := ctx.tokenService.reportActiveTokenCount(context.Background(), &quota.ScopeParameters{})
 				require.Nil(t, err)
 				tag, err := quota.NewTag(auth.QuotaTargetSrv, auth.QuotaTarget, quota.GlobalScope)
 				require.NoError(t, err)
@@ -550,27 +550,20 @@ func createTestContext(t *testing.T) *testContext {
 	}
 
 	tokenService := &UserAuthTokenService{
-		SQLStore: sqlstore,
-		Cfg:      cfg,
+		sqlStore: sqlstore,
+		cfg:      cfg,
 		log:      log.New("test-logger"),
 	}
 
-	activeTokenService := &ActiveAuthTokenService{
-		cfg:      cfg,
-		sqlStore: sqlstore,
-	}
-
 	return &testContext{
-		sqlstore:           sqlstore,
-		tokenService:       tokenService,
-		activeTokenService: activeTokenService,
+		sqlstore:     sqlstore,
+		tokenService: tokenService,
 	}
 }
 
 type testContext struct {
-	sqlstore           db.DB
-	tokenService       *UserAuthTokenService
-	activeTokenService *ActiveAuthTokenService
+	sqlstore     db.DB
+	tokenService *UserAuthTokenService
 }
 
 func (c *testContext) getAuthTokenByID(id int64) (*userAuthToken, error) {
diff --git a/pkg/services/auth/authimpl/token_cleanup.go b/pkg/services/auth/authimpl/token_cleanup.go
index 08d8ae7c614..7731184ce07 100644
--- a/pkg/services/auth/authimpl/token_cleanup.go
+++ b/pkg/services/auth/authimpl/token_cleanup.go
@@ -9,10 +9,10 @@ import (
 
 func (s *UserAuthTokenService) Run(ctx context.Context) error {
 	ticker := time.NewTicker(time.Hour)
-	maxInactiveLifetime := s.Cfg.LoginMaxInactiveLifetime
-	maxLifetime := s.Cfg.LoginMaxLifetime
+	maxInactiveLifetime := s.cfg.LoginMaxInactiveLifetime
+	maxLifetime := s.cfg.LoginMaxLifetime
 
-	err := s.ServerLockService.LockAndExecute(ctx, "cleanup expired auth tokens", time.Hour*12, func(context.Context) {
+	err := s.serverLockService.LockAndExecute(ctx, "cleanup expired auth tokens", time.Hour*12, func(context.Context) {
 		if _, err := s.deleteExpiredTokens(ctx, maxInactiveLifetime, maxLifetime); err != nil {
 			s.log.Error("An error occurred while deleting expired tokens", "err", err)
 		}
@@ -24,7 +24,7 @@ func (s *UserAuthTokenService) Run(ctx context.Context) error {
 	for {
 		select {
 		case <-ticker.C:
-			err = s.ServerLockService.LockAndExecute(ctx, "cleanup expired auth tokens", time.Hour*12, func(context.Context) {
+			err = s.serverLockService.LockAndExecute(ctx, "cleanup expired auth tokens", time.Hour*12, func(context.Context) {
 				if _, err := s.deleteExpiredTokens(ctx, maxInactiveLifetime, maxLifetime); err != nil {
 					s.log.Error("An error occurred while deleting expired tokens", "err", err)
 				}
@@ -46,7 +46,7 @@ func (s *UserAuthTokenService) deleteExpiredTokens(ctx context.Context, maxInact
 	s.log.Debug("starting cleanup of expired auth tokens", "createdBefore", createdBefore, "rotatedBefore", rotatedBefore)
 
 	var affected int64
-	err := s.SQLStore.WithDbSession(ctx, func(dbSession *db.Session) error {
+	err := s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
 		sql := `DELETE from user_auth_token WHERE created_at <= ? OR rotated_at <= ?`
 		res, err := dbSession.Exec(sql, createdBefore.Unix(), rotatedBefore.Unix())
 		if err != nil {
diff --git a/pkg/services/auth/authimpl/token_cleanup_test.go b/pkg/services/auth/authimpl/token_cleanup_test.go
index e207448c8f6..b6623d99036 100644
--- a/pkg/services/auth/authimpl/token_cleanup_test.go
+++ b/pkg/services/auth/authimpl/token_cleanup_test.go
@@ -16,8 +16,8 @@ func TestUserAuthTokenCleanup(t *testing.T) {
 		ctx := createTestContext(t)
 		maxInactiveLifetime, _ := time.ParseDuration("168h")
 		maxLifetime, _ := time.ParseDuration("720h")
-		ctx.tokenService.Cfg.LoginMaxInactiveLifetime = maxInactiveLifetime
-		ctx.tokenService.Cfg.LoginMaxLifetime = maxLifetime
+		ctx.tokenService.cfg.LoginMaxInactiveLifetime = maxInactiveLifetime
+		ctx.tokenService.cfg.LoginMaxLifetime = maxLifetime
 		return ctx
 	}
 
diff --git a/pkg/services/contexthandler/auth_proxy_test.go b/pkg/services/contexthandler/auth_proxy_test.go
index dc697eff484..3958f57e249 100644
--- a/pkg/services/contexthandler/auth_proxy_test.go
+++ b/pkg/services/contexthandler/auth_proxy_test.go
@@ -104,7 +104,7 @@ func getContextHandler(t *testing.T) *ContextHandler {
 
 	return ProvideService(cfg, userAuthTokenSvc, authJWTSvc, remoteCacheSvc,
 		renderSvc, sqlStore, tracer, authProxy, loginService, nil, authenticator,
-		&userService, orgService, nil, nil, nil)
+		&userService, orgService, nil, nil)
 }
 
 type FakeGetSignUserStore struct {
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index 01e48445926..f09015707d3 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -49,11 +49,6 @@ func ProvideService(cfg *setting.Cfg, tokenService auth.UserTokenService, jwtSer
 	tracer tracing.Tracer, authProxy *authproxy.AuthProxy, loginService login.Service,
 	apiKeyService apikey.Service, authenticator loginpkg.Authenticator, userService user.Service,
 	orgService org.Service, oauthTokenService oauthtoken.OAuthTokenService, features *featuremgmt.FeatureManager,
-	// before 9.3.0 the quota service used to depend on on the ActiveTokenService
-	// since 9.3.0 after the quota refactoring ActiveTokenService depends on the quota
-	// therefore it's added to avoid cycle dependencies
-	// since it's used only by the middleware for enforcing quota limits.
-	activeTokenService auth.ActiveTokenService,
 ) *ContextHandler {
 	return &ContextHandler{
 		Cfg:               cfg,
diff --git a/pkg/services/quota/quotaimpl/quota_test.go b/pkg/services/quota/quotaimpl/quota_test.go
index 5d73021f2c9..6614bcbdaf9 100644
--- a/pkg/services/quota/quotaimpl/quota_test.go
+++ b/pkg/services/quota/quotaimpl/quota_test.go
@@ -465,7 +465,7 @@ func getQuotaBySrvTargetScope(t *testing.T, quotaService quota.Service, srv quot
 func setupEnv(t *testing.T, sqlStore *sqlstore.SQLStore, b bus.Bus, quotaService quota.Service) {
 	_, err := apikeyimpl.ProvideService(sqlStore, sqlStore.Cfg, quotaService)
 	require.NoError(t, err)
-	_, err = authimpl.ProvideActiveAuthTokenService(sqlStore.Cfg, sqlStore, quotaService)
+	_, err = authimpl.ProvideUserAuthTokenService(sqlStore, sqlStore.Cfg, nil, quotaService)
 	require.NoError(t, err)
 	_, err = dashboardStore.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
 	require.NoError(t, err)

From 850f5fa8d7d9998f5a57f6980bea5c45c13de5fe Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Tue, 22 Nov 2022 10:05:55 +0000
Subject: [PATCH 057/153] LibraryPanels: Fix issue where viewer with folder
 edit permissions could not update library panel (#58420)

* LibraryPanels: Fix issue where viewer with folder edit permissions could not update library panel
---
 public/app/features/library-panels/state/api.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/library-panels/state/api.ts b/public/app/features/library-panels/state/api.ts
index 026ccfb8274..e82b2d5e4e1 100644
--- a/public/app/features/library-panels/state/api.ts
+++ b/public/app/features/library-panels/state/api.ts
@@ -90,9 +90,10 @@ export async function addLibraryPanel(
 
 export async function updateLibraryPanel(panelSaveModel: PanelModelWithLibraryPanel): Promise<LibraryElementDTO> {
   const { libraryPanel, ...model } = panelSaveModel;
-  const { uid, name, version } = libraryPanel;
+  const { uid, name, version, folderUid } = libraryPanel;
   const kind = LibraryElementKind.Panel;
   const { result } = await getBackendSrv().patch(`/api/library-elements/${uid}`, {
+    folderUid,
     name,
     model,
     version,

From 082c8ba7a02c1032e989861fc99cdc56fc4b822f Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:35:54 +0100
Subject: [PATCH 058/153] Docs: Add step for custom labels in alert form
 (#59027)

---
 .../alerting/alerting-rules/create-grafana-managed-rule.md     | 3 ++-
 .../alerting-rules/create-mimir-loki-managed-recording-rule.md | 3 ++-
 .../alerting/alerting-rules/create-mimir-loki-managed-rule.md  | 3 ++-
 3 files changed, 6 insertions(+), 3 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 b00268b51d1..21bb21782d5 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -43,7 +43,8 @@ Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
    - 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/" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
-   - Add custom labels.
+1. In Step 5, add custom labels.
+   - Add custom labels selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value .
 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 for the 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 9f61d11a7df..9e07626fc4c 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
@@ -67,5 +67,6 @@ To create a Grafana Mimir or Loki managed recording rule
 1. In Step 4, add additional metadata associated with the rule.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
-   - Add custom labels.
+1. In Step 5, add custom labels.
+   - Add custom labels selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value .
 1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
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 c57f82e9839..89b7def3c5d 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
@@ -50,6 +50,7 @@ Watch this video to learn more about how to create a Mimir managed alert rule: {
    - 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/" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
-   - Add custom labels.
+1. In Step 5, add custom labels.
+   - Add custom labels selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value .
 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 for the rule.

From 189bf102cf1bf1619a9245f0e2bc38d8921ed883 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Tue, 22 Nov 2022 11:37:18 +0100
Subject: [PATCH 059/153] LoginAttempt: Move logic around login attempts into
 the service (#58962)

* LoginAttemps: Remove from sqlstore mock

* LoginAttemps: Move from models package to service package

* LoginAttemps: Implement functionallity from brute force login in service

* LoginAttemps: Call service

* LoginAttempts: Update name and remove internal functions

* LoginAttempts: Add tests

* LoginAttempt: Add service fake

* LoginAttempt: Register service as a background_services and remove job
from cleanup service

* LoginAttemps: Remove result from command struct

* LoginAttempt: No longer pass pointers
---
 pkg/cmd/grafana-cli/runner/wire.go            |   2 +
 pkg/login/auth.go                             |   9 +-
 pkg/login/auth_test.go                        | 117 +++++++-----------
 pkg/login/brute_force_login_protection.go     |  48 -------
 .../brute_force_login_protection_test.go      | 116 -----------------
 pkg/models/login_attempt.go                   |  36 ------
 .../backgroundsvcs/background_services.go     |   4 +-
 pkg/server/wire.go                            |   2 +
 pkg/services/cleanup/cleanup.go               |  33 +----
 pkg/services/loginattempt/login_attempt.go    |  17 ++-
 .../loginattemptimpl/login_attempt.go         |  99 +++++++++++----
 .../loginattemptimpl/login_attempt_test.go    |  98 +++++++++++++++
 .../loginattempt/loginattemptimpl/models.go   |  23 ++++
 .../loginattempt/loginattemptimpl/store.go    |  62 ++++++----
 .../loginattemptimpl/store_test.go            |  70 +++++------
 .../loginattempt/loginattempttest/fake.go     |  22 ++++
 .../loginattempt/loginattempttest/mock.go     |  27 ++++
 pkg/services/sqlstore/mockstore/mockstore.go  |  18 +--
 18 files changed, 388 insertions(+), 415 deletions(-)
 delete mode 100644 pkg/login/brute_force_login_protection.go
 delete mode 100644 pkg/login/brute_force_login_protection_test.go
 delete mode 100644 pkg/models/login_attempt.go
 create mode 100644 pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
 create mode 100644 pkg/services/loginattempt/loginattemptimpl/models.go
 create mode 100644 pkg/services/loginattempt/loginattempttest/fake.go
 create mode 100644 pkg/services/loginattempt/loginattempttest/mock.go

diff --git a/pkg/cmd/grafana-cli/runner/wire.go b/pkg/cmd/grafana-cli/runner/wire.go
index 7fd0801876d..3276c5cc6ff 100644
--- a/pkg/cmd/grafana-cli/runner/wire.go
+++ b/pkg/cmd/grafana-cli/runner/wire.go
@@ -82,6 +82,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
 	authinfodatabase "github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
+	"github.com/grafana/grafana/pkg/services/loginattempt"
 	"github.com/grafana/grafana/pkg/services/loginattempt/loginattemptimpl"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	ngmetrics "github.com/grafana/grafana/pkg/services/ngalert/metrics"
@@ -227,6 +228,7 @@ var wireSet = wire.NewSet(
 	loginpkg.ProvideService,
 	wire.Bind(new(loginpkg.Authenticator), new(*loginpkg.AuthenticatorService)),
 	loginattemptimpl.ProvideService,
+	wire.Bind(new(loginattempt.Service), new(*loginattemptimpl.Service)),
 	datasourceproxy.ProvideService,
 	search.ProvideService,
 	searchV2.ProvideService,
diff --git a/pkg/login/auth.go b/pkg/login/auth.go
index 7839d48bc67..382b4b4f288 100644
--- a/pkg/login/auth.go
+++ b/pkg/login/auth.go
@@ -50,16 +50,19 @@ func ProvideService(store db.DB, loginService login.Service, loginAttemptService
 
 // AuthenticateUser authenticates the user via username & password
 func (a *AuthenticatorService) AuthenticateUser(ctx context.Context, query *models.LoginUserQuery) error {
-	if err := validateLoginAttempts(ctx, query, a.loginAttemptService); err != nil {
+	ok, err := a.loginAttemptService.Validate(ctx, query.Username)
+	if err != nil {
 		return err
 	}
+	if !ok {
+		return ErrTooManyLoginAttempts
+	}
 
 	if err := validatePasswordSet(query.Password); err != nil {
 		return err
 	}
 
 	isGrafanaLoginEnabled := !query.Cfg.DisableLogin
-	var err error
 
 	if isGrafanaLoginEnabled {
 		err = loginUsingGrafanaDB(ctx, query, a.userService)
@@ -84,7 +87,7 @@ func (a *AuthenticatorService) AuthenticateUser(ctx context.Context, query *mode
 	}
 
 	if errors.Is(err, ErrInvalidCredentials) || errors.Is(err, ldap.ErrInvalidCredentials) {
-		if err := saveInvalidLoginAttempt(ctx, query, a.loginAttemptService); err != nil {
+		if err := a.loginAttemptService.Add(ctx, query.Username, query.IpAddress); err != nil {
 			loginLogger.Error("Failed to save invalid login attempt", "err", err)
 		}
 
diff --git a/pkg/login/auth_test.go b/pkg/login/auth_test.go
index dfa0a629db0..edc8f4ed3d8 100644
--- a/pkg/login/auth_test.go
+++ b/pkg/login/auth_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/login/logintest"
-	"github.com/grafana/grafana/pkg/services/loginattempt"
+	"github.com/grafana/grafana/pkg/services/loginattempt/loginattempttest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
@@ -18,16 +18,15 @@ import (
 
 func TestAuthenticateUser(t *testing.T) {
 	authScenario(t, "When a user authenticates without setting a password", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(nil, sc)
 		mockLoginUsingLDAP(false, nil, sc)
 
-		loginQuery := models.LoginUserQuery{
+		loginAttemptService := &loginattempttest.FakeLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
+		err := a.AuthenticateUser(context.Background(), &models.LoginUserQuery{
 			Username: "user",
 			Password: "",
-		}
-		a := AuthenticatorService{loginAttemptService: nil, loginService: &logintest.LoginServiceFake{}}
-		err := a.AuthenticateUser(context.Background(), &loginQuery)
+		})
 
 		require.EqualError(t, err, ErrPasswordEmpty.Error())
 		assert.False(t, sc.grafanaLoginWasCalled)
@@ -36,164 +35,154 @@ func TestAuthenticateUser(t *testing.T) {
 	})
 
 	authScenario(t, "When user authenticates with no auth provider enabled", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		sc.loginUserQuery.Cfg.DisableLogin = true
 
-		a := AuthenticatorService{loginAttemptService: nil, loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, ErrNoAuthProvider.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.False(t, sc.grafanaLoginWasCalled)
 		assert.False(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Equal(t, "", sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When a user authenticates having too many login attempts", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(ErrTooManyLoginAttempts, sc)
 		mockLoginUsingGrafanaDB(nil, sc)
 		mockLoginUsingLDAP(true, nil, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: false}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, ErrTooManyLoginAttempts.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.False(t, sc.grafanaLoginWasCalled)
 		assert.False(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Empty(t, sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When grafana user authenticate with valid credentials", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(nil, sc)
 		mockLoginUsingLDAP(true, ErrInvalidCredentials, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.NoError(t, err)
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.False(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Equal(t, "grafana", sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When grafana user authenticate and unexpected error occurs", func(sc *authScenarioContext) {
 		customErr := errors.New("custom")
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(customErr, sc)
 		mockLoginUsingLDAP(true, ErrInvalidCredentials, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, customErr.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.False(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Equal(t, "grafana", sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When a non-existing grafana user authenticate and ldap disabled", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(user.ErrUserNotFound, sc)
 		mockLoginUsingLDAP(false, nil, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, user.ErrUserNotFound.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.True(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Empty(t, sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When a non-existing grafana user authenticate and invalid ldap credentials", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(user.ErrUserNotFound, sc)
 		mockLoginUsingLDAP(true, ldap.ErrInvalidCredentials, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, ErrInvalidCredentials.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.True(t, sc.ldapLoginWasCalled)
-		assert.True(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Equal(t, login.LDAPAuthModule, sc.loginUserQuery.AuthModule)
+		assert.True(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When a non-existing grafana user authenticate and valid ldap credentials", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(user.ErrUserNotFound, sc)
 		mockLoginUsingLDAP(true, nil, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.NoError(t, err)
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.True(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Equal(t, login.LDAPAuthModule, sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When a non-existing grafana user authenticate and ldap returns unexpected error", func(sc *authScenarioContext) {
 		customErr := errors.New("custom")
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(user.ErrUserNotFound, sc)
 		mockLoginUsingLDAP(true, customErr, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, customErr.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.True(t, sc.ldapLoginWasCalled)
-		assert.False(t, sc.saveInvalidLoginAttemptWasCalled)
 		assert.Equal(t, login.LDAPAuthModule, sc.loginUserQuery.AuthModule)
+		assert.False(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 
 	authScenario(t, "When grafana user authenticate with invalid credentials and invalid ldap credentials", func(sc *authScenarioContext) {
-		mockLoginAttemptValidation(nil, sc)
 		mockLoginUsingGrafanaDB(ErrInvalidCredentials, sc)
 		mockLoginUsingLDAP(true, ldap.ErrInvalidCredentials, sc)
-		mockSaveInvalidLoginAttempt(sc)
 
-		a := AuthenticatorService{loginService: &logintest.LoginServiceFake{}}
+		loginAttemptService := &loginattempttest.MockLoginAttemptService{ExpectedValid: true}
+		a := AuthenticatorService{loginAttemptService: loginAttemptService, loginService: &logintest.LoginServiceFake{}}
 		err := a.AuthenticateUser(context.Background(), sc.loginUserQuery)
 
 		require.EqualError(t, err, ErrInvalidCredentials.Error())
-		assert.True(t, sc.loginAttemptValidationWasCalled)
 		assert.True(t, sc.grafanaLoginWasCalled)
 		assert.True(t, sc.ldapLoginWasCalled)
-		assert.True(t, sc.saveInvalidLoginAttemptWasCalled)
+		assert.True(t, loginAttemptService.AddCalled)
+		assert.True(t, loginAttemptService.ValidateCalled)
 	})
 }
 
 type authScenarioContext struct {
-	loginUserQuery                   *models.LoginUserQuery
-	grafanaLoginWasCalled            bool
-	ldapLoginWasCalled               bool
-	loginAttemptValidationWasCalled  bool
-	saveInvalidLoginAttemptWasCalled bool
+	loginUserQuery        *models.LoginUserQuery
+	grafanaLoginWasCalled bool
+	ldapLoginWasCalled    bool
 }
 
 type authScenarioFunc func(sc *authScenarioContext)
@@ -212,28 +201,12 @@ func mockLoginUsingLDAP(enabled bool, err error, sc *authScenarioContext) {
 	}
 }
 
-func mockLoginAttemptValidation(err error, sc *authScenarioContext) {
-	validateLoginAttempts = func(context.Context, *models.LoginUserQuery, loginattempt.Service) error {
-		sc.loginAttemptValidationWasCalled = true
-		return err
-	}
-}
-
-func mockSaveInvalidLoginAttempt(sc *authScenarioContext) {
-	saveInvalidLoginAttempt = func(ctx context.Context, query *models.LoginUserQuery, _ loginattempt.Service) error {
-		sc.saveInvalidLoginAttemptWasCalled = true
-		return nil
-	}
-}
-
 func authScenario(t *testing.T, desc string, fn authScenarioFunc) {
 	t.Helper()
 
 	t.Run(desc, func(t *testing.T) {
 		origLoginUsingGrafanaDB := loginUsingGrafanaDB
 		origLoginUsingLDAP := loginUsingLDAP
-		origValidateLoginAttempts := validateLoginAttempts
-		origSaveInvalidLoginAttempt := saveInvalidLoginAttempt
 		cfg := setting.Cfg{DisableLogin: false}
 		sc := &authScenarioContext{
 			loginUserQuery: &models.LoginUserQuery{
@@ -247,8 +220,6 @@ func authScenario(t *testing.T, desc string, fn authScenarioFunc) {
 		t.Cleanup(func() {
 			loginUsingGrafanaDB = origLoginUsingGrafanaDB
 			loginUsingLDAP = origLoginUsingLDAP
-			validateLoginAttempts = origValidateLoginAttempts
-			saveInvalidLoginAttempt = origSaveInvalidLoginAttempt
 		})
 
 		fn(sc)
diff --git a/pkg/login/brute_force_login_protection.go b/pkg/login/brute_force_login_protection.go
deleted file mode 100644
index 0c44067a5f2..00000000000
--- a/pkg/login/brute_force_login_protection.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package login
-
-import (
-	"context"
-	"time"
-
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/loginattempt"
-)
-
-var (
-	maxInvalidLoginAttempts int64 = 5
-	loginAttemptsWindow           = time.Minute * 5
-)
-
-var validateLoginAttempts = func(ctx context.Context, query *models.LoginUserQuery, loginAttemptService loginattempt.Service) error {
-	if query.Cfg.DisableBruteForceLoginProtection {
-		return nil
-	}
-
-	loginAttemptCountQuery := models.GetUserLoginAttemptCountQuery{
-		Username: query.Username,
-		Since:    time.Now().Add(-loginAttemptsWindow),
-	}
-
-	if err := loginAttemptService.GetUserLoginAttemptCount(ctx, &loginAttemptCountQuery); err != nil {
-		return err
-	}
-
-	if loginAttemptCountQuery.Result >= maxInvalidLoginAttempts {
-		return ErrTooManyLoginAttempts
-	}
-
-	return nil
-}
-
-var saveInvalidLoginAttempt = func(ctx context.Context, query *models.LoginUserQuery, loginAttemptService loginattempt.Service) error {
-	if query.Cfg.DisableBruteForceLoginProtection {
-		return nil
-	}
-
-	loginAttemptCommand := models.CreateLoginAttemptCommand{
-		Username:  query.Username,
-		IpAddress: query.IpAddress,
-	}
-
-	return loginAttemptService.CreateLoginAttempt(ctx, &loginAttemptCommand)
-}
diff --git a/pkg/login/brute_force_login_protection_test.go b/pkg/login/brute_force_login_protection_test.go
deleted file mode 100644
index 71d20fa02d0..00000000000
--- a/pkg/login/brute_force_login_protection_test.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package login
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/sqlstore/mockstore"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestValidateLoginAttempts(t *testing.T) {
-	testCases := []struct {
-		name          string
-		loginAttempts int64
-		cfg           *setting.Cfg
-		expected      error
-	}{
-		{
-			name:          "When brute force protection enabled and user login attempt count is less than max",
-			loginAttempts: maxInvalidLoginAttempts - 1,
-			cfg:           cfgWithBruteForceLoginProtectionEnabled(t),
-			expected:      nil,
-		},
-		{
-			name:          "When brute force protection enabled and user login attempt count equals max",
-			loginAttempts: maxInvalidLoginAttempts,
-			cfg:           cfgWithBruteForceLoginProtectionEnabled(t),
-			expected:      ErrTooManyLoginAttempts,
-		},
-		{
-			name:          "When brute force protection enabled and user login attempt count is greater than max",
-			loginAttempts: maxInvalidLoginAttempts + 1,
-			cfg:           cfgWithBruteForceLoginProtectionEnabled(t),
-			expected:      ErrTooManyLoginAttempts,
-		},
-
-		{
-			name:          "When brute force protection disabled and user login attempt count is less than max",
-			loginAttempts: maxInvalidLoginAttempts - 1,
-			cfg:           cfgWithBruteForceLoginProtectionDisabled(t),
-			expected:      nil,
-		},
-		{
-			name:          "When brute force protection disabled and user login attempt count equals max",
-			loginAttempts: maxInvalidLoginAttempts,
-			cfg:           cfgWithBruteForceLoginProtectionDisabled(t),
-			expected:      nil,
-		},
-		{
-			name:          "When brute force protection disabled and user login attempt count is greater than max",
-			loginAttempts: maxInvalidLoginAttempts + 1,
-			cfg:           cfgWithBruteForceLoginProtectionDisabled(t),
-			expected:      nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			store := mockstore.NewSQLStoreMock()
-			store.ExpectedLoginAttempts = tc.loginAttempts
-
-			query := &models.LoginUserQuery{Username: "user", Cfg: tc.cfg}
-
-			err := validateLoginAttempts(context.Background(), query, store)
-			require.Equal(t, tc.expected, err)
-		})
-	}
-}
-
-func TestSaveInvalidLoginAttempt(t *testing.T) {
-	t.Run("When brute force protection enabled", func(t *testing.T) {
-		store := mockstore.NewSQLStoreMock()
-		err := saveInvalidLoginAttempt(context.Background(), &models.LoginUserQuery{
-			Username:  "user",
-			Password:  "pwd",
-			IpAddress: "192.168.1.1:56433",
-			Cfg:       cfgWithBruteForceLoginProtectionEnabled(t),
-		}, store)
-		require.NoError(t, err)
-
-		require.NotNil(t, store.LastLoginAttemptCommand)
-		assert.Equal(t, "user", store.LastLoginAttemptCommand.Username)
-		assert.Equal(t, "192.168.1.1:56433", store.LastLoginAttemptCommand.IpAddress)
-	})
-
-	t.Run("When brute force protection disabled", func(t *testing.T) {
-		store := mockstore.NewSQLStoreMock()
-		err := saveInvalidLoginAttempt(context.Background(), &models.LoginUserQuery{
-			Username:  "user",
-			Password:  "pwd",
-			IpAddress: "192.168.1.1:56433",
-			Cfg:       cfgWithBruteForceLoginProtectionDisabled(t),
-		}, store)
-		require.NoError(t, err)
-
-		require.Nil(t, store.LastLoginAttemptCommand)
-	})
-}
-
-func cfgWithBruteForceLoginProtectionDisabled(t *testing.T) *setting.Cfg {
-	t.Helper()
-	cfg := setting.NewCfg()
-	cfg.DisableBruteForceLoginProtection = true
-	return cfg
-}
-
-func cfgWithBruteForceLoginProtectionEnabled(t *testing.T) *setting.Cfg {
-	t.Helper()
-	cfg := setting.NewCfg()
-	require.False(t, cfg.DisableBruteForceLoginProtection)
-	return cfg
-}
diff --git a/pkg/models/login_attempt.go b/pkg/models/login_attempt.go
deleted file mode 100644
index 6e0976bc506..00000000000
--- a/pkg/models/login_attempt.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package models
-
-import (
-	"time"
-)
-
-type LoginAttempt struct {
-	Id        int64
-	Username  string
-	IpAddress string
-	Created   int64
-}
-
-// ---------------------
-// COMMANDS
-
-type CreateLoginAttemptCommand struct {
-	Username  string
-	IpAddress string
-
-	Result LoginAttempt
-}
-
-type DeleteOldLoginAttemptsCommand struct {
-	OlderThan   time.Time
-	DeletedRows int64
-}
-
-// ---------------------
-// QUERIES
-
-type GetUserLoginAttemptCountQuery struct {
-	Username string
-	Since    time.Time
-	Result   int64
-}
diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index 2582d680327..66181694739 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -18,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/live/pushhttp"
 	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
+	"github.com/grafana/grafana/pkg/services/loginattempt/loginattemptimpl"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	plugindashboardsservice "github.com/grafana/grafana/pkg/services/plugindashboards/service"
@@ -46,7 +47,7 @@ func ProvideBackgroundServiceRegistry(
 	thumbnailsService thumbs.Service, StorageService store.StorageService, searchService searchV2.SearchService, entityEventsService store.EntityEventsService,
 	saService *samanager.ServiceAccountsService, authInfoService *authinfoservice.Implementation,
 	grpcServerProvider grpcserver.Provider,
-	secretMigrationProvider secretsMigrations.SecretMigrationProvider,
+	secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
 	// Need to make sure these are initialized, is there a better place to put them?
 	_ dashboardsnapshots.Service, _ *alerting.AlertNotificationService,
 	_ serviceaccounts.Service, _ *guardian.Provider,
@@ -81,6 +82,7 @@ func ProvideBackgroundServiceRegistry(
 		authInfoService,
 		processManager,
 		secretMigrationProvider,
+		loginAttemptService,
 	)
 }
 
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 0c46d0529d3..7c4dfeadb54 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -84,6 +84,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
 	authinfodatabase "github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
 	"github.com/grafana/grafana/pkg/services/login/loginservice"
+	"github.com/grafana/grafana/pkg/services/loginattempt"
 	"github.com/grafana/grafana/pkg/services/loginattempt/loginattemptimpl"
 	"github.com/grafana/grafana/pkg/services/navtree/navtreeimpl"
 	"github.com/grafana/grafana/pkg/services/ngalert"
@@ -363,6 +364,7 @@ var wireBasicSet = wire.NewSet(
 	teamimpl.ProvideService,
 	tempuserimpl.ProvideService,
 	loginattemptimpl.ProvideService,
+	wire.Bind(new(loginattempt.Service), new(*loginattemptimpl.Service)),
 	secretsMigrations.ProvideDataSourceMigrationService,
 	secretsMigrations.ProvideMigrateToPluginService,
 	secretsMigrations.ProvideMigrateFromPluginService,
diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
index d8889d37912..a04dfdd125a 100644
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -20,7 +20,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
-	"github.com/grafana/grafana/pkg/services/loginattempt"
 	"github.com/grafana/grafana/pkg/services/ngalert/image"
 	"github.com/grafana/grafana/pkg/services/queryhistory"
 	"github.com/grafana/grafana/pkg/services/shorturls"
@@ -31,7 +30,7 @@ import (
 func ProvideService(cfg *setting.Cfg, serverLockService *serverlock.ServerLockService,
 	shortURLService shorturls.Service, sqlstore db.DB, queryHistoryService queryhistory.Service,
 	dashboardVersionService dashver.Service, dashSnapSvc dashboardsnapshots.Service, deleteExpiredImageService *image.DeleteExpiredService,
-	loginAttemptService loginattempt.Service, tempUserService tempuser.Service, tracer tracing.Tracer, annotationCleaner annotations.Cleaner) *CleanUpService {
+	tempUserService tempuser.Service, tracer tracing.Tracer, annotationCleaner annotations.Cleaner) *CleanUpService {
 	s := &CleanUpService{
 		Cfg:                       cfg,
 		ServerLockService:         serverLockService,
@@ -42,7 +41,6 @@ func ProvideService(cfg *setting.Cfg, serverLockService *serverlock.ServerLockSe
 		dashboardVersionService:   dashboardVersionService,
 		dashboardSnapshotService:  dashSnapSvc,
 		deleteExpiredImageService: deleteExpiredImageService,
-		loginAttemptService:       loginAttemptService,
 		tempUserService:           tempUserService,
 		tracer:                    tracer,
 		annotationCleaner:         annotationCleaner,
@@ -61,7 +59,6 @@ type CleanUpService struct {
 	dashboardVersionService   dashver.Service
 	dashboardSnapshotService  dashboardsnapshots.Service
 	deleteExpiredImageService *image.DeleteExpiredService
-	loginAttemptService       loginattempt.Service
 	tempUserService           tempuser.Service
 	annotationCleaner         annotations.Cleaner
 }
@@ -106,7 +103,6 @@ func (srv *CleanUpService) clean(ctx context.Context) {
 		{"expire old user invites", srv.expireOldUserInvites},
 		{"delete stale short URLs", srv.deleteStaleShortURLs},
 		{"delete stale query history", srv.deleteStaleQueryHistory},
-		{"delete old login attempts", srv.deleteOldLoginAttempts},
 	}
 
 	logger := srv.log.FromContext(ctx)
@@ -227,33 +223,6 @@ func (srv *CleanUpService) deleteExpiredImages(ctx context.Context) {
 	}
 }
 
-func (srv *CleanUpService) deleteOldLoginAttempts(ctx context.Context) {
-	logger := srv.log.FromContext(ctx)
-	err := srv.ServerLockService.LockAndExecute(ctx, "delete old login attempts",
-		time.Minute*10, func(context.Context) {
-			srv.deleteOldLoginAttemptsWithoutLock(ctx)
-		})
-	if err != nil {
-		logger.Error("failed to lock and execute cleanup of old login attempts", "error", err)
-	}
-}
-
-func (srv *CleanUpService) deleteOldLoginAttemptsWithoutLock(ctx context.Context) {
-	logger := srv.log.FromContext(ctx)
-	if srv.Cfg.DisableBruteForceLoginProtection {
-		return
-	}
-
-	cmd := models.DeleteOldLoginAttemptsCommand{
-		OlderThan: time.Now().Add(time.Minute * -10),
-	}
-	if err := srv.loginAttemptService.DeleteOldLoginAttempts(ctx, &cmd); err != nil {
-		logger.Error("Problem deleting expired login attempts", "error", err.Error())
-	} else {
-		logger.Debug("Deleted expired login attempts", "rows affected", cmd.DeletedRows)
-	}
-}
-
 func (srv *CleanUpService) expireOldUserInvites(ctx context.Context) {
 	logger := srv.log.FromContext(ctx)
 	maxInviteLifetime := srv.Cfg.UserInviteMaxLifetime
diff --git a/pkg/services/loginattempt/login_attempt.go b/pkg/services/loginattempt/login_attempt.go
index cbf581a3d59..897ebbccf1f 100644
--- a/pkg/services/loginattempt/login_attempt.go
+++ b/pkg/services/loginattempt/login_attempt.go
@@ -2,12 +2,19 @@ package loginattempt
 
 import (
 	"context"
-
-	"github.com/grafana/grafana/pkg/models"
 )
 
 type Service interface {
-	CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error
-	DeleteOldLoginAttempts(ctx context.Context, cmd *models.DeleteOldLoginAttemptsCommand) error
-	GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error
+	// Add adds a new login attempt record for provided username
+	Add(ctx context.Context, username, IPAddress string) error
+	// Validate checks if username has to many login attempts inside a window.
+	// Will return true if provided username do not have too many attempts.
+	Validate(ctx context.Context, username string) (bool, error)
+}
+
+type LoginAttempt struct {
+	Id        int64
+	Username  string
+	IpAddress string
+	Created   int64
 }
diff --git a/pkg/services/loginattempt/loginattemptimpl/login_attempt.go b/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
index c9329d4cc84..11bba09a786 100644
--- a/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
+++ b/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
@@ -5,40 +5,95 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/loginattempt"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/serverlock"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
-type Service struct {
-	store store
-}
+const (
+	maxInvalidLoginAttempts int64 = 5
+	loginAttemptsWindow           = time.Minute * 5
+)
 
-func ProvideService(db db.DB) loginattempt.Service {
+func ProvideService(db db.DB, cfg *setting.Cfg, lock *serverlock.ServerLockService) *Service {
 	return &Service{
-		store: &xormStore{db: db, now: time.Now},
+		&xormStore{db: db, now: time.Now},
+		cfg,
+		lock,
+		log.New("login_attempt"),
 	}
 }
 
-func (s *Service) CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error {
-	err := s.store.CreateLoginAttempt(ctx, cmd)
-	if err != nil {
-		return err
-	}
-	return nil
+type Service struct {
+	store  store
+	cfg    *setting.Cfg
+	lock   *serverlock.ServerLockService
+	logger log.Logger
 }
 
-func (s *Service) DeleteOldLoginAttempts(ctx context.Context, cmd *models.DeleteOldLoginAttemptsCommand) error {
-	err := s.store.DeleteOldLoginAttempts(ctx, cmd)
-	if err != nil {
-		return err
+func (s *Service) Run(ctx context.Context) error {
+	// no need to run clean up job if it is disabled
+	if s.cfg.DisableBruteForceLoginProtection {
+		return nil
+	}
+
+	ticker := time.NewTicker(time.Minute * 10)
+	for {
+		select {
+		case <-ticker.C:
+			s.cleanup(ctx)
+		case <-ctx.Done():
+			return ctx.Err()
+		}
 	}
-	return nil
 }
 
-func (s *Service) GetUserLoginAttemptCount(ctx context.Context, cmd *models.GetUserLoginAttemptCountQuery) error {
-	err := s.store.GetUserLoginAttemptCount(ctx, cmd)
+func (s *Service) Add(ctx context.Context, username, IPAddress string) error {
+	if s.cfg.DisableBruteForceLoginProtection {
+		return nil
+	}
+
+	return s.store.CreateLoginAttempt(ctx, CreateLoginAttemptCommand{
+		Username:  username,
+		IpAddress: IPAddress,
+	})
+}
+
+func (s *Service) Validate(ctx context.Context, username string) (bool, error) {
+	if s.cfg.DisableBruteForceLoginProtection {
+		return true, nil
+	}
+
+	loginAttemptCountQuery := GetUserLoginAttemptCountQuery{
+		Username: username,
+		Since:    time.Now().Add(-loginAttemptsWindow),
+	}
+
+	count, err := s.store.GetUserLoginAttemptCount(ctx, loginAttemptCountQuery)
 	if err != nil {
-		return err
+		return false, err
+	}
+
+	if count >= maxInvalidLoginAttempts {
+		return false, nil
+	}
+
+	return true, nil
+}
+
+func (s *Service) cleanup(ctx context.Context) {
+	err := s.lock.LockAndExecute(ctx, "delete old login attempts", time.Minute*10, func(context.Context) {
+		cmd := DeleteOldLoginAttemptsCommand{
+			OlderThan: time.Now().Add(time.Minute * -10),
+		}
+		if deletedLogs, err := s.store.DeleteOldLoginAttempts(ctx, cmd); err != nil {
+			s.logger.Error("Problem deleting expired login attempts", "error", err.Error())
+		} else {
+			s.logger.Debug("Deleted expired login attempts", "rows affected", deletedLogs)
+		}
+	})
+
+	if err != nil {
+		s.logger.Error("failed to lock and execute cleanup of old login attempts", "error", err)
 	}
-	return nil
 }
diff --git a/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go b/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
new file mode 100644
index 00000000000..ae4de8b931f
--- /dev/null
+++ b/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
@@ -0,0 +1,98 @@
+package loginattemptimpl
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestService_Validate(t *testing.T) {
+	testCases := []struct {
+		name          string
+		loginAttempts int64
+		disabled      bool
+		expected      bool
+		expectedErr   error
+	}{
+		{
+			name:          "When brute force protection enabled and user login attempt count is less than max",
+			loginAttempts: maxInvalidLoginAttempts - 1,
+			expected:      true,
+			expectedErr:   nil,
+		},
+		{
+			name:          "When brute force protection enabled and user login attempt count equals max",
+			loginAttempts: maxInvalidLoginAttempts,
+			expected:      false,
+			expectedErr:   nil,
+		},
+		{
+			name:          "When brute force protection enabled and user login attempt count is greater than max",
+			loginAttempts: maxInvalidLoginAttempts + 1,
+			expected:      false,
+			expectedErr:   nil,
+		},
+
+		{
+			name:          "When brute force protection disabled and user login attempt count is less than max",
+			loginAttempts: maxInvalidLoginAttempts - 1,
+			disabled:      true,
+			expected:      true,
+			expectedErr:   nil,
+		},
+		{
+			name:          "When brute force protection disabled and user login attempt count equals max",
+			loginAttempts: maxInvalidLoginAttempts,
+			disabled:      true,
+			expected:      true,
+			expectedErr:   nil,
+		},
+		{
+			name:          "When brute force protection disabled and user login attempt count is greater than max",
+			loginAttempts: maxInvalidLoginAttempts + 1,
+			disabled:      true,
+			expected:      true,
+			expectedErr:   nil,
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.DisableBruteForceLoginProtection = tt.disabled
+			service := &Service{
+				store: fakeStore{
+					ExpectedCount: tt.loginAttempts,
+					ExpectedErr:   tt.expectedErr,
+				},
+				cfg: cfg,
+			}
+
+			ok, err := service.Validate(context.Background(), "test")
+			assert.Equal(t, tt.expected, ok)
+			assert.Equal(t, tt.expectedErr, err)
+		})
+	}
+}
+
+var _ store = new(fakeStore)
+
+type fakeStore struct {
+	ExpectedErr         error
+	ExpectedCount       int64
+	ExpectedDeletedRows int64
+}
+
+func (f fakeStore) GetUserLoginAttemptCount(ctx context.Context, query GetUserLoginAttemptCountQuery) (int64, error) {
+	return f.ExpectedCount, f.ExpectedErr
+}
+
+func (f fakeStore) CreateLoginAttempt(ctx context.Context, command CreateLoginAttemptCommand) error {
+	return f.ExpectedErr
+}
+
+func (f fakeStore) DeleteOldLoginAttempts(ctx context.Context, command DeleteOldLoginAttemptsCommand) (int64, error) {
+	return f.ExpectedDeletedRows, f.ExpectedErr
+}
diff --git a/pkg/services/loginattempt/loginattemptimpl/models.go b/pkg/services/loginattempt/loginattemptimpl/models.go
new file mode 100644
index 00000000000..b372e2df6c9
--- /dev/null
+++ b/pkg/services/loginattempt/loginattemptimpl/models.go
@@ -0,0 +1,23 @@
+package loginattemptimpl
+
+import (
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/loginattempt"
+)
+
+type CreateLoginAttemptCommand struct {
+	Username  string
+	IpAddress string
+
+	Result loginattempt.LoginAttempt
+}
+
+type GetUserLoginAttemptCountQuery struct {
+	Username string
+	Since    time.Time
+}
+
+type DeleteOldLoginAttemptsCommand struct {
+	OlderThan time.Time
+}
diff --git a/pkg/services/loginattempt/loginattemptimpl/store.go b/pkg/services/loginattempt/loginattemptimpl/store.go
index 2881bba4e2a..6721eefb99b 100644
--- a/pkg/services/loginattempt/loginattemptimpl/store.go
+++ b/pkg/services/loginattempt/loginattemptimpl/store.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/loginattempt"
 )
 
 type xormStore struct {
@@ -15,14 +15,14 @@ type xormStore struct {
 }
 
 type store interface {
-	CreateLoginAttempt(context.Context, *models.CreateLoginAttemptCommand) error
-	DeleteOldLoginAttempts(context.Context, *models.DeleteOldLoginAttemptsCommand) error
-	GetUserLoginAttemptCount(context.Context, *models.GetUserLoginAttemptCountQuery) error
+	CreateLoginAttempt(ctx context.Context, cmd CreateLoginAttemptCommand) error
+	DeleteOldLoginAttempts(ctx context.Context, cmd DeleteOldLoginAttemptsCommand) (int64, error)
+	GetUserLoginAttemptCount(ctx context.Context, query GetUserLoginAttemptCountQuery) (int64, error)
 }
 
-func (xs *xormStore) CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error {
+func (xs *xormStore) CreateLoginAttempt(ctx context.Context, cmd CreateLoginAttemptCommand) error {
 	return xs.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		loginAttempt := models.LoginAttempt{
+		loginAttempt := loginattempt.LoginAttempt{
 			Username:  cmd.Username,
 			IpAddress: cmd.IpAddress,
 			Created:   xs.now().Unix(),
@@ -38,8 +38,9 @@ func (xs *xormStore) CreateLoginAttempt(ctx context.Context, cmd *models.CreateL
 	})
 }
 
-func (xs *xormStore) DeleteOldLoginAttempts(ctx context.Context, cmd *models.DeleteOldLoginAttemptsCommand) error {
-	return xs.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+func (xs *xormStore) DeleteOldLoginAttempts(ctx context.Context, cmd DeleteOldLoginAttemptsCommand) (int64, error) {
+	var deletedRows int64
+	err := xs.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
 		var maxId int64
 		sql := "SELECT max(id) as id FROM login_attempt WHERE created < ?"
 		result, err := sess.Query(sql, cmd.OlderThan.Unix())
@@ -59,31 +60,38 @@ func (xs *xormStore) DeleteOldLoginAttempts(ctx context.Context, cmd *models.Del
 
 		sql = "DELETE FROM login_attempt WHERE id <= ?"
 
-		if result, err := sess.Exec(sql, maxId); err != nil {
-			return err
-		} else if cmd.DeletedRows, err = result.RowsAffected(); err != nil {
-			return err
-		}
-
-		return nil
-	})
-}
-
-func (xs *xormStore) GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error {
-	return xs.db.WithDbSession(ctx, func(dbSession *db.Session) error {
-		loginAttempt := new(models.LoginAttempt)
-		total, err := dbSession.
-			Where("username = ?", query.Username).
-			And("created >= ?", query.Since.Unix()).
-			Count(loginAttempt)
-
+		deleteResult, err := sess.Exec(sql, maxId)
 		if err != nil {
 			return err
 		}
 
-		query.Result = total
+		deletedRows, err = deleteResult.RowsAffected()
+		if err != nil {
+			return err
+		}
 		return nil
 	})
+	return deletedRows, err
+}
+
+func (xs *xormStore) GetUserLoginAttemptCount(ctx context.Context, query GetUserLoginAttemptCountQuery) (int64, error) {
+	var total int64
+	err := xs.db.WithDbSession(ctx, func(dbSession *db.Session) error {
+		var queryErr error
+		loginAttempt := new(loginattempt.LoginAttempt)
+		total, queryErr = dbSession.
+			Where("username = ?", query.Username).
+			And("created >= ?", query.Since.Unix()).
+			Count(loginAttempt)
+
+		if queryErr != nil {
+			return queryErr
+		}
+
+		return nil
+	})
+
+	return total, err
 }
 
 func toInt64(i interface{}) int64 {
diff --git a/pkg/services/loginattempt/loginattemptimpl/store_test.go b/pkg/services/loginattempt/loginattemptimpl/store_test.go
index e0c5af8dafb..12f4ed58bfb 100644
--- a/pkg/services/loginattempt/loginattemptimpl/store_test.go
+++ b/pkg/services/loginattempt/loginattemptimpl/store_test.go
@@ -8,15 +8,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/loginattempt"
 )
 
 func TestIntegrationLoginAttemptsQuery(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	var loginAttemptService loginattempt.Service
 	user := "user"
 
 	beginningOfTime := time.Date(2017, 10, 22, 8, 0, 0, 0, time.Local)
@@ -25,58 +22,60 @@ func TestIntegrationLoginAttemptsQuery(t *testing.T) {
 
 	for _, test := range []struct {
 		Name   string
-		Query  models.GetUserLoginAttemptCountQuery
+		Query  GetUserLoginAttemptCountQuery
 		Err    error
 		Result int64
 	}{
 		{
 			"Should return a total count of zero login attempts when comparing since beginning of time + 2min and 1s",
-			models.GetUserLoginAttemptCountQuery{Username: user, Since: timePlusTwoMinutes.Add(time.Second * 1)}, nil, 0,
+			GetUserLoginAttemptCountQuery{Username: user, Since: timePlusTwoMinutes.Add(time.Second * 1)}, nil, 0,
 		},
 		{
 			"Should return a total count of zero login attempts when comparing since beginning of time + 2min and 1s",
-			models.GetUserLoginAttemptCountQuery{Username: user, Since: timePlusTwoMinutes.Add(time.Second * 1)}, nil, 0,
+			GetUserLoginAttemptCountQuery{Username: user, Since: timePlusTwoMinutes.Add(time.Second * 1)}, nil, 0,
 		},
 		{
 			"Should return the total count of login attempts since beginning of time",
-			models.GetUserLoginAttemptCountQuery{Username: user, Since: beginningOfTime}, nil, 3,
+			GetUserLoginAttemptCountQuery{Username: user, Since: beginningOfTime}, nil, 3,
 		},
 		{
 			"Should return the total count of login attempts since beginning of time + 1min",
-			models.GetUserLoginAttemptCountQuery{Username: user, Since: timePlusOneMinute}, nil, 2,
+			GetUserLoginAttemptCountQuery{Username: user, Since: timePlusOneMinute}, nil, 2,
 		},
 		{
 			"Should return the total count of login attempts since beginning of time + 2min",
-			models.GetUserLoginAttemptCountQuery{Username: user, Since: timePlusTwoMinutes}, nil, 1,
+			GetUserLoginAttemptCountQuery{Username: user, Since: timePlusTwoMinutes}, nil, 1,
 		},
 	} {
 		mockTime := beginningOfTime
-		loginAttemptService = &Service{
-			store: &xormStore{
-				db:  db.InitTestDB(t),
-				now: func() time.Time { return mockTime },
-			},
+		s := &xormStore{
+			db:  db.InitTestDB(t),
+			now: func() time.Time { return mockTime },
 		}
-		err := loginAttemptService.CreateLoginAttempt(context.Background(), &models.CreateLoginAttemptCommand{
+
+		err := s.CreateLoginAttempt(context.Background(), CreateLoginAttemptCommand{
 			Username:  user,
 			IpAddress: "192.168.0.1",
 		})
 		require.Nil(t, err)
+
 		mockTime = timePlusOneMinute
-		err = loginAttemptService.CreateLoginAttempt(context.Background(), &models.CreateLoginAttemptCommand{
+		err = s.CreateLoginAttempt(context.Background(), CreateLoginAttemptCommand{
 			Username:  user,
 			IpAddress: "192.168.0.1",
 		})
 		require.Nil(t, err)
+
 		mockTime = timePlusTwoMinutes
-		err = loginAttemptService.CreateLoginAttempt(context.Background(), &models.CreateLoginAttemptCommand{
+		err = s.CreateLoginAttempt(context.Background(), CreateLoginAttemptCommand{
 			Username:  user,
 			IpAddress: "192.168.0.1",
 		})
 		require.Nil(t, err)
-		err = loginAttemptService.GetUserLoginAttemptCount(context.Background(), &test.Query)
+
+		count, err := s.GetUserLoginAttemptCount(context.Background(), test.Query)
 		require.Equal(t, test.Err, err, test.Name)
-		require.Equal(t, test.Result, test.Query.Result, test.Name)
+		require.Equal(t, test.Result, count, test.Name)
 	}
 }
 
@@ -84,7 +83,6 @@ func TestIntegrationLoginAttemptsDelete(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	var loginAttemptService loginattempt.Service
 	user := "user"
 
 	beginningOfTime := time.Date(2017, 10, 22, 8, 0, 0, 0, time.Local)
@@ -93,53 +91,55 @@ func TestIntegrationLoginAttemptsDelete(t *testing.T) {
 
 	for _, test := range []struct {
 		Name        string
-		Cmd         models.DeleteOldLoginAttemptsCommand
+		Cmd         DeleteOldLoginAttemptsCommand
 		Err         error
 		DeletedRows int64
 	}{
 		{
 			"Should return deleted rows older than beginning of time",
-			models.DeleteOldLoginAttemptsCommand{OlderThan: beginningOfTime}, nil, 0,
+			DeleteOldLoginAttemptsCommand{OlderThan: beginningOfTime}, nil, 0,
 		},
 		{
 			"Should return deleted rows older than beginning of time + 1min",
-			models.DeleteOldLoginAttemptsCommand{OlderThan: timePlusOneMinute}, nil, 1,
+			DeleteOldLoginAttemptsCommand{OlderThan: timePlusOneMinute}, nil, 1,
 		},
 		{
 			"Should return deleted rows older than beginning of time + 2min",
-			models.DeleteOldLoginAttemptsCommand{OlderThan: timePlusTwoMinutes}, nil, 2,
+			DeleteOldLoginAttemptsCommand{OlderThan: timePlusTwoMinutes}, nil, 2,
 		},
 		{
 			"Should return deleted rows older than beginning of time + 2min and 1s",
-			models.DeleteOldLoginAttemptsCommand{OlderThan: timePlusTwoMinutes.Add(time.Second * 1)}, nil, 3,
+			DeleteOldLoginAttemptsCommand{OlderThan: timePlusTwoMinutes.Add(time.Second * 1)}, nil, 3,
 		},
 	} {
 		mockTime := beginningOfTime
-		loginAttemptService = &Service{
-			store: &xormStore{
-				db:  db.InitTestDB(t),
-				now: func() time.Time { return mockTime },
-			},
+		s := &xormStore{
+			db:  db.InitTestDB(t),
+			now: func() time.Time { return mockTime },
 		}
-		err := loginAttemptService.CreateLoginAttempt(context.Background(), &models.CreateLoginAttemptCommand{
+
+		err := s.CreateLoginAttempt(context.Background(), CreateLoginAttemptCommand{
 			Username:  user,
 			IpAddress: "192.168.0.1",
 		})
 		require.Nil(t, err)
+
 		mockTime = timePlusOneMinute
-		err = loginAttemptService.CreateLoginAttempt(context.Background(), &models.CreateLoginAttemptCommand{
+		err = s.CreateLoginAttempt(context.Background(), CreateLoginAttemptCommand{
 			Username:  user,
 			IpAddress: "192.168.0.1",
 		})
 		require.Nil(t, err)
+
 		mockTime = timePlusTwoMinutes
-		err = loginAttemptService.CreateLoginAttempt(context.Background(), &models.CreateLoginAttemptCommand{
+		err = s.CreateLoginAttempt(context.Background(), CreateLoginAttemptCommand{
 			Username:  user,
 			IpAddress: "192.168.0.1",
 		})
 		require.Nil(t, err)
-		err = loginAttemptService.DeleteOldLoginAttempts(context.Background(), &test.Cmd)
+
+		deletedRows, err := s.DeleteOldLoginAttempts(context.Background(), test.Cmd)
 		require.Equal(t, test.Err, err, test.Name)
-		require.Equal(t, test.DeletedRows, test.Cmd.DeletedRows, test.Name)
+		require.Equal(t, test.DeletedRows, deletedRows, test.Name)
 	}
 }
diff --git a/pkg/services/loginattempt/loginattempttest/fake.go b/pkg/services/loginattempt/loginattempttest/fake.go
new file mode 100644
index 00000000000..1168989af98
--- /dev/null
+++ b/pkg/services/loginattempt/loginattempttest/fake.go
@@ -0,0 +1,22 @@
+package loginattempttest
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/loginattempt"
+)
+
+var _ loginattempt.Service = new(FakeLoginAttemptService)
+
+type FakeLoginAttemptService struct {
+	ExpectedValid bool
+	ExpectedErr   error
+}
+
+func (f FakeLoginAttemptService) Add(ctx context.Context, username, IPAddress string) error {
+	return f.ExpectedErr
+}
+
+func (f FakeLoginAttemptService) Validate(ctx context.Context, username string) (bool, error) {
+	return f.ExpectedValid, f.ExpectedErr
+}
diff --git a/pkg/services/loginattempt/loginattempttest/mock.go b/pkg/services/loginattempt/loginattempttest/mock.go
new file mode 100644
index 00000000000..a74c37fd3d9
--- /dev/null
+++ b/pkg/services/loginattempt/loginattempttest/mock.go
@@ -0,0 +1,27 @@
+package loginattempttest
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/loginattempt"
+)
+
+var _ loginattempt.Service = new(MockLoginAttemptService)
+
+type MockLoginAttemptService struct {
+	AddCalled      bool
+	ValidateCalled bool
+
+	ExpectedValid bool
+	ExpectedErr   error
+}
+
+func (f *MockLoginAttemptService) Add(ctx context.Context, username, IPAddress string) error {
+	f.AddCalled = true
+	return f.ExpectedErr
+}
+
+func (f *MockLoginAttemptService) Validate(ctx context.Context, username string) (bool, error) {
+	f.ValidateCalled = true
+	return f.ExpectedValid, f.ExpectedErr
+}
diff --git a/pkg/services/sqlstore/mockstore/mockstore.go b/pkg/services/sqlstore/mockstore/mockstore.go
index 1b4757b2e93..9ce5d0990ea 100644
--- a/pkg/services/sqlstore/mockstore/mockstore.go
+++ b/pkg/services/sqlstore/mockstore/mockstore.go
@@ -17,8 +17,7 @@ type OrgListResponse []struct {
 	Response error
 }
 type SQLStoreMock struct {
-	LastGetAlertsQuery      *models.GetAlertsQuery
-	LastLoginAttemptCommand *models.CreateLoginAttemptCommand
+	LastGetAlertsQuery *models.GetAlertsQuery
 
 	ExpectedUser                   *user.User
 	ExpectedTeamsByUser            []*models.TeamDTO
@@ -28,7 +27,6 @@ type SQLStoreMock struct {
 	ExpectedDataSourcesAccessStats []*models.DataSourceAccessStats
 	ExpectedNotifierUsageStats     []*models.NotifierUsageStats
 	ExpectedSignedInUser           *user.SignedInUser
-	ExpectedLoginAttempts          int64
 
 	ExpectedError error
 }
@@ -130,11 +128,6 @@ func (m *SQLStoreMock) GetSqlxSession() *session.SessionDB {
 	return nil
 }
 
-func (m *SQLStoreMock) CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error {
-	m.LastLoginAttemptCommand = cmd
-	return m.ExpectedError
-}
-
 func (m *SQLStoreMock) GetAlertById(ctx context.Context, query *models.GetAlertByIdQuery) error {
 	query.Result = m.ExpectedAlert
 	return m.ExpectedError
@@ -144,19 +137,10 @@ func (m *SQLStoreMock) GetAlertNotificationUidWithId(ctx context.Context, query
 	return m.ExpectedError
 }
 
-func (m *SQLStoreMock) DeleteOldLoginAttempts(ctx context.Context, cmd *models.DeleteOldLoginAttemptsCommand) error {
-	return m.ExpectedError
-}
-
 func (m *SQLStoreMock) GetAlertNotificationsWithUidToSend(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) error {
 	return m.ExpectedError
 }
 
-func (m *SQLStoreMock) GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error {
-	query.Result = m.ExpectedLoginAttempts
-	return m.ExpectedError
-}
-
 func (m *SQLStoreMock) GetAlertStatesForDashboard(ctx context.Context, query *models.GetAlertStatesForDashboardQuery) error {
 	return m.ExpectedError
 }

From 19e97a1f31a6d9ad9818b2b6f5d041b4596e9693 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 22 Nov 2022 11:19:57 +0000
Subject: [PATCH 060/153] Accessibility: Improve keyboard accessibility in
 `Collapse` (#59022)

fix keyboard accessibility in Collapse
---
 packages/grafana-ui/src/components/Collapse/Collapse.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/Collapse/Collapse.tsx b/packages/grafana-ui/src/components/Collapse/Collapse.tsx
index 76f1c0c9826..9676bba702e 100644
--- a/packages/grafana-ui/src/components/Collapse/Collapse.tsx
+++ b/packages/grafana-ui/src/components/Collapse/Collapse.tsx
@@ -4,6 +4,7 @@ import React, { FunctionComponent, useState } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/ThemeContext';
+import { clearButtonStyles } from '../Button';
 import { Icon } from '../Icon/Icon';
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -71,9 +72,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     label: collapse__header;
     padding: ${theme.spacing(1, 2, 1, 2)};
     display: flex;
-    cursor: inherit;
     transition: all 0.1s linear;
-    cursor: pointer;
   `,
   headerCollapsed: css`
     label: collapse__header--collapsed;
@@ -132,6 +131,7 @@ export const Collapse = ({
   className,
   children,
 }: React.PropsWithChildren<Props>) => {
+  const buttonStyles = useStyles2(clearButtonStyles);
   const style = useStyles2(getStyles);
   const onClickToggle = () => {
     if (onToggle) {
@@ -145,10 +145,10 @@ export const Collapse = ({
 
   return (
     <div className={panelClass}>
-      <div className={headerClass} onClick={onClickToggle}>
+      <button type="button" className={cx(buttonStyles, headerClass)} onClick={onClickToggle}>
         {collapsible && <Icon className={style.icon} name={isOpen ? 'angle-down' : 'angle-right'} />}
         <div className={cx([style.headerLabel])}>{label}</div>
-      </div>
+      </button>
       {isOpen && (
         <div className={cx([style.collapseBody])}>
           <div className={loaderClass} />

From 9c4b78ae4f52ca0e00077241c27e2dcb1008cfde Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:26:07 +0100
Subject: [PATCH 061/153] Alerting: add group name validation in alert rule
 form (#59095)

Add group name validation in alert rule form
---
 .../alerting/unified/components/rule-editor/FolderAndGroup.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
index be1e2ee99b7..6b9aee47954 100644
--- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -203,6 +203,9 @@ export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
           control={control}
           rules={{
             required: { value: true, message: 'Must enter a group name' },
+            validate: {
+              pathSeparator: (group_: string) => checkForPathSeparator(group_),
+            },
           }}
         />
       </Field>

From 6c6103d573337f05b0b1430af2f977290cdc7b4f Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:46:48 +0000
Subject: [PATCH 062/153] Docs: adds workaround for editing provisioned rules
 using the HTTP API (#59094)

* Docs: adds workaround for editing provisioned rules using api

* updates text

* updates text take two
---
 .../provision-alerting-resources/_index.md       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
index 151e93f4ef4..9da57092d03 100644
--- a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
@@ -21,15 +21,25 @@ There are three options to choose from:
 
 1. Use file provisioning to provision your Grafana Alerting resources, such as alert rules and contact points, through files on disk.
 
-1. Provision your alerting resources using the Grafana HTTP API.
+1. Provision your alerting resources using the Alerting Provisioning HTTP API.
 
-   For more information on the Grafana Alerting provisioning API, refer to [Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/).
+   For more information on the Alerting Provisioning HTTP API, refer to [Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/).
+
+   **Note:**
+
+   Typically, you cannot edit API-provisioned alert rules from the Grafana UI.
+
+   In order to enable editing, add the x-disable-provenance header to the following requests when creating or editing your alert rules in the API:
+
+   POST /api/v1/provisioning/alert-rules
+
+   PUT /api/v1/provisioning/alert-rules/{UID}
 
 1. Provision your alerting resources using Terraform.
 
 **Note:**
 
-Currently, provisioning for Grafana Alerting supports alert rules, contact points, mute timings, and templates. Provisioned alerting resources can only be edited in the source that created them and not from within Grafana or any other source. For example, if you provision your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
+Currently, provisioning for Grafana Alerting supports alert rules, contact points, mute timings, and templates. Provisioned alerting resources using file provisioning or Terraform can only be edited in the source that created them and not from within Grafana or any other source. For example, if you provision your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
 
 **Useful Links:**
 

From 9926931d407f9c7389d7ec263bf729c81840dfaa Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Tue, 22 Nov 2022 14:04:09 +0200
Subject: [PATCH 063/153] Nested Folder: Include URL into the GET response
 (#59099)

---
 pkg/services/folder/folderimpl/sqlstore.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/services/folder/folderimpl/sqlstore.go b/pkg/services/folder/folderimpl/sqlstore.go
index 2b496eff878..92390db472f 100644
--- a/pkg/services/folder/folderimpl/sqlstore.go
+++ b/pkg/services/folder/folderimpl/sqlstore.go
@@ -10,6 +10,7 @@ import (
 	"github.com/go-sql-driver/mysql"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/setting"
@@ -173,6 +174,7 @@ func (ss *sqlStore) Get(ctx context.Context, q folder.GetFolderQuery) (*folder.F
 		}
 		return nil
 	})
+	foldr.Url = models.GetFolderUrl(foldr.UID, models.SlugifyTitle(foldr.Title))
 	return foldr, err
 }
 

From 460be702619428e455ba74f8fb3bb563c1bea43a Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:18:34 +0000
Subject: [PATCH 064/153] Internationalization: Change locale preference to
 language (#58359)

* backend locale -> language

* frontend locale -> language

* sample.ini and tests

* fix few last locale -> language

* fix few last locale -> language
---
 conf/defaults.ini                             |  4 +--
 conf/sample.ini                               |  4 +--
 packages/grafana-data/src/types/config.ts     |  1 +
 pkg/api/dtos/models.go                        |  1 +
 pkg/api/dtos/prefs.go                         |  6 ++--
 pkg/api/index.go                              | 15 ++++++----
 pkg/api/preferences.go                        |  6 ++--
 pkg/services/preference/model.go              |  6 ++--
 pkg/services/preference/prefimpl/pref.go      | 14 +++++-----
 pkg/services/preference/prefimpl/pref_test.go | 28 +++++++++----------
 pkg/setting/setting.go                        |  8 +++---
 public/app/app.ts                             |  4 +--
 .../SharedPreferences.test.tsx                |  8 +++---
 .../SharedPreferences/SharedPreferences.tsx   | 22 +++++++--------
 .../internationalization/constants.test.ts    |  8 +++---
 .../core/internationalization/constants.ts    | 10 +++----
 .../app/core/internationalization/index.tsx   | 12 ++++----
 public/app/core/services/context_srv.ts       |  2 ++
 public/app/core/services/echo/utils.test.ts   |  1 +
 public/app/types/preferences.ts               |  2 +-
 20 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 57b6abc9a10..050437bf0aa 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -412,8 +412,8 @@ password_hint = password
 # Default UI theme ("dark" or "light")
 default_theme = dark
 
-# Default locale (supported IETF language tag, such as en-US)
-default_locale = en-US
+# Default UI language (supported IETF language tag, such as en-US)
+default_language = en-US
 
 # Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
 home_page =
diff --git a/conf/sample.ini b/conf/sample.ini
index 4bbd7bf97e7..7c27b34819b 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -412,8 +412,8 @@
 # Default UI theme ("dark" or "light")
 ;default_theme = dark
 
-# Default locale (supported IETF language tag, such as en-US)
-;default_locale = en-US
+# Default UI language (supported IETF language tag, such as en-US)
+;default_language = en-US
 
 # Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
 ;home_page =
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 0e592167184..c6f708056b0 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -127,6 +127,7 @@ export interface CurrentUserDTO {
   timezone: string;
   weekStart: string;
   locale: string;
+  language: string;
   permissions?: Record<string, boolean>;
 }
 
diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index 31d17005756..704d573e1a3 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -44,6 +44,7 @@ type CurrentUser struct {
 	Timezone                   string             `json:"timezone"`
 	WeekStart                  string             `json:"weekStart"`
 	Locale                     string             `json:"locale"`
+	Language                   string             `json:"language"`
 	HelpFlags1                 user.HelpFlags1    `json:"helpFlags1"`
 	HasEditPermissionInFolders bool               `json:"hasEditPermissionInFolders"`
 	Permissions                UserPermissionsMap `json:"permissions,omitempty"`
diff --git a/pkg/api/dtos/prefs.go b/pkg/api/dtos/prefs.go
index 0c5ac67dc6f..4dc3d7cc97c 100644
--- a/pkg/api/dtos/prefs.go
+++ b/pkg/api/dtos/prefs.go
@@ -10,7 +10,7 @@ type Prefs struct {
 	HomeDashboardUID string                      `json:"homeDashboardUID,omitempty"`
 	Timezone         string                      `json:"timezone"`
 	WeekStart        string                      `json:"weekStart"`
-	Locale           string                      `json:"locale"`
+	Language         string                      `json:"language"`
 	Navbar           pref.NavbarPreference       `json:"navbar,omitempty"`
 	QueryHistory     pref.QueryHistoryPreference `json:"queryHistory,omitempty"`
 }
@@ -28,7 +28,7 @@ type UpdatePrefsCmd struct {
 	WeekStart    string                       `json:"weekStart"`
 	Navbar       *pref.NavbarPreference       `json:"navbar,omitempty"`
 	QueryHistory *pref.QueryHistoryPreference `json:"queryHistory,omitempty"`
-	Locale       string                       `json:"locale"`
+	Language     string                       `json:"language"`
 }
 
 // swagger:model
@@ -41,7 +41,7 @@ type PatchPrefsCmd struct {
 	// Enum: utc,browser
 	Timezone         *string                      `json:"timezone,omitempty"`
 	WeekStart        *string                      `json:"weekStart,omitempty"`
-	Locale           *string                      `json:"locale,omitempty"`
+	Language         *string                      `json:"language,omitempty"`
 	Navbar           *pref.NavbarPreference       `json:"navbar,omitempty"`
 	QueryHistory     *pref.QueryHistoryPreference `json:"queryHistory,omitempty"`
 	HomeDashboardUID *string                      `json:"homeDashboardUID,omitempty"`
diff --git a/pkg/api/index.go b/pkg/api/index.go
index e0d0b8de637..dbf621190ef 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -45,15 +45,17 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 		return nil, err
 	}
 
-	// Set locale to the preference, otherwise fall back to the accept language header.
-	// In practice, because the preference has configuration-backed default, the header
-	// shouldn't frequently be used
+	// Locale is used for some number and date/time formatting, whereas language is used just for
+	// translating words in the interface
 	acceptLangHeader := c.Req.Header.Get("Accept-Language")
 	locale := "en-US"
+	language := "" // frontend will set the default language
 
-	if hs.Features.IsEnabled(featuremgmt.FlagInternationalization) && prefs.JSONData.Locale != "" {
-		locale = prefs.JSONData.Locale
-	} else if len(acceptLangHeader) > 0 {
+	if hs.Features.IsEnabled(featuremgmt.FlagInternationalization) && prefs.JSONData.Language != "" {
+		language = prefs.JSONData.Language
+	}
+
+	if len(acceptLangHeader) > 0 {
 		parts := strings.Split(acceptLangHeader, ",")
 		locale = parts[0]
 	}
@@ -100,6 +102,7 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 			Timezone:                   prefs.Timezone,
 			WeekStart:                  weekStart,
 			Locale:                     locale,
+			Language:                   language,
 			HelpFlags1:                 c.HelpFlags1,
 			HasEditPermissionInFolders: hasEditPerm,
 		},
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
index 4b119557a14..e5e2a40a009 100644
--- a/pkg/api/preferences.go
+++ b/pkg/api/preferences.go
@@ -96,7 +96,7 @@ func (hs *HTTPServer) getPreferencesFor(ctx context.Context, orgID, userID, team
 	}
 
 	if preference.JSONData != nil {
-		dto.Locale = preference.JSONData.Locale
+		dto.Language = preference.JSONData.Language
 		dto.Navbar = preference.JSONData.Navbar
 		dto.QueryHistory = preference.JSONData.QueryHistory
 	}
@@ -149,7 +149,7 @@ func (hs *HTTPServer) updatePreferencesFor(ctx context.Context, orgID, userID, t
 		OrgID:           orgID,
 		TeamID:          teamId,
 		Theme:           dtoCmd.Theme,
-		Locale:          dtoCmd.Locale,
+		Language:        dtoCmd.Language,
 		Timezone:        dtoCmd.Timezone,
 		WeekStart:       dtoCmd.WeekStart,
 		HomeDashboardID: dtoCmd.HomeDashboardID,
@@ -212,7 +212,7 @@ func (hs *HTTPServer) patchPreferencesFor(ctx context.Context, orgID, userID, te
 		Timezone:        dtoCmd.Timezone,
 		WeekStart:       dtoCmd.WeekStart,
 		HomeDashboardID: dtoCmd.HomeDashboardID,
-		Locale:          dtoCmd.Locale,
+		Language:        dtoCmd.Language,
 		Navbar:          dtoCmd.Navbar,
 		QueryHistory:    dtoCmd.QueryHistory,
 	}
diff --git a/pkg/services/preference/model.go b/pkg/services/preference/model.go
index 3f09da21d92..9bb6a2ef22f 100644
--- a/pkg/services/preference/model.go
+++ b/pkg/services/preference/model.go
@@ -49,7 +49,7 @@ type SavePreferenceCommand struct {
 	Timezone         string                  `json:"timezone,omitempty"`
 	WeekStart        string                  `json:"weekStart,omitempty"`
 	Theme            string                  `json:"theme,omitempty"`
-	Locale           string                  `json:"locale,omitempty"`
+	Language         string                  `json:"language,omitempty"`
 	Navbar           *NavbarPreference       `json:"navbar,omitempty"`
 	QueryHistory     *QueryHistoryPreference `json:"queryHistory,omitempty"`
 }
@@ -64,7 +64,7 @@ type PatchPreferenceCommand struct {
 	Timezone         *string                 `json:"timezone,omitempty"`
 	WeekStart        *string                 `json:"weekStart,omitempty"`
 	Theme            *string                 `json:"theme,omitempty"`
-	Locale           *string                 `json:"locale,omitempty"`
+	Language         *string                 `json:"language,omitempty"`
 	Navbar           *NavbarPreference       `json:"navbar,omitempty"`
 	QueryHistory     *QueryHistoryPreference `json:"queryHistory,omitempty"`
 }
@@ -81,7 +81,7 @@ type NavbarPreference struct {
 }
 
 type PreferenceJSONData struct {
-	Locale       string                 `json:"locale"`
+	Language     string                 `json:"language"`
 	Navbar       NavbarPreference       `json:"navbar"`
 	QueryHistory QueryHistoryPreference `json:"queryHistory"`
 }
diff --git a/pkg/services/preference/prefimpl/pref.go b/pkg/services/preference/prefimpl/pref.go
index 7b9d0c5d10a..feadcbfa06e 100644
--- a/pkg/services/preference/prefimpl/pref.go
+++ b/pkg/services/preference/prefimpl/pref.go
@@ -61,8 +61,8 @@ func (s *Service) GetWithDefaults(ctx context.Context, query *pref.GetPreference
 			res.HomeDashboardID = p.HomeDashboardID
 		}
 		if p.JSONData != nil {
-			if p.JSONData.Locale != "" {
-				res.JSONData.Locale = p.JSONData.Locale
+			if p.JSONData.Language != "" {
+				res.JSONData.Language = p.JSONData.Language
 			}
 
 			if len(p.JSONData.Navbar.SavedItems) > 0 {
@@ -113,7 +113,7 @@ func (s *Service) Save(ctx context.Context, cmd *pref.SavePreferenceCommand) err
 				Created:         time.Now(),
 				Updated:         time.Now(),
 				JSONData: &pref.PreferenceJSONData{
-					Locale: cmd.Locale,
+					Language: cmd.Language,
 				},
 			}
 			_, err = s.store.Insert(ctx, preference)
@@ -131,7 +131,7 @@ func (s *Service) Save(ctx context.Context, cmd *pref.SavePreferenceCommand) err
 	preference.Version += 1
 	preference.HomeDashboardID = cmd.HomeDashboardID
 	preference.JSONData = &pref.PreferenceJSONData{
-		Locale: cmd.Locale,
+		Language: cmd.Language,
 	}
 
 	if cmd.Navbar != nil {
@@ -166,11 +166,11 @@ func (s *Service) Patch(ctx context.Context, cmd *pref.PatchPreferenceCommand) e
 		exists = true
 	}
 
-	if cmd.Locale != nil {
+	if cmd.Language != nil {
 		if preference.JSONData == nil {
 			preference.JSONData = &pref.PreferenceJSONData{}
 		}
-		preference.JSONData.Locale = *cmd.Locale
+		preference.JSONData.Language = *cmd.Language
 	}
 
 	if cmd.Navbar != nil {
@@ -238,7 +238,7 @@ func (s *Service) GetDefaults() *pref.Preference {
 	}
 
 	if s.features.IsEnabled(featuremgmt.FlagInternationalization) {
-		defaults.JSONData.Locale = s.cfg.DefaultLocale
+		defaults.JSONData.Language = s.cfg.DefaultLanguage
 	}
 
 	return defaults
diff --git a/pkg/services/preference/prefimpl/pref_test.go b/pkg/services/preference/prefimpl/pref_test.go
index 6aa09fdf1f4..0f5868b0117 100644
--- a/pkg/services/preference/prefimpl/pref_test.go
+++ b/pkg/services/preference/prefimpl/pref_test.go
@@ -33,7 +33,7 @@ func TestGetDefaults(t *testing.T) {
 		cfg:      setting.NewCfg(),
 		features: featuremgmt.WithFeatures(),
 	}
-	prefService.cfg.DefaultLocale = "en-US"
+	prefService.cfg.DefaultLanguage = "en-US"
 	prefService.cfg.DefaultTheme = "light"
 	prefService.cfg.DateFormats.DefaultTimezone = "UTC"
 	weekStart := ""
@@ -76,7 +76,7 @@ func TestGetDefaultsWithI18nFeatureFlag(t *testing.T) {
 		features: featuremgmt.WithFeatures(featuremgmt.FlagInternationalization),
 	}
 	weekStart := ""
-	prefService.cfg.DefaultLocale = "en-US"
+	prefService.cfg.DefaultLanguage = "en-US"
 	prefService.cfg.DefaultTheme = "light"
 	prefService.cfg.DateFormats.DefaultTimezone = "UTC"
 
@@ -88,7 +88,7 @@ func TestGetDefaultsWithI18nFeatureFlag(t *testing.T) {
 			Timezone:        "UTC",
 			HomeDashboardID: 0,
 			JSONData: &pref.PreferenceJSONData{
-				Locale: "en-US",
+				Language: "en-US",
 			},
 		}
 		if diff := cmp.Diff(expected, preference); diff != "" {
@@ -103,7 +103,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 		cfg:      setting.NewCfg(),
 		features: featuremgmt.WithFeatures(),
 	}
-	prefService.cfg.DefaultLocale = "en-US"
+	prefService.cfg.DefaultLanguage = "en-US"
 
 	weekStartOne := "1"
 	weekStartTwo := "2"
@@ -115,7 +115,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 			Timezone:        "UTC",
 			WeekStart:       &weekStartOne,
 			JSONData: &pref.PreferenceJSONData{
-				Locale: "en-GB",
+				Language: "en-GB",
 			},
 		},
 		pref.Preference{
@@ -126,7 +126,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 			Timezone:        "browser",
 			WeekStart:       &weekStartTwo,
 			JSONData: &pref.PreferenceJSONData{
-				Locale: "en-AU",
+				Language: "en-AU",
 			},
 		},
 	)
@@ -141,7 +141,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 			WeekStart:       &weekStartTwo,
 			HomeDashboardID: 4,
 			JSONData: &pref.PreferenceJSONData{
-				Locale: "en-AU",
+				Language: "en-AU",
 			},
 		}
 		if diff := cmp.Diff(expected, preference); diff != "" {
@@ -160,7 +160,7 @@ func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
 			WeekStart:       &weekStartOne,
 			HomeDashboardID: 1,
 			JSONData: &pref.PreferenceJSONData{
-				Locale: "en-GB",
+				Language: "en-GB",
 			},
 		}
 		if diff := cmp.Diff(expected, preference); diff != "" {
@@ -209,9 +209,9 @@ func TestGetDefaults_JSONData(t *testing.T) {
 	orgPreferencesJsonData := pref.PreferenceJSONData{
 		Navbar: orgNavbarPreferences,
 	}
-	orgPreferencesWithLocaleJsonData := pref.PreferenceJSONData{
-		Navbar: orgNavbarPreferences,
-		Locale: "en-GB",
+	orgPreferencesWithLanguageJsonData := pref.PreferenceJSONData{
+		Navbar:   orgNavbarPreferences,
+		Language: "en-GB",
 	}
 	team2PreferencesJsonData := pref.PreferenceJSONData{
 		Navbar: team2NavbarPreferences,
@@ -248,7 +248,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 		}, preference)
 	})
 
-	t.Run("user JSONData with missing locale does not override org preference", func(t *testing.T) {
+	t.Run("user JSONData with missing language does not override org preference", func(t *testing.T) {
 		prefService := &Service{
 			store:    newFake(),
 			cfg:      setting.NewCfg(),
@@ -258,7 +258,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 		insertPrefs(t, prefService.store,
 			pref.Preference{
 				OrgID:    1,
-				JSONData: &orgPreferencesWithLocaleJsonData,
+				JSONData: &orgPreferencesWithLanguageJsonData,
 			},
 			pref.Preference{
 				OrgID:    1,
@@ -273,7 +273,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 		require.Equal(t, &pref.Preference{
 			WeekStart: &weekStart,
 			JSONData: &pref.PreferenceJSONData{
-				Locale:       "en-GB",
+				Language:     "en-GB",
 				Navbar:       userNavbarPreferences,
 				QueryHistory: queryPreference,
 			},
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index dc874143e40..4754d5c028e 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -427,9 +427,9 @@ type Cfg struct {
 	LDAPSkipOrgRoleSync bool
 	LDAPAllowSignup     bool
 
-	DefaultTheme  string
-	DefaultLocale string
-	HomePage      string
+	DefaultTheme    string
+	DefaultLanguage string
+	HomePage        string
 
 	Quota QuotaSettings
 
@@ -1455,7 +1455,7 @@ func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
 	LoginHint = valueAsString(users, "login_hint", "")
 	PasswordHint = valueAsString(users, "password_hint", "")
 	cfg.DefaultTheme = valueAsString(users, "default_theme", "")
-	cfg.DefaultLocale = valueAsString(users, "default_locale", "")
+	cfg.DefaultLanguage = valueAsString(users, "default_language", "")
 	cfg.HomePage = valueAsString(users, "home_page", "")
 	ExternalUserMngLinkUrl = valueAsString(users, "external_manage_link_url", "")
 	ExternalUserMngLinkName = valueAsString(users, "external_manage_link_name", "")
diff --git a/public/app/app.ts b/public/app/app.ts
index 466e6ba6b55..cdf836281f2 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -105,7 +105,7 @@ export class GrafanaApp {
       // Let iframe container know grafana has started loading
       parent.postMessage('GrafanaAppInit', '*');
 
-      const loadLocalePromise = initializeI18n(config.bootData.user.locale);
+      const initI18nPromise = initializeI18n(config.bootData.user.language);
 
       setBackendSrv(backendSrv);
       initEchoSrv();
@@ -160,7 +160,7 @@ export class GrafanaApp {
       modalManager.init();
 
       await Promise.all([
-        loadLocalePromise,
+        initI18nPromise,
 
         // Preload selected app plugins
         await preloadPlugins(config.pluginsToPreload),
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.test.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.test.tsx
index 4e0cd8dff93..7daa5ab05c4 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.test.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.test.tsx
@@ -83,7 +83,7 @@ const mockPreferences: UserPreferencesDTO = {
   queryHistory: {
     homeTab: '',
   },
-  locale: '',
+  language: '',
 };
 
 const mockPrefsPatch = jest.fn();
@@ -152,7 +152,7 @@ describe('SharedPreferences', () => {
     expect(weekSelect).toHaveTextContent('Monday');
   });
 
-  it('renders the locale preference', async () => {
+  it('renders the language preference', async () => {
     const weekSelect = getSelectParent(screen.getByLabelText(/language/i));
     expect(weekSelect).toHaveTextContent('Default');
   });
@@ -174,7 +174,7 @@ describe('SharedPreferences', () => {
       queryHistory: {
         homeTab: '',
       },
-      locale: 'fr-FR',
+      language: 'fr-FR',
     });
   });
 
@@ -196,7 +196,7 @@ describe('SharedPreferences', () => {
       queryHistory: {
         homeTab: '',
       },
-      locale: '',
+      language: '',
     });
   });
 
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index 5254a210938..e9ab93f9867 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -19,7 +19,7 @@ import {
 } from '@grafana/ui';
 import { DashboardPicker } from 'app/core/components/Select/DashboardPicker';
 import { t, Trans } from 'app/core/internationalization';
-import { LOCALES } from 'app/core/internationalization/constants';
+import { LANGUAGES } from 'app/core/internationalization/constants';
 import { PreferencesService } from 'app/core/services/PreferencesService';
 import { UserPreferencesDTO } from 'app/types';
 
@@ -37,7 +37,7 @@ const themes: SelectableValue[] = [
 ];
 
 function getLanguageOptions(): Array<SelectableValue<string>> {
-  const languageOptions = LOCALES.map((v) => ({
+  const languageOptions = LANGUAGES.map((v) => ({
     value: v.code,
     label: v.name,
   }));
@@ -66,7 +66,7 @@ export class SharedPreferences extends PureComponent<Props, State> {
       theme: '',
       timezone: '',
       weekStart: '',
-      locale: '',
+      language: '',
       queryHistory: { homeTab: '' },
     };
   }
@@ -79,14 +79,14 @@ export class SharedPreferences extends PureComponent<Props, State> {
       theme: prefs.theme,
       timezone: prefs.timezone,
       weekStart: prefs.weekStart,
-      locale: prefs.locale,
+      language: prefs.language,
       queryHistory: prefs.queryHistory,
     });
   }
 
   onSubmitForm = async () => {
-    const { homeDashboardUID, theme, timezone, weekStart, locale, queryHistory } = this.state;
-    await this.service.update({ homeDashboardUID, theme, timezone, weekStart, locale, queryHistory });
+    const { homeDashboardUID, theme, timezone, weekStart, language, queryHistory } = this.state;
+    await this.service.update({ homeDashboardUID, theme, timezone, weekStart, language, queryHistory });
     window.location.reload();
   };
 
@@ -109,12 +109,12 @@ export class SharedPreferences extends PureComponent<Props, State> {
     this.setState({ homeDashboardUID: dashboardUID });
   };
 
-  onLocaleChanged = (locale: string) => {
-    this.setState({ locale });
+  onLanguageChanged = (language: string) => {
+    this.setState({ language });
   };
 
   render() {
-    const { theme, timezone, weekStart, homeDashboardUID, locale } = this.state;
+    const { theme, timezone, weekStart, homeDashboardUID, language } = this.state;
     const { disabled } = this.props;
     const styles = getStyles();
     const languages = getLanguageOptions();
@@ -188,8 +188,8 @@ export class SharedPreferences extends PureComponent<Props, State> {
                   data-testid="User preferences language drop down"
                 >
                   <Select
-                    value={languages.find((lang) => lang.value === locale)}
-                    onChange={(locale: SelectableValue<string>) => this.onLocaleChanged(locale.value ?? '')}
+                    value={languages.find((lang) => lang.value === language)}
+                    onChange={(lang: SelectableValue<string>) => this.onLanguageChanged(lang.value ?? '')}
                     options={languages}
                     placeholder={t('shared-preferences.fields.locale-placeholder', 'Choose language')}
                     inputId="locale-select"
diff --git a/public/app/core/internationalization/constants.test.ts b/public/app/core/internationalization/constants.test.ts
index 4b3fd705041..e0dff39d343 100644
--- a/public/app/core/internationalization/constants.test.ts
+++ b/public/app/core/internationalization/constants.test.ts
@@ -1,14 +1,14 @@
 import { uniqBy } from 'lodash';
 
-import { LOCALES, VALID_LOCALES } from './constants';
+import { LANGUAGES, VALID_LANGUAGES } from './constants';
 
 describe('internationalization constants', () => {
   it('should not have duplicate languages codes', () => {
-    const uniqLocales = uniqBy(LOCALES, (v) => v.code);
-    expect(LOCALES).toHaveLength(uniqLocales.length);
+    const uniqLocales = uniqBy(LANGUAGES, (v) => v.code);
+    expect(LANGUAGES).toHaveLength(uniqLocales.length);
   });
 
   it('should have a correct list of valid locale codes', () => {
-    expect(VALID_LOCALES).toEqual(LOCALES.map((v) => v.code));
+    expect(VALID_LANGUAGES).toEqual(LANGUAGES.map((v) => v.code));
   });
 });
diff --git a/public/app/core/internationalization/constants.ts b/public/app/core/internationalization/constants.ts
index 6e6eec3ae4e..f9d390bbf1d 100644
--- a/public/app/core/internationalization/constants.ts
+++ b/public/app/core/internationalization/constants.ts
@@ -7,9 +7,9 @@ export const GERMAN_GERMANY = 'de-DE';
 export const CHINESE_SIMPLIFIED = 'zh-Hans';
 export const PSEUDO_LOCALE = 'pseudo-LOCALE';
 
-export const DEFAULT_LOCALE = ENGLISH_US;
+export const DEFAULT_LANGUAGE = ENGLISH_US;
 
-interface LocaleDefinition {
+interface LanguageDefinitions {
   /** IETF language tag for the language e.g. en-US */
   code: string;
 
@@ -20,7 +20,7 @@ interface LocaleDefinition {
   loader: () => Promise<ResourceKey>;
 }
 
-export const LOCALES: LocaleDefinition[] = [
+export const LANGUAGES: LanguageDefinitions[] = [
   {
     code: ENGLISH_US,
     name: 'English',
@@ -53,11 +53,11 @@ export const LOCALES: LocaleDefinition[] = [
 ];
 
 if (process.env.NODE_ENV === 'development') {
-  LOCALES.push({
+  LANGUAGES.push({
     code: PSEUDO_LOCALE,
     name: 'Pseudo-locale',
     loader: () => import('../../../locales/pseudo-LOCALE/grafana.json'),
   });
 }
 
-export const VALID_LOCALES = LOCALES.map((v) => v.code);
+export const VALID_LANGUAGES = LANGUAGES.map((v) => v.code);
diff --git a/public/app/core/internationalization/index.tsx b/public/app/core/internationalization/index.tsx
index d06f0d7f8c8..ffdfe5ff56c 100644
--- a/public/app/core/internationalization/index.tsx
+++ b/public/app/core/internationalization/index.tsx
@@ -2,13 +2,13 @@ import i18n, { BackendModule } from 'i18next';
 import React from 'react';
 import { Trans as I18NextTrans, initReactI18next } from 'react-i18next'; // eslint-disable-line no-restricted-imports
 
-import { DEFAULT_LOCALE, LOCALES, VALID_LOCALES } from './constants';
+import { DEFAULT_LANGUAGE, LANGUAGES, VALID_LANGUAGES } from './constants';
 
 const loadTranslations: BackendModule = {
   type: 'backend',
   init() {},
   async read(language, namespace, callback) {
-    const localeDef = LOCALES.find((v) => v.code === language);
+    const localeDef = LANGUAGES.find((v) => v.code === language);
 
     if (!localeDef) {
       return callback(new Error('No message loader available for ' + language), null);
@@ -19,8 +19,8 @@ const loadTranslations: BackendModule = {
   },
 };
 
-export function initializeI18n(locale: string) {
-  const validLocale = VALID_LOCALES.includes(locale) ? locale : DEFAULT_LOCALE;
+export function initializeI18n(language: string) {
+  const validLocale = VALID_LANGUAGES.includes(language) ? language : DEFAULT_LANGUAGE;
 
   i18n
     .use(loadTranslations)
@@ -47,7 +47,7 @@ export function initializeI18n(locale: string) {
 }
 
 export function changeLanguage(locale: string) {
-  const validLocale = VALID_LOCALES.includes(locale) ? locale : DEFAULT_LOCALE;
+  const validLocale = VALID_LANGUAGES.includes(locale) ? locale : DEFAULT_LANGUAGE;
   return i18n.changeLanguage(validLocale);
 }
 
@@ -63,7 +63,7 @@ export const i18nDate = (value: number | Date | string, format: Intl.DateTimeFor
   if (typeof value === 'string') {
     return i18nDate(new Date(value), format);
   }
-  const locale = i18n.options.lng ?? DEFAULT_LOCALE;
+  const locale = i18n.options.lng ?? DEFAULT_LANGUAGE;
 
   const dateFormatter = new Intl.DateTimeFormat(locale, format);
   return dateFormatter.format(value);
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index c8511c5aaa9..fe1c8dc41b1 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -24,6 +24,7 @@ export class User implements CurrentUserInternal {
   timezone: string;
   weekStart: string;
   locale: string;
+  language: string;
   helpFlags1: number;
   hasEditPermissionInFolders: boolean;
   permissions?: UserPermission;
@@ -47,6 +48,7 @@ export class User implements CurrentUserInternal {
     this.email = '';
     this.name = '';
     this.locale = '';
+    this.language = '';
     this.weekStart = '';
     this.gravatarUrl = '';
 
diff --git a/public/app/core/services/echo/utils.test.ts b/public/app/core/services/echo/utils.test.ts
index 06406970ab5..353f32ec936 100644
--- a/public/app/core/services/echo/utils.test.ts
+++ b/public/app/core/services/echo/utils.test.ts
@@ -18,6 +18,7 @@ const baseUser: CurrentUserDTO = {
   timezone: 'browser',
   weekStart: 'browser',
   locale: 'en-AU',
+  language: 'en-US',
   externalUserId: '',
 };
 
diff --git a/public/app/types/preferences.ts b/public/app/types/preferences.ts
index 85a1e8420a2..c6b37f94fad 100644
--- a/public/app/types/preferences.ts
+++ b/public/app/types/preferences.ts
@@ -3,7 +3,7 @@ import { TimeZone } from '@grafana/data';
 export interface UserPreferencesDTO {
   timezone: TimeZone;
   weekStart: string;
-  locale: string;
+  language: string;
   // It is undefined when there is not dashboard assigned (default)
   homeDashboardUID?: string;
   theme: string;

From 4d8287b319514b750617c20c130ffc424a3ecf2c Mon Sep 17 00:00:00 2001
From: Denis Limarev <denislimarev@gmail.com>
Date: Tue, 22 Nov 2022 18:24:36 +0600
Subject: [PATCH 065/153] Performance: add preallocation for some slice/map
 (#57860)

This change preallocates slices and maps where the size of the data is known before the object is created.

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
---
 pkg/api/dtos/models.go                               |  2 +-
 pkg/api/frontendlogging/sentry.go                    |  2 +-
 .../manager/loader/initializer/initializer.go        |  2 +-
 .../ngalert/notifier/channels/alertmanager.go        | 12 +++++++-----
 pkg/services/provisioning/dashboards/types.go        |  4 ++--
 pkg/services/sqlstore/migrations/ualert/channel.go   |  2 +-
 pkg/services/updatechecker/plugins.go                |  2 +-
 pkg/tsdb/prometheus/querydata/request.go             |  2 +-
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index 704d573e1a3..9fa6eb79667 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -88,7 +88,7 @@ func (mr *MetricRequest) GetUniqueDatasourceTypes() []string {
 		}
 	}
 
-	res := make([]string, 0)
+	res := make([]string, 0, len(dsTypes))
 	for dsType := range dsTypes {
 		res = append(res, dsType)
 	}
diff --git a/pkg/api/frontendlogging/sentry.go b/pkg/api/frontendlogging/sentry.go
index c91e3a47177..032bb874ef1 100644
--- a/pkg/api/frontendlogging/sentry.go
+++ b/pkg/api/frontendlogging/sentry.go
@@ -59,7 +59,7 @@ func (value *FrontendSentryExceptionValue) FmtStacktrace(store *SourceMapStore)
 }
 
 func (exception *FrontendSentryException) FmtStacktraces(store *SourceMapStore) string {
-	var stacktraces []string
+	stacktraces := make([]string, 0, len(exception.Values))
 	for _, value := range exception.Values {
 		stacktraces = append(stacktraces, value.FmtStacktrace(store))
 	}
diff --git a/pkg/plugins/manager/loader/initializer/initializer.go b/pkg/plugins/manager/loader/initializer/initializer.go
index 4c5f6cdc50b..b484882c635 100644
--- a/pkg/plugins/manager/loader/initializer/initializer.go
+++ b/pkg/plugins/manager/loader/initializer/initializer.go
@@ -87,7 +87,7 @@ func (i *Initializer) awsEnvVars() []string {
 type pluginSettings map[string]string
 
 func (ps pluginSettings) asEnvVar(prefix string, hostEnv []string) []string {
-	var env []string
+	env := make([]string, 0, len(ps))
 	for k, v := range ps {
 		key := fmt.Sprintf("%s_%s", prefix, strings.ToUpper(k))
 		if value := os.Getenv(key); value != "" {
diff --git a/pkg/services/ngalert/notifier/channels/alertmanager.go b/pkg/services/ngalert/notifier/channels/alertmanager.go
index befbb002f7c..9d5d32e4531 100644
--- a/pkg/services/ngalert/notifier/channels/alertmanager.go
+++ b/pkg/services/ngalert/notifier/channels/alertmanager.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-
 	"net/url"
 	"strings"
 
@@ -34,18 +33,21 @@ func NewAlertmanagerConfig(config *NotificationChannelConfig, fn GetDecryptedVal
 	if urlStr == "" {
 		return nil, errors.New("could not find url property in settings")
 	}
-	var urls []*url.URL
-	for _, uS := range strings.Split(urlStr, ",") {
+
+	urlParts := strings.Split(urlStr, ",")
+	urls := make([]*url.URL, 0, len(urlParts))
+
+	for _, uS := range urlParts {
 		uS = strings.TrimSpace(uS)
 		if uS == "" {
 			continue
 		}
 		uS = strings.TrimSuffix(uS, "/") + "/api/v1/alerts"
-		url, err := url.Parse(uS)
+		u, err := url.Parse(uS)
 		if err != nil {
 			return nil, fmt.Errorf("invalid url property in settings: %w", err)
 		}
-		urls = append(urls, url)
+		urls = append(urls, u)
 	}
 	return &AlertmanagerConfig{
 		NotificationChannelConfig: config,
diff --git a/pkg/services/provisioning/dashboards/types.go b/pkg/services/provisioning/dashboards/types.go
index b565085dceb..8a4c200d5f8 100644
--- a/pkg/services/provisioning/dashboards/types.go
+++ b/pkg/services/provisioning/dashboards/types.go
@@ -74,7 +74,7 @@ func createDashboardJSON(data *simplejson.Json, lastModified time.Time, cfg *con
 }
 
 func mapV0ToDashboardsAsConfig(v0 []*configV0) ([]*config, error) {
-	var r []*config
+	r := make([]*config, 0, len(v0))
 	seen := make(map[string]bool)
 
 	for _, v := range v0 {
@@ -101,7 +101,7 @@ func mapV0ToDashboardsAsConfig(v0 []*configV0) ([]*config, error) {
 }
 
 func (dc *configV1) mapToDashboardsAsConfig() ([]*config, error) {
-	var r []*config
+	r := make([]*config, 0, len(dc.Providers))
 	seen := make(map[string]bool)
 
 	for _, v := range dc.Providers {
diff --git a/pkg/services/sqlstore/migrations/ualert/channel.go b/pkg/services/sqlstore/migrations/ualert/channel.go
index e6ce68cb93f..01981b47a5d 100644
--- a/pkg/services/sqlstore/migrations/ualert/channel.go
+++ b/pkg/services/sqlstore/migrations/ualert/channel.go
@@ -212,7 +212,7 @@ func (m *migration) createNotifier(c *notificationChannel) (*PostableGrafanaRece
 
 // Create one receiver for every unique notification channel.
 func (m *migration) createReceivers(allChannels []*notificationChannel) (map[uidOrID]*PostableApiReceiver, []*PostableApiReceiver, error) {
-	var receivers []*PostableApiReceiver
+	receivers := make([]*PostableApiReceiver, 0, len(allChannels))
 	receiversMap := make(map[uidOrID]*PostableApiReceiver)
 
 	set := make(map[string]struct{}) // Used to deduplicate sanitized names.
diff --git a/pkg/services/updatechecker/plugins.go b/pkg/services/updatechecker/plugins.go
index 8ba7c27348d..bd3ce31896d 100644
--- a/pkg/services/updatechecker/plugins.go
+++ b/pkg/services/updatechecker/plugins.go
@@ -146,7 +146,7 @@ func canUpdate(v1, v2 string) bool {
 }
 
 func (s *PluginsService) pluginIDsCSV(m map[string]plugins.PluginDTO) string {
-	var ids []string
+	ids := make([]string, 0, len(m))
 	for pluginID := range m {
 		ids = append(ids, pluginID)
 	}
diff --git a/pkg/tsdb/prometheus/querydata/request.go b/pkg/tsdb/prometheus/querydata/request.go
index e6ab6b4e123..cce1f4dfefc 100644
--- a/pkg/tsdb/prometheus/querydata/request.go
+++ b/pkg/tsdb/prometheus/querydata/request.go
@@ -185,7 +185,7 @@ func (s *QueryData) trace(ctx context.Context, q *models.Query) (context.Context
 }
 
 func sdkHeaderToHttpHeader(headers map[string]string) http.Header {
-	httpHeader := make(http.Header)
+	httpHeader := make(http.Header, len(headers))
 	for key, val := range headers {
 		httpHeader[key] = []string{val}
 	}

From 91582ba03d74a8d43c8f2f2c37d219122910cda3 Mon Sep 17 00:00:00 2001
From: Marcos de Oliveira <markinholiveira@gmail.com>
Date: Tue, 22 Nov 2022 09:47:53 -0300
Subject: [PATCH 066/153] LDAP: Make LDAP attribute mapping case-insensitive
 (#58992)

* Make LDAP attribute mapping case-insensitive

* Add test case with attribute name different from schema's

* Add fix to getArrayAttribute also and add test with mismatched letter
case.

* Update pkg/services/ldap/helpers.go

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
---
 pkg/services/ldap/helpers.go           |  4 ++--
 pkg/services/ldap/ldap_helpers_test.go | 29 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pkg/services/ldap/helpers.go b/pkg/services/ldap/helpers.go
index 851725f2d19..384f2adb7c4 100644
--- a/pkg/services/ldap/helpers.go
+++ b/pkg/services/ldap/helpers.go
@@ -34,7 +34,7 @@ func getAttribute(name string, entry *ldap.Entry) string {
 	}
 
 	for _, attr := range entry.Attributes {
-		if attr.Name == name {
+		if strings.EqualFold(attr.Name, name) {
 			if len(attr.Values) > 0 {
 				return attr.Values[0]
 			}
@@ -49,7 +49,7 @@ func getArrayAttribute(name string, entry *ldap.Entry) []string {
 	}
 
 	for _, attr := range entry.Attributes {
-		if attr.Name == name && len(attr.Values) > 0 {
+		if strings.EqualFold(attr.Name, name) && len(attr.Values) > 0 {
 			return attr.Values
 		}
 	}
diff --git a/pkg/services/ldap/ldap_helpers_test.go b/pkg/services/ldap/ldap_helpers_test.go
index 887a2a0a5df..bf45cb0b0a3 100644
--- a/pkg/services/ldap/ldap_helpers_test.go
+++ b/pkg/services/ldap/ldap_helpers_test.go
@@ -83,6 +83,20 @@ func TestGetAttribute(t *testing.T) {
 		assert.Equal(t, value, result)
 	})
 
+	t.Run("letter case mismatch", func(t *testing.T) {
+		value := "roelgerrits"
+		entry := &ldap.Entry{
+			Attributes: []*ldap.EntryAttribute{
+				{
+					Name: "sAMAccountName", Values: []string{value},
+				},
+			},
+		}
+
+		result := getAttribute("samaccountname", entry)
+		assert.Equal(t, value, result)
+	})
+
 	t.Run("no result", func(t *testing.T) {
 		value := []string{"roelgerrits"}
 		entry := &ldap.Entry{
@@ -124,6 +138,21 @@ func TestGetArrayAttribute(t *testing.T) {
 		assert.EqualValues(t, value, result)
 	})
 
+	t.Run("letter case mismatch", func(t *testing.T) {
+		value := []string{"CN=Administrators,CN=Builtin,DC=grafana,DC=org"}
+		entry := &ldap.Entry{
+			Attributes: []*ldap.EntryAttribute{
+				{
+					Name: "memberOf", Values: value,
+				},
+			},
+		}
+
+		result := getArrayAttribute("memberof", entry)
+
+		assert.EqualValues(t, value, result)
+	})
+
 	t.Run("no result", func(t *testing.T) {
 		value := []string{"roelgerrits"}
 		entry := &ldap.Entry{

From afeb21e300bb6001534005b38a2c5890cdf0b482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 22 Nov 2022 13:49:03 +0100
Subject: [PATCH 067/153] yarn: commit files to make yarn-install reproducible
 (#55979)

---
 .../rst2html-https-e87da7ea2f-63d5ff3068.zip   | Bin 0 -> 48895 bytes
 ...tether-drop-https-3382d2649f-a10a7337d5.zip | Bin 0 -> 317519 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .yarn/cache/rst2html-https-e87da7ea2f-63d5ff3068.zip
 create mode 100644 .yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip

diff --git a/.yarn/cache/rst2html-https-e87da7ea2f-63d5ff3068.zip b/.yarn/cache/rst2html-https-e87da7ea2f-63d5ff3068.zip
new file mode 100644
index 0000000000000000000000000000000000000000..245557fb35155454ea34da2c3b4fde64e15956b2
GIT binary patch
literal 48895
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
XRs!^^ssaGOe0}b|+PM3+KaTzn_g5mF

literal 0
HcmV?d00001

diff --git a/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip b/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip
new file mode 100644
index 0000000000000000000000000000000000000000..1602b2e6742fa41b4d25d7209d749aadf377ee8d
GIT binary patch
literal 317519
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%0DN4<-CjB|(*K4+
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%0AVe2VF
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
JalBgv`ahf?H+ld7

literal 0
HcmV?d00001


From 08e87a217c59de3512b3902475485885fa88cfb6 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Tue, 22 Nov 2022 14:02:30 +0100
Subject: [PATCH 068/153] Loki: Add `gzip` compression to resource calls
 (#59059)

* Loki: Add compression to `callResource`

* add missing tests

* fix formatting
---
 pkg/tsdb/loki/api.go      | 25 ++++++++++++++++++++-----
 pkg/tsdb/loki/api_mock.go | 31 +++++++++++++++++++++++++++++++
 pkg/tsdb/loki/api_test.go | 15 +++++++++++++++
 pkg/tsdb/loki/loki.go     | 24 ++++++++++++++++--------
 4 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/pkg/tsdb/loki/api.go b/pkg/tsdb/loki/api.go
index 553cc9bdf4d..15743e5efeb 100644
--- a/pkg/tsdb/loki/api.go
+++ b/pkg/tsdb/loki/api.go
@@ -24,6 +24,11 @@ type LokiAPI struct {
 	headers map[string]string
 }
 
+type RawLokiResponse struct {
+	Body     []byte
+	Encoding string
+}
+
 func newLokiAPI(client *http.Client, url string, log log.Logger, headers map[string]string) *LokiAPI {
 	return &LokiAPI{client: client, url: url, log: log, headers: headers}
 }
@@ -204,15 +209,15 @@ func makeRawRequest(ctx context.Context, lokiDsUrl string, resourcePath string,
 	return req, nil
 }
 
-func (api *LokiAPI) RawQuery(ctx context.Context, resourcePath string) ([]byte, error) {
+func (api *LokiAPI) RawQuery(ctx context.Context, resourcePath string) (RawLokiResponse, error) {
 	req, err := makeRawRequest(ctx, api.url, resourcePath, api.headers)
 	if err != nil {
-		return nil, err
+		return RawLokiResponse{}, err
 	}
 
 	resp, err := api.client.Do(req)
 	if err != nil {
-		return nil, err
+		return RawLokiResponse{}, err
 	}
 
 	defer func() {
@@ -222,8 +227,18 @@ func (api *LokiAPI) RawQuery(ctx context.Context, resourcePath string) ([]byte,
 	}()
 
 	if resp.StatusCode/100 != 2 {
-		return nil, makeLokiError(resp.Body)
+		return RawLokiResponse{}, makeLokiError(resp.Body)
 	}
 
-	return io.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return RawLokiResponse{}, err
+	}
+
+	encodedBytes := RawLokiResponse{
+		Body:     body,
+		Encoding: resp.Header.Get("Content-Encoding"),
+	}
+
+	return encodedBytes, nil
 }
diff --git a/pkg/tsdb/loki/api_mock.go b/pkg/tsdb/loki/api_mock.go
index ae54fb85293..425c0a885a0 100644
--- a/pkg/tsdb/loki/api_mock.go
+++ b/pkg/tsdb/loki/api_mock.go
@@ -32,6 +32,29 @@ func (mockedRT *mockedRoundTripper) RoundTrip(req *http.Request) (*http.Response
 	}, nil
 }
 
+type mockedCompressedRoundTripper struct {
+	statusCode      int
+	responseBytes   []byte
+	contentType     string
+	requestCallback mockRequestCallback
+}
+
+func (mockedRT *mockedCompressedRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	requestCallback := mockedRT.requestCallback
+	if requestCallback != nil {
+		requestCallback(req)
+	}
+
+	header := http.Header{}
+	header.Add("Content-Type", mockedRT.contentType)
+	header.Add("Content-Encoding", "gzip")
+	return &http.Response{
+		StatusCode: mockedRT.statusCode,
+		Header:     header,
+		Body:       io.NopCloser(bytes.NewReader(mockedRT.responseBytes)),
+	}, nil
+}
+
 func makeMockedAPI(statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback) *LokiAPI {
 	return makeMockedAPIWithUrl("http://localhost:9999", statusCode, contentType, responseBytes, requestCallback)
 }
@@ -43,3 +66,11 @@ func makeMockedAPIWithUrl(url string, statusCode int, contentType string, respon
 
 	return newLokiAPI(&client, url, log.New("test"), nil)
 }
+
+func makeCompressedMockedAPIWithUrl(url string, statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback) *LokiAPI {
+	client := http.Client{
+		Transport: &mockedCompressedRoundTripper{statusCode: statusCode, contentType: contentType, responseBytes: responseBytes, requestCallback: requestCallback},
+	}
+
+	return newLokiAPI(&client, url, log.New("test"), nil)
+}
diff --git a/pkg/tsdb/loki/api_test.go b/pkg/tsdb/loki/api_test.go
index 4db38dd14f3..2b64e383bf4 100644
--- a/pkg/tsdb/loki/api_test.go
+++ b/pkg/tsdb/loki/api_test.go
@@ -150,3 +150,18 @@ func TestApiUrlHandling(t *testing.T) {
 		})
 	}
 }
+
+func TestApiReturnValues(t *testing.T) {
+	t.Run("Loki should return the right encoding", func(t *testing.T) {
+		called := false
+		api := makeCompressedMockedAPIWithUrl("http://localhost:3100", 200, "application/json", []byte("foo"), func(req *http.Request) {
+			called = true
+		})
+
+		encodedBytes, err := api.RawQuery(context.Background(), "/loki/api/v1/labels?start=1&end=2")
+		require.NoError(t, err)
+		require.True(t, called)
+		require.Equal(t, "gzip", encodedBytes.Encoding)
+		require.Equal(t, []byte("foo"), encodedBytes.Body)
+	})
+}
diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index 49c1f46b909..12a2d8561a7 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -119,7 +119,7 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 	return callResource(ctx, req, sender, dsInfo, logger.FromContext(ctx))
 }
 
-func getAuthHeadersForCallResource(headers map[string][]string) map[string]string {
+func getHeadersForCallResource(headers map[string][]string) map[string]string {
 	data := make(map[string]string)
 
 	if auth := arrayHeaderFirstValue(headers["Authorization"]); auth != "" {
@@ -134,6 +134,10 @@ func getAuthHeadersForCallResource(headers map[string][]string) map[string]strin
 		data["X-ID-Token"] = idToken
 	}
 
+	if encType := arrayHeaderFirstValue(headers["Accept-Encoding"]); encType != "" {
+		data["Accept-Encoding"] = encType
+	}
+
 	return data
 }
 
@@ -151,19 +155,23 @@ func callResource(ctx context.Context, req *backend.CallResourceRequest, sender
 	}
 	lokiURL := fmt.Sprintf("/loki/api/v1/%s", url)
 
-	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, getAuthHeadersForCallResource(req.Headers))
-	bytes, err := api.RawQuery(ctx, lokiURL)
+	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, getHeadersForCallResource(req.Headers))
+	encodedBytes, err := api.RawQuery(ctx, lokiURL)
 
 	if err != nil {
 		return err
 	}
 
+	respHeaders := map[string][]string{
+		"content-type": {"application/json"},
+	}
+	if encodedBytes.Encoding != "" {
+		respHeaders["content-encoding"] = []string{encodedBytes.Encoding}
+	}
 	return sender.Send(&backend.CallResourceResponse{
-		Status: http.StatusOK,
-		Headers: map[string][]string{
-			"content-type": {"application/json"},
-		},
-		Body: bytes,
+		Status:  http.StatusOK,
+		Headers: respHeaders,
+		Body:    encodedBytes.Body,
 	})
 }
 

From 4eed56193ffde622f2fed26fcbf3ada79518ccc0 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 22 Nov 2022 13:31:47 +0000
Subject: [PATCH 069/153] DataSourceWithBackend - Set postResource method to
 POST (#59114)

Set postResource method to POST
---
 packages/grafana-runtime/src/utils/DataSourceWithBackend.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
index 15c2bd947e3..b35a7485368 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
@@ -299,7 +299,7 @@ class DataSourceWithBackend<
     const result = await lastValueFrom(
       getBackendSrv().fetch<T>({
         ...options,
-        method: 'GET',
+        method: 'POST',
         headers: options?.headers ? { ...options.headers, ...headers } : headers,
         data: data ?? { ...data },
         url: `/api/datasources/${this.id}/resources/${path}`,

From 42baad837a6241acbd59b266311d291345a1e4a3 Mon Sep 17 00:00:00 2001
From: sam boyer <sdboyer@grafana.com>
Date: Tue, 22 Nov 2022 09:00:29 -0500
Subject: [PATCH 070/153] codegen: Refactor core jennies for reusability, add
 version-picking metajennies (#58995)

* Add each-major jenny, refactor TS jenny for it

* Introduce LatestJenny, refactor GoTypesJenny for it
---
 kinds/gen.go                                  | 11 +--
 .../raw/dashboard/x/dashboard_types.gen.ts    |  1 +
 .../src/raw/playlist/x/playlist_types.gen.ts  |  1 +
 pkg/codegen/generators.go                     | 48 ++++++----
 pkg/codegen/jenny_eachmajor.go                | 74 +++++++++++++++
 pkg/codegen/jenny_gotypes.go                  | 89 +++----------------
 pkg/codegen/jenny_tstypes.go                  | 79 +++-------------
 pkg/codegen/latest_jenny.go                   | 56 ++++++++++++
 pkg/codegen/tmpl.go                           |  7 ++
 pkg/codegen/tmpl/gen_header.tmpl              | 11 +++
 pkg/kinds/dashboard/dashboard_types_gen.go    |  1 +
 pkg/kinds/playlist/playlist_types_gen.go      |  1 +
 12 files changed, 206 insertions(+), 173 deletions(-)
 create mode 100644 pkg/codegen/jenny_eachmajor.go
 create mode 100644 pkg/codegen/latest_jenny.go
 create mode 100644 pkg/codegen/tmpl/gen_header.tmpl

diff --git a/kinds/gen.go b/kinds/gen.go
index 41f0d527049..f9981203e17 100644
--- a/kinds/gen.go
+++ b/kinds/gen.go
@@ -21,8 +21,6 @@ import (
 	"github.com/grafana/grafana/pkg/kindsys"
 )
 
-const sep = string(filepath.Separator)
-
 func main() {
 	if len(os.Args) > 1 {
 		fmt.Fprintf(os.Stderr, "plugin thema code generator does not currently accept any arguments\n, got %q", os.Args)
@@ -37,16 +35,11 @@ func main() {
 
 	// All the jennies that comprise the core kinds generator pipeline
 	coreKindsGen.Append(
-		codegen.GoTypesJenny(kindsys.GoCoreKindParentPath, nil),
+		codegen.LatestJenny(kindsys.GoCoreKindParentPath, codegen.GoTypesJenny{}),
 		codegen.CoreStructuredKindJenny(kindsys.GoCoreKindParentPath, nil),
 		codegen.RawKindJenny(kindsys.GoCoreKindParentPath, nil),
 		codegen.BaseCoreRegistryJenny(filepath.Join("pkg", "registry", "corekind"), kindsys.GoCoreKindParentPath),
-		codegen.TSTypesJenny(kindsys.TSCoreKindParentPath, &codegen.TSTypesGeneratorConfig{
-			GenDirName: func(decl *codegen.DeclForGen) string {
-				// FIXME this hardcodes always generating to experimental dir. OK for now, but need generator fanout
-				return filepath.Join(decl.Meta.Common().MachineName, "x")
-			},
-		}),
+		codegen.LatestMajorsOrXJenny(kindsys.TSCoreKindParentPath, codegen.TSTypesJenny{}),
 		codegen.TSVeneerIndexJenny(filepath.Join("packages", "grafana-schema", "src")),
 	)
 
diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
index 7bcf55da260..f89a0ae4abf 100644
--- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
@@ -4,6 +4,7 @@
 //     kinds/gen.go
 // Using jennies:
 //     TSTypesJenny
+//     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts b/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
index 1e1ceeabd8d..a4fe7fc3d15 100644
--- a/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
+++ b/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
@@ -4,6 +4,7 @@
 //     kinds/gen.go
 // Using jennies:
 //     TSTypesJenny
+//     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/codegen/generators.go b/pkg/codegen/generators.go
index 11820333f7a..1a56f71a5b4 100644
--- a/pkg/codegen/generators.go
+++ b/pkg/codegen/generators.go
@@ -57,7 +57,6 @@ func StructuredForGen(k kindsys.Structured) *DeclForGen {
 type DeclForGen struct {
 	*kindsys.SomeDecl
 	lin thema.Lineage
-	sch thema.Lineage
 }
 
 // Lineage returns the [thema.Lineage] for the underlying [kindsys.SomeDecl].
@@ -65,10 +64,15 @@ func (decl *DeclForGen) Lineage() thema.Lineage {
 	return decl.lin
 }
 
-// Schema returns the [thema.Schema] that a jenny should operate against, for those
-// jennies that target a single schema.
-func (decl *DeclForGen) Schema() thema.Lineage {
-	return decl.sch
+// ForLatestSchema returns a [SchemaForGen] for the latest schema in this
+// DeclForGen's lineage.
+func (decl *DeclForGen) ForLatestSchema() SchemaForGen {
+	comm := decl.Meta.Common()
+	return SchemaForGen{
+		Name:    comm.Name,
+		Schema:  decl.Lineage().Latest(),
+		IsGroup: comm.LineageIsGroup,
+	}
 }
 
 // SlashHeaderMapper produces a FileMapper that injects a comment header onto
@@ -82,22 +86,28 @@ func SlashHeaderMapper(maingen string) codejen.FileMapper {
 		case ".json", ".yml", ".yaml":
 			return f, nil
 		default:
-			b := new(bytes.Buffer)
-			fmt.Fprintf(b, headerTmpl, filepath.ToSlash(maingen), f.FromString())
-			fmt.Fprint(b, string(f.Data))
-			f.Data = b.Bytes()
+			buf := new(bytes.Buffer)
+			if err := tmpls.Lookup("gen_header.tmpl").Execute(buf, tvars_gen_header{
+				MainGenerator: maingen,
+				Using:         f.From,
+			}); err != nil {
+				return codejen.File{}, fmt.Errorf("failed executing gen header template: %w", err)
+			}
+			fmt.Fprint(buf, string(f.Data))
+			f.Data = buf.Bytes()
 		}
 		return f, nil
 	}
 }
 
-var headerTmpl = `// THIS FILE IS GENERATED. EDITING IS FUTILE.
-//
-// Generated by:
-//     %s
-// Using jennies:
-//     %s
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-`
+// SchemaForGen is an intermediate values type for jennies that holds both a thema.Schema,
+// and values relevant to generating the schema that should properly, eventually, be in
+// thema itself.
+type SchemaForGen struct {
+	// The PascalCase name of the schematized type.
+	Name string
+	// The schema to be rendered for the type itself.
+	Schema thema.Schema
+	// Whether the schema is grouped. See https://github.com/grafana/thema/issues/62
+	IsGroup bool
+}
diff --git a/pkg/codegen/jenny_eachmajor.go b/pkg/codegen/jenny_eachmajor.go
new file mode 100644
index 00000000000..766fcad5bf0
--- /dev/null
+++ b/pkg/codegen/jenny_eachmajor.go
@@ -0,0 +1,74 @@
+package codegen
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/grafana/codejen"
+	"github.com/grafana/grafana/pkg/kindsys"
+)
+
+// LatestMajorsOrXJenny returns a jenny that repeats the input for the latest in each major version,
+func LatestMajorsOrXJenny(parentdir string, inner codejen.OneToOne[SchemaForGen]) OneToMany {
+	if inner == nil {
+		panic("inner jenny must not be nil")
+	}
+
+	return &lmox{
+		parentdir: parentdir,
+		inner:     inner,
+	}
+}
+
+type lmox struct {
+	parentdir string
+	inner     codejen.OneToOne[SchemaForGen]
+}
+
+func (j *lmox) JennyName() string {
+	return "LatestMajorsOrXJenny"
+}
+
+func (j *lmox) Generate(decl *DeclForGen) (codejen.Files, error) {
+	if decl.IsRaw() {
+		return nil, nil
+	}
+	comm := decl.Meta.Common()
+	sfg := SchemaForGen{
+		Name:    comm.Name,
+		IsGroup: comm.LineageIsGroup,
+	}
+
+	do := func(sfg SchemaForGen, infix string) (codejen.Files, error) {
+		f, err := j.inner.Generate(sfg)
+		if err != nil {
+			return nil, fmt.Errorf("%s jenny failed on %s schema for %s: %w", j.inner.JennyName(), sfg.Schema.Version(), decl.Meta.Common().Name, err)
+		}
+		if f == nil || !f.Exists() {
+			return nil, nil
+		}
+
+		f.RelativePath = filepath.Join(j.parentdir, comm.MachineName, infix, f.RelativePath)
+		f.From = append(f.From, j)
+		return codejen.Files{*f}, nil
+	}
+
+	if comm.Maturity.Less(kindsys.MaturityStable) {
+		sfg.Schema = decl.Lineage().Latest()
+		return do(sfg, "x")
+	}
+
+	var fl codejen.Files
+	for sch := decl.Lineage().First(); sch != nil; sch.Successor() {
+		sfg.Schema = sch.LatestInMajor()
+		files, err := do(sfg, fmt.Sprintf("v%v", sch.Version()[0]))
+		if err != nil {
+			return nil, err
+		}
+		fl = append(fl, files...)
+	}
+	if fl.Validate() != nil {
+		return nil, fl.Validate()
+	}
+	return fl, nil
+}
diff --git a/pkg/codegen/jenny_gotypes.go b/pkg/codegen/jenny_gotypes.go
index 5d933ee6857..c662455eda4 100644
--- a/pkg/codegen/jenny_gotypes.go
+++ b/pkg/codegen/jenny_gotypes.go
@@ -1,98 +1,29 @@
 package codegen
 
 import (
-	"fmt"
-	"path/filepath"
-
 	"github.com/grafana/codejen"
-	"github.com/grafana/thema"
 	"github.com/grafana/thema/encoding/gocode"
 	"golang.org/x/tools/go/ast/astutil"
 )
 
-// GoTypesJenny creates a [OneToOne] that produces Go types for the latest
-// Thema schema in a structured kind's lineage.
-//
-// At minimum, a gokindsdir must be provided. This should be the path to the parent
-// directory of the directory in which the types should be generated, relative
-// to the project root. For example, if the types for a kind named "foo"
-// should live at pkg/kind/foo/foo_gen.go, relpath should be "pkg/kind".
-//
-// This generator is a no-op for raw kinds.
-func GoTypesJenny(gokindsdir string, cfg *GoTypesGeneratorConfig) OneToOne {
-	if cfg == nil {
-		cfg = new(GoTypesGeneratorConfig)
-	}
-	if cfg.GenDirName == nil {
-		cfg.GenDirName = func(decl *DeclForGen) string {
-			return decl.Meta.Common().MachineName
-		}
-	}
+// GoTypesJenny creates a [OneToOne] that produces Go types for the provided
+// [thema.Schema].
+type GoTypesJenny struct{}
 
-	return &genGoTypes{
-		gokindsdir: gokindsdir,
-		cfg:        cfg,
-	}
-}
-
-// GoTypesGeneratorConfig holds configuration options for [GoTypesJenny].
-type GoTypesGeneratorConfig struct {
-	// Apply is an optional AST manipulation func that, if provided, will be run
-	// against the generated Go file prior to running it through goimports.
-	Apply astutil.ApplyFunc
-
-	// GenDirName returns the name of the parent directory in which the type file
-	// should be generated. If nil, the DeclForGen.Lineage().Name() will be used.
-	GenDirName func(*DeclForGen) string
-
-	// Version of the schema to generate. If nil, latest is generated.
-	Version *thema.SyntacticVersion
-}
-
-type genGoTypes struct {
-	gokindsdir string
-	cfg        *GoTypesGeneratorConfig
-}
-
-func (gen *genGoTypes) JennyName() string {
+func (j GoTypesJenny) JennyName() string {
 	return "GoTypesJenny"
 }
 
-func (gen *genGoTypes) Generate(decl *DeclForGen) (*codejen.File, error) {
-	if decl.IsRaw() {
-		return nil, nil
-	}
-
-	var sch thema.Schema
-	var err error
-
-	lin := decl.Lineage()
-	if gen.cfg.Version == nil {
-		sch = lin.Latest()
-	} else {
-		sch, err = lin.Schema(*gen.cfg.Version)
-		if err != nil {
-			return nil, fmt.Errorf("error in configured version for %s generator: %w", *gen.cfg.Version, err)
-		}
-	}
-
-	// always drop prefixes.
-	var appf []astutil.ApplyFunc
-	if gen.cfg.Apply != nil {
-		appf = append(appf, gen.cfg.Apply)
-	}
-	appf = append(appf, PrefixDropper(decl.Meta.Common().Name))
-
-	pdir := gen.cfg.GenDirName(decl)
-	fpath := filepath.Join(gen.gokindsdir, pdir, lin.Name()+"_types_gen.go")
+func (j GoTypesJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
 	// TODO allow using name instead of machine name in thema generator
-	b, err := gocode.GenerateTypesOpenAPI(sch, &gocode.TypeConfigOpenAPI{
-		PackageName: filepath.Base(pdir),
-		ApplyFuncs:  appf,
+	b, err := gocode.GenerateTypesOpenAPI(sfg.Schema, &gocode.TypeConfigOpenAPI{
+		// TODO will need to account for sanitizing e.g. dashes here at some point
+		PackageName: sfg.Schema.Lineage().Name(),
+		ApplyFuncs:  []astutil.ApplyFunc{PrefixDropper(sfg.Name)},
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	return codejen.NewFile(fpath, b, gen), nil
+	return codejen.NewFile(sfg.Schema.Lineage().Name()+"_types_gen.go", b, j), nil
 }
diff --git a/pkg/codegen/jenny_tstypes.go b/pkg/codegen/jenny_tstypes.go
index 110ec60ff1a..aa02b922eab 100644
--- a/pkg/codegen/jenny_tstypes.go
+++ b/pkg/codegen/jenny_tstypes.go
@@ -1,85 +1,32 @@
 package codegen
 
 import (
-	"fmt"
-	"path/filepath"
-
 	"github.com/grafana/codejen"
-	"github.com/grafana/thema"
 	"github.com/grafana/thema/encoding/typescript"
 )
 
-// TSTypesJenny creates a [OneToOne] that produces TypeScript types and
-// defaults for the latest Thema schema in a structured kind's lineage.
+// TSTypesJenny is a [OneToOne] that produces TypeScript types and
+// defaults for a Thema schema.
 //
-// At minimum, a tskindsdir must be provided. This should be the path to the parent
-// directory of the directory in which the types should be generated, relative
-// to the project root. For example, if the types for a kind named "foo"
-// should live at packages/grafana-schema/src/raw/foo, relpath should be "pkg/kind".
-//
-// This generator is a no-op for raw kinds.
-func TSTypesJenny(tskindsdir string, cfg *TSTypesGeneratorConfig) OneToOne {
-	if cfg == nil {
-		cfg = new(TSTypesGeneratorConfig)
-	}
-	if cfg.GenDirName == nil {
-		cfg.GenDirName = func(decl *DeclForGen) string {
-			return decl.Meta.Common().MachineName
-		}
-	}
+// Thema's generic TS jenny will be able to replace this one once
+// https://github.com/grafana/thema/issues/89 is complete.
+type TSTypesJenny struct{}
 
-	return &genTSTypes{
-		tskindsdir: tskindsdir,
-		cfg:        cfg,
-	}
-}
+var _ codejen.OneToOne[SchemaForGen] = &TSTypesJenny{}
 
-// TSTypesGeneratorConfig holds configuration options for [TSTypesJenny].
-type TSTypesGeneratorConfig struct {
-	// GenDirName returns the name of the parent directory in which the type file
-	// should be generated. If nil, the DeclForGen.Lineage().Name() will be used.
-	GenDirName func(*DeclForGen) string
-
-	// Version of the schema to generate. If nil, latest is generated.
-	Version *thema.SyntacticVersion
-}
-
-type genTSTypes struct {
-	tskindsdir string
-	cfg        *TSTypesGeneratorConfig
-}
-
-func (gen *genTSTypes) JennyName() string {
+func (j TSTypesJenny) JennyName() string {
 	return "TSTypesJenny"
 }
 
-func (gen *genTSTypes) Generate(decl *DeclForGen) (*codejen.File, error) {
-	if decl.IsRaw() {
-		return nil, nil
-	}
-	var sch thema.Schema
-	var err error
-
-	lin := decl.Lineage()
-	if gen.cfg.Version == nil {
-		sch = lin.Latest()
-	} else {
-		sch, err = lin.Schema(*gen.cfg.Version)
-		if err != nil {
-			return nil, fmt.Errorf("error in configured version for %s generator: %w", *gen.cfg.Version, err)
-		}
-	}
-
+func (j TSTypesJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
 	// TODO allow using name instead of machine name in thema generator
-	f, err := typescript.GenerateTypes(sch, &typescript.TypeConfig{
-		RootName: decl.Meta.Common().Name,
-		Group:    decl.Meta.Common().LineageIsGroup,
+	f, err := typescript.GenerateTypes(sfg.Schema, &typescript.TypeConfig{
+		RootName: sfg.Name,
+		Group:    sfg.IsGroup,
 	})
 	if err != nil {
 		return nil, err
 	}
-	return codejen.NewFile(
-		filepath.Join(gen.tskindsdir, gen.cfg.GenDirName(decl), lin.Name()+"_types.gen.ts"),
-		[]byte(f.String()),
-		gen), nil
+
+	return codejen.NewFile(sfg.Schema.Lineage().Name()+"_types.gen.ts", []byte(f.String()), j), nil
 }
diff --git a/pkg/codegen/latest_jenny.go b/pkg/codegen/latest_jenny.go
new file mode 100644
index 00000000000..5f24052a46a
--- /dev/null
+++ b/pkg/codegen/latest_jenny.go
@@ -0,0 +1,56 @@
+package codegen
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/grafana/codejen"
+)
+
+// LatestJenny returns a jenny that runs another jenny for only the latest
+// schema in a DeclForGen, and prefixes the resulting file with the provided
+// parentdir (e.g. "pkg/kinds/") and with a directory based on the kind's
+// machine name (e.g. "dashboard/").
+func LatestJenny(parentdir string, inner codejen.OneToOne[SchemaForGen]) OneToOne {
+	if inner == nil {
+		panic("inner jenny must not be nil")
+	}
+
+	return &latestj{
+		parentdir: parentdir,
+		inner:     inner,
+	}
+}
+
+type latestj struct {
+	parentdir string
+	inner     codejen.OneToOne[SchemaForGen]
+}
+
+func (j *latestj) JennyName() string {
+	return "LatestJenny"
+}
+
+func (j *latestj) Generate(decl *DeclForGen) (*codejen.File, error) {
+	if decl.IsRaw() {
+		return nil, nil
+	}
+	comm := decl.Meta.Common()
+	sfg := SchemaForGen{
+		Name:    comm.Name,
+		Schema:  decl.Lineage().Latest(),
+		IsGroup: comm.LineageIsGroup,
+	}
+
+	f, err := j.inner.Generate(sfg)
+	if err != nil {
+		return nil, fmt.Errorf("%s jenny failed on %s schema for %s: %w", j.inner.JennyName(), sfg.Schema.Version(), decl.Meta.Common().Name, err)
+	}
+	if f == nil || !f.Exists() {
+		return nil, nil
+	}
+
+	f.RelativePath = filepath.Join(j.parentdir, comm.MachineName, f.RelativePath)
+	f.From = append(f.From, j)
+	return f, nil
+}
diff --git a/pkg/codegen/tmpl.go b/pkg/codegen/tmpl.go
index 5b4f8212f4c..a2639faa58b 100644
--- a/pkg/codegen/tmpl.go
+++ b/pkg/codegen/tmpl.go
@@ -5,6 +5,8 @@ import (
 	"embed"
 	"text/template"
 	"time"
+
+	"github.com/grafana/codejen"
 )
 
 // All the parsed templates in the tmpl subdirectory
@@ -29,6 +31,11 @@ type (
 		LineageCUEPath string
 		GenLicense     bool
 	}
+	tvars_gen_header struct {
+		MainGenerator string
+		Using         []codejen.NamedJenny
+		From          string
+	}
 	tvars_kind_registry struct {
 		// Header tvars_autogen_header
 		NumRaw, NumStructured int
diff --git a/pkg/codegen/tmpl/gen_header.tmpl b/pkg/codegen/tmpl/gen_header.tmpl
new file mode 100644
index 00000000000..d32ee6f24b3
--- /dev/null
+++ b/pkg/codegen/tmpl/gen_header.tmpl
@@ -0,0 +1,11 @@
+// THIS FILE IS GENERATED. EDITING IS FUTILE.
+//
+// Generated by:
+//     {{ .MainGenerator }}
+// Using jennies:
+{{- range .Using }}
+//     {{ .JennyName }}
+{{- end }}
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
diff --git a/pkg/kinds/dashboard/dashboard_types_gen.go b/pkg/kinds/dashboard/dashboard_types_gen.go
index e4d63c1a16b..c8faba1a7a5 100644
--- a/pkg/kinds/dashboard/dashboard_types_gen.go
+++ b/pkg/kinds/dashboard/dashboard_types_gen.go
@@ -4,6 +4,7 @@
 //     kinds/gen.go
 // Using jennies:
 //     GoTypesJenny
+//     LatestJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/playlist/playlist_types_gen.go b/pkg/kinds/playlist/playlist_types_gen.go
index d45a61f3e2c..9b94aa11107 100644
--- a/pkg/kinds/playlist/playlist_types_gen.go
+++ b/pkg/kinds/playlist/playlist_types_gen.go
@@ -4,6 +4,7 @@
 //     kinds/gen.go
 // Using jennies:
 //     GoTypesJenny
+//     LatestJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 

From 6f26668a9f58b49b5ae085f81b8c5fb53a2c83ee Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 22 Nov 2022 14:01:51 +0000
Subject: [PATCH 071/153] Chore: Document theme toggle keybinding (#59031)

* make theme toggle keybinding dev only

* fix bug + add support for theme change keybinding
---
 public/app/core/components/help/HelpModal.tsx |  1 +
 public/app/core/services/keybindingSrv.ts     |  4 +--
 public/app/core/services/toggleTheme.ts       | 28 ++++++++++---------
 .../actions/global.static.actions.ts          |  1 +
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/app/core/components/help/HelpModal.tsx b/public/app/core/components/help/HelpModal.tsx
index 6920e168ea2..9718205fad6 100644
--- a/public/app/core/components/help/HelpModal.tsx
+++ b/public/app/core/components/help/HelpModal.tsx
@@ -12,6 +12,7 @@ const shortcuts = {
     { keys: ['esc'], description: 'Exit edit/setting views' },
     { keys: ['h'], description: 'Show all keyboard shortcuts' },
     { keys: ['mod+k'], description: 'Open command palette' },
+    { keys: ['c', 't'], description: 'Change theme' },
   ],
   Dashboard: [
     { keys: ['mod+s'], description: 'Save dashboard' },
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 9706221a0e7..3920e53eb61 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -45,8 +45,8 @@ export class KeybindingSrv {
       this.bindGlobalEsc();
     }
 
-    this.bind('t t', () => toggleTheme(false));
-    this.bind('t r', () => toggleTheme(true));
+    this.bind('c t', () => toggleTheme(false));
+    this.bind('c r', () => toggleTheme(true));
 
     if (process.env.NODE_ENV === 'development') {
       this.bind('t n', () => this.toggleNav());
diff --git a/public/app/core/services/toggleTheme.ts b/public/app/core/services/toggleTheme.ts
index 6aeca20546a..ee274847ce9 100644
--- a/public/app/core/services/toggleTheme.ts
+++ b/public/app/core/services/toggleTheme.ts
@@ -8,7 +8,7 @@ import { contextSrv } from '../core';
 import { PreferencesService } from './PreferencesService';
 
 export async function toggleTheme(runtimeOnly: boolean) {
-  const currentTheme = config.theme;
+  const currentTheme = config.theme2;
   const newTheme = createTheme({
     colors: {
       mode: currentTheme.isDark ? 'light' : 'dark',
@@ -16,6 +16,7 @@ export async function toggleTheme(runtimeOnly: boolean) {
   });
 
   appEvents.publish(new ThemeChangedEvent(newTheme));
+  config.theme2.isDark = newTheme.isDark;
 
   if (runtimeOnly) {
     return;
@@ -25,20 +26,21 @@ export async function toggleTheme(runtimeOnly: boolean) {
   const newCssLink = document.createElement('link');
   newCssLink.rel = 'stylesheet';
   newCssLink.href = config.bootData.themePaths[newTheme.colors.mode];
-  document.body.appendChild(newCssLink);
+  newCssLink.onload = () => {
+    // Remove old css file
+    const bodyLinks = document.getElementsByTagName('link');
+    for (let i = 0; i < bodyLinks.length; i++) {
+      const link = bodyLinks[i];
 
-  // Remove old css file
-  const bodyLinks = document.getElementsByTagName('link');
-  for (let i = 0; i < bodyLinks.length; i++) {
-    const link = bodyLinks[i];
-
-    if (link.href && link.href.indexOf(`build/grafana.${currentTheme.type}`) > 0) {
-      // Remove existing link after a 500ms to allow new css to load to avoid flickering
-      // If we add new css at the same time we remove current one the page will be rendered without css
-      // As the new css file is loading
-      setTimeout(() => link.remove(), 500);
+      if (link.href && link.href.includes(`build/grafana.${!newTheme.isDark ? 'dark' : 'light'}`)) {
+        // Remove existing link once the new css has loaded to avoid flickering
+        // If we add new css at the same time we remove current one the page will be rendered without css
+        // As the new css file is loading
+        link.remove();
+      }
     }
-  }
+  };
+  document.body.appendChild(newCssLink);
 
   if (!contextSrv.isSignedIn) {
     return;
diff --git a/public/app/features/commandPalette/actions/global.static.actions.ts b/public/app/features/commandPalette/actions/global.static.actions.ts
index 4211a532ac3..7fb13a30a0f 100644
--- a/public/app/features/commandPalette/actions/global.static.actions.ts
+++ b/public/app/features/commandPalette/actions/global.static.actions.ts
@@ -33,6 +33,7 @@ export default (navBarTree: NavModelItem[]) => {
       name: 'Change theme...',
       keywords: 'interface color dark light',
       section: 'Preferences',
+      shortcut: ['c', 't'],
     },
     {
       id: 'preferences/dark-theme',

From 7ff41cde9a72d9faf0b876885eb7236c3d2c98c2 Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Tue, 22 Nov 2022 15:06:39 +0100
Subject: [PATCH 072/153] Chore: Fix status codes for nested folders (#59087)

* check for errutil errors first

* a better fix
---
 pkg/api/apierrors/folder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/api/apierrors/folder.go b/pkg/api/apierrors/folder.go
index d6b8e84fc77..38a0f3a534c 100644
--- a/pkg/api/apierrors/folder.go
+++ b/pkg/api/apierrors/folder.go
@@ -40,5 +40,5 @@ func ToFolderErrorResponse(err error) response.Response {
 		return response.JSON(412, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})
 	}
 
-	return response.Error(500, "Folder API error", err)
+	return response.ErrOrFallback(500, "Folder API error", err)
 }

From 2903e2dbf5e5228999870c269944d4f432b08154 Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Tue, 22 Nov 2022 14:38:43 +0000
Subject: [PATCH 073/153] Chore: Refactor UiFindInput.test.js to TypeScript
 (#59063)

---
 .../src/common/UiFindInput.test.tsx           | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 packages/jaeger-ui-components/src/common/UiFindInput.test.tsx

diff --git a/packages/jaeger-ui-components/src/common/UiFindInput.test.tsx b/packages/jaeger-ui-components/src/common/UiFindInput.test.tsx
new file mode 100644
index 00000000000..a2836a147ce
--- /dev/null
+++ b/packages/jaeger-ui-components/src/common/UiFindInput.test.tsx
@@ -0,0 +1,36 @@
+// Copyright (c) 2019 Uber Technologies, Inc.
+//
+// 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.
+
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import UiFindInput from './UiFindInput';
+
+describe('UiFindInput', () => {
+  describe('rendering', () => {
+    it('renders as expected with no value', () => {
+      render(<UiFindInput />);
+      const uiFindInput = screen.queryByPlaceholderText('Find...');
+      expect(uiFindInput).toBeInTheDocument();
+      expect(uiFindInput?.getAttribute('value')).toEqual('');
+    });
+
+    it('renders as expected with value', () => {
+      render(<UiFindInput value="value" />);
+      const uiFindInput = screen.queryByPlaceholderText('Find...');
+      expect(uiFindInput).toBeInTheDocument();
+      expect(uiFindInput?.getAttribute('value')).toEqual('value');
+    });
+  });
+});

From f62e55f4614988133e96b1853af2872350c6964e Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Tue, 22 Nov 2022 14:40:12 +0000
Subject: [PATCH 074/153] Chore: Refactor CopyIcon.test.js to TS (#59024)

---
 .../src/common/{CopyIcon.test.js => CopyIcon.test.tsx}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/jaeger-ui-components/src/common/{CopyIcon.test.js => CopyIcon.test.tsx} (97%)

diff --git a/packages/jaeger-ui-components/src/common/CopyIcon.test.js b/packages/jaeger-ui-components/src/common/CopyIcon.test.tsx
similarity index 97%
rename from packages/jaeger-ui-components/src/common/CopyIcon.test.js
rename to packages/jaeger-ui-components/src/common/CopyIcon.test.tsx
index b06ac040043..9f0101501f1 100644
--- a/packages/jaeger-ui-components/src/common/CopyIcon.test.js
+++ b/packages/jaeger-ui-components/src/common/CopyIcon.test.tsx
@@ -26,7 +26,7 @@ describe('<CopyIcon />', () => {
     copyText: 'copyTextValue',
     tooltipTitle: 'tooltipTitleValue',
   };
-  let copySpy;
+  let copySpy: jest.SpyInstance;
 
   beforeAll(() => {
     copySpy = jest.spyOn(copy, 'default');

From c43e1a721fd7c4001125d0f96fa94fc045dbd2c0 Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Tue, 22 Nov 2022 15:59:11 +0100
Subject: [PATCH 075/153] CloudWatch: fix custom namespace for listing
 dimension keys, refactor to non-pointer types, add test assertions, rename
 packages (#59106)

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
---
 pkg/tsdb/cloudwatch/annotation_query_test.go  |  4 +-
 pkg/tsdb/cloudwatch/cloudwatch.go             |  2 +-
 pkg/tsdb/cloudwatch/cloudwatch_test.go        | 29 +++++++-------
 pkg/tsdb/cloudwatch/log_actions_test.go       | 16 ++++----
 pkg/tsdb/cloudwatch/metric_find_query_test.go |  8 ++--
 .../cloudwatch/mocks/list_metrics_service.go  | 21 +++++-----
 .../models/{metric_types.go => api.go}        |  8 ++--
 pkg/tsdb/cloudwatch/models/request/types.go   |  6 ---
 .../dimension_keys_request.go                 | 17 +++------
 .../dimension_keys_request_test.go            | 38 ++++++++++++++++++-
 .../dimension_values_request.go               | 10 ++---
 .../dimension_values_rquest_test.go           |  2 +-
 .../metrics_resource_request.go}              |  2 +-
 .../metrics_resource_request_test.go}         |  2 +-
 .../resource_request.go                       |  2 +-
 .../resource_request_test.go                  |  4 +-
 pkg/tsdb/cloudwatch/models/resources/types.go | 11 ++++++
 .../models/{request => resources}/utils.go    |  2 +-
 pkg/tsdb/cloudwatch/models/settings.go        |  8 ++--
 pkg/tsdb/cloudwatch/models/types.go           |  7 +---
 pkg/tsdb/cloudwatch/routes/dimension_keys.go  | 20 +++++-----
 .../cloudwatch/routes/dimension_keys_test.go  | 28 ++++++--------
 .../cloudwatch/routes/dimension_values.go     |  8 ++--
 .../routes/dimension_values_test.go           | 13 ++++++-
 pkg/tsdb/cloudwatch/routes/metrics.go         | 12 +++---
 pkg/tsdb/cloudwatch/routes/metrics_test.go    | 18 +++++----
 pkg/tsdb/cloudwatch/routes/namespaces_test.go |  2 +-
 .../cloudwatch/services/hardcoded_metrics.go  | 14 +++----
 .../services/hardcoded_metrics_test.go        |  4 +-
 pkg/tsdb/cloudwatch/services/list_metrics.go  | 14 +++----
 .../cloudwatch/services/list_metrics_test.go  | 14 +++----
 pkg/tsdb/cloudwatch/time_series_query_test.go |  8 ++--
 32 files changed, 194 insertions(+), 160 deletions(-)
 rename pkg/tsdb/cloudwatch/models/{metric_types.go => api.go} (59%)
 delete mode 100644 pkg/tsdb/cloudwatch/models/request/types.go
 rename pkg/tsdb/cloudwatch/models/{request => resources}/dimension_keys_request.go (72%)
 rename pkg/tsdb/cloudwatch/models/{request => resources}/dimension_keys_request_test.go (71%)
 rename pkg/tsdb/cloudwatch/models/{request => resources}/dimension_values_request.go (74%)
 rename pkg/tsdb/cloudwatch/models/{request => resources}/dimension_values_rquest_test.go (99%)
 rename pkg/tsdb/cloudwatch/models/{request/metrics.go => resources/metrics_resource_request.go} (97%)
 rename pkg/tsdb/cloudwatch/models/{request/metrics_test.go => resources/metrics_resource_request_test.go} (98%)
 rename pkg/tsdb/cloudwatch/models/{request => resources}/resource_request.go (94%)
 rename pkg/tsdb/cloudwatch/models/{request => resources}/resource_request_test.go (88%)
 create mode 100644 pkg/tsdb/cloudwatch/models/resources/types.go
 rename pkg/tsdb/cloudwatch/models/{request => resources}/utils.go (98%)

diff --git a/pkg/tsdb/cloudwatch/annotation_query_test.go b/pkg/tsdb/cloudwatch/annotation_query_test.go
index 5185ce2c889..e76dcce8ed4 100644
--- a/pkg/tsdb/cloudwatch/annotation_query_test.go
+++ b/pkg/tsdb/cloudwatch/annotation_query_test.go
@@ -32,7 +32,7 @@ func TestQuery_AnnotationQuery(t *testing.T) {
 	t.Run("DescribeAlarmsForMetric is called with minimum parameters", func(t *testing.T) {
 		client = fakeCWAnnotationsClient{describeAlarmsForMetricOutput: &cloudwatch.DescribeAlarmsForMetricOutput{}}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -66,7 +66,7 @@ func TestQuery_AnnotationQuery(t *testing.T) {
 	t.Run("DescribeAlarms is called when prefixMatching is true", func(t *testing.T) {
 		client = fakeCWAnnotationsClient{describeAlarmsOutput: &cloudwatch.DescribeAlarmsOutput{}}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 291715cce88..e78dfb8318f 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -50,7 +50,7 @@ type DataQueryJson struct {
 }
 
 type DataSource struct {
-	Settings   *models.CloudWatchSettings
+	Settings   models.CloudWatchSettings
 	HTTPClient *http.Client
 }
 
diff --git a/pkg/tsdb/cloudwatch/cloudwatch_test.go b/pkg/tsdb/cloudwatch/cloudwatch_test.go
index c4ec23dc1dd..bca9bbe4e80 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch_test.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -52,7 +53,7 @@ func TestNewInstanceSettings(t *testing.T) {
 				},
 			},
 			expectedDS: DataSource{
-				Settings: &models.CloudWatchSettings{
+				Settings: models.CloudWatchSettings{
 					AWSDatasourceSettings: awsds.AWSDatasourceSettings{
 						Profile:       "foo",
 						Region:        "us-east2",
@@ -112,7 +113,7 @@ func Test_CheckHealth(t *testing.T) {
 	t.Run("successfully query metrics and logs", func(t *testing.T) {
 		client = fakeCheckHealthClient{}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
@@ -133,7 +134,7 @@ func Test_CheckHealth(t *testing.T) {
 				return nil, fmt.Errorf("some logs query error")
 			}}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
@@ -154,7 +155,7 @@ func Test_CheckHealth(t *testing.T) {
 				return fmt.Errorf("some list metrics error")
 			}}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
@@ -172,7 +173,7 @@ func Test_CheckHealth(t *testing.T) {
 	t.Run("fail to get clients", func(t *testing.T) {
 		client = fakeCheckHealthClient{}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{getSession: func(c awsds.SessionConfig) (*session.Session, error) {
 			return nil, fmt.Errorf("some sessions error")
@@ -203,7 +204,7 @@ func Test_executeLogAlertQuery(t *testing.T) {
 	t.Run("getCWLogsClient is called with region from input JSON", func(t *testing.T) {
 		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		sess := fakeSessionCache{}
 		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
@@ -229,7 +230,7 @@ func Test_executeLogAlertQuery(t *testing.T) {
 	t.Run("getCWLogsClient is called with region from instance manager when region is default", func(t *testing.T) {
 		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
 		})
 		sess := fakeSessionCache{}
 
@@ -266,7 +267,7 @@ func TestQuery_ResourceRequest_DescribeAllLogGroups(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -412,7 +413,7 @@ func TestQuery_ResourceRequest_DescribeLogGroups(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -467,7 +468,7 @@ func TestQuery_ResourceRequest_DescribeLogGroups(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -505,7 +506,7 @@ func TestQuery_ResourceRequest_DescribeLogGroups(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -546,7 +547,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 		return &api
 	}
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	t.Run("Should handle dimension value request and return values from the api", func(t *testing.T) {
@@ -699,10 +700,10 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 		sent := sender.Response
 		require.NotNil(t, sent)
 		require.Equal(t, http.StatusOK, sent.Status)
-		res := []models.Metric{}
+		res := []resources.Metric{}
 		err = json.Unmarshal(sent.Body, &res)
 		require.Nil(t, err)
-		assert.Equal(t, []models.Metric{{Name: "Test_MetricName1", Namespace: "AWS/EC2"}, {Name: "Test_MetricName2", Namespace: "AWS/EC2"}, {Name: "Test_MetricName3", Namespace: "AWS/ECS"}, {Name: "Test_MetricName10", Namespace: "AWS/ECS"}, {Name: "Test_MetricName4", Namespace: "AWS/ECS"}, {Name: "Test_MetricName5", Namespace: "AWS/Redshift"}}, res)
+		assert.Equal(t, []resources.Metric{{Name: "Test_MetricName1", Namespace: "AWS/EC2"}, {Name: "Test_MetricName2", Namespace: "AWS/EC2"}, {Name: "Test_MetricName3", Namespace: "AWS/ECS"}, {Name: "Test_MetricName10", Namespace: "AWS/ECS"}, {Name: "Test_MetricName4", Namespace: "AWS/ECS"}, {Name: "Test_MetricName5", Namespace: "AWS/Redshift"}}, res)
 	})
 }
 
diff --git a/pkg/tsdb/cloudwatch/log_actions_test.go b/pkg/tsdb/cloudwatch/log_actions_test.go
index 950df2f89f5..00985a930f8 100644
--- a/pkg/tsdb/cloudwatch/log_actions_test.go
+++ b/pkg/tsdb/cloudwatch/log_actions_test.go
@@ -83,7 +83,7 @@ func TestQuery_GetLogEvents(t *testing.T) {
 			cli = fakeCWLogsClient{}
 
 			im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-				return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+				return DataSource{Settings: models.CloudWatchSettings{}}, nil
 			})
 
 			executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -141,7 +141,7 @@ func TestQuery_GetLogGroupFields(t *testing.T) {
 	const refID = "A"
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -222,7 +222,7 @@ func TestQuery_StartQuery(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -275,7 +275,7 @@ func TestQuery_StartQuery(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -333,7 +333,7 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("successfully parses information from JSON to StartQueryWithContext", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
@@ -369,7 +369,7 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("does not populate StartQueryInput.limit when no limit provided", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
@@ -425,7 +425,7 @@ func TestQuery_StopQuery(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	timeRange := backend.TimeRange{
@@ -520,7 +520,7 @@ func TestQuery_GetQueryResults(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
diff --git a/pkg/tsdb/cloudwatch/metric_find_query_test.go b/pkg/tsdb/cloudwatch/metric_find_query_test.go
index 89e04c9eb07..9061430d4b7 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query_test.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query_test.go
@@ -41,7 +41,7 @@ func TestQuery_Regions(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -108,7 +108,7 @@ func TestQuery_InstanceAttributes(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		filterMap := map[string][]string{
@@ -191,7 +191,7 @@ func TestQuery_EBSVolumeIDs(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -251,7 +251,7 @@ func TestQuery_ResourceARNs(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		tagMap := map[string][]string{
diff --git a/pkg/tsdb/cloudwatch/mocks/list_metrics_service.go b/pkg/tsdb/cloudwatch/mocks/list_metrics_service.go
index 7bd44ca004b..e809bc8518c 100644
--- a/pkg/tsdb/cloudwatch/mocks/list_metrics_service.go
+++ b/pkg/tsdb/cloudwatch/mocks/list_metrics_service.go
@@ -1,8 +1,7 @@
 package mocks
 
 import (
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -10,26 +9,26 @@ type ListMetricsServiceMock struct {
 	mock.Mock
 }
 
-func (a *ListMetricsServiceMock) GetDimensionKeysByDimensionFilter(*request.DimensionKeysRequest) ([]string, error) {
-	args := a.Called()
+func (a *ListMetricsServiceMock) GetDimensionKeysByDimensionFilter(r resources.DimensionKeysRequest) ([]string, error) {
+	args := a.Called(r)
 
 	return args.Get(0).([]string), args.Error(1)
 }
 
-func (a *ListMetricsServiceMock) GetDimensionValuesByDimensionFilter(r *request.DimensionValuesRequest) ([]string, error) {
-	args := a.Called()
+func (a *ListMetricsServiceMock) GetDimensionValuesByDimensionFilter(r resources.DimensionValuesRequest) ([]string, error) {
+	args := a.Called(r)
 
 	return args.Get(0).([]string), args.Error(1)
 }
 
-func (a *ListMetricsServiceMock) GetDimensionKeysByNamespace(string) ([]string, error) {
-	args := a.Called()
+func (a *ListMetricsServiceMock) GetDimensionKeysByNamespace(namespace string) ([]string, error) {
+	args := a.Called(namespace)
 
 	return args.Get(0).([]string), args.Error(1)
 }
 
-func (a *ListMetricsServiceMock) GetMetricsByNamespace(namespace string) ([]models.Metric, error) {
-	args := a.Called()
+func (a *ListMetricsServiceMock) GetMetricsByNamespace(namespace string) ([]resources.Metric, error) {
+	args := a.Called(namespace)
 
-	return args.Get(0).([]models.Metric), args.Error(1)
+	return args.Get(0).([]resources.Metric), args.Error(1)
 }
diff --git a/pkg/tsdb/cloudwatch/models/metric_types.go b/pkg/tsdb/cloudwatch/models/api.go
similarity index 59%
rename from pkg/tsdb/cloudwatch/models/metric_types.go
rename to pkg/tsdb/cloudwatch/models/api.go
index ec6c1ed6087..b86860e5efd 100644
--- a/pkg/tsdb/cloudwatch/models/metric_types.go
+++ b/pkg/tsdb/cloudwatch/models/api.go
@@ -2,14 +2,14 @@ package models
 
 import (
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
 
 type ListMetricsProvider interface {
-	GetDimensionKeysByDimensionFilter(*request.DimensionKeysRequest) ([]string, error)
+	GetDimensionKeysByDimensionFilter(resources.DimensionKeysRequest) ([]string, error)
 	GetDimensionKeysByNamespace(string) ([]string, error)
-	GetDimensionValuesByDimensionFilter(*request.DimensionValuesRequest) ([]string, error)
-	GetMetricsByNamespace(namespace string) ([]Metric, error)
+	GetDimensionValuesByDimensionFilter(resources.DimensionValuesRequest) ([]string, error)
+	GetMetricsByNamespace(namespace string) ([]resources.Metric, error)
 }
 
 type MetricsClientProvider interface {
diff --git a/pkg/tsdb/cloudwatch/models/request/types.go b/pkg/tsdb/cloudwatch/models/request/types.go
deleted file mode 100644
index e06440bc9c8..00000000000
--- a/pkg/tsdb/cloudwatch/models/request/types.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package request
-
-type Dimension struct {
-	Name  string
-	Value string
-}
diff --git a/pkg/tsdb/cloudwatch/models/request/dimension_keys_request.go b/pkg/tsdb/cloudwatch/models/resources/dimension_keys_request.go
similarity index 72%
rename from pkg/tsdb/cloudwatch/models/request/dimension_keys_request.go
rename to pkg/tsdb/cloudwatch/models/resources/dimension_keys_request.go
index 7713cdb6ce8..894943caa09 100644
--- a/pkg/tsdb/cloudwatch/models/request/dimension_keys_request.go
+++ b/pkg/tsdb/cloudwatch/models/resources/dimension_keys_request.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"net/url"
@@ -9,7 +9,6 @@ type DimensionKeysRequestType uint32
 const (
 	StandardDimensionKeysRequest DimensionKeysRequestType = iota
 	FilterDimensionKeysRequest
-	CustomMetricDimensionKeysRequest
 )
 
 type DimensionKeysRequest struct {
@@ -20,24 +19,20 @@ type DimensionKeysRequest struct {
 }
 
 func (q *DimensionKeysRequest) Type() DimensionKeysRequestType {
-	if isCustomNamespace(q.Namespace) {
-		return CustomMetricDimensionKeysRequest
-	}
-
-	if len(q.DimensionFilter) > 0 {
+	if isCustomNamespace(q.Namespace) || len(q.DimensionFilter) > 0 {
 		return FilterDimensionKeysRequest
 	}
 
 	return StandardDimensionKeysRequest
 }
 
-func GetDimensionKeysRequest(parameters url.Values) (*DimensionKeysRequest, error) {
+func GetDimensionKeysRequest(parameters url.Values) (DimensionKeysRequest, error) {
 	resourceRequest, err := getResourceRequest(parameters)
 	if err != nil {
-		return nil, err
+		return DimensionKeysRequest{}, err
 	}
 
-	request := &DimensionKeysRequest{
+	request := DimensionKeysRequest{
 		ResourceRequest: resourceRequest,
 		Namespace:       parameters.Get("namespace"),
 		MetricName:      parameters.Get("metricName"),
@@ -46,7 +41,7 @@ func GetDimensionKeysRequest(parameters url.Values) (*DimensionKeysRequest, erro
 
 	dimensions, err := parseDimensionFilter(parameters.Get("dimensionFilters"))
 	if err != nil {
-		return nil, err
+		return DimensionKeysRequest{}, err
 	}
 
 	request.DimensionFilter = dimensions
diff --git a/pkg/tsdb/cloudwatch/models/request/dimension_keys_request_test.go b/pkg/tsdb/cloudwatch/models/resources/dimension_keys_request_test.go
similarity index 71%
rename from pkg/tsdb/cloudwatch/models/request/dimension_keys_request_test.go
rename to pkg/tsdb/cloudwatch/models/resources/dimension_keys_request_test.go
index 2285aefbc4e..f41936023de 100644
--- a/pkg/tsdb/cloudwatch/models/request/dimension_keys_request_test.go
+++ b/pkg/tsdb/cloudwatch/models/resources/dimension_keys_request_test.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"testing"
@@ -69,4 +69,40 @@ func TestDimensionKeyRequest(t *testing.T) {
 		assert.Equal(t, "InstanceId", request.DimensionFilter[0].Name)
 		assert.Equal(t, "", request.DimensionFilter[0].Value)
 	})
+
+	type testCase struct {
+		name                 string
+		dimensionKeysRequest DimensionKeysRequest
+		expectedType         DimensionKeysRequestType
+	}
+	testCases := []testCase{
+		{
+			name: "With custom namespace it should resolve to FilterDimensionKeysRequest",
+			dimensionKeysRequest: DimensionKeysRequest{
+				Namespace: "custom",
+			},
+			expectedType: FilterDimensionKeysRequest,
+		},
+		{
+			name: "With dimension filter it should resolve to FilterDimensionKeysRequest",
+			dimensionKeysRequest: DimensionKeysRequest{
+				Namespace:       "AWS/EC2",
+				DimensionFilter: []*Dimension{{Name: "InstanceId", Value: "i-1234567890abcdef0"}},
+			},
+			expectedType: FilterDimensionKeysRequest,
+		},
+		{
+			name: "With dimension filter and without custom namespace it should resolve to StandardDimensionKeysRequest",
+			dimensionKeysRequest: DimensionKeysRequest{
+				Namespace: "AWS/EC2",
+			},
+			expectedType: StandardDimensionKeysRequest,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			assert.Equal(t, tc.expectedType, tc.dimensionKeysRequest.Type())
+		})
+	}
 }
diff --git a/pkg/tsdb/cloudwatch/models/request/dimension_values_request.go b/pkg/tsdb/cloudwatch/models/resources/dimension_values_request.go
similarity index 74%
rename from pkg/tsdb/cloudwatch/models/request/dimension_values_request.go
rename to pkg/tsdb/cloudwatch/models/resources/dimension_values_request.go
index d14a8f4236a..730234494fb 100644
--- a/pkg/tsdb/cloudwatch/models/request/dimension_values_request.go
+++ b/pkg/tsdb/cloudwatch/models/resources/dimension_values_request.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"net/url"
@@ -12,13 +12,13 @@ type DimensionValuesRequest struct {
 	DimensionFilter []*Dimension
 }
 
-func GetDimensionValuesRequest(parameters url.Values) (*DimensionValuesRequest, error) {
+func GetDimensionValuesRequest(parameters url.Values) (DimensionValuesRequest, error) {
 	resourceRequest, err := getResourceRequest(parameters)
 	if err != nil {
-		return nil, err
+		return DimensionValuesRequest{}, err
 	}
 
-	request := &DimensionValuesRequest{
+	request := DimensionValuesRequest{
 		ResourceRequest: resourceRequest,
 		Namespace:       parameters.Get("namespace"),
 		MetricName:      parameters.Get("metricName"),
@@ -28,7 +28,7 @@ func GetDimensionValuesRequest(parameters url.Values) (*DimensionValuesRequest,
 
 	dimensions, err := parseDimensionFilter(parameters.Get("dimensionFilters"))
 	if err != nil {
-		return nil, err
+		return DimensionValuesRequest{}, err
 	}
 
 	request.DimensionFilter = dimensions
diff --git a/pkg/tsdb/cloudwatch/models/request/dimension_values_rquest_test.go b/pkg/tsdb/cloudwatch/models/resources/dimension_values_rquest_test.go
similarity index 99%
rename from pkg/tsdb/cloudwatch/models/request/dimension_values_rquest_test.go
rename to pkg/tsdb/cloudwatch/models/resources/dimension_values_rquest_test.go
index 4a381555c04..cb73b2ad31f 100644
--- a/pkg/tsdb/cloudwatch/models/request/dimension_values_rquest_test.go
+++ b/pkg/tsdb/cloudwatch/models/resources/dimension_values_rquest_test.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"testing"
diff --git a/pkg/tsdb/cloudwatch/models/request/metrics.go b/pkg/tsdb/cloudwatch/models/resources/metrics_resource_request.go
similarity index 97%
rename from pkg/tsdb/cloudwatch/models/request/metrics.go
rename to pkg/tsdb/cloudwatch/models/resources/metrics_resource_request.go
index a4f2e65fa45..6bc749348cd 100644
--- a/pkg/tsdb/cloudwatch/models/request/metrics.go
+++ b/pkg/tsdb/cloudwatch/models/resources/metrics_resource_request.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"net/url"
diff --git a/pkg/tsdb/cloudwatch/models/request/metrics_test.go b/pkg/tsdb/cloudwatch/models/resources/metrics_resource_request_test.go
similarity index 98%
rename from pkg/tsdb/cloudwatch/models/request/metrics_test.go
rename to pkg/tsdb/cloudwatch/models/resources/metrics_resource_request_test.go
index 0e1038a6669..9883503588f 100644
--- a/pkg/tsdb/cloudwatch/models/request/metrics_test.go
+++ b/pkg/tsdb/cloudwatch/models/resources/metrics_resource_request_test.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"net/url"
diff --git a/pkg/tsdb/cloudwatch/models/request/resource_request.go b/pkg/tsdb/cloudwatch/models/resources/resource_request.go
similarity index 94%
rename from pkg/tsdb/cloudwatch/models/request/resource_request.go
rename to pkg/tsdb/cloudwatch/models/resources/resource_request.go
index 5f541b0feb1..e13c11cb558 100644
--- a/pkg/tsdb/cloudwatch/models/request/resource_request.go
+++ b/pkg/tsdb/cloudwatch/models/resources/resource_request.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"fmt"
diff --git a/pkg/tsdb/cloudwatch/models/request/resource_request_test.go b/pkg/tsdb/cloudwatch/models/resources/resource_request_test.go
similarity index 88%
rename from pkg/tsdb/cloudwatch/models/request/resource_request_test.go
rename to pkg/tsdb/cloudwatch/models/resources/resource_request_test.go
index 4f9f38f611e..666a13c897d 100644
--- a/pkg/tsdb/cloudwatch/models/request/resource_request_test.go
+++ b/pkg/tsdb/cloudwatch/models/resources/resource_request_test.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"testing"
@@ -10,7 +10,7 @@ import (
 func TestResourceRequest(t *testing.T) {
 	t.Run("Should return an error if region is not provided", func(t *testing.T) {
 		request, err := GetDimensionValuesRequest(map[string][]string{})
-		require.Nil(t, request)
+		require.Empty(t, request)
 		assert.Equal(t, "region is required", err.Error())
 	})
 }
diff --git a/pkg/tsdb/cloudwatch/models/resources/types.go b/pkg/tsdb/cloudwatch/models/resources/types.go
new file mode 100644
index 00000000000..a218740a438
--- /dev/null
+++ b/pkg/tsdb/cloudwatch/models/resources/types.go
@@ -0,0 +1,11 @@
+package resources
+
+type Dimension struct {
+	Name  string
+	Value string
+}
+
+type Metric struct {
+	Name      string `json:"name"`
+	Namespace string `json:"namespace"`
+}
diff --git a/pkg/tsdb/cloudwatch/models/request/utils.go b/pkg/tsdb/cloudwatch/models/resources/utils.go
similarity index 98%
rename from pkg/tsdb/cloudwatch/models/request/utils.go
rename to pkg/tsdb/cloudwatch/models/resources/utils.go
index 4057a5f095d..22472876070 100644
--- a/pkg/tsdb/cloudwatch/models/request/utils.go
+++ b/pkg/tsdb/cloudwatch/models/resources/utils.go
@@ -1,4 +1,4 @@
-package request
+package resources
 
 import (
 	"encoding/json"
diff --git a/pkg/tsdb/cloudwatch/models/settings.go b/pkg/tsdb/cloudwatch/models/settings.go
index 17b746c95d2..1f2cab0c3f0 100644
--- a/pkg/tsdb/cloudwatch/models/settings.go
+++ b/pkg/tsdb/cloudwatch/models/settings.go
@@ -13,11 +13,11 @@ type CloudWatchSettings struct {
 	Namespace string `json:"customMetricsNamespaces"`
 }
 
-func LoadCloudWatchSettings(config backend.DataSourceInstanceSettings) (*CloudWatchSettings, error) {
-	instance := &CloudWatchSettings{}
+func LoadCloudWatchSettings(config backend.DataSourceInstanceSettings) (CloudWatchSettings, error) {
+	instance := CloudWatchSettings{}
 	if config.JSONData != nil && len(config.JSONData) > 1 {
-		if err := json.Unmarshal(config.JSONData, instance); err != nil {
-			return nil, fmt.Errorf("could not unmarshal DatasourceSettings json: %w", err)
+		if err := json.Unmarshal(config.JSONData, &instance); err != nil {
+			return CloudWatchSettings{}, fmt.Errorf("could not unmarshal DatasourceSettings json: %w", err)
 		}
 	}
 
diff --git a/pkg/tsdb/cloudwatch/models/types.go b/pkg/tsdb/cloudwatch/models/types.go
index 0deec3522b0..df41487234d 100644
--- a/pkg/tsdb/cloudwatch/models/types.go
+++ b/pkg/tsdb/cloudwatch/models/types.go
@@ -8,7 +8,7 @@ import (
 
 type RequestContext struct {
 	MetricsClientProvider MetricsClientProvider
-	Settings              *CloudWatchSettings
+	Settings              CloudWatchSettings
 }
 
 type RequestContextFactoryFunc func(pluginCtx backend.PluginContext, region string) (reqCtx RequestContext, err error)
@@ -35,8 +35,3 @@ type metricStatMeta struct {
 	Period int    `json:"period"`
 	Label  string `json:"label,omitempty"`
 }
-
-type Metric struct {
-	Name      string `json:"name"`
-	Namespace string `json:"namespace"`
-}
diff --git a/pkg/tsdb/cloudwatch/routes/dimension_keys.go b/pkg/tsdb/cloudwatch/routes/dimension_keys.go
index 7bba7258444..302225dbed3 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_keys.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_keys.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/services"
 )
 
 func DimensionKeysHandler(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, parameters url.Values) ([]byte, *models.HttpError) {
-	dimensionKeysRequest, err := request.GetDimensionKeysRequest(parameters)
+	dimensionKeysRequest, err := resources.GetDimensionKeysRequest(parameters)
 	if err != nil {
 		return nil, models.NewHttpError("error in DimensionKeyHandler", http.StatusBadRequest, err)
 	}
@@ -22,25 +22,23 @@ func DimensionKeysHandler(pluginCtx backend.PluginContext, reqCtxFactory models.
 		return nil, models.NewHttpError("error in DimensionKeyHandler", http.StatusInternalServerError, err)
 	}
 
-	dimensionKeys := []string{}
+	var response []string
 	switch dimensionKeysRequest.Type() {
-	case request.StandardDimensionKeysRequest:
-		dimensionKeys, err = services.GetHardCodedDimensionKeysByNamespace(dimensionKeysRequest.Namespace)
-	case request.FilterDimensionKeysRequest:
-		dimensionKeys, err = service.GetDimensionKeysByDimensionFilter(dimensionKeysRequest)
-	case request.CustomMetricDimensionKeysRequest:
-		dimensionKeys, err = service.GetDimensionKeysByNamespace(dimensionKeysRequest.Namespace)
+	case resources.FilterDimensionKeysRequest:
+		response, err = service.GetDimensionKeysByDimensionFilter(dimensionKeysRequest)
+	default:
+		response, err = services.GetHardCodedDimensionKeysByNamespace(dimensionKeysRequest.Namespace)
 	}
 	if err != nil {
 		return nil, models.NewHttpError("error in DimensionKeyHandler", http.StatusInternalServerError, err)
 	}
 
-	dimensionKeysResponse, err := json.Marshal(dimensionKeys)
+	jsonResponse, err := json.Marshal(response)
 	if err != nil {
 		return nil, models.NewHttpError("error in DimensionKeyHandler", http.StatusInternalServerError, err)
 	}
 
-	return dimensionKeysResponse, nil
+	return jsonResponse, nil
 }
 
 // newListMetricsService is an list metrics service factory.
diff --git a/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go b/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
index d86ccc9f98e..e48fa7dabb6 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
@@ -8,7 +8,9 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
@@ -22,7 +24,7 @@ var logger = &logtest.Fake{}
 func Test_DimensionKeys_Route(t *testing.T) {
 	t.Run("calls FilterDimensionKeysRequest when a StandardDimensionKeysRequest is passed", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionKeysByDimensionFilter").Return([]string{}, nil)
+		mockListMetricsService.On("GetDimensionKeysByDimensionFilter", mock.Anything).Return([]string{}, nil).Once()
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
@@ -30,20 +32,12 @@ func Test_DimensionKeys_Route(t *testing.T) {
 		req := httptest.NewRequest("GET", `/dimension-keys?region=us-east-2&namespace=AWS/EC2&metricName=CPUUtilization&dimensionFilters={"NodeID":["Shared"],"stage":["QueryCommit"]}`, nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(DimensionKeysHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
-		mockListMetricsService.AssertNumberOfCalls(t, "GetDimensionKeysByDimensionFilter", 1)
-	})
-
-	t.Run("calls GetDimensionKeysByNamespace when a CustomMetricDimensionKeysRequest is passed", func(t *testing.T) {
-		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionKeysByNamespace").Return([]string{}, nil)
-		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
-			return &mockListMetricsService, nil
-		}
-		rr := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", `/dimension-keys?region=us-east-2&namespace=custom&metricName=CPUUtilization`, nil)
-		handler := http.HandlerFunc(ResourceRequestMiddleware(DimensionKeysHandler, logger, nil))
-		handler.ServeHTTP(rr, req)
-		mockListMetricsService.AssertNumberOfCalls(t, "GetDimensionKeysByNamespace", 1)
+		mockListMetricsService.AssertCalled(t, "GetDimensionKeysByDimensionFilter", resources.DimensionKeysRequest{
+			ResourceRequest: &resources.ResourceRequest{Region: "us-east-2"},
+			Namespace:       "AWS/EC2",
+			MetricName:      "CPUUtilization",
+			DimensionFilter: []*resources.Dimension{{Name: "NodeID", Value: "Shared"}, {Name: "stage", Value: "QueryCommit"}},
+		})
 	})
 
 	t.Run("calls GetHardCodedDimensionKeysByNamespace when a StandardDimensionKeysRequest is passed", func(t *testing.T) {
@@ -62,7 +56,7 @@ func Test_DimensionKeys_Route(t *testing.T) {
 		req := httptest.NewRequest("GET", "/dimension-keys?region=us-east-2&namespace=AWS/EC2&metricName=CPUUtilization", nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(DimensionKeysHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
-		res := []models.Metric{}
+		res := []resources.Metric{}
 		err := json.Unmarshal(rr.Body.Bytes(), &res)
 		require.Nil(t, err)
 		assert.True(t, haveBeenCalled)
@@ -71,7 +65,7 @@ func Test_DimensionKeys_Route(t *testing.T) {
 
 	t.Run("return 500 if GetDimensionKeysByDimensionFilter returns an error", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionKeysByDimensionFilter").Return([]string{}, fmt.Errorf("some error"))
+		mockListMetricsService.On("GetDimensionKeysByDimensionFilter", mock.Anything).Return([]string{}, fmt.Errorf("some error"))
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
diff --git a/pkg/tsdb/cloudwatch/routes/dimension_values.go b/pkg/tsdb/cloudwatch/routes/dimension_values.go
index 1cbfe88d22d..810bee9f918 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_values.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_values.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
 
 func DimensionValuesHandler(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, parameters url.Values) ([]byte, *models.HttpError) {
-	dimensionValuesRequest, err := request.GetDimensionValuesRequest(parameters)
+	dimensionValuesRequest, err := resources.GetDimensionValuesRequest(parameters)
 	if err != nil {
 		return nil, models.NewHttpError("error in DimensionValuesHandler", http.StatusBadRequest, err)
 	}
@@ -21,12 +21,12 @@ func DimensionValuesHandler(pluginCtx backend.PluginContext, reqCtxFactory model
 		return nil, models.NewHttpError("error in DimensionValuesHandler", http.StatusInternalServerError, err)
 	}
 
-	dimensionValues, err := service.GetDimensionValuesByDimensionFilter(dimensionValuesRequest)
+	response, err := service.GetDimensionValuesByDimensionFilter(dimensionValuesRequest)
 	if err != nil {
 		return nil, models.NewHttpError("error in DimensionValuesHandler", http.StatusInternalServerError, err)
 	}
 
-	dimensionValuesResponse, err := json.Marshal(dimensionValues)
+	dimensionValuesResponse, err := json.Marshal(response)
 	if err != nil {
 		return nil, models.NewHttpError("error in DimensionValuesHandler", http.StatusInternalServerError, err)
 	}
diff --git a/pkg/tsdb/cloudwatch/routes/dimension_values_test.go b/pkg/tsdb/cloudwatch/routes/dimension_values_test.go
index 444b6972d7b..c2853a8c98b 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_values_test.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_values_test.go
@@ -7,7 +7,9 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
@@ -16,7 +18,7 @@ import (
 func Test_DimensionValues_Route(t *testing.T) {
 	t.Run("Calls GetDimensionValuesByDimensionFilter when a valid request is passed", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionValuesByDimensionFilter").Return([]string{}, nil)
+		mockListMetricsService.On("GetDimensionValuesByDimensionFilter", mock.Anything).Return([]string{}, nil).Once()
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
@@ -24,11 +26,18 @@ func Test_DimensionValues_Route(t *testing.T) {
 		req := httptest.NewRequest("GET", `/dimension-values?region=us-east-2&dimensionKey=instanceId&namespace=AWS/EC2&metricName=CPUUtilization&dimensionFilters={"NodeID":["Shared"],"stage":["QueryCommit"]}`, nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(DimensionValuesHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
+		mockListMetricsService.AssertCalled(t, "GetDimensionValuesByDimensionFilter", resources.DimensionValuesRequest{
+			ResourceRequest: &resources.ResourceRequest{Region: "us-east-2"},
+			Namespace:       "AWS/EC2",
+			MetricName:      "CPUUtilization",
+			DimensionKey:    "instanceId",
+			DimensionFilter: []*resources.Dimension{{Name: "NodeID", Value: "Shared"}, {Name: "stage", Value: "QueryCommit"}},
+		})
 	})
 
 	t.Run("returns 500 if GetDimensionValuesByDimensionFilter returns an error", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionValuesByDimensionFilter").Return([]string{}, fmt.Errorf("some error"))
+		mockListMetricsService.On("GetDimensionValuesByDimensionFilter", mock.Anything).Return([]string{}, fmt.Errorf("some error"))
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
diff --git a/pkg/tsdb/cloudwatch/routes/metrics.go b/pkg/tsdb/cloudwatch/routes/metrics.go
index 83b708bb2f0..db90f7b2f2c 100644
--- a/pkg/tsdb/cloudwatch/routes/metrics.go
+++ b/pkg/tsdb/cloudwatch/routes/metrics.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/services"
 )
 
 func MetricsHandler(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, parameters url.Values) ([]byte, *models.HttpError) {
-	metricsRequest, err := request.GetMetricsRequest(parameters)
+	metricsRequest, err := resources.GetMetricsRequest(parameters)
 	if err != nil {
 		return nil, models.NewHttpError("error in MetricsHandler", http.StatusBadRequest, err)
 	}
@@ -22,13 +22,13 @@ func MetricsHandler(pluginCtx backend.PluginContext, reqCtxFactory models.Reques
 		return nil, models.NewHttpError("error in MetricsHandler", http.StatusInternalServerError, err)
 	}
 
-	var metrics []models.Metric
+	var metrics []resources.Metric
 	switch metricsRequest.Type() {
-	case request.AllMetricsRequestType:
+	case resources.AllMetricsRequestType:
 		metrics = services.GetAllHardCodedMetrics()
-	case request.MetricsByNamespaceRequestType:
+	case resources.MetricsByNamespaceRequestType:
 		metrics, err = services.GetHardCodedMetricsByNamespace(metricsRequest.Namespace)
-	case request.CustomNamespaceRequestType:
+	case resources.CustomNamespaceRequestType:
 		metrics, err = service.GetMetricsByNamespace(metricsRequest.Namespace)
 	}
 	if err != nil {
diff --git a/pkg/tsdb/cloudwatch/routes/metrics_test.go b/pkg/tsdb/cloudwatch/routes/metrics_test.go
index 4cc991d6f43..061a846012c 100644
--- a/pkg/tsdb/cloudwatch/routes/metrics_test.go
+++ b/pkg/tsdb/cloudwatch/routes/metrics_test.go
@@ -8,7 +8,9 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
@@ -19,7 +21,7 @@ import (
 func Test_Metrics_Route(t *testing.T) {
 	t.Run("calls GetMetricsByNamespace when a CustomNamespaceRequestType is passed", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetMetricsByNamespace").Return([]models.Metric{}, nil)
+		mockListMetricsService.On("GetMetricsByNamespace", mock.Anything).Return([]resources.Metric{}, nil)
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
@@ -36,15 +38,15 @@ func Test_Metrics_Route(t *testing.T) {
 			services.GetAllHardCodedMetrics = origGetAllHardCodedMetrics
 		})
 		haveBeenCalled := false
-		services.GetAllHardCodedMetrics = func() []models.Metric {
+		services.GetAllHardCodedMetrics = func() []resources.Metric {
 			haveBeenCalled = true
-			return []models.Metric{}
+			return []resources.Metric{}
 		}
 		rr := httptest.NewRecorder()
 		req := httptest.NewRequest("GET", "/metrics?region=us-east-2", nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(MetricsHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
-		res := []models.Metric{}
+		res := []resources.Metric{}
 		err := json.Unmarshal(rr.Body.Bytes(), &res)
 		require.Nil(t, err)
 		assert.True(t, haveBeenCalled)
@@ -57,16 +59,16 @@ func Test_Metrics_Route(t *testing.T) {
 		})
 		haveBeenCalled := false
 		usedNamespace := ""
-		services.GetHardCodedMetricsByNamespace = func(namespace string) ([]models.Metric, error) {
+		services.GetHardCodedMetricsByNamespace = func(namespace string) ([]resources.Metric, error) {
 			haveBeenCalled = true
 			usedNamespace = namespace
-			return []models.Metric{}, nil
+			return []resources.Metric{}, nil
 		}
 		rr := httptest.NewRecorder()
 		req := httptest.NewRequest("GET", "/metrics?region=us-east-2&namespace=AWS/DMS", nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(MetricsHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
-		res := []models.Metric{}
+		res := []resources.Metric{}
 		err := json.Unmarshal(rr.Body.Bytes(), &res)
 		require.Nil(t, err)
 		assert.True(t, haveBeenCalled)
@@ -75,7 +77,7 @@ func Test_Metrics_Route(t *testing.T) {
 
 	t.Run("returns 500 if GetMetricsByNamespace returns an error", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetMetricsByNamespace").Return([]models.Metric{}, fmt.Errorf("some error"))
+		mockListMetricsService.On("GetMetricsByNamespace", mock.Anything).Return([]resources.Metric{}, fmt.Errorf("some error"))
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
diff --git a/pkg/tsdb/cloudwatch/routes/namespaces_test.go b/pkg/tsdb/cloudwatch/routes/namespaces_test.go
index 5f95525ebf9..9eeec6f0a94 100644
--- a/pkg/tsdb/cloudwatch/routes/namespaces_test.go
+++ b/pkg/tsdb/cloudwatch/routes/namespaces_test.go
@@ -16,7 +16,7 @@ func Test_Namespaces_Route(t *testing.T) {
 	customNamespaces := ""
 	factoryFunc := func(pluginCtx backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
 		return models.RequestContext{
-			Settings: &models.CloudWatchSettings{
+			Settings: models.CloudWatchSettings{
 				Namespace: customNamespaces,
 			},
 		}, nil
diff --git a/pkg/tsdb/cloudwatch/services/hardcoded_metrics.go b/pkg/tsdb/cloudwatch/services/hardcoded_metrics.go
index 3a6079e1908..2268089b566 100644
--- a/pkg/tsdb/cloudwatch/services/hardcoded_metrics.go
+++ b/pkg/tsdb/cloudwatch/services/hardcoded_metrics.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
 
 var GetHardCodedDimensionKeysByNamespace = func(namespace string) ([]string, error) {
@@ -16,8 +16,8 @@ var GetHardCodedDimensionKeysByNamespace = func(namespace string) ([]string, err
 	return dimensionKeys, nil
 }
 
-var GetHardCodedMetricsByNamespace = func(namespace string) ([]models.Metric, error) {
-	response := []models.Metric{}
+var GetHardCodedMetricsByNamespace = func(namespace string) ([]resources.Metric, error) {
+	response := []resources.Metric{}
 	exists := false
 	var metrics []string
 	if metrics, exists = constants.NamespaceMetricsMap[namespace]; !exists {
@@ -25,17 +25,17 @@ var GetHardCodedMetricsByNamespace = func(namespace string) ([]models.Metric, er
 	}
 
 	for _, metric := range metrics {
-		response = append(response, models.Metric{Namespace: namespace, Name: metric})
+		response = append(response, resources.Metric{Namespace: namespace, Name: metric})
 	}
 
 	return response, nil
 }
 
-var GetAllHardCodedMetrics = func() []models.Metric {
-	response := []models.Metric{}
+var GetAllHardCodedMetrics = func() []resources.Metric {
+	response := []resources.Metric{}
 	for namespace, metrics := range constants.NamespaceMetricsMap {
 		for _, metric := range metrics {
-			response = append(response, models.Metric{Namespace: namespace, Name: metric})
+			response = append(response, resources.Metric{Namespace: namespace, Name: metric})
 		}
 	}
 
diff --git a/pkg/tsdb/cloudwatch/services/hardcoded_metrics_test.go b/pkg/tsdb/cloudwatch/services/hardcoded_metrics_test.go
index ca821a18b85..4895ef9dc61 100644
--- a/pkg/tsdb/cloudwatch/services/hardcoded_metrics_test.go
+++ b/pkg/tsdb/cloudwatch/services/hardcoded_metrics_test.go
@@ -3,7 +3,7 @@ package services
 import (
 	"testing"
 
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -34,6 +34,6 @@ func TestHardcodedMetrics_GetHardCodedMetricsByNamespace(t *testing.T) {
 	t.Run("Should return metrics if namespace exist", func(t *testing.T) {
 		resp, err := GetHardCodedMetricsByNamespace("AWS/IoTAnalytics")
 		require.NoError(t, err)
-		assert.Equal(t, []models.Metric{{Name: "ActionExecution", Namespace: "AWS/IoTAnalytics"}, {Name: "ActivityExecutionError", Namespace: "AWS/IoTAnalytics"}, {Name: "IncomingMessages", Namespace: "AWS/IoTAnalytics"}}, resp)
+		assert.Equal(t, []resources.Metric{{Name: "ActionExecution", Namespace: "AWS/IoTAnalytics"}, {Name: "ActivityExecutionError", Namespace: "AWS/IoTAnalytics"}, {Name: "IncomingMessages", Namespace: "AWS/IoTAnalytics"}}, resp)
 	})
 }
diff --git a/pkg/tsdb/cloudwatch/services/list_metrics.go b/pkg/tsdb/cloudwatch/services/list_metrics.go
index 224890743dd..8ab2d2bebad 100644
--- a/pkg/tsdb/cloudwatch/services/list_metrics.go
+++ b/pkg/tsdb/cloudwatch/services/list_metrics.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
 
 type ListMetricsService struct {
@@ -18,7 +18,7 @@ func NewListMetricsService(metricsClient models.MetricsClientProvider) models.Li
 	return &ListMetricsService{metricsClient}
 }
 
-func (l *ListMetricsService) GetDimensionKeysByDimensionFilter(r *request.DimensionKeysRequest) ([]string, error) {
+func (l *ListMetricsService) GetDimensionKeysByDimensionFilter(r resources.DimensionKeysRequest) ([]string, error) {
 	input := &cloudwatch.ListMetricsInput{}
 	if r.Namespace != "" {
 		input.Namespace = aws.String(r.Namespace)
@@ -63,7 +63,7 @@ func (l *ListMetricsService) GetDimensionKeysByDimensionFilter(r *request.Dimens
 	return dimensionKeys, nil
 }
 
-func (l *ListMetricsService) GetDimensionValuesByDimensionFilter(r *request.DimensionValuesRequest) ([]string, error) {
+func (l *ListMetricsService) GetDimensionValuesByDimensionFilter(r resources.DimensionValuesRequest) ([]string, error) {
 	input := &cloudwatch.ListMetricsInput{
 		Namespace:  aws.String(r.Namespace),
 		MetricName: aws.String(r.MetricName),
@@ -116,26 +116,26 @@ func (l *ListMetricsService) GetDimensionKeysByNamespace(namespace string) ([]st
 	return dimensionKeys, nil
 }
 
-func (l *ListMetricsService) GetMetricsByNamespace(namespace string) ([]models.Metric, error) {
+func (l *ListMetricsService) GetMetricsByNamespace(namespace string) ([]resources.Metric, error) {
 	metrics, err := l.ListMetricsWithPageLimit(&cloudwatch.ListMetricsInput{Namespace: aws.String(namespace)})
 	if err != nil {
 		return nil, err
 	}
 
-	response := []models.Metric{}
+	response := []resources.Metric{}
 	dupCheck := make(map[string]struct{})
 	for _, metric := range metrics {
 		if _, exists := dupCheck[*metric.MetricName]; exists {
 			continue
 		}
 		dupCheck[*metric.MetricName] = struct{}{}
-		response = append(response, models.Metric{Name: *metric.MetricName, Namespace: *metric.Namespace})
+		response = append(response, resources.Metric{Name: *metric.MetricName, Namespace: *metric.Namespace})
 	}
 
 	return response, nil
 }
 
-func setDimensionFilter(input *cloudwatch.ListMetricsInput, dimensionFilter []*request.Dimension) {
+func setDimensionFilter(input *cloudwatch.ListMetricsInput, dimensionFilter []*resources.Dimension) {
 	for _, dimension := range dimensionFilter {
 		df := &cloudwatch.DimensionFilter{
 			Name: aws.String(dimension.Name),
diff --git a/pkg/tsdb/cloudwatch/services/list_metrics_test.go b/pkg/tsdb/cloudwatch/services/list_metrics_test.go
index f2dc2db0c60..34548ffaa98 100644
--- a/pkg/tsdb/cloudwatch/services/list_metrics_test.go
+++ b/pkg/tsdb/cloudwatch/services/list_metrics_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/request"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -47,11 +47,11 @@ func TestListMetricsService_GetDimensionKeysByDimensionFilter(t *testing.T) {
 		fakeMetricsClient.On("ListMetricsWithPageLimit", mock.Anything).Return(metricResponse, nil)
 		listMetricsService := NewListMetricsService(fakeMetricsClient)
 
-		resp, err := listMetricsService.GetDimensionKeysByDimensionFilter(&request.DimensionKeysRequest{
-			ResourceRequest: &request.ResourceRequest{Region: "us-east-1"},
+		resp, err := listMetricsService.GetDimensionKeysByDimensionFilter(resources.DimensionKeysRequest{
+			ResourceRequest: &resources.ResourceRequest{Region: "us-east-1"},
 			Namespace:       "AWS/EC2",
 			MetricName:      "CPUUtilization",
-			DimensionFilter: []*request.Dimension{
+			DimensionFilter: []*resources.Dimension{
 				{Name: "InstanceId", Value: ""},
 			},
 		})
@@ -80,12 +80,12 @@ func TestListMetricsService_GetDimensionValuesByDimensionFilter(t *testing.T) {
 		fakeMetricsClient.On("ListMetricsWithPageLimit", mock.Anything).Return(metricResponse, nil)
 		listMetricsService := NewListMetricsService(fakeMetricsClient)
 
-		resp, err := listMetricsService.GetDimensionValuesByDimensionFilter(&request.DimensionValuesRequest{
-			ResourceRequest: &request.ResourceRequest{Region: "us-east-1"},
+		resp, err := listMetricsService.GetDimensionValuesByDimensionFilter(resources.DimensionValuesRequest{
+			ResourceRequest: &resources.ResourceRequest{Region: "us-east-1"},
 			Namespace:       "AWS/EC2",
 			MetricName:      "CPUUtilization",
 			DimensionKey:    "InstanceId",
-			DimensionFilter: []*request.Dimension{
+			DimensionFilter: []*resources.Dimension{
 				{Name: "InstanceId", Value: ""},
 			},
 		})
diff --git a/pkg/tsdb/cloudwatch/time_series_query_test.go b/pkg/tsdb/cloudwatch/time_series_query_test.go
index c978120662f..1dd7042ada6 100644
--- a/pkg/tsdb/cloudwatch/time_series_query_test.go
+++ b/pkg/tsdb/cloudwatch/time_series_query_test.go
@@ -50,7 +50,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 				}}}, nil)
 
 		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
 		})
 
 		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
@@ -150,7 +150,7 @@ func Test_executeTimeSeriesQuery_getCWClient_is_called_once_per_region_and_GetMe
 	}
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	t.Run("Queries with the same region should call GetSession with that region 1 time and call GetMetricDataWithContext 1 time", func(t *testing.T) {
@@ -342,7 +342,7 @@ func Test_QueryData_timeSeriesQuery_GetMetricDataWithContext(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
 	t.Run("passes query label as GetMetricData label when dynamic labels feature toggle is enabled", func(t *testing.T) {
@@ -444,7 +444,7 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 			}}, nil)
 
 	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: &models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 

From f98ec2c582252e667de937cc66eb96c90a4c7a89 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Tue, 22 Nov 2022 16:30:16 +0100
Subject: [PATCH 076/153] Scenes: Add custom variable support (#59057)

---
 .../features/scenes/scenes/variablesDemo.tsx  |  12 +
 .../variables/variants/CustomVariable.test.ts | 253 ++++++++++++++++++
 .../variables/variants/CustomVariable.tsx     |  56 ++++
 3 files changed, 321 insertions(+)
 create mode 100644 public/app/features/scenes/variables/variants/CustomVariable.test.ts
 create mode 100644 public/app/features/scenes/variables/variants/CustomVariable.tsx

diff --git a/public/app/features/scenes/scenes/variablesDemo.tsx b/public/app/features/scenes/scenes/variablesDemo.tsx
index 74aec941ef3..16cf91a60fb 100644
--- a/public/app/features/scenes/scenes/variablesDemo.tsx
+++ b/public/app/features/scenes/scenes/variablesDemo.tsx
@@ -7,6 +7,7 @@ import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { VariableValueSelectors } from '../variables/components/VariableValueSelectors';
 import { SceneVariableSet } from '../variables/sets/SceneVariableSet';
+import { CustomVariable } from '../variables/variants/CustomVariable';
 import { TestVariable } from '../variables/variants/TestVariable';
 
 import { getQueryRunnerWithRandomWalkQuery } from './queries';
@@ -42,6 +43,17 @@ export function getVariablesDemo(): Scene {
           text: '',
           options: [],
         }),
+        new CustomVariable({
+          name: 'Single Custom',
+          query: 'A : 10,B : 20',
+          options: [],
+        }),
+        new CustomVariable({
+          name: 'Multi Custom',
+          query: 'A : 10,B : 20',
+          isMulti: true,
+          options: [],
+        }),
       ],
     }),
     layout: new SceneFlexLayout({
diff --git a/public/app/features/scenes/variables/variants/CustomVariable.test.ts b/public/app/features/scenes/variables/variants/CustomVariable.test.ts
new file mode 100644
index 00000000000..f974a281b93
--- /dev/null
+++ b/public/app/features/scenes/variables/variants/CustomVariable.test.ts
@@ -0,0 +1,253 @@
+import { lastValueFrom } from 'rxjs';
+
+import { CustomVariable } from './CustomVariable';
+
+describe('CustomVariable', () => {
+  describe('When empty query is provided', () => {
+    it('Should default to empty options', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: '',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('');
+      expect(variable.state.text).toEqual('');
+      expect(variable.state.options).toEqual([]);
+    });
+  });
+
+  describe('When invalid query is provided', () => {
+    it('Should default to empty options', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'A - B',
+      });
+
+      // TODO: Be able to triggger the state update to get the options
+      await lastValueFrom(variable.getValueOptions({}));
+
+      expect(variable.state.value).toEqual('');
+      expect(variable.state.text).toEqual('');
+      expect(variable.state.options).toEqual([]);
+    });
+  });
+
+  describe('When valid query is provided', () => {
+    it('Should generate correctly the options for only value queries', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'A,B,C',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('A');
+      expect(variable.state.text).toEqual('A');
+      expect(variable.state.options).toEqual([
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' },
+      ]);
+    });
+
+    it('Should generate correctly the options for key:value pairs', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'label-1 : value-1,label-2 : value-2, label-3 : value-3',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('value-1');
+      expect(variable.state.text).toEqual('label-1');
+      expect(variable.state.options).toEqual([
+        { label: 'label-1', value: 'value-1' },
+        { label: 'label-2', value: 'value-2' },
+        { label: 'label-3', value: 'value-3' },
+      ]);
+    });
+
+    it('Should generate correctly the options for key:value pairs with special characters', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'label\\,1 :  value\\,1',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('value,1');
+      expect(variable.state.text).toEqual('label,1');
+      expect(variable.state.options).toEqual([{ label: 'label,1', value: 'value,1' }]);
+    });
+
+    it('Should generate correctly the options for key:value and only values combined', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'label-1 : value-1, value-2, label\\,3 : value-3,value\\,4',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('value-1');
+      expect(variable.state.text).toEqual('label-1');
+      expect(variable.state.options).toEqual([
+        { label: 'label-1', value: 'value-1' },
+        { label: 'value-2', value: 'value-2' },
+        { label: 'label,3', value: 'value-3' },
+        { label: 'value,4', value: 'value,4' },
+      ]);
+    });
+
+    it('Should generate correctly the options for key:value pairs with extra spaces', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'a,  b,   c, d :    e',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('a');
+      expect(variable.state.text).toEqual('a');
+      expect(variable.state.options).toEqual([
+        {
+          label: 'a',
+          value: 'a',
+        },
+        {
+          label: 'b',
+          value: 'b',
+        },
+        {
+          label: 'c',
+          value: 'c',
+        },
+        {
+          label: 'd',
+          value: 'e',
+        },
+      ]);
+    });
+
+    it('Should generate correctly the options for only values as URLs', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'http://www.google.com/, http://www.amazon.com/',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('http://www.google.com/');
+      expect(variable.state.text).toEqual('http://www.google.com/');
+      expect(variable.state.options).toEqual([
+        {
+          label: 'http://www.google.com/',
+          value: 'http://www.google.com/',
+        },
+        {
+          label: 'http://www.amazon.com/',
+          value: 'http://www.amazon.com/',
+        },
+      ]);
+    });
+
+    it('Should generate correctly the options for key/values as URLs', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'google : http://www.google.com/, amazon : http://www.amazon.com/',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('http://www.google.com/');
+      expect(variable.state.text).toEqual('google');
+      expect(variable.state.options).toEqual([
+        {
+          label: 'google',
+          value: 'http://www.google.com/',
+        },
+        {
+          label: 'amazon',
+          value: 'http://www.amazon.com/',
+        },
+      ]);
+    });
+  });
+
+  describe('When value is provided', () => {
+    it('Should keep current value if current value is valid', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        query: 'A,B',
+        value: 'B',
+        text: 'B',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toBe('B');
+      expect(variable.state.text).toBe('B');
+    });
+
+    it('Should maintain the valid values when multiple selected', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        isMulti: true,
+        query: 'A,C',
+        value: ['A', 'B', 'C'],
+        text: ['A', 'B', 'C'],
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual(['A', 'C']);
+      expect(variable.state.text).toEqual(['A', 'C']);
+    });
+
+    it('Should pick first option if none of the current values are valid', async () => {
+      const variable = new CustomVariable({
+        name: 'test',
+        options: [],
+        isMulti: true,
+        query: 'A,C',
+        value: ['D', 'E'],
+        text: ['E', 'E'],
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual(['A']);
+      expect(variable.state.text).toEqual(['A']);
+    });
+  });
+});
diff --git a/public/app/features/scenes/variables/variants/CustomVariable.tsx b/public/app/features/scenes/variables/variants/CustomVariable.tsx
new file mode 100644
index 00000000000..07c923b7d54
--- /dev/null
+++ b/public/app/features/scenes/variables/variants/CustomVariable.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { Observable, of } from 'rxjs';
+
+import { SceneComponentProps } from '../../core/types';
+import { VariableDependencyConfig } from '../VariableDependencyConfig';
+import { VariableValueSelect } from '../components/VariableValueSelect';
+import { VariableValueOption } from '../types';
+
+import { MultiValueVariable, MultiValueVariableState, VariableGetOptionsArgs } from './MultiValueVariable';
+
+export interface CustomVariableState extends MultiValueVariableState {
+  query: string;
+}
+
+export class CustomVariable extends MultiValueVariable<CustomVariableState> {
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    statePaths: ['query'],
+  });
+
+  public constructor(initialState: Partial<CustomVariableState>) {
+    super({
+      query: '',
+      value: '',
+      text: '',
+      options: [],
+      name: '',
+      ...initialState,
+    });
+  }
+
+  public getValueOptions(args: VariableGetOptionsArgs): Observable<VariableValueOption[]> {
+    const match = this.state.query.match(/(?:\\,|[^,])+/g) ?? [];
+
+    const options = match.map((text) => {
+      text = text.replace(/\\,/g, ',');
+      const textMatch = /^(.+)\s:\s(.+)$/g.exec(text) ?? [];
+      if (textMatch.length === 3) {
+        const [, key, value] = textMatch;
+        return { label: key.trim(), value: value.trim() };
+      } else {
+        return { label: text.trim(), value: text.trim() };
+      }
+    });
+
+    return of(options);
+
+    // TODO: Support 'All'
+    //if (this.state.includeAll) {
+    //  options.unshift({ text: ALL_VARIABLE_TEXT, value: ALL_VARIABLE_VALUE, selected: false });
+    //}
+  }
+
+  public static Component = ({ model }: SceneComponentProps<MultiValueVariable>) => {
+    return <VariableValueSelect model={model} />;
+  };
+}

From 3bea8f24626a643c143eab81929d7910dcbed6b9 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Tue, 22 Nov 2022 16:43:35 +0100
Subject: [PATCH 077/153] Azure Monitor: Fix namespace selection for
 storageaccounts (#56449)

---
 .../MetricsQueryEditor/setQueryValue.test.ts    |  4 +++-
 .../MetricsQueryEditor/setQueryValue.ts         | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.test.ts
index 01b527ff6b6..ee9c3d814e8 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.test.ts
@@ -4,8 +4,10 @@ describe('setQueryValue', () => {
   describe('setCustomNamespace', () => {
     it('The metricnamespace must be: microsoft.storage/storageaccounts for storage accounts.', () => {
       const result = setCustomNamespace({ refId: 'A' }, 'microsoft.storage/storageaccounts/fileservices');
-      expect(result.azureMonitor?.customNamespace).toEqual('');
+      expect(result.azureMonitor?.customNamespace).toBeUndefined();
+      expect(result.azureMonitor?.metricNamespace).toEqual('microsoft.storage/storageaccounts/fileservices');
     });
+
     it('Set a custom namespace for non storage accounts.', () => {
       const result = setCustomNamespace({ refId: 'A' }, 'foo/bar');
       expect(result.azureMonitor?.customNamespace).toEqual('foo/bar');
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.ts
index e04ff8550b4..6e1416913ce 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.ts
@@ -4,13 +4,26 @@ export function setCustomNamespace(query: AzureMonitorQuery, selection: string |
   if (query.azureMonitor?.customNamespace === selection) {
     return query;
   }
-  const customNamespace = selection?.toLowerCase().startsWith('microsoft.storage/storageaccounts/') ? '' : selection;
+
+  if (selection?.toLowerCase().startsWith('microsoft.storage/storageaccounts/')) {
+    return {
+      ...query,
+      azureMonitor: {
+        ...query.azureMonitor,
+        metricNamespace: selection,
+        metricName: undefined,
+        aggregation: undefined,
+        timeGrain: '',
+        dimensionFilters: [],
+      },
+    };
+  }
 
   return {
     ...query,
     azureMonitor: {
       ...query.azureMonitor,
-      customNamespace,
+      customNamespace: selection,
       metricName: undefined,
       aggregation: undefined,
       timeGrain: '',

From 5b1ff83ee9c527c83439f0ac52d74d9b0df6d3c1 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Tue, 22 Nov 2022 16:43:57 +0100
Subject: [PATCH 078/153] Azure Monitor: Fix resource picker selection for
 subresources (#56392)

---
 .../components/ResourcePicker/utils.test.ts   | 63 +++++++++++++------
 .../components/ResourcePicker/utils.ts        | 27 ++++++--
 2 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.test.ts
index b86486f1563..57083d316fd 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.test.ts
@@ -6,16 +6,16 @@ import { findRow, parseResourceURI, setResource } from './utils';
 describe('AzureMonitor ResourcePicker utils', () => {
   describe('parseResourceURI', () => {
     it('should parse subscription URIs', () => {
-      expect(parseResourceURI('/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572')).toEqual({
-        subscription: '44693801-6ee6-49de-9b2d-9106972f9572',
+      expect(parseResourceURI('/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')).toEqual({
+        subscription: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
       });
     });
 
     it('should parse resource group URIs', () => {
       expect(
-        parseResourceURI('/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources')
+        parseResourceURI('/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources')
       ).toEqual({
-        subscription: '44693801-6ee6-49de-9b2d-9106972f9572',
+        subscription: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
         resourceGroup: 'cloud-datasources',
       });
     });
@@ -23,10 +23,10 @@ describe('AzureMonitor ResourcePicker utils', () => {
     it('should parse resource URIs', () => {
       expect(
         parseResourceURI(
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/Microsoft.Compute/virtualMachines/GithubTestDataVM'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Compute/virtualMachines/GithubTestDataVM'
         )
       ).toEqual({
-        subscription: '44693801-6ee6-49de-9b2d-9106972f9572',
+        subscription: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
         resourceGroup: 'cloud-datasources',
         metricNamespace: 'Microsoft.Compute/virtualMachines',
         resourceName: 'GithubTestDataVM',
@@ -36,10 +36,10 @@ describe('AzureMonitor ResourcePicker utils', () => {
     it('should parse resource URIs with a subresource', () => {
       expect(
         parseResourceURI(
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0/fileServices/default'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0/fileServices/default'
         )
       ).toEqual({
-        subscription: '44693801-6ee6-49de-9b2d-9106972f9572',
+        subscription: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
         resourceGroup: 'cloud-datasources',
         metricNamespace: 'Microsoft.Storage/storageAccounts/fileServices',
         resourceName: 'csb100320016c43d2d0/default',
@@ -47,30 +47,30 @@ describe('AzureMonitor ResourcePicker utils', () => {
     });
 
     it('returns undefined for invalid input', () => {
-      expect(parseResourceURI('44693801-6ee6-49de-9b2d-9106972f9572')).toEqual({});
+      expect(parseResourceURI('aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')).toEqual({});
     });
 
     it('returns a valid response with a missing element in the metric namespace and name', () => {
       expect(
         parseResourceURI(
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/foo'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/foo'
         )
       ).toEqual({
         metricNamespace: 'foo',
         resourceGroup: 'cloud-datasources',
         resourceName: '',
-        subscription: '44693801-6ee6-49de-9b2d-9106972f9572',
+        subscription: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
       });
 
       expect(
         parseResourceURI(
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/foo/bar'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/foo/bar'
         )
       ).toEqual({
         metricNamespace: 'foo/bar',
         resourceGroup: 'cloud-datasources',
         resourceName: '',
-        subscription: '44693801-6ee6-49de-9b2d-9106972f9572',
+        subscription: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
       });
     });
   });
@@ -87,7 +87,7 @@ describe('AzureMonitor ResourcePicker utils', () => {
       const rows: ResourceRowGroup = [
         {
           id: '',
-          uri: '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0',
+          uri: '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0',
           name: '',
           type: ResourceRowType.Resource,
           typeLabel: '',
@@ -96,7 +96,7 @@ describe('AzureMonitor ResourcePicker utils', () => {
       expect(
         findRow(
           rows,
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0/fileServices/default'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0/fileServices/default'
         )
       ).toEqual(rows[0]);
     });
@@ -105,7 +105,7 @@ describe('AzureMonitor ResourcePicker utils', () => {
       const rows: ResourceRowGroup = [
         {
           id: '',
-          uri: '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/microsoft.storage/storageaccounts/csb100320016c43d2d0',
+          uri: '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/microsoft.storage/storageaccounts/csb100320016c43d2d0',
           name: '',
           type: ResourceRowType.Resource,
           typeLabel: '',
@@ -114,7 +114,7 @@ describe('AzureMonitor ResourcePicker utils', () => {
       expect(
         findRow(
           rows,
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0'
         )
       ).toEqual(rows[0]);
     });
@@ -123,7 +123,7 @@ describe('AzureMonitor ResourcePicker utils', () => {
       const rows: ResourceRowGroup = [
         {
           id: '',
-          uri: '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/CLOUD-DATASOURCES/providers/microsoft.storage/storageaccounts/csb100320016c43d2d0',
+          uri: '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/CLOUD-DATASOURCES/providers/microsoft.storage/storageaccounts/csb100320016c43d2d0',
           name: '',
           type: ResourceRowType.Resource,
           typeLabel: '',
@@ -132,10 +132,35 @@ describe('AzureMonitor ResourcePicker utils', () => {
       expect(
         findRow(
           rows,
-          '/subscriptions/44693801-6ee6-49de-9b2d-9106972f9572/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0'
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Storage/storageAccounts/csb100320016c43d2d0'
         )
       ).toEqual(rows[0]);
     });
+
+    it('should find a row matching the right subresource', () => {
+      const rows: ResourceRowGroup = [
+        {
+          id: '',
+          uri: '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Sql/servers/foo',
+          name: '',
+          type: ResourceRowType.Resource,
+          typeLabel: '',
+        },
+        {
+          id: '',
+          uri: '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Sql/servers/foo/databases/bar',
+          name: '',
+          type: ResourceRowType.Resource,
+          typeLabel: '',
+        },
+      ];
+      expect(
+        findRow(
+          rows,
+          '/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.Sql/servers/foo/databases/bar'
+        )
+      ).toEqual(rows[1]);
+    });
   });
 
   describe('setResource', () => {
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
index 6a20d5df88d..a5a8778eb76 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
@@ -62,6 +62,22 @@ export function isGUIDish(input: string) {
   return !!input.match(/^[A-Z0-9]+/i);
 }
 
+function compareNamespaceAndName(
+  rowNamespace?: string,
+  rowName?: string,
+  resourceNamespace?: string,
+  resourceName?: string
+) {
+  // StorageAccounts subresources are not listed independently
+  if (resourceNamespace?.startsWith('microsoft.storage/storageaccounts')) {
+    resourceNamespace = 'microsoft.storage/storageaccounts';
+    if (resourceName?.endsWith('/default')) {
+      resourceName = resourceName.slice(0, -'/default'.length);
+    }
+  }
+  return rowNamespace === resourceNamespace && rowName === resourceName;
+}
+
 function matchURI(rowURI: string, resourceURI: string) {
   const targetParams = parseResourceDetails(resourceURI);
   const rowParams = parseResourceDetails(rowURI);
@@ -69,11 +85,12 @@ function matchURI(rowURI: string, resourceURI: string) {
   return (
     rowParams?.subscription === targetParams?.subscription &&
     rowParams?.resourceGroup?.toLowerCase() === targetParams?.resourceGroup?.toLowerCase() &&
-    // metricNamespace may include a subresource that we don't need to compare
-    rowParams?.metricNamespace?.toLowerCase().split('/')[0] ===
-      targetParams?.metricNamespace?.toLowerCase().split('/')[0] &&
-    // resourceName may include a subresource that we don't need to compare
-    rowParams?.resourceName?.split('/')[0] === targetParams?.resourceName?.split('/')[0]
+    compareNamespaceAndName(
+      rowParams?.metricNamespace?.toLowerCase(),
+      rowParams?.resourceName,
+      targetParams?.metricNamespace?.toLowerCase(),
+      targetParams?.resourceName
+    )
   );
 }
 

From f8dc333ee468d2d38257b867724d26dcf621b0ac Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:47:42 +0100
Subject: [PATCH 079/153] Preferences: Add confirmation modal when saving org
 preferences (#59119)

---
 .../ConfirmModal/ConfirmModal.story.tsx       |  7 ++--
 .../components/ConfirmModal/ConfirmModal.tsx  |  7 ++--
 .../SharedPreferences/SharedPreferences.tsx   | 11 +++++--
 public/app/core/services/ModalManager.ts      |  8 ++++-
 .../app/features/org/OrgDetailsPage.test.tsx  | 33 +++++++++++++++++--
 public/app/features/org/OrgDetailsPage.tsx    | 22 +++++++++++--
 public/app/types/events.ts                    |  4 ++-
 7 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx
index 2255b431718..4135e314a1f 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx
@@ -46,6 +46,7 @@ export const Basic: ComponentStory<typeof ConfirmModal> = ({
   body,
   description,
   confirmText,
+  confirmButtonVariant,
   dismissText,
   icon,
   isOpen,
@@ -58,6 +59,7 @@ export const Basic: ComponentStory<typeof ConfirmModal> = ({
       body={body}
       description={description}
       confirmText={confirmText}
+      confirmButtonVariant={confirmButtonVariant}
       dismissText={dismissText}
       icon={icon}
       onConfirm={onConfirm}
@@ -77,6 +79,7 @@ Basic.args = {
   body: 'Are you sure you want to delete this user?',
   description: 'Removing the user will not remove any dashboards the user has created',
   confirmText: 'Delete',
+  confirmButtonVariant: 'destructive',
   dismissText: 'Cancel',
   icon: 'exclamation-triangle',
   isOpen: true,
@@ -112,7 +115,7 @@ export const AlternativeAction: ComponentStory<typeof ConfirmModal> = ({
 
 AlternativeAction.parameters = {
   controls: {
-    exclude: [...defaultExcludes, 'confirmationText'],
+    exclude: [...defaultExcludes, 'confirmationText', 'confirmButtonVariant'],
   },
 };
 
@@ -155,7 +158,7 @@ export const WithConfirmation: ComponentStory<typeof ConfirmModal> = ({
 
 WithConfirmation.parameters = {
   controls: {
-    exclude: [...defaultExcludes, 'alternativeText'],
+    exclude: [...defaultExcludes, 'alternativeText', 'confirmButtonVariant'],
   },
 };
 
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
index 0251fbcfd0c..86058fa945f 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
@@ -7,7 +7,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { HorizontalGroup, Input } from '..';
 import { useStyles2 } from '../../themes';
 import { IconName } from '../../types/icon';
-import { Button } from '../Button';
+import { Button, ButtonVariant } from '../Button';
 import { Modal } from '../Modal/Modal';
 
 export interface ConfirmModalProps {
@@ -31,6 +31,8 @@ export interface ConfirmModalProps {
   confirmationText?: string;
   /** Text for alternative button */
   alternativeText?: string;
+  /** Confirm button variant */
+  confirmButtonVariant?: ButtonVariant;
   /** Confirm action callback */
   onConfirm(): void;
   /** Dismiss action callback */
@@ -53,6 +55,7 @@ export const ConfirmModal = ({
   onConfirm,
   onDismiss,
   onAlternative,
+  confirmButtonVariant = 'destructive',
 }: ConfirmModalProps): JSX.Element => {
   const [disabled, setDisabled] = useState(Boolean(confirmationText));
   const styles = useStyles2(getStyles);
@@ -86,7 +89,7 @@ export const ConfirmModal = ({
           {dismissText}
         </Button>
         <Button
-          variant="destructive"
+          variant={confirmButtonVariant}
           onClick={onConfirm}
           disabled={disabled}
           ref={buttonRef}
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index e9ab93f9867..c5cc50cc4f5 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -26,6 +26,7 @@ import { UserPreferencesDTO } from 'app/types';
 export interface Props {
   resourceUri: string;
   disabled?: boolean;
+  onConfirm?: () => Promise<boolean>;
 }
 
 export type State = UserPreferencesDTO;
@@ -85,9 +86,13 @@ export class SharedPreferences extends PureComponent<Props, State> {
   }
 
   onSubmitForm = async () => {
-    const { homeDashboardUID, theme, timezone, weekStart, language, queryHistory } = this.state;
-    await this.service.update({ homeDashboardUID, theme, timezone, weekStart, language, queryHistory });
-    window.location.reload();
+    const confirmationResult = this.props.onConfirm ? await this.props.onConfirm() : true;
+
+    if (confirmationResult) {
+      const { homeDashboardUID, theme, timezone, weekStart, language, queryHistory } = this.state;
+      await this.service.update({ homeDashboardUID, theme, timezone, weekStart, language, queryHistory });
+      window.location.reload();
+    }
   };
 
   onThemeChanged = (value: string) => {
diff --git a/public/app/core/services/ModalManager.ts b/public/app/core/services/ModalManager.ts
index ce7f3b02d7e..92f59748d3f 100644
--- a/public/app/core/services/ModalManager.ts
+++ b/public/app/core/services/ModalManager.ts
@@ -51,6 +51,7 @@ export class ModalManager {
     const {
       confirmText,
       onConfirm = () => undefined,
+      onDismiss,
       text2,
       altActionText,
       onAltAction,
@@ -60,9 +61,11 @@ export class ModalManager {
       yesText = 'Yes',
       icon,
       title = 'Confirm',
+      yesButtonVariant,
     } = payload;
     const props: ConfirmModalProps = {
       confirmText: yesText,
+      confirmButtonVariant: yesButtonVariant,
       confirmationText: confirmText,
       icon,
       title,
@@ -74,7 +77,10 @@ export class ModalManager {
         onConfirm();
         this.onReactModalDismiss();
       },
-      onDismiss: this.onReactModalDismiss,
+      onDismiss: () => {
+        onDismiss?.();
+        this.onReactModalDismiss();
+      },
       onAlternative: onAltAction
         ? () => {
             onAltAction();
diff --git a/public/app/features/org/OrgDetailsPage.test.tsx b/public/app/features/org/OrgDetailsPage.test.tsx
index e566078ba8f..018e589d471 100644
--- a/public/app/features/org/OrgDetailsPage.test.tsx
+++ b/public/app/features/org/OrgDetailsPage.test.tsx
@@ -1,8 +1,12 @@
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 
 import { NavModel } from '@grafana/data';
+import { ModalManager } from 'app/core/services/ModalManager';
+import { configureStore } from 'app/store/configureStore';
 
 import { backendSrv } from '../../core/services/backend_srv';
 import { Organization } from '../../types';
@@ -12,6 +16,7 @@ import { setOrganizationName } from './state/reducers';
 
 jest.mock('app/core/core', () => {
   return {
+    ...jest.requireActual('app/core/core'),
     contextSrv: {
       hasPermission: () => true,
     },
@@ -56,7 +61,11 @@ const setup = (propOverrides?: object) => {
   };
   Object.assign(props, propOverrides);
 
-  render(<OrgDetailsPage {...props} />);
+  render(
+    <Provider store={configureStore()}>
+      <OrgDetailsPage {...props} />
+    </Provider>
+  );
 };
 
 describe('Render', () => {
@@ -84,4 +93,24 @@ describe('Render', () => {
       })
     ).not.toThrow();
   });
+
+  it('should show a modal when submitting', async () => {
+    new ModalManager().init();
+    setup({
+      organization: {
+        name: 'Cool org',
+        id: 1,
+      },
+      preferences: {
+        homeDashboardUID: 'home-dashboard',
+        theme: 'Default',
+        timezone: 'Default',
+        locale: '',
+      },
+    });
+
+    await userEvent.click(screen.getByRole('button', { name: 'Save' }));
+
+    expect(screen.getByText('Confirm preferences update')).toBeInTheDocument();
+  });
 });
diff --git a/public/app/features/org/OrgDetailsPage.tsx b/public/app/features/org/OrgDetailsPage.tsx
index 57c21a83a63..27fb009c740 100644
--- a/public/app/features/org/OrgDetailsPage.tsx
+++ b/public/app/features/org/OrgDetailsPage.tsx
@@ -5,9 +5,10 @@ import { NavModel } from '@grafana/data';
 import { VerticalGroup } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
-import { contextSrv } from 'app/core/core';
+import { appEvents, contextSrv } from 'app/core/core';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { AccessControlAction, Organization, StoreState } from 'app/types';
+import { ShowConfirmModalEvent } from 'app/types/events';
 
 import OrgProfile from './OrgProfile';
 import { loadOrganization, updateOrganization } from './state/actions';
@@ -31,6 +32,21 @@ export class OrgDetailsPage extends PureComponent<Props> {
     this.props.updateOrganization();
   };
 
+  handleConfirm = () => {
+    return new Promise<boolean>((resolve) => {
+      appEvents.publish(
+        new ShowConfirmModalEvent({
+          title: 'Confirm preferences update',
+          text: 'This will update the preferences for the whole organization. Are you sure you want to update the preferences?',
+          yesText: 'Save',
+          yesButtonVariant: 'primary',
+          onConfirm: async () => resolve(true),
+          onDismiss: async () => resolve(false),
+        })
+      );
+    });
+  };
+
   render() {
     const { navModel, organization } = this.props;
     const isLoading = Object.keys(organization).length === 0;
@@ -44,7 +60,9 @@ export class OrgDetailsPage extends PureComponent<Props> {
           {!isLoading && (
             <VerticalGroup spacing="lg">
               {canReadOrg && <OrgProfile onSubmit={this.onUpdateOrganization} orgName={organization.name} />}
-              {canReadPreferences && <SharedPreferences resourceUri="org" disabled={!canWritePreferences} />}
+              {canReadPreferences && (
+                <SharedPreferences resourceUri="org" disabled={!canWritePreferences} onConfirm={this.handleConfirm} />
+              )}
             </VerticalGroup>
           )}
         </Page.Contents>
diff --git a/public/app/types/events.ts b/public/app/types/events.ts
index c1a6d63c529..8501bcc0f26 100644
--- a/public/app/types/events.ts
+++ b/public/app/types/events.ts
@@ -1,5 +1,5 @@
 import { AnnotationQuery, BusEventBase, BusEventWithPayload, eventFactory } from '@grafana/data';
-import { IconName } from '@grafana/ui';
+import { IconName, ButtonVariant } from '@grafana/ui';
 
 /**
  * Event Payloads
@@ -37,7 +37,9 @@ export interface ShowConfirmModalPayload {
   yesText?: string;
   noText?: string;
   icon?: IconName;
+  yesButtonVariant?: ButtonVariant;
 
+  onDismiss?: () => void;
   onConfirm?: () => void;
   onAltAction?: () => void;
 }

From d5274dfdda0274c3faac3e885f77e5c4656082a7 Mon Sep 17 00:00:00 2001
From: Kristina <kristina.durivage@grafana.com>
Date: Tue, 22 Nov 2022 09:52:50 -0600
Subject: [PATCH 080/153] Explore: Skip flaky query history test (#59135)

Skip flaky query history test
---
 public/app/features/explore/spec/queryHistory.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/explore/spec/queryHistory.test.tsx b/public/app/features/explore/spec/queryHistory.test.tsx
index 0e3f67b28c5..f9d102fa320 100644
--- a/public/app/features/explore/spec/queryHistory.test.tsx
+++ b/public/app/features/explore/spec/queryHistory.test.tsx
@@ -142,7 +142,7 @@ describe('Explore: Query History', () => {
     await assertQueryHistory(['{"expr":"query #2"}', '{"expr":"query #1"}']);
   });
 
-  it('updates the state in both Explore panes', async () => {
+  it.skip('updates the state in both Explore panes', async () => {
     const urlParams = {
       left: serializeStateToUrlParam({
         datasource: 'loki',

From 41b3398eb4b4436bf1d63ab30747cad193457864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?=
 <JohnnyQQQQ@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:54:24 +0100
Subject: [PATCH 081/153] Alerting: Enable interpolation for notification
 policies in file provisioning (#58956)

---
 .../alerting/notification_policy_types.go     | 42 +++++++++++++++----
 .../notification_policy_types_test.go         | 37 ++++++++++++++++
 pkg/services/provisioning/alerting/types.go   | 13 ++++--
 3 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 pkg/services/provisioning/alerting/notification_policy_types_test.go

diff --git a/pkg/services/provisioning/alerting/notification_policy_types.go b/pkg/services/provisioning/alerting/notification_policy_types.go
index 21987888612..dae145211ad 100644
--- a/pkg/services/provisioning/alerting/notification_policy_types.go
+++ b/pkg/services/provisioning/alerting/notification_policy_types.go
@@ -1,26 +1,54 @@
 package alerting
 
 import (
+	"encoding/json"
+
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
 )
 
 type NotificiationPolicyV1 struct {
-	OrgID  values.Int64Value `json:"orgId" yaml:"orgId"`
-	Policy definitions.Route `json:",inline" yaml:",inline"`
+	OrgID values.Int64Value `json:"orgId" yaml:"orgId"`
+	// We use JSONValue here, as we want to have interpolation the values.
+	Policy values.JSONValue `json:"-" yaml:"-"`
 }
 
-func (v1 *NotificiationPolicyV1) mapToModel() NotificiationPolicy {
+func (v1 *NotificiationPolicyV1) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	err := v1.Policy.UnmarshalYAML(unmarshal)
+	if err != nil {
+		return err
+	}
+	// As we also want to unmarshal the orgId and any other field that might be
+	// added in the future we create an alias type that prevents recursion
+	// and just uses the default marshler.
+	type plain NotificiationPolicyV1
+	return unmarshal((*plain)(v1))
+}
+
+func (v1 *NotificiationPolicyV1) mapToModel() (NotificiationPolicy, error) {
 	orgID := v1.OrgID.Value()
 	if orgID < 1 {
 		orgID = 1
 	}
-	// we don't need any further validation here as it's done by
-	// the notification policy service
+	var route definitions.Route
+	// We need the string json representation, so we marshal the policy back
+	// as a string and interpolate it at the same time.
+	data, err := json.Marshal(v1.Policy.Value())
+	if err != nil {
+		return NotificiationPolicy{}, err
+	}
+	// Now we can take the interpolated string json represtenation of the policy
+	// and unmarshal it in the concrete type.
+	err = json.Unmarshal(data, &route)
+	if err != nil {
+		return NotificiationPolicy{}, err
+	}
+	// We don't need any further validation here as it's done by
+	// the notification policy service.
 	return NotificiationPolicy{
 		OrgID:  orgID,
-		Policy: v1.Policy,
-	}
+		Policy: route,
+	}, nil
 }
 
 type NotificiationPolicy struct {
diff --git a/pkg/services/provisioning/alerting/notification_policy_types_test.go b/pkg/services/provisioning/alerting/notification_policy_types_test.go
new file mode 100644
index 00000000000..3538ad23657
--- /dev/null
+++ b/pkg/services/provisioning/alerting/notification_policy_types_test.go
@@ -0,0 +1,37 @@
+package alerting
+
+import (
+	"os"
+	"testing"
+
+	"gopkg.in/yaml.v2"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNotificationPolicy(t *testing.T) {
+	const (
+		envKey   = "NOTIFIER_EMAIL_REMINDER_FREQUENCY"
+		envValue = "4h"
+	)
+	err := os.Setenv(envKey, envValue)
+	require.NoError(t, err)
+	defer func() {
+		_ = os.Unsetenv(envKey)
+	}()
+	data := `orgId: 123
+receiver: test
+continue: true
+repeat_interval: ${NOTIFIER_EMAIL_REMINDER_FREQUENCY}
+`
+	var model NotificiationPolicyV1
+
+	err = yaml.Unmarshal([]byte(data), &model)
+	require.NoError(t, err)
+	np, err := model.mapToModel()
+	require.NoError(t, err)
+	require.Equal(t, int64(123), np.OrgID)
+	require.Equal(t, "test", np.Policy.Receiver)
+	require.True(t, np.Policy.Continue)
+	require.Equal(t, envValue, np.Policy.RepeatInterval.String())
+}
diff --git a/pkg/services/provisioning/alerting/types.go b/pkg/services/provisioning/alerting/types.go
index 7efe34b4025..6b500c85dd1 100644
--- a/pkg/services/provisioning/alerting/types.go
+++ b/pkg/services/provisioning/alerting/types.go
@@ -51,7 +51,9 @@ func (fileV1 *AlertingFileV1) MapToModel() (AlertingFile, error) {
 	if err := fileV1.mapContactPoint(&alertingFile); err != nil {
 		return AlertingFile{}, fmt.Errorf("failure parsing contact points: %w", err)
 	}
-	fileV1.mapPolicies(&alertingFile)
+	if err := fileV1.mapPolicies(&alertingFile); err != nil {
+		return AlertingFile{}, fmt.Errorf("failure parsing policies: %w", err)
+	}
 	if err := fileV1.mapMuteTimes(&alertingFile); err != nil {
 		return AlertingFile{}, fmt.Errorf("failure parsing mute times: %w", err)
 	}
@@ -89,13 +91,18 @@ func (fileV1 *AlertingFileV1) mapMuteTimes(alertingFile *AlertingFile) error {
 	return nil
 }
 
-func (fileV1 *AlertingFileV1) mapPolicies(alertingFile *AlertingFile) {
+func (fileV1 *AlertingFileV1) mapPolicies(alertingFile *AlertingFile) error {
 	for _, npV1 := range fileV1.Policies {
-		alertingFile.Policies = append(alertingFile.Policies, npV1.mapToModel())
+		np, err := npV1.mapToModel()
+		if err != nil {
+			return err
+		}
+		alertingFile.Policies = append(alertingFile.Policies, np)
 	}
 	for _, orgIDV1 := range fileV1.ResetPolicies {
 		alertingFile.ResetPolicies = append(alertingFile.ResetPolicies, OrgID(orgIDV1.Value()))
 	}
+	return nil
 }
 
 func (fileV1 *AlertingFileV1) mapContactPoint(alertingFile *AlertingFile) error {

From 414df842b8c7784b091a8c1ee7ec111e51207d69 Mon Sep 17 00:00:00 2001
From: Guilherme Caulada <guilherme.caulada@grafana.com>
Date: Tue, 22 Nov 2022 13:04:14 -0300
Subject: [PATCH 082/153] Build: Add command to publish to AWS Marketplace
 through the pipeline (#59068)

* Remove generic variables from publish github action

* Create publish aws cmd to automate aws releases

* Add tests to publish aws cmd

* Replace fmt with log for prints

* Remove unnecessary type assertions

* Readd mistakenly removed go package

* Replace log with fmt for prints due to conflicts

* Update github tests to conform with casing
---
 go.mod                              |   8 +-
 go.sum                              |   4 +
 pkg/build/cmd/main.go               |  31 ++-
 pkg/build/cmd/publishaws.go         | 307 ++++++++++++++++++++++++++++
 pkg/build/cmd/publishaws_test.go    | 205 +++++++++++++++++++
 pkg/build/cmd/publishgithub.go      |  12 +-
 pkg/build/cmd/publishgithub_test.go |  38 ++--
 7 files changed, 577 insertions(+), 28 deletions(-)
 create mode 100644 pkg/build/cmd/publishaws.go
 create mode 100644 pkg/build/cmd/publishaws_test.go

diff --git a/go.mod b/go.mod
index 50dbe4cff3c..8f29add2ffd 100644
--- a/go.mod
+++ b/go.mod
@@ -257,7 +257,6 @@ require (
 	github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/matryer/is v1.4.0
-	github.com/parca-dev/parca v0.12.1
 	github.com/urfave/cli v1.22.9
 	go.etcd.io/etcd/api/v3 v3.5.4
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0
@@ -275,8 +274,11 @@ require (
 	github.com/armon/go-metrics v0.3.10 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
+	github.com/containerd/containerd v1.6.8 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/drone-runners/drone-runner-docker v1.8.2 // indirect
 	github.com/drone/drone-go v1.7.1 // indirect
 	github.com/drone/envsubst v1.0.3 // indirect
@@ -296,6 +298,9 @@ require (
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
+	github.com/parca-dev/parca v0.12.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/segmentio/asm v1.1.4 // indirect
@@ -327,6 +332,7 @@ require (
 	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
+	github.com/docker/docker v20.10.21+incompatible
 	github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
diff --git a/go.sum b/go.sum
index e5f5e30bf67..d41b9baea0d 100644
--- a/go.sum
+++ b/go.sum
@@ -579,6 +579,7 @@ github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoT
 github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
 github.com/containerd/containerd v1.5.4/go.mod h1:sx18RgvW6ABJ4iYUw7Q5x7bgFOAB9B6G7+yO0XBc4zw=
 github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs=
+github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -751,6 +752,7 @@ github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
+github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
@@ -2011,6 +2013,7 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I
 github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=
+github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
@@ -3483,6 +3486,7 @@ k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C
 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
+k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU=
 k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index a75033a6ade..658cceb9011 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -225,7 +225,7 @@ func main() {
 				{
 					Name:   "github",
 					Usage:  "Publish packages to GitHub releases",
-					Action: PublishGitHub,
+					Action: PublishGithub,
 					Flags: []cli.Flag{
 						&dryRunFlag,
 						&cli.StringFlag{
@@ -240,7 +240,7 @@ func main() {
 						},
 						&cli.StringFlag{
 							Name:  "tag",
-							Usage: "Release tag (default from metadata)ß",
+							Usage: "Release tag (default from metadata)",
 						},
 						&cli.BoolFlag{
 							Name:  "create",
@@ -248,6 +248,33 @@ func main() {
 						},
 					},
 				},
+				{
+					Name:   "aws",
+					Usage:  "Publish image to AWS Marketplace releases",
+					Action: PublishAwsMarketplace,
+					Flags: []cli.Flag{
+						&dryRunFlag,
+						&cli.StringFlag{
+							Name:  "version",
+							Usage: "Release version (default from metadata)",
+						},
+						&cli.StringFlag{
+							Name:     "image",
+							Required: true,
+							Usage:    "Name of the image to be released",
+						},
+						&cli.StringFlag{
+							Name:     "repo",
+							Required: true,
+							Usage:    "AWS Marketplace ECR repository",
+						},
+						&cli.StringFlag{
+							Name:     "product",
+							Required: true,
+							Usage:    "AWS Marketplace product identifier",
+						},
+					},
+				},
 			},
 		},
 	}
diff --git a/pkg/build/cmd/publishaws.go b/pkg/build/cmd/publishaws.go
new file mode 100644
index 00000000000..68ed5e695ac
--- /dev/null
+++ b/pkg/build/cmd/publishaws.go
@@ -0,0 +1,307 @@
+package main
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/ecr"
+	"github.com/aws/aws-sdk-go/service/marketplacecatalog"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/client"
+	"github.com/urfave/cli/v2"
+)
+
+const (
+	marketplaceChangeSetName  = "Add new version"
+	marketplaceCatalogId      = "AWSMarketplace"
+	marketplaceRegistryId     = "709825985650"
+	marketplaceRegistryRegion = "us-east-1"
+	marketplaceRegistryUrl    = "709825985650.dkr.ecr.us-east-1.amazonaws.com"
+	marketplaceRequestsUrl    = "https://aws.amazon.com/marketplace/management/requests/"
+	releaseNotesTemplateUrl   = "https://grafana.com/docs/grafana/latest/release-notes/release-notes-${TAG}/"
+	helmChartsUrl             = "https://grafana.github.io/helm-charts/"
+	docsUrl                   = "https://grafana.com/docs/grafana/latest/enterprise/license/"
+	imagePlatform             = "linux/amd64"
+
+	publishAwsMarketplaceTestKey publishAwsMarketplaceTestKeyType = "test-client"
+)
+
+var (
+	errEmptyVersion = errors.New(`failed to retrieve release version from metadata, use "--version" to set it manually`)
+)
+
+type publishAwsMarketplaceTestKeyType string
+
+type publishAwsMarketplaceFlags struct {
+	dryRun  bool
+	version string
+	repo    string
+	image   string
+	product string
+}
+
+type AwsMarketplacePublishingService struct {
+	auth   string
+	docker AwsMarketplaceDocker
+	ecr    AwsMarketplaceRegistry
+	mkt    AwsMarketplaceCatalog
+}
+
+type AwsMarketplaceDocker interface {
+	ImagePull(ctx context.Context, refStr string, options types.ImagePullOptions) (io.ReadCloser, error)
+	ImageTag(ctx context.Context, source string, target string) error
+	ImagePush(ctx context.Context, image string, options types.ImagePushOptions) (io.ReadCloser, error)
+}
+
+type AwsMarketplaceRegistry interface {
+	GetAuthorizationTokenWithContext(ctx context.Context, input *ecr.GetAuthorizationTokenInput, opts ...request.Option) (*ecr.GetAuthorizationTokenOutput, error)
+}
+
+type AwsMarketplaceCatalog interface {
+	DescribeEntityWithContext(ctx context.Context, input *marketplacecatalog.DescribeEntityInput, opts ...request.Option) (*marketplacecatalog.DescribeEntityOutput, error)
+	StartChangeSetWithContext(ctx context.Context, input *marketplacecatalog.StartChangeSetInput, opts ...request.Option) (*marketplacecatalog.StartChangeSetOutput, error)
+}
+
+func PublishAwsMarketplace(ctx *cli.Context) error {
+	f, err := getPublishAwsMarketplaceFlags(ctx)
+	if err != nil {
+		return err
+	}
+
+	if f.version == "" {
+		return errEmptyVersion
+	}
+
+	svc, err := getAwsMarketplacePublishingService()
+	if err != nil {
+		return err
+	}
+
+	if ctx.Context.Value(publishAwsMarketplaceTestKey) != nil {
+		svc = ctx.Context.Value(publishAwsMarketplaceTestKey).(*AwsMarketplacePublishingService)
+	}
+
+	fmt.Println("Logging in to AWS Marketplace registry")
+	err = svc.Login(ctx.Context)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Retrieving image '%s:%s' from Docker Hub\n", f.image, f.version)
+	err = svc.PullImage(ctx.Context, f.image, f.version)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Renaming image '%s:%s' to '%s/%s:%s'\n", f.image, f.version, marketplaceRegistryUrl, f.repo, f.version)
+	err = svc.TagImage(ctx.Context, f.image, f.repo, f.version)
+	if err != nil {
+		return err
+	}
+
+	if !f.dryRun {
+		fmt.Printf("Pushing image '%s/%s:%s' to the AWS Marketplace ECR\n", marketplaceRegistryUrl, f.repo, f.version)
+		err = svc.PushToMarketplace(ctx.Context, f.repo, f.version)
+		if err != nil {
+			return err
+		}
+	} else {
+		fmt.Printf("Dry-Run: Pushing image '%s/%s:%s' to the AWS Marketplace ECR\n", marketplaceRegistryUrl, f.repo, f.version)
+	}
+
+	fmt.Printf("Retrieving product identifier for product '%s'\n", f.product)
+	pid, err := svc.GetProductIdentifier(ctx.Context, f.product)
+	if err != nil {
+		return err
+	}
+
+	if !f.dryRun {
+		fmt.Printf("Releasing to product, you can view the progress of the release on %s\n", marketplaceRequestsUrl)
+		return svc.ReleaseToProduct(ctx.Context, pid, f.repo, f.version)
+	} else {
+		fmt.Printf("Dry-Run: Releasing to product, you can view the progress of the release on %s\n", marketplaceRequestsUrl)
+	}
+
+	return nil
+}
+
+func getAwsMarketplacePublishingService() (*AwsMarketplacePublishingService, error) {
+	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+	if err != nil {
+		return nil, err
+	}
+
+	mySession := session.Must(session.NewSession())
+	ecr := ecr.New(mySession, aws.NewConfig().WithRegion(marketplaceRegistryRegion))
+	mkt := marketplacecatalog.New(mySession, aws.NewConfig().WithRegion(marketplaceRegistryRegion))
+	return &AwsMarketplacePublishingService{
+		docker: cli,
+		ecr:    ecr,
+		mkt:    mkt,
+	}, nil
+}
+
+func (s *AwsMarketplacePublishingService) Login(ctx context.Context) error {
+	out, err := s.ecr.GetAuthorizationTokenWithContext(ctx, &ecr.GetAuthorizationTokenInput{})
+	if err != nil {
+		return err
+	}
+	s.auth = *out.AuthorizationData[0].AuthorizationToken
+	authData, err := base64.StdEncoding.DecodeString(s.auth)
+	if err != nil {
+		return err
+	}
+	authString := strings.Split(string(authData), ":")
+	authData, err = json.Marshal(types.AuthConfig{
+		Username: authString[0],
+		Password: authString[1],
+	})
+	s.auth = base64.StdEncoding.EncodeToString(authData)
+	return err
+}
+
+func (s *AwsMarketplacePublishingService) PullImage(ctx context.Context, image string, version string) error {
+	reader, err := s.docker.ImagePull(ctx, fmt.Sprintf("%s:%s", image, version), types.ImagePullOptions{
+		Platform: imagePlatform,
+	})
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(os.Stdout, reader)
+	if err != nil {
+		return err
+	}
+
+	err = reader.Close()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *AwsMarketplacePublishingService) TagImage(ctx context.Context, image string, repo string, version string) error {
+	err := s.docker.ImageTag(ctx, fmt.Sprintf("%s:%s", image, version), fmt.Sprintf("%s/%s:%s", marketplaceRegistryUrl, repo, version))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *AwsMarketplacePublishingService) PushToMarketplace(ctx context.Context, repo string, version string) error {
+	reader, err := s.docker.ImagePush(ctx, fmt.Sprintf("%s/%s:%s", marketplaceRegistryUrl, repo, version), types.ImagePushOptions{
+		RegistryAuth: s.auth,
+	})
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(os.Stdout, reader)
+	if err != nil {
+		return err
+	}
+
+	err = reader.Close()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *AwsMarketplacePublishingService) GetProductIdentifier(ctx context.Context, product string) (string, error) {
+	out, err := s.mkt.DescribeEntityWithContext(ctx, &marketplacecatalog.DescribeEntityInput{
+		EntityId: aws.String(product),
+		Catalog:  aws.String(marketplaceCatalogId),
+	})
+	if err != nil {
+		return "", err
+	}
+	return *out.EntityIdentifier, nil
+}
+
+func (s *AwsMarketplacePublishingService) ReleaseToProduct(ctx context.Context, pid string, repo string, version string) error {
+	_, err := s.mkt.StartChangeSetWithContext(ctx, &marketplacecatalog.StartChangeSetInput{
+		Catalog:       aws.String(marketplaceCatalogId),
+		ChangeSetName: aws.String(marketplaceChangeSetName),
+		ChangeSet: []*marketplacecatalog.Change{
+			buildAwsMarketplaceChangeSet(pid, repo, version),
+		},
+	})
+	return err
+}
+
+func getPublishAwsMarketplaceFlags(ctx *cli.Context) (*publishAwsMarketplaceFlags, error) {
+	metadata, err := GenerateMetadata(ctx)
+	if err != nil {
+		return nil, err
+	}
+	version := ctx.String("version")
+	if version == "" && metadata.GrafanaVersion != "" {
+		version = metadata.GrafanaVersion
+	}
+	image := ctx.String("image")
+	repo := ctx.String("repo")
+	product := ctx.String("product")
+	dryRun := ctx.Bool("dry-run")
+	return &publishAwsMarketplaceFlags{
+		dryRun:  dryRun,
+		version: version,
+		image:   image,
+		repo:    repo,
+		product: product,
+	}, nil
+}
+
+func buildAwsMarketplaceReleaseNotesUrl(version string) string {
+	sanitizedVersion := strings.ReplaceAll(version, ".", "-")
+	return strings.ReplaceAll(releaseNotesTemplateUrl, "${TAG}", sanitizedVersion)
+}
+
+func buildAwsMarketplaceChangeSet(entityId string, repo string, version string) *marketplacecatalog.Change {
+	return &marketplacecatalog.Change{
+		ChangeType: aws.String("AddDeliveryOptions"),
+		Entity: &marketplacecatalog.Entity{
+			Type:       aws.String("ContainerProduct@1.0"),
+			Identifier: aws.String(entityId),
+		},
+		Details: aws.String(buildAwsMarketplaceVersionDetails(repo, version)),
+	}
+}
+
+func buildAwsMarketplaceVersionDetails(repo string, version string) string {
+	releaseNotesUrl := buildAwsMarketplaceReleaseNotesUrl(version)
+	return fmt.Sprintf(`{
+        "Version": {
+          "ReleaseNotes": "Release notes are available on the website %s",
+          "VersionTitle": "v%s"
+        },
+        "DeliveryOptions": [
+          {
+            "Details": {
+              "EcrDeliveryOptionDetails": {
+                "DeploymentResources": [
+                  {
+                    "Name": "Helm Charts",
+                    "Url": "%s"
+                  }
+                ],
+                "CompatibleServices": ["EKS", "ECS", "ECS-Anywhere", "EKS-Anywhere"],
+                "ContainerImages": ["%s/%s:%s"],
+                "Description": "Grafana Enterprise can be installed using the official Grafana Helm chart repository. The repository is available on Github: %s",
+                "UsageInstructions": "You can apply your Grafana Enterprise license to a new or existing Grafana Enterprise deployment by updating a configuration setting or environment variable. Your Grafana instance must be deployed on AWS, or have network access to AWS. For more information, see %s"
+              }
+            },
+            "DeliveryOptionTitle": "Helm Chart"
+          }
+        ]
+      }`, releaseNotesUrl, version, helmChartsUrl, marketplaceRegistryUrl, repo, version, helmChartsUrl, docsUrl)
+}
diff --git a/pkg/build/cmd/publishaws_test.go b/pkg/build/cmd/publishaws_test.go
new file mode 100644
index 00000000000..34274aff92a
--- /dev/null
+++ b/pkg/build/cmd/publishaws_test.go
@@ -0,0 +1,205 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"errors"
+	"io"
+	"os"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/service/ecr"
+	"github.com/aws/aws-sdk-go/service/marketplacecatalog"
+	"github.com/docker/docker/api/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/urfave/cli/v2"
+)
+
+type awsPublishTestCase struct {
+	name           string
+	args           []string
+	expectedError  error
+	errorContains  string
+	expectedOutput string
+	mockedService  *AwsMarketplacePublishingService
+}
+
+func TestPublishAwsMarketplace(t *testing.T) {
+	t.Setenv("DRONE_BUILD_EVENT", "promote")
+	testApp := setupPublishAwsMarketplaceTests(t)
+	errShouldNotCallMock := errors.New("shouldn't call")
+
+	testCases := []awsPublishTestCase{
+		{
+			name:          "try to publish without required flags",
+			errorContains: `Required flags "image, repo, product" not set`,
+		},
+		{
+			name: "try to publish without credentials",
+			args: []string{"--image", "test/test", "--repo", "test/test", "--product", "test", "--version", "1.0.0"},
+			mockedService: &AwsMarketplacePublishingService{
+				ecr: &mockAwsMarketplaceRegistry{
+					GetAuthorizationTokenWithContextError: credentials.ErrNoValidProvidersFoundInChain,
+				},
+			},
+			expectedError: credentials.ErrNoValidProvidersFoundInChain,
+		},
+		{
+			name: "try to publish with valid credentials and nonexisting version",
+			args: []string{"--image", "test/test", "--repo", "test/test", "--product", "test", "--version", "1.0.0"},
+			mockedService: &AwsMarketplacePublishingService{
+				ecr:    &mockAwsMarketplaceRegistry{},
+				docker: &mockAwsMarketplaceDocker{},
+				mkt:    &mockAwsMarketplaceCatalog{},
+			},
+			expectedOutput: "Releasing to product",
+		},
+		{
+			name: "try to publish with valid credentials and existing version",
+			args: []string{"--image", "test/test", "--repo", "test/test", "--product", "test", "--version", "1.0.0"},
+			mockedService: &AwsMarketplacePublishingService{
+				ecr:    &mockAwsMarketplaceRegistry{},
+				docker: &mockAwsMarketplaceDocker{},
+				mkt:    &mockAwsMarketplaceCatalog{},
+			},
+			expectedOutput: "Releasing to product",
+		},
+		{
+			name: "dry run with invalid credentials",
+			args: []string{"--dry-run", "--image", "test/test", "--repo", "test/test", "--product", "test", "--version", "1.0.0"},
+			mockedService: &AwsMarketplacePublishingService{
+				ecr: &mockAwsMarketplaceRegistry{
+					GetAuthorizationTokenWithContextError: credentials.ErrNoValidProvidersFoundInChain,
+				},
+			},
+			expectedError: credentials.ErrNoValidProvidersFoundInChain,
+		},
+		{
+			name: "dry run with valid credentials",
+			args: []string{"--dry-run", "--image", "test/test", "--repo", "test/test", "--product", "test", "--version", "1.0.0"},
+			mockedService: &AwsMarketplacePublishingService{
+				ecr: &mockAwsMarketplaceRegistry{},
+				docker: &mockAwsMarketplaceDocker{
+					ImagePushError: errShouldNotCallMock,
+				},
+				mkt: &mockAwsMarketplaceCatalog{
+					StartChangeSetWithContextError: errShouldNotCallMock,
+				},
+			},
+			expectedOutput: "Dry-Run: Releasing to product",
+		},
+	}
+
+	if os.Getenv("DRONE_COMMIT") == "" {
+		// this test only works locally due to Drone environment
+		testCases = append(testCases,
+			awsPublishTestCase{
+				name:          "try to publish without version",
+				args:          []string{"--image", "test/test", "--repo", "test/test", "--product", "test"},
+				expectedError: errEmptyVersion,
+			},
+		)
+	}
+
+	for _, test := range testCases {
+		t.Run(test.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), publishAwsMarketplaceTestKey, test.mockedService)
+			args := []string{"run"}
+			args = append(args, test.args...)
+			out, err := captureStdout(t, func() error {
+				return testApp.RunContext(ctx, args)
+			})
+			if test.expectedOutput != "" {
+				assert.Contains(t, out, test.expectedOutput)
+			}
+			if test.expectedError != nil || test.errorContains != "" {
+				assert.Error(t, err)
+				if test.expectedError != nil {
+					assert.ErrorIs(t, err, test.expectedError)
+				}
+				if test.errorContains != "" {
+					assert.ErrorContains(t, err, test.errorContains)
+				}
+			} else {
+				assert.NoError(t, err)
+			}
+		})
+	}
+}
+
+func setupPublishAwsMarketplaceTests(t *testing.T) *cli.App {
+	t.Helper()
+	testApp := cli.NewApp()
+	testApp.Action = PublishAwsMarketplace
+	testApp.Flags = []cli.Flag{
+		&dryRunFlag,
+		&cli.StringFlag{
+			Name:  "version",
+			Usage: "Release version (default from metadata)",
+		},
+		&cli.StringFlag{
+			Name:     "image",
+			Required: true,
+			Usage:    "Name of the image to be released",
+		},
+		&cli.StringFlag{
+			Name:     "repo",
+			Required: true,
+			Usage:    "AWS Marketplace ECR repository",
+		},
+		&cli.StringFlag{
+			Name:     "product",
+			Required: true,
+			Usage:    "AWS Marketplace product identifier",
+		},
+	}
+	return testApp
+}
+
+type mockAwsMarketplaceDocker struct {
+	ImagePullError error
+	ImageTagError  error
+	ImagePushError error
+}
+
+func (m *mockAwsMarketplaceDocker) ImagePull(ctx context.Context, refStr string, options types.ImagePullOptions) (io.ReadCloser, error) {
+	return io.NopCloser(bytes.NewReader([]byte(""))), m.ImagePullError
+}
+func (m *mockAwsMarketplaceDocker) ImageTag(ctx context.Context, source string, target string) error {
+	return m.ImageTagError
+}
+func (m *mockAwsMarketplaceDocker) ImagePush(ctx context.Context, image string, options types.ImagePushOptions) (io.ReadCloser, error) {
+	return io.NopCloser(bytes.NewReader([]byte(""))), m.ImagePushError
+}
+
+type mockAwsMarketplaceRegistry struct {
+	GetAuthorizationTokenWithContextError error
+}
+
+func (m *mockAwsMarketplaceRegistry) GetAuthorizationTokenWithContext(ctx context.Context, input *ecr.GetAuthorizationTokenInput, opts ...request.Option) (*ecr.GetAuthorizationTokenOutput, error) {
+	return &ecr.GetAuthorizationTokenOutput{
+		AuthorizationData: []*ecr.AuthorizationData{
+			{
+				AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte("username:password"))),
+			},
+		},
+	}, m.GetAuthorizationTokenWithContextError
+}
+
+type mockAwsMarketplaceCatalog struct {
+	DescribeEntityWithContextError error
+	StartChangeSetWithContextError error
+}
+
+func (m *mockAwsMarketplaceCatalog) DescribeEntityWithContext(ctx context.Context, input *marketplacecatalog.DescribeEntityInput, opts ...request.Option) (*marketplacecatalog.DescribeEntityOutput, error) {
+	return &marketplacecatalog.DescribeEntityOutput{
+		EntityIdentifier: aws.String("productid"),
+	}, m.DescribeEntityWithContextError
+}
+func (m *mockAwsMarketplaceCatalog) StartChangeSetWithContext(ctx context.Context, input *marketplacecatalog.StartChangeSetInput, opts ...request.Option) (*marketplacecatalog.StartChangeSetOutput, error) {
+	return &marketplacecatalog.StartChangeSetOutput{}, m.StartChangeSetWithContextError
+}
diff --git a/pkg/build/cmd/publishgithub.go b/pkg/build/cmd/publishgithub.go
index 02c06b3ab33..5217b16c98a 100644
--- a/pkg/build/cmd/publishgithub.go
+++ b/pkg/build/cmd/publishgithub.go
@@ -39,9 +39,9 @@ var (
 	errReleaseNotFound = errors.New(`release not found, use "--create" to create the release`)
 )
 
-func PublishGitHub(ctx *cli.Context) error {
+func PublishGithub(ctx *cli.Context) error {
 	token := os.Getenv("GH_TOKEN")
-	f, err := getFlags(ctx)
+	f, err := getPublishGithubFlags(ctx)
 	if err != nil {
 		return err
 	}
@@ -55,7 +55,7 @@ func PublishGitHub(ctx *cli.Context) error {
 	}
 
 	if f.dryRun {
-		return runDryRun(f, token, ctx)
+		return runPublishGithubDryRun(f, token, ctx)
 	}
 
 	client := newGithubClient(ctx.Context, token)
@@ -99,7 +99,7 @@ func githubRepositoryClient(ctx context.Context, token string) githubRepositoryS
 	return client.Repositories
 }
 
-func getFlags(ctx *cli.Context) (*publishGithubFlags, error) {
+func getPublishGithubFlags(ctx *cli.Context) (*publishGithubFlags, error) {
 	metadata, err := GenerateMetadata(ctx)
 	if err != nil {
 		return nil, err
@@ -126,12 +126,12 @@ func getFlags(ctx *cli.Context) (*publishGithubFlags, error) {
 	}, nil
 }
 
-func runDryRun(f *publishGithubFlags, token string, ctx *cli.Context) error {
+func runPublishGithubDryRun(f *publishGithubFlags, token string, ctx *cli.Context) error {
 	client := newGithubClient(ctx.Context, token)
 	fmt.Println("Dry-Run: Retrieving release on repository by tag")
 	release, res, err := client.GetReleaseByTag(ctx.Context, f.repo.owner, f.repo.name, f.tag)
 	if err != nil && res.StatusCode != 404 {
-		fmt.Println("Dry-Run: GitHub communication error:\n", err)
+		fmt.Println("Dry-Run: Github communication error:\n", err)
 		return nil
 	}
 
diff --git a/pkg/build/cmd/publishgithub_test.go b/pkg/build/cmd/publishgithub_test.go
index 845e40a9af9..537669a3f1c 100644
--- a/pkg/build/cmd/publishgithub_test.go
+++ b/pkg/build/cmd/publishgithub_test.go
@@ -21,16 +21,16 @@ type githubPublishTestCases struct {
 	expectedError  error
 	errorContains  string
 	expectedOutput string
-	mockedService  *mockGitHubRepositoryServiceImpl
+	mockedService  *mockGithubRepositoryServiceImpl
 }
 
-var mockGitHubRepositoryService = &mockGitHubRepositoryServiceImpl{}
+var mockGithubRepositoryService = &mockGithubRepositoryServiceImpl{}
 
 func mockGithubRepositoryClient(context.Context, string) githubRepositoryService {
-	return mockGitHubRepositoryService
+	return mockGithubRepositoryService
 }
 
-func TestPublishGitHub(t *testing.T) {
+func TestPublishGithub(t *testing.T) {
 	t.Setenv("DRONE_BUILD_EVENT", "promote")
 	testApp, testPath := setupPublishGithubTests(t)
 	mockErrUnauthorized := errors.New("401")
@@ -49,21 +49,21 @@ func TestPublishGitHub(t *testing.T) {
 			name:          "try to publish with invalid token",
 			token:         "invalid",
 			args:          []string{"--path", testPath, "--repo", "test/test", "--tag", "v1.0.0"},
-			mockedService: &mockGitHubRepositoryServiceImpl{tagErr: mockErrUnauthorized},
+			mockedService: &mockGithubRepositoryServiceImpl{tagErr: mockErrUnauthorized},
 			expectedError: mockErrUnauthorized,
 		},
 		{
 			name:          "try to publish with valid token and nonexisting tag with create disabled",
 			token:         "valid",
 			args:          []string{"--path", testPath, "--repo", "test/test", "--tag", "v1.0.0"},
-			mockedService: &mockGitHubRepositoryServiceImpl{tagErr: errReleaseNotFound},
+			mockedService: &mockGithubRepositoryServiceImpl{tagErr: errReleaseNotFound},
 			expectedError: errReleaseNotFound,
 		},
 		{
 			name:          "try to publish with valid token and nonexisting tag with create enabled",
 			token:         "valid",
 			args:          []string{"--path", testPath, "--repo", "test/test", "--tag", "v1.0.0", "--create"},
-			mockedService: &mockGitHubRepositoryServiceImpl{tagErr: errReleaseNotFound},
+			mockedService: &mockGithubRepositoryServiceImpl{tagErr: errReleaseNotFound},
 		},
 		{
 			name:  "try to publish with valid token and existing tag",
@@ -74,21 +74,21 @@ func TestPublishGitHub(t *testing.T) {
 			name:           "dry run with invalid token",
 			token:          "invalid",
 			args:           []string{"--dry-run", "--path", testPath, "--repo", "test/test", "--tag", "v1.0.0"},
-			mockedService:  &mockGitHubRepositoryServiceImpl{tagErr: mockErrUnauthorized},
-			expectedOutput: "GitHub communication error",
+			mockedService:  &mockGithubRepositoryServiceImpl{tagErr: mockErrUnauthorized},
+			expectedOutput: "Github communication error",
 		},
 		{
 			name:           "dry run with valid token and nonexisting tag with create disabled",
 			token:          "valid",
 			args:           []string{"--dry-run", "--path", testPath, "--repo", "test/test", "--tag", "v1.0.0"},
-			mockedService:  &mockGitHubRepositoryServiceImpl{tagErr: errReleaseNotFound},
+			mockedService:  &mockGithubRepositoryServiceImpl{tagErr: errReleaseNotFound},
 			expectedOutput: "Release doesn't exist",
 		},
 		{
 			name:           "dry run with valid token and nonexisting tag with create enabled",
 			token:          "valid",
 			args:           []string{"--dry-run", "--path", testPath, "--repo", "test/test", "--tag", "v1.0.0", "--create"},
-			mockedService:  &mockGitHubRepositoryServiceImpl{tagErr: errReleaseNotFound},
+			mockedService:  &mockGithubRepositoryServiceImpl{tagErr: errReleaseNotFound},
 			expectedOutput: "Would upload asset",
 		},
 		{
@@ -116,9 +116,9 @@ func TestPublishGitHub(t *testing.T) {
 				t.Setenv("GH_TOKEN", test.token)
 			}
 			if test.mockedService != nil {
-				mockGitHubRepositoryService = test.mockedService
+				mockGithubRepositoryService = test.mockedService
 			} else {
-				mockGitHubRepositoryService = &mockGitHubRepositoryServiceImpl{}
+				mockGithubRepositoryService = &mockGithubRepositoryServiceImpl{}
 			}
 			args := []string{"run"}
 			args = append(args, test.args...)
@@ -154,7 +154,7 @@ func setupPublishGithubTests(t *testing.T) (*cli.App, string) {
 	newGithubClient = mockGithubRepositoryClient
 
 	testApp := cli.NewApp()
-	testApp.Action = PublishGitHub
+	testApp.Action = PublishGithub
 	testApp.Flags = []cli.Flag{
 		&dryRunFlag,
 		&cli.StringFlag{
@@ -165,7 +165,7 @@ func setupPublishGithubTests(t *testing.T) (*cli.App, string) {
 		&cli.StringFlag{
 			Name:     "repo",
 			Required: true,
-			Usage:    "GitHub repository",
+			Usage:    "Github repository",
 		},
 		&cli.StringFlag{
 			Name:  "tag",
@@ -194,13 +194,13 @@ func captureStdout(t *testing.T, fn func() error) (string, error) {
 	return string(out), err
 }
 
-type mockGitHubRepositoryServiceImpl struct {
+type mockGithubRepositoryServiceImpl struct {
 	tagErr    error
 	createErr error
 	uploadErr error
 }
 
-func (m *mockGitHubRepositoryServiceImpl) GetReleaseByTag(ctx context.Context, owner string, repo string, tag string) (*github.RepositoryRelease, *github.Response, error) {
+func (m *mockGithubRepositoryServiceImpl) GetReleaseByTag(ctx context.Context, owner string, repo string, tag string) (*github.RepositoryRelease, *github.Response, error) {
 	var release *github.RepositoryRelease
 	res := &github.Response{Response: &http.Response{}}
 	if m.tagErr == nil {
@@ -212,12 +212,12 @@ func (m *mockGitHubRepositoryServiceImpl) GetReleaseByTag(ctx context.Context, o
 	return release, res, m.tagErr
 }
 
-func (m *mockGitHubRepositoryServiceImpl) CreateRelease(ctx context.Context, owner string, repo string, release *github.RepositoryRelease) (*github.RepositoryRelease, *github.Response, error) {
+func (m *mockGithubRepositoryServiceImpl) CreateRelease(ctx context.Context, owner string, repo string, release *github.RepositoryRelease) (*github.RepositoryRelease, *github.Response, error) {
 	releaseID := int64(1)
 	return &github.RepositoryRelease{ID: &releaseID}, &github.Response{}, m.createErr
 }
 
-func (m *mockGitHubRepositoryServiceImpl) UploadReleaseAsset(ctx context.Context, owner string, repo string, id int64, opt *github.UploadOptions, file *os.File) (*github.ReleaseAsset, *github.Response, error) {
+func (m *mockGithubRepositoryServiceImpl) UploadReleaseAsset(ctx context.Context, owner string, repo string, id int64, opt *github.UploadOptions, file *os.File) (*github.ReleaseAsset, *github.Response, error) {
 	assetName := "test"
 	assetUrl := "testurl.com.br"
 	return &github.ReleaseAsset{Name: &assetName, BrowserDownloadURL: &assetUrl}, &github.Response{}, m.uploadErr

From 26a742315167690c32c5a19d30db1383cff92992 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 22 Nov 2022 16:42:21 +0000
Subject: [PATCH 083/153] Chore: add some unique keys to prevent warnings
 (#59143)

add some unique keys to prevent warnings
---
 public/app/features/dashboard/components/DashNav/DashNav.tsx | 1 +
 public/app/features/scenes/components/Scene.tsx              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 0ced7a34b85..5ffbef293d9 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -342,6 +342,7 @@ export const DashNav = React.memo<Props>((props) => {
     if (config.featureToggles.scenes) {
       buttons.push(
         <ToolbarButton
+          key="button-scenes"
           tooltip={'View as Scene'}
           icon="apps"
           onClick={() => locationService.push(`/scenes/dashboard/${dashboard.uid}`)}
diff --git a/public/app/features/scenes/components/Scene.tsx b/public/app/features/scenes/components/Scene.tsx
index fe4731c13da..f870c91b57a 100644
--- a/public/app/features/scenes/components/Scene.tsx
+++ b/public/app/features/scenes/components/Scene.tsx
@@ -41,6 +41,7 @@ function SceneRenderer({ model }: SceneComponentProps<Scene>) {
   if ($editor) {
     toolbarActions.push(
       <ToolbarButton
+        key="scene-settings"
         icon="cog"
         variant={isEditing ? 'primary' : 'default'}
         onClick={() => model.setState({ isEditing: !model.state.isEditing })}

From 824a562b03595fe02e7d140d600f4c94c0b5a8d5 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 22 Nov 2022 16:48:07 +0000
Subject: [PATCH 084/153] Navigation: share logic between `buildBreadcrumbs`
 and `usePageTitle` (#58819)

* simplify usePageTitle logic a bit

* use buildBreadcrumbs logic in usePageTitle

* always add home item to navTree, fix some tests

* fix remaining unit tests
---
 pkg/services/navtree/navtreeimpl/navtree.go   | 10 +++---
 .../core/components/AppChrome/NavToolbar.tsx  |  2 +-
 .../core/components/Breadcrumbs/utils.test.ts | 14 ++++----
 .../app/core/components/Breadcrumbs/utils.ts  |  4 +--
 public/app/core/components/NavBar/NavBar.tsx  |  2 +-
 .../app/core/components/Page/usePageTitle.ts  | 36 ++++++-------------
 .../app/core/components/PageNew/Page.test.tsx |  8 +++--
 .../app/core/navigation/GrafanaRoute.test.tsx |  7 +++-
 public/app/core/services/context_srv.ts       |  2 +-
 .../features/alerting/AlertRuleList.test.tsx  | 11 ++++--
 .../features/api-keys/ApiKeysPage.test.tsx    | 11 ++++--
 .../AnnotationsSettings.test.tsx              | 11 ++++--
 .../GeneralSettings.test.tsx                  | 11 ++++--
 .../DashboardSettings/LinksSettings.test.tsx  | 11 ++++--
 .../VersionsSettings.test.tsx                 | 11 ++++--
 .../containers/DashboardPage.test.tsx         |  9 +++--
 .../features/invites/SignupInvited.test.tsx   |  9 ++++-
 .../app/features/org/OrgDetailsPage.test.tsx  |  5 +--
 .../playlist/PlaylistEditPage.test.tsx        |  8 ++++-
 .../playlist/PlaylistNewPage.test.tsx         | 12 +++++--
 .../features/playlist/PlaylistPage.test.tsx   | 10 +++++-
 .../profile/ChangePasswordPage.test.tsx       |  9 ++++-
 .../profile/UserProfileEditPage.test.tsx      | 11 ++++--
 .../scenes/components/NestedScene.test.tsx    | 10 +++++-
 .../layout/SceneGridLayout.test.tsx           | 13 +++++--
 .../ServiceAccountCreatePage.test.tsx         | 11 +++++-
 .../ServiceAccountPage.test.tsx               | 10 +++++-
 .../ServiceAccountsListPage.test.tsx          | 12 +++++--
 public/app/features/teams/CreateTeam.test.tsx | 10 +++++-
 public/app/features/teams/TeamList.test.tsx   |  9 ++++-
 30 files changed, 216 insertions(+), 83 deletions(-)

diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index 73d601b6ba3..16f0a5e231d 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -73,9 +73,7 @@ func (s *ServiceImpl) GetNavTree(c *models.ReqContext, hasEditPerm bool, prefs *
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	treeRoot := &navtree.NavTreeRoot{}
 
-	if s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		treeRoot.AddSection(s.getHomeNode(c, prefs))
-	}
+	treeRoot.AddSection(s.getHomeNode(c, prefs))
 
 	if hasAccess(ac.ReqSignedIn, ac.EvalPermission(dashboards.ActionDashboardsRead)) {
 		starredItemsLinks, err := s.buildStarredItemsNavLinks(c)
@@ -224,7 +222,7 @@ func (s *ServiceImpl) getHomeNode(c *models.ReqContext, prefs *pref.Preference)
 		}
 	}
 
-	return &navtree.NavLink{
+	homeNode := &navtree.NavLink{
 		Text:       "Home",
 		Id:         "home",
 		Url:        homeUrl,
@@ -232,6 +230,10 @@ func (s *ServiceImpl) getHomeNode(c *models.ReqContext, prefs *pref.Preference)
 		Section:    navtree.NavSectionCore,
 		SortWeight: navtree.WeightHome,
 	}
+	if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
+		homeNode.HideFromMenu = true
+	}
+	return homeNode
 }
 
 func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *models.ReqContext) {
diff --git a/public/app/core/components/AppChrome/NavToolbar.tsx b/public/app/core/components/AppChrome/NavToolbar.tsx
index 12c4c46d481..59cc55b552e 100644
--- a/public/app/core/components/AppChrome/NavToolbar.tsx
+++ b/public/app/core/components/AppChrome/NavToolbar.tsx
@@ -33,7 +33,7 @@ export function NavToolbar({
 }: Props) {
   const homeNav = useSelector((state) => state.navIndex)[HOME_NAV_ID];
   const styles = useStyles2(getStyles);
-  const breadcrumbs = buildBreadcrumbs(homeNav, sectionNav, pageNav);
+  const breadcrumbs = buildBreadcrumbs(sectionNav, pageNav, homeNav);
 
   return (
     <div className={styles.pageToolbar}>
diff --git a/public/app/core/components/Breadcrumbs/utils.test.ts b/public/app/core/components/Breadcrumbs/utils.test.ts
index c84ca5d0c6d..c696d65a4d3 100644
--- a/public/app/core/components/Breadcrumbs/utils.test.ts
+++ b/public/app/core/components/Breadcrumbs/utils.test.ts
@@ -15,7 +15,7 @@ describe('breadcrumb utils', () => {
         text: 'My section',
         url: '/my-section',
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav)).toEqual([{ text: 'My section', href: '/my-section' }]);
+      expect(buildBreadcrumbs(sectionNav)).toEqual([{ text: 'My section', href: '/my-section' }]);
     });
 
     it('includes breadcrumbs for the page nav', () => {
@@ -28,7 +28,7 @@ describe('breadcrumb utils', () => {
         text: 'My page',
         url: '/my-page',
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav, pageNav)).toEqual([
+      expect(buildBreadcrumbs(sectionNav, pageNav)).toEqual([
         { text: 'My section', href: '/my-section' },
         { text: 'My page', href: '/my-page' },
       ]);
@@ -43,7 +43,7 @@ describe('breadcrumb utils', () => {
           url: '/my-parent-section',
         },
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav)).toEqual([
+      expect(buildBreadcrumbs(sectionNav)).toEqual([
         { text: 'My parent section', href: '/my-parent-section' },
         { text: 'My section', href: '/my-section' },
       ]);
@@ -66,7 +66,7 @@ describe('breadcrumb utils', () => {
           url: '/my-parent-section',
         },
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav, pageNav)).toEqual([
+      expect(buildBreadcrumbs(sectionNav, pageNav)).toEqual([
         { text: 'My parent section', href: '/my-parent-section' },
         { text: 'My section', href: '/my-section' },
         { text: 'My parent page', href: '/my-parent-page' },
@@ -91,7 +91,7 @@ describe('breadcrumb utils', () => {
           url: '/my-parent-section',
         },
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav, pageNav)).toEqual([
+      expect(buildBreadcrumbs(sectionNav, pageNav, mockHomeNav)).toEqual([
         { text: 'Home', href: '/home' },
         { text: 'My page', href: '/my-page' },
       ]);
@@ -114,7 +114,7 @@ describe('breadcrumb utils', () => {
           url: '/my-parent-section',
         },
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav, pageNav)).toEqual([
+      expect(buildBreadcrumbs(sectionNav, pageNav, mockHomeNav)).toEqual([
         { text: 'Home', href: '/home?orgId=1' },
         { text: 'My page', href: '/my-page' },
       ]);
@@ -137,7 +137,7 @@ describe('breadcrumb utils', () => {
           url: '/my-parent-section',
         },
       };
-      expect(buildBreadcrumbs(mockHomeNav, sectionNav, pageNav)).toEqual([
+      expect(buildBreadcrumbs(sectionNav, pageNav, mockHomeNav)).toEqual([
         { text: 'My parent section', href: '/my-parent-section' },
         { text: 'My section', href: '/my-section' },
         { text: 'My parent page', href: '/home?orgId=1&editview=settings' },
diff --git a/public/app/core/components/Breadcrumbs/utils.ts b/public/app/core/components/Breadcrumbs/utils.ts
index c41022f7f26..cbf68fefb50 100644
--- a/public/app/core/components/Breadcrumbs/utils.ts
+++ b/public/app/core/components/Breadcrumbs/utils.ts
@@ -4,7 +4,7 @@ import { getNavTitle } from '../NavBar/navBarItem-translations';
 
 import { Breadcrumb } from './types';
 
-export function buildBreadcrumbs(homeNav: NavModelItem, sectionNav: NavModelItem, pageNav?: NavModelItem) {
+export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelItem, homeNav?: NavModelItem) {
   const crumbs: Breadcrumb[] = [];
   let foundHome = false;
 
@@ -17,7 +17,7 @@ export function buildBreadcrumbs(homeNav: NavModelItem, sectionNav: NavModelItem
       urlToMatch += `?editview=${urlSearchParams.get('editview')}`;
     }
     if (!foundHome && !node.hideFromBreadcrumbs) {
-      if (urlToMatch === homeNav.url) {
+      if (homeNav && urlToMatch === homeNav.url) {
         crumbs.unshift({ text: getNavTitle(homeNav.id) ?? homeNav.text, href: node.url ?? '' });
         foundHome = true;
       } else {
diff --git a/public/app/core/components/NavBar/NavBar.tsx b/public/app/core/components/NavBar/NavBar.tsx
index e1765c71d61..9fc506b3ef0 100644
--- a/public/app/core/components/NavBar/NavBar.tsx
+++ b/public/app/core/components/NavBar/NavBar.tsx
@@ -61,7 +61,7 @@ export const NavBar = React.memo(() => {
     menuOpen
   );
 
-  const navTree = cloneDeep(navBarTree);
+  const navTree = cloneDeep(navBarTree).filter((item) => item.hideFromMenu !== true);
 
   const coreItems = navTree
     .filter((item) => item.section === NavSection.Core)
diff --git a/public/app/core/components/Page/usePageTitle.ts b/public/app/core/components/Page/usePageTitle.ts
index 730c696fc27..7a9e0e025a5 100644
--- a/public/app/core/components/Page/usePageTitle.ts
+++ b/public/app/core/components/Page/usePageTitle.ts
@@ -1,37 +1,23 @@
 import { useEffect } from 'react';
 
 import { NavModel, NavModelItem } from '@grafana/data';
+import { HOME_NAV_ID } from 'app/core/reducers/navModel';
+import { useSelector } from 'app/types';
 
 import { Branding } from '../Branding/Branding';
+import { buildBreadcrumbs } from '../Breadcrumbs/utils';
 
 export function usePageTitle(navModel?: NavModel, pageNav?: NavModelItem) {
+  const homeNav = useSelector((state) => state.navIndex)[HOME_NAV_ID];
   useEffect(() => {
-    const parts: string[] = [];
-    if (pageNav) {
-      if (pageNav.children) {
-        const activePage = pageNav.children.find((x) => x.active);
-        if (activePage) {
-          addTitleSegment(parts, activePage);
-        }
-      }
-      addTitleSegment(parts, pageNav);
-    }
+    const sectionNav = (navModel?.node !== navModel?.main ? navModel?.node : navModel?.main) ?? { text: 'Grafana' };
+    const parts: string[] = buildBreadcrumbs(sectionNav, pageNav, homeNav)
+      .map((crumb) => crumb.text)
+      .reverse();
 
-    if (navModel) {
-      if (navModel.node !== navModel.main) {
-        addTitleSegment(parts, navModel.node);
-      }
-      addTitleSegment(parts, navModel.main);
-    }
-
-    parts.push(Branding.AppTitle);
+    // Override `Home` with the custom brand title
+    parts[parts.length - 1] = Branding.AppTitle;
 
     document.title = parts.join(' - ');
-  }, [navModel, pageNav]);
-}
-
-function addTitleSegment(parts: string[], node: NavModelItem) {
-  if (!node.hideFromBreadcrumbs) {
-    parts.push(node.text);
-  }
+  }, [homeNav, navModel, pageNav]);
 }
diff --git a/public/app/core/components/PageNew/Page.test.tsx b/public/app/core/components/PageNew/Page.test.tsx
index 4ea9862923b..66556318fa1 100644
--- a/public/app/core/components/PageNew/Page.test.tsx
+++ b/public/app/core/components/PageNew/Page.test.tsx
@@ -6,6 +6,7 @@ import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 import { NavModelItem } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
+import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 import { configureStore } from 'app/store/configureStore';
 
 import { PageProps } from '../Page/types';
@@ -19,9 +20,12 @@ const pageNav: NavModelItem = {
     { text: 'pageNav child2', url: '2' },
   ],
 };
-
 const setup = (props: Partial<PageProps>) => {
   config.bootData.navTree = [
+    {
+      id: HOME_NAV_ID,
+      text: 'Home',
+    },
     {
       text: 'Section name',
       id: 'section',
@@ -92,7 +96,7 @@ describe('Render', () => {
 
   it('should update document title', async () => {
     setup({ navId: 'child1', pageNav });
-    expect(document.title).toBe('pageNav child1 - pageNav title - Child1 - Section name - Grafana');
+    expect(document.title).toBe('pageNav title - Child1 - Section name - Grafana');
   });
 
   it('should not include hideFromBreadcrumb nodes in title', async () => {
diff --git a/public/app/core/navigation/GrafanaRoute.test.tsx b/public/app/core/navigation/GrafanaRoute.test.tsx
index bf6efb99c83..396fe7e802a 100644
--- a/public/app/core/navigation/GrafanaRoute.test.tsx
+++ b/public/app/core/navigation/GrafanaRoute.test.tsx
@@ -1,16 +1,19 @@
 import { render, screen } from '@testing-library/react';
 import React, { ComponentType } from 'react';
+import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { setEchoSrv } from '@grafana/runtime';
 
+import { configureStore } from '../../store/configureStore';
 import { GrafanaContext } from '../context/GrafanaContext';
 import { Echo } from '../services/echo/Echo';
 
 import { GrafanaRoute, Props } from './GrafanaRoute';
 
 function setup(overrides: Partial<Props>) {
+  const store = configureStore();
   const props: Props = {
     location: { search: '?query=hello&test=asd' } as any,
     history: {} as any,
@@ -25,7 +28,9 @@ function setup(overrides: Partial<Props>) {
   render(
     <BrowserRouter>
       <GrafanaContext.Provider value={getGrafanaContextMock()}>
-        <GrafanaRoute {...props} />
+        <Provider store={store}>
+          <GrafanaRoute {...props} />
+        </Provider>
       </GrafanaContext.Provider>
     </BrowserRouter>
   );
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index fe1c8dc41b1..97d2564a3e6 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -71,7 +71,7 @@ export class ContextSrv {
 
   constructor() {
     if (!config.bootData) {
-      config.bootData = { user: {}, settings: {} } as any;
+      config.bootData = { user: {}, settings: {}, navTree: [] } as any;
     }
 
     this.user = new User();
diff --git a/public/app/features/alerting/AlertRuleList.test.tsx b/public/app/features/alerting/AlertRuleList.test.tsx
index c146cdb322d..2589b5f4cd6 100644
--- a/public/app/features/alerting/AlertRuleList.test.tsx
+++ b/public/app/features/alerting/AlertRuleList.test.tsx
@@ -1,6 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 import { openMenu } from 'react-select-event';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 
@@ -8,6 +9,7 @@ import { locationService } from '@grafana/runtime';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 
 import appEvents from '../../core/app_events';
+import { configureStore } from '../../store/configureStore';
 import { ShowModalReactEvent } from '../../types/events';
 
 import { AlertHowToModal } from './AlertHowToModal';
@@ -29,15 +31,20 @@ const defaultProps: Props = {
 };
 
 const setup = (propOverrides?: object) => {
+  const store = configureStore();
   const props: Props = {
     ...defaultProps,
     ...propOverrides,
   };
 
-  const { rerender } = render(<AlertRuleListUnconnected {...props} />);
+  const { rerender } = render(
+    <Provider store={store}>
+      <AlertRuleListUnconnected {...props} />
+    </Provider>
+  );
 
   return {
-    rerender,
+    rerender: (element: JSX.Element) => rerender(<Provider store={store}>{element}</Provider>),
   };
 };
 
diff --git a/public/app/features/api-keys/ApiKeysPage.test.tsx b/public/app/features/api-keys/ApiKeysPage.test.tsx
index fd61e6683be..f1bcc796342 100644
--- a/public/app/features/api-keys/ApiKeysPage.test.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.test.tsx
@@ -1,12 +1,14 @@
 import { render, screen, within } from '@testing-library/react';
 import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { ApiKey, OrgRole } from 'app/types';
 
 import { mockToolkitActionCreator } from '../../../test/core/redux/mocks';
 import { silenceConsoleOutput } from '../../../test/core/utils/silenceConsoleOutput';
+import { configureStore } from '../../store/configureStore';
 
 import { ApiKeysPageUnconnected, Props } from './ApiKeysPage';
 import { getMultipleMockKeys } from './__mocks__/apiKeysMock';
@@ -22,6 +24,7 @@ jest.mock('app/core/core', () => {
 });
 
 const setup = (propOverrides: Partial<Props>) => {
+  const store = configureStore();
   const loadApiKeysMock = jest.fn();
   const deleteApiKeyMock = jest.fn();
   const migrateApiKeyMock = jest.fn();
@@ -54,9 +57,13 @@ const setup = (propOverrides: Partial<Props>) => {
 
   Object.assign(props, propOverrides);
 
-  const { rerender } = render(<ApiKeysPageUnconnected {...props} />);
+  const { rerender } = render(
+    <Provider store={store}>
+      <ApiKeysPageUnconnected {...props} />
+    </Provider>
+  );
   return {
-    rerender,
+    rerender: (element: JSX.Element) => rerender(<Provider store={store}>{element}</Provider>),
     props,
     loadApiKeysMock,
     setSearchQueryMock,
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
index a510c4b0eb8..3d68416cfa7 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
@@ -2,6 +2,7 @@ import { within } from '@testing-library/dom';
 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 { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
@@ -10,11 +11,13 @@ import { locationService, setAngularLoader, setDataSourceSrv } from '@grafana/ru
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 import { mockDataSource, MockDataSourceSrv } from 'app/features/alerting/unified/mocks';
 
+import { configureStore } from '../../../../store/configureStore';
 import { DashboardModel } from '../../state/DashboardModel';
 
 import { AnnotationsSettings } from './AnnotationsSettings';
 
 function setup(dashboard: DashboardModel, editIndex?: number) {
+  const store = configureStore();
   const sectionNav = {
     main: { text: 'Dashboard' },
     node: {
@@ -24,9 +27,11 @@ function setup(dashboard: DashboardModel, editIndex?: number) {
 
   return render(
     <GrafanaContext.Provider value={getGrafanaContextMock()}>
-      <BrowserRouter>
-        <AnnotationsSettings sectionNav={sectionNav} dashboard={dashboard} editIndex={editIndex} />
-      </BrowserRouter>
+      <Provider store={store}>
+        <BrowserRouter>
+          <AnnotationsSettings sectionNav={sectionNav} dashboard={dashboard} editIndex={editIndex} />
+        </BrowserRouter>
+      </Provider>
     </GrafanaContext.Provider>
   );
 }
diff --git a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
index e8c4aba49d1..227765f674d 100644
--- a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
@@ -1,6 +1,7 @@
 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 { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
@@ -10,6 +11,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { BackendSrv, setBackendSrv } from '@grafana/runtime';
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 
+import { configureStore } from '../../../../store/configureStore';
 import { DashboardModel } from '../../state';
 
 import { GeneralSettingsUnconnected as GeneralSettings, Props } from './GeneralSettings';
@@ -19,6 +21,7 @@ setBackendSrv({
 } as unknown as BackendSrv);
 
 const setupTestContext = (options: Partial<Props>) => {
+  const store = configureStore();
   const defaults: Props = {
     dashboard: new DashboardModel(
       {
@@ -49,9 +52,11 @@ const setupTestContext = (options: Partial<Props>) => {
 
   const { rerender } = render(
     <GrafanaContext.Provider value={getGrafanaContextMock()}>
-      <BrowserRouter>
-        <GeneralSettings {...props} />
-      </BrowserRouter>
+      <Provider store={store}>
+        <BrowserRouter>
+          <GeneralSettings {...props} />
+        </BrowserRouter>
+      </Provider>
     </GrafanaContext.Provider>
   );
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
index f3c1a51b72c..c6716812b13 100644
--- a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
@@ -2,6 +2,7 @@ import { within } from '@testing-library/dom';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
@@ -9,11 +10,13 @@ import { selectors } from '@grafana/e2e-selectors';
 import { locationService } from '@grafana/runtime';
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 
+import { configureStore } from '../../../../store/configureStore';
 import { DashboardModel } from '../../state';
 
 import { DashboardSettings } from './DashboardSettings';
 
 function setup(dashboard: DashboardModel) {
+  const store = configureStore();
   const sectionNav = {
     main: { text: 'Dashboard' },
     node: {
@@ -24,9 +27,11 @@ function setup(dashboard: DashboardModel) {
   // Need to use DashboardSettings here as it's responsible for fetching the state back from location
   return render(
     <GrafanaContext.Provider value={getGrafanaContextMock()}>
-      <Router history={locationService.getHistory()}>
-        <DashboardSettings editview="links" dashboard={dashboard} sectionNav={sectionNav} pageNav={sectionNav.node} />
-      </Router>
+      <Provider store={store}>
+        <Router history={locationService.getHistory()}>
+          <DashboardSettings editview="links" dashboard={dashboard} sectionNav={sectionNav} pageNav={sectionNav.node} />
+        </Router>
+      </Provider>
     </GrafanaContext.Provider>
   );
 }
diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
index 2ab45f6268d..9de7e2b0ff1 100644
--- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
@@ -2,11 +2,13 @@ import { within } from '@testing-library/dom';
 import { render, screen, waitFor } 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 { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 
+import { configureStore } from '../../../../store/configureStore';
 import { DashboardModel } from '../../state/DashboardModel';
 import { historySrv } from '../VersionHistory/HistorySrv';
 
@@ -27,6 +29,7 @@ const queryByFullText = (text: string) =>
   });
 
 function setup() {
+  const store = configureStore();
   const dashboard = new DashboardModel({
     id: 74,
     version: 11,
@@ -43,9 +46,11 @@ function setup() {
 
   return render(
     <GrafanaContext.Provider value={getGrafanaContextMock()}>
-      <BrowserRouter>
-        <VersionsSettings sectionNav={sectionNav} dashboard={dashboard} />
-      </BrowserRouter>
+      <Provider store={store}>
+        <BrowserRouter>
+          <VersionsSettings sectionNav={sectionNav} dashboard={dashboard} />
+        </BrowserRouter>
+      </Provider>
     </GrafanaContext.Provider>
   );
 }
diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx
index be37870e6a3..5dd77df63b7 100644
--- a/public/app/features/dashboard/containers/DashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx
@@ -13,6 +13,7 @@ import { config, locationService, setDataSourceSrv } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
+import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 import { DashboardInitPhase, DashboardMeta, DashboardRoutes } from 'app/types';
 
 import { configureStore } from '../../../store/configureStore';
@@ -105,7 +106,10 @@ function dashboardPageScenario(description: string, scenarioFn: (ctx: ScenarioCo
         setupFn = fn;
       },
       mount: (propOverrides?: Partial<Props>) => {
-        config.bootData.navTree = [{ text: 'Dashboards', id: 'dashboards' }];
+        config.bootData.navTree = [
+          { text: 'Dashboards', id: 'dashboards' },
+          { text: 'Home', id: HOME_NAV_ID },
+        ];
 
         const store = configureStore();
         const props: Props = {
@@ -114,7 +118,8 @@ function dashboardPageScenario(description: string, scenarioFn: (ctx: ScenarioCo
             route: { routeName: DashboardRoutes.Normal } as any,
           }),
           navIndex: {
-            dashboards: { text: 'Dashboards' },
+            dashboards: { text: 'Dashboards', id: 'dashboards', parentItem: { text: 'Home', id: HOME_NAV_ID } },
+            [HOME_NAV_ID]: { text: 'Home', id: HOME_NAV_ID },
           },
           initPhase: DashboardInitPhase.NotStarted,
           initError: null,
diff --git a/public/app/features/invites/SignupInvited.test.tsx b/public/app/features/invites/SignupInvited.test.tsx
index d16170371e9..693ff41b0e2 100644
--- a/public/app/features/invites/SignupInvited.test.tsx
+++ b/public/app/features/invites/SignupInvited.test.tsx
@@ -1,10 +1,12 @@
 import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 
 import { backendSrv } from '../../core/services/backend_srv';
+import { configureStore } from '../../store/configureStore';
 
 import { SignupInvitedPage, Props } from './SignupInvited';
 
@@ -28,6 +30,7 @@ const defaultGet = {
 
 async function setupTestContext({ get = defaultGet }: { get?: typeof defaultGet | null } = {}) {
   jest.clearAllMocks();
+  const store = configureStore();
 
   const getSpy = jest.spyOn(backendSrv, 'get');
   getSpy.mockResolvedValue(get);
@@ -43,7 +46,11 @@ async function setupTestContext({ get = defaultGet }: { get?: typeof defaultGet
     }),
   };
 
-  render(<SignupInvitedPage {...props} />);
+  render(
+    <Provider store={store}>
+      <SignupInvitedPage {...props} />
+    </Provider>
+  );
 
   await waitFor(() => expect(getSpy).toHaveBeenCalled());
   expect(getSpy).toHaveBeenCalledTimes(1);
diff --git a/public/app/features/org/OrgDetailsPage.test.tsx b/public/app/features/org/OrgDetailsPage.test.tsx
index 018e589d471..50c086d81e9 100644
--- a/public/app/features/org/OrgDetailsPage.test.tsx
+++ b/public/app/features/org/OrgDetailsPage.test.tsx
@@ -6,9 +6,9 @@ import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 
 import { NavModel } from '@grafana/data';
 import { ModalManager } from 'app/core/services/ModalManager';
-import { configureStore } from 'app/store/configureStore';
 
 import { backendSrv } from '../../core/services/backend_srv';
+import { configureStore } from '../../store/configureStore';
 import { Organization } from '../../types';
 
 import { OrgDetailsPage, Props } from './OrgDetailsPage';
@@ -37,6 +37,7 @@ jest.mock('@grafana/runtime', () => {
 });
 
 const setup = (propOverrides?: object) => {
+  const store = configureStore();
   jest.clearAllMocks();
   // needed because SharedPreferences is rendered in the test
   jest.spyOn(backendSrv, 'put');
@@ -62,7 +63,7 @@ const setup = (propOverrides?: object) => {
   Object.assign(props, propOverrides);
 
   render(
-    <Provider store={configureStore()}>
+    <Provider store={store}>
       <OrgDetailsPage {...props} />
     </Provider>
   );
diff --git a/public/app/features/playlist/PlaylistEditPage.test.tsx b/public/app/features/playlist/PlaylistEditPage.test.tsx
index d1894a85839..a64bab76278 100644
--- a/public/app/features/playlist/PlaylistEditPage.test.tsx
+++ b/public/app/features/playlist/PlaylistEditPage.test.tsx
@@ -1,10 +1,13 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { locationService } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 
+import { configureStore } from '../../store/configureStore';
+
 import { PlaylistEditPage } from './PlaylistEditPage';
 import { Playlist } from './types';
 
@@ -21,6 +24,7 @@ jest.mock('app/core/components/TagFilter/TagFilter', () => ({
 
 async function getTestContext({ name, interval, items, uid }: Partial<Playlist> = {}) {
   jest.clearAllMocks();
+  const store = configureStore();
   const playlist = { name, items, interval, uid } as unknown as Playlist;
   const queryParams = {};
   const route: any = {};
@@ -36,7 +40,9 @@ async function getTestContext({ name, interval, items, uid }: Partial<Playlist>
     uid: 'foo',
   });
   const { rerender } = render(
-    <PlaylistEditPage queryParams={queryParams} route={route} match={match} location={location} history={history} />
+    <Provider store={store}>
+      <PlaylistEditPage queryParams={queryParams} route={route} match={match} location={location} history={history} />
+    </Provider>
   );
   await waitFor(() => expect(getMock).toHaveBeenCalledTimes(1));
 
diff --git a/public/app/features/playlist/PlaylistNewPage.test.tsx b/public/app/features/playlist/PlaylistNewPage.test.tsx
index 704dd9841fb..69cabd81048 100644
--- a/public/app/features/playlist/PlaylistNewPage.test.tsx
+++ b/public/app/features/playlist/PlaylistNewPage.test.tsx
@@ -1,10 +1,13 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { locationService } from '@grafana/runtime';
-import { backendSrv } from 'app/core/services/backend_srv';
+
+import { backendSrv } from '../../core/services/backend_srv';
+import { configureStore } from '../../store/configureStore';
 
 import { PlaylistNewPage } from './PlaylistNewPage';
 import { Playlist } from './types';
@@ -21,11 +24,16 @@ jest.mock('app/core/components/TagFilter/TagFilter', () => ({
 }));
 
 function getTestContext({ name, interval, items }: Partial<Playlist> = {}) {
+  const store = configureStore();
   jest.clearAllMocks();
   const playlist = { name, items, interval } as unknown as Playlist;
   const backendSrvMock = jest.spyOn(backendSrv, 'post');
 
-  const { rerender } = render(<PlaylistNewPage />);
+  const { rerender } = render(
+    <Provider store={store}>
+      <PlaylistNewPage />
+    </Provider>
+  );
 
   return { playlist, rerender, backendSrvMock };
 }
diff --git a/public/app/features/playlist/PlaylistPage.test.tsx b/public/app/features/playlist/PlaylistPage.test.tsx
index 39b32744c00..70f1b6924b0 100644
--- a/public/app/features/playlist/PlaylistPage.test.tsx
+++ b/public/app/features/playlist/PlaylistPage.test.tsx
@@ -1,8 +1,11 @@
 import { render, waitFor } from '@testing-library/react';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { contextSrv } from 'app/core/services/context_srv';
 
+import { configureStore } from '../../store/configureStore';
+
 import { PlaylistPage } from './PlaylistPage';
 
 const fnMock = jest.fn();
@@ -21,7 +24,12 @@ jest.mock('app/core/services/context_srv', () => ({
 }));
 
 function getTestContext() {
-  return render(<PlaylistPage />);
+  const store = configureStore();
+  return render(
+    <Provider store={store}>
+      <PlaylistPage />
+    </Provider>
+  );
 }
 
 describe('PlaylistPage', () => {
diff --git a/public/app/features/profile/ChangePasswordPage.test.tsx b/public/app/features/profile/ChangePasswordPage.test.tsx
index 41cca32c284..dcef679b234 100644
--- a/public/app/features/profile/ChangePasswordPage.test.tsx
+++ b/public/app/features/profile/ChangePasswordPage.test.tsx
@@ -1,10 +1,12 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import config from 'app/core/config';
 
 import { backendSrv } from '../../core/services/backend_srv';
+import { configureStore } from '../../store/configureStore';
 
 import { Props, ChangePasswordPage } from './ChangePasswordPage';
 import { initialUserState } from './state/reducers';
@@ -26,6 +28,7 @@ const defaultProps: Props = {
 };
 
 async function getTestContext(overrides: Partial<Props> = {}) {
+  const store = configureStore();
   jest.clearAllMocks();
   jest.spyOn(backendSrv, 'get').mockResolvedValue({
     id: 1,
@@ -38,7 +41,11 @@ async function getTestContext(overrides: Partial<Props> = {}) {
   });
 
   const props = { ...defaultProps, ...overrides };
-  const { rerender } = render(<ChangePasswordPage {...props} />);
+  const { rerender } = render(
+    <Provider store={store}>
+      <ChangePasswordPage {...props} />
+    </Provider>
+  );
 
   await waitFor(() => expect(props.loadUser).toHaveBeenCalledTimes(1));
 
diff --git a/public/app/features/profile/UserProfileEditPage.test.tsx b/public/app/features/profile/UserProfileEditPage.test.tsx
index 19761e364a3..31ecb2d0fad 100644
--- a/public/app/features/profile/UserProfileEditPage.test.tsx
+++ b/public/app/features/profile/UserProfileEditPage.test.tsx
@@ -2,12 +2,14 @@ import { within } from '@testing-library/dom';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { OrgRole } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import TestProvider from '../../../test/helpers/TestProvider';
 import { backendSrv } from '../../core/services/backend_srv';
+import { configureStore } from '../../store/configureStore';
 import { TeamPermissionLevel } from '../../types';
 
 import { Props, UserProfileEditPage } from './UserProfileEditPage';
@@ -96,6 +98,7 @@ function getSelectors() {
 }
 
 async function getTestContext(overrides: Partial<Props> = {}) {
+  const store = configureStore();
   jest.clearAllMocks();
   const putSpy = jest.spyOn(backendSrv, 'put');
   const getSpy = jest
@@ -105,9 +108,11 @@ async function getTestContext(overrides: Partial<Props> = {}) {
 
   const props = { ...defaultProps, ...overrides };
   const { rerender } = render(
-    <TestProvider>
-      <UserProfileEditPage {...props} />
-    </TestProvider>
+    <Provider store={store}>
+      <TestProvider>
+        <UserProfileEditPage {...props} />
+      </TestProvider>
+    </Provider>
   );
 
   await waitFor(() => expect(props.initUserProfilePage).toHaveBeenCalledTimes(1));
diff --git a/public/app/features/scenes/components/NestedScene.test.tsx b/public/app/features/scenes/components/NestedScene.test.tsx
index 0b9d0b16355..06d61eeacc3 100644
--- a/public/app/features/scenes/components/NestedScene.test.tsx
+++ b/public/app/features/scenes/components/NestedScene.test.tsx
@@ -1,5 +1,8 @@
 import { screen, render } from '@testing-library/react';
 import React from 'react';
+import { Provider } from 'react-redux';
+
+import { configureStore } from '../../../store/configureStore';
 
 import { NestedScene } from './NestedScene';
 import { Scene } from './Scene';
@@ -7,6 +10,7 @@ import { SceneCanvasText } from './SceneCanvasText';
 import { SceneFlexLayout } from './layout/SceneFlexLayout';
 
 function setup() {
+  const store = configureStore();
   const scene = new Scene({
     title: 'Hello',
     layout: new SceneFlexLayout({
@@ -23,7 +27,11 @@ function setup() {
     }),
   });
 
-  render(<scene.Component model={scene} />);
+  render(
+    <Provider store={store}>
+      <scene.Component model={scene} />
+    </Provider>
+  );
 }
 
 describe('NestedScene', () => {
diff --git a/public/app/features/scenes/components/layout/SceneGridLayout.test.tsx b/public/app/features/scenes/components/layout/SceneGridLayout.test.tsx
index 07c1e585d25..677f1a8a6d0 100644
--- a/public/app/features/scenes/components/layout/SceneGridLayout.test.tsx
+++ b/public/app/features/scenes/components/layout/SceneGridLayout.test.tsx
@@ -1,6 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
+import { Provider } from 'react-redux';
 
+import { configureStore } from '../../../../store/configureStore';
 import { SceneObjectBase } from '../../core/SceneObjectBase';
 import { SceneComponentProps, SceneLayoutChildState } from '../../core/types';
 import { Scene } from '../Scene';
@@ -21,6 +23,11 @@ class TestObject extends SceneObjectBase<SceneLayoutChildState> {
   };
 }
 
+function renderWithProvider(element: JSX.Element) {
+  const store = configureStore();
+  return render(<Provider store={store}>{element}</Provider>);
+}
+
 describe('SceneGridLayout', () => {
   describe('rendering', () => {
     it('should render all grid children', async () => {
@@ -34,7 +41,7 @@ describe('SceneGridLayout', () => {
         }),
       });
 
-      render(<scene.Component model={scene} />);
+      renderWithProvider(<scene.Component model={scene} />);
 
       expect(screen.queryAllByTestId('test-object')).toHaveLength(2);
     });
@@ -57,7 +64,7 @@ describe('SceneGridLayout', () => {
         }),
       });
 
-      render(<scene.Component model={scene} />);
+      renderWithProvider(<scene.Component model={scene} />);
 
       expect(screen.queryAllByTestId('test-object')).toHaveLength(2);
     });
@@ -80,7 +87,7 @@ describe('SceneGridLayout', () => {
         }),
       });
 
-      render(<scene.Component model={scene} />);
+      renderWithProvider(<scene.Component model={scene} />);
 
       expect(screen.queryAllByTestId('test-object')).toHaveLength(3);
     });
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
index 0eca4499524..e9dfe18c306 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
@@ -1,6 +1,9 @@
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
+
+import { configureStore } from '../../store/configureStore';
 
 import { ServiceAccountCreatePage, Props } from './ServiceAccountCreatePage';
 
@@ -9,6 +12,7 @@ const patchMock = jest.fn().mockResolvedValue({});
 const putMock = jest.fn().mockResolvedValue({});
 
 jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => ({
     post: postMock,
     patch: patchMock,
@@ -41,6 +45,7 @@ jest.mock('app/core/core', () => ({
 }));
 
 const setup = (propOverrides: Partial<Props>) => {
+  const store = configureStore();
   const props: Props = {
     navModel: {
       main: {
@@ -54,7 +59,11 @@ const setup = (propOverrides: Partial<Props>) => {
 
   Object.assign(props, propOverrides);
 
-  render(<ServiceAccountCreatePage {...props} />);
+  render(
+    <Provider store={store}>
+      <ServiceAccountCreatePage {...props} />
+    </Provider>
+  );
 };
 
 describe('ServiceAccountCreatePage tests', () => {
diff --git a/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx
index c70c984d064..9a3e5800c70 100644
--- a/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx
@@ -1,9 +1,12 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { ApiKey, OrgRole, ServiceAccountDTO } from 'app/types';
 
+import { configureStore } from '../../store/configureStore';
+
 import { ServiceAccountPageUnconnected, Props } from './ServiceAccountPage';
 
 jest.mock('app/core/core', () => ({
@@ -16,6 +19,7 @@ jest.mock('app/core/core', () => ({
 }));
 
 const setup = (propOverrides: Partial<Props>) => {
+  const store = configureStore();
   const createServiceAccountTokenMock = jest.fn();
   const deleteServiceAccountMock = jest.fn();
   const deleteServiceAccountTokenMock = jest.fn();
@@ -49,7 +53,11 @@ const setup = (propOverrides: Partial<Props>) => {
 
   Object.assign(props, propOverrides);
 
-  const { rerender } = render(<ServiceAccountPageUnconnected {...props} />);
+  const { rerender } = render(
+    <Provider store={store}>
+      <ServiceAccountPageUnconnected {...props} />
+    </Provider>
+  );
   return {
     rerender,
     props,
diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
index 632c9126c8e..4e4d74ec145 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
@@ -1,9 +1,12 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { OrgRole, ServiceAccountDTO, ServiceAccountStateFilter } from 'app/types';
 
+import { configureStore } from '../../store/configureStore';
+
 import { Props, ServiceAccountsListPageUnconnected } from './ServiceAccountsListPage';
 
 jest.mock('app/core/core', () => ({
@@ -15,6 +18,7 @@ jest.mock('app/core/core', () => ({
 }));
 
 const setup = (propOverrides: Partial<Props>) => {
+  const store = configureStore();
   const changeQueryMock = jest.fn();
   const fetchACOptionsMock = jest.fn();
   const fetchServiceAccountsMock = jest.fn();
@@ -51,9 +55,13 @@ const setup = (propOverrides: Partial<Props>) => {
 
   Object.assign(props, propOverrides);
 
-  const { rerender } = render(<ServiceAccountsListPageUnconnected {...props} />);
+  const { rerender } = render(
+    <Provider store={store}>
+      <ServiceAccountsListPageUnconnected {...props} />
+    </Provider>
+  );
   return {
-    rerender,
+    rerender: (element: JSX.Element) => rerender(<Provider store={store}>{element}</Provider>),
     props,
     changeQueryMock,
     fetchACOptionsMock,
diff --git a/public/app/features/teams/CreateTeam.test.tsx b/public/app/features/teams/CreateTeam.test.tsx
index 7ab05634da9..3cfdbb310ee 100644
--- a/public/app/features/teams/CreateTeam.test.tsx
+++ b/public/app/features/teams/CreateTeam.test.tsx
@@ -1,9 +1,12 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { BackendSrv, setBackendSrv } from '@grafana/runtime';
 
+import { configureStore } from '../../store/configureStore';
+
 import { CreateTeam } from './CreateTeam';
 
 beforeEach(() => {
@@ -32,7 +35,12 @@ setBackendSrv({
 } as unknown as BackendSrv);
 
 const setup = () => {
-  return render(<CreateTeam />);
+  const store = configureStore();
+  return render(
+    <Provider store={store}>
+      <CreateTeam />
+    </Provider>
+  );
 };
 
 describe('Create team', () => {
diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx
index c368f2ae02f..5adaa2a8722 100644
--- a/public/app/features/teams/TeamList.test.tsx
+++ b/public/app/features/teams/TeamList.test.tsx
@@ -1,9 +1,11 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { contextSrv, User } from 'app/core/services/context_srv';
 
+import { configureStore } from '../../store/configureStore';
 import { OrgRole, Team } from '../../types';
 
 import { Props, TeamList } from './TeamList';
@@ -15,6 +17,7 @@ jest.mock('app/core/config', () => ({
 }));
 
 const setup = (propOverrides?: object) => {
+  const store = configureStore();
   const props: Props = {
     teams: [] as Team[],
     noTeams: false,
@@ -37,7 +40,11 @@ const setup = (propOverrides?: object) => {
 
   contextSrv.user = props.signedInUser;
 
-  render(<TeamList {...props} />);
+  render(
+    <Provider store={store}>
+      <TeamList {...props} />
+    </Provider>
+  );
 };
 
 describe('TeamList', () => {

From de99ce139c96e7229bb5e194aed225e3321d8685 Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@grafana.com>
Date: Tue, 22 Nov 2022 11:53:43 -0500
Subject: [PATCH 085/153] Server: Switch from separate server & cli to a
 unified grafana binary (#58286)

* avoid the need for a second bulky binary for grafana-cli

* look for grafana-server in $PATH as well as same directory

* implement unified "grafana" command

* update dockerfiles, fix grafana-cli -v

* update packaging to work with single binary

- add wrapper scripts for grafana and grafana-server
- update and sync package files
- implement --sign flag of build package command
- stop packaging scripts folder, they are not useful for end users
- add support for --configOverrides in server command
- remove unused nfpm.yaml config file

* windows support
---
 .bra.toml                                    |   9 +-
 Dockerfile                                   |   2 +-
 Dockerfile.ubuntu                            |   2 +-
 Makefile                                     |   6 +-
 packaging/conf/nfpm.yaml                     |  35 -----
 packaging/deb/control/postinst               |  38 ++---
 packaging/deb/init.d/grafana-server          | 152 +++++++++----------
 packaging/deb/systemd/grafana-server.service |   5 +-
 packaging/docker/run.sh                      |   6 +-
 packaging/mac/bin/grafana                    |   4 +-
 packaging/rpm/control/postinst               |  52 +++----
 packaging/rpm/init.d/grafana-server          |   9 +-
 packaging/rpm/systemd/grafana-server.service |   4 +-
 packaging/wrappers/grafana                   |  49 ++++++
 packaging/wrappers/grafana-cli               |  15 +-
 packaging/wrappers/grafana-server            |  41 +++++
 pkg/build/cmd.go                             |  17 ++-
 pkg/build/cmd/package.go                     |  17 ++-
 pkg/build/config/config.go                   |   1 +
 pkg/build/grafana/build.go                   |   2 +-
 pkg/build/packaging/grafana.go               |  92 ++++-------
 pkg/cmd/grafana-cli/commands/cli.go          |  62 ++------
 pkg/cmd/grafana-cli/commands/commands.go     |   3 +-
 pkg/cmd/grafana-cli/main.go                  |   7 +-
 pkg/cmd/grafana-server/commands/cli.go       |  32 +++-
 pkg/cmd/grafana-server/main.go               |  15 +-
 pkg/cmd/grafana/main.go                      |  68 +++++++++
 pkg/util/cmd/cmd.go                          |  65 ++++++++
 28 files changed, 480 insertions(+), 330 deletions(-)
 delete mode 100644 packaging/conf/nfpm.yaml
 create mode 100755 packaging/wrappers/grafana
 create mode 100755 packaging/wrappers/grafana-server
 create mode 100644 pkg/cmd/grafana/main.go
 create mode 100644 pkg/util/cmd/cmd.go

diff --git a/.bra.toml b/.bra.toml
index 005306880a0..22f56050c52 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -2,9 +2,8 @@
 init_cmds = [
   ["make", "gen-go"],
   ["make", "gen-jsonnet"],
-  ["GO_BUILD_DEV=1", "make", "build-cli"],
-  ["GO_BUILD_DEV=1", "make", "build-server"],
-  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["GO_BUILD_DEV=1", "make", "build-go"],
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
 follow_symlinks = true
@@ -20,6 +19,6 @@ build_delay = 1500
 cmds = [
   ["make", "gen-go"],
   ["make", "gen-jsonnet"],
-  ["GO_BUILD_DEV=1", "make", "build-server"],
-  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["GO_BUILD_DEV=1", "make", "build-go"],
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
diff --git a/Dockerfile b/Dockerfile
index 1032ba60ae7..966aebfa347 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,7 +82,7 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
   chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
   chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli ./bin/
+COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli /grafana/bin/*/grafana ./bin/
 COPY --from=js-builder /grafana/public ./public
 COPY --from=js-builder /grafana/tools ./tools
 
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 077d97a0c99..a6b62ea1e25 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -77,7 +77,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli bin/
+COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli /grafana/bin/*/grafana bin/
 COPY --from=js-builder /usr/src/app/public public
 COPY --from=js-builder /usr/src/app/tools tools
 
diff --git a/Makefile b/Makefile
index 03a2c40b48b..18c873b8ad2 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue
+.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue
 
 GO = go
 GO_FILES ?= ./pkg/...
@@ -82,6 +82,10 @@ build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build
 
+build-backend: ## Build Grafana backend.
+	@echo "build backend"
+	$(GO) run build.go $(GO_BUILD_FLAGS) build-backend
+
 build-server: ## Build Grafana server.
 	@echo "build server"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build-server
diff --git a/packaging/conf/nfpm.yaml b/packaging/conf/nfpm.yaml
deleted file mode 100644
index 03d26fa5ff2..00000000000
--- a/packaging/conf/nfpm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: "grafana"
-arch: "${ARCH}"
-platform: "linux"
-version: "${VERSION}"
-section: "default"
-priority: "extra"
-replaces:
-- grafana
-provides:
-- grafana-server
-- grafana-cli
-depends:
-- adduser
-maintainer: "<contact@grafana.com>"
-description: |
-  Grafana
-vendor: "Grafana"
-homepage: "https://grafana.com"
-license: "Apache 2"
-bindir: "/usr/sbin"
-files:
-  "./bin/grafana-server": "/usr/sbin/grafana-server"
-  "./bin/grafana-cli": "/usr/sbin/grafana-cli"
-config_files:
-  ./packaging/deb/init.d/grafana-server: "/etc/init.d/grafana-server"
-  ./packaging/deb/default/grafana-server: "/etc/default/grafana-server"
-  ./packaging/deb/systemd/grafana-server.service: "/usr/lib/systemd/system/grafana-server.service"
-overrides:
-  rpm:
-    scripts:
-      preinstall: ./scripts/preinstall.sh
-      postremove: ./scripts/postremove.sh
-  deb:
-    scripts:
-      postinstall: ./packaging/deb/control/postinst
diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst
index 952e71e2239..bb7a040a5fd 100755
--- a/packaging/deb/control/postinst
+++ b/packaging/deb/control/postinst
@@ -7,23 +7,24 @@ set -e
 IS_UPGRADE=false
 
 
-case "$1" in
-	configure)
-	[ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
-	[ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
-	if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
-	    addgroup --system "$GRAFANA_GROUP" --quiet
-	fi
-	if ! id $GRAFANA_USER > /dev/null 2>&1 ; then
-	    adduser --system --home /usr/share/grafana --no-create-home \
-		--ingroup "$GRAFANA_GROUP" --disabled-password --shell /bin/false \
-		"$GRAFANA_USER"
-	fi
+# Initial installation: $1 == configure
+# Upgrade: $1 == configure, and $2 not empty
+if [ "$1" = configure ]; then
+  [ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
+  [ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
+  if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
+    addgroup --system "$GRAFANA_GROUP" --quiet
+  fi
+  if ! id "$GRAFANA_USER" > /dev/null 2>&1 ; then
+    adduser --system --home /usr/share/grafana --no-create-home \
+      --ingroup "$GRAFANA_GROUP" --disabled-password --shell /bin/false \
+      "$GRAFANA_USER"
+  fi
 
-	# Set user permissions on /var/log/grafana, /var/lib/grafana
-	mkdir -p /var/log/grafana /var/lib/grafana
-	chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
-	chmod 755 /var/log/grafana /var/lib/grafana
+  # Set user permissions on /var/log/grafana, /var/lib/grafana
+  mkdir -p /var/log/grafana /var/lib/grafana
+  chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
+  chmod 755 /var/log/grafana /var/lib/grafana
 
   # copy user config files
   if [ ! -f $CONF_FILE ]; then
@@ -97,6 +98,5 @@ case "$1" in
     fi
     echo " OK"
 
-	fi
-	;;
-esac
+  fi
+fi
diff --git a/packaging/deb/init.d/grafana-server b/packaging/deb/init.d/grafana-server
index 5c1d9c8271a..840de5e9d62 100755
--- a/packaging/deb/init.d/grafana-server
+++ b/packaging/deb/init.d/grafana-server
@@ -36,7 +36,7 @@ CONF_FILE=$CONF_DIR/grafana.ini
 PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
 MAX_OPEN_FILES=10000
 PID_FILE=/var/run/$NAME.pid
-DAEMON=/usr/sbin/$NAME
+DAEMON=$GRAFANA_HOME/bin/grafana
 
 umask 0027
 
@@ -48,104 +48,102 @@ fi
 . /lib/lsb/init-functions
 
 if [ -r /etc/default/rcS ]; then
-	. /etc/default/rcS
+  . /etc/default/rcS
 fi
 
 # overwrite settings from default file
 if [ -f "$DEFAULT" ]; then
-	. "$DEFAULT"
+  . "$DEFAULT"
 fi
 
-DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} --packaging=deb cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR} cfg:default.paths.plugins=${PLUGINS_DIR}"
+DAEMON_OPTS="server --pidfile=${PID_FILE} --config=${CONF_FILE} --packaging=deb cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR} cfg:default.paths.plugins=${PLUGINS_DIR}"
 
 function checkUser() {
   if [ `id -u` -ne 0 ]; then
-  	echo "You need root privileges to run this script"
-  	exit 4
+    echo "You need root privileges to run this script"
+    exit 4
   fi
 }
 
 case "$1" in
   start)
-  checkUser
-	log_daemon_msg "Starting $DESC"
+    checkUser
+    log_daemon_msg "Starting $DESC"
+    pid=`pidofproc -p $PID_FILE grafana`
+    if [ -n "$pid" ] ; then
+      log_begin_msg "Already running."
+      log_end_msg 0
+      exit 0
+    fi
 
-	pid=`pidofproc -p $PID_FILE grafana`
-	if [ -n "$pid" ] ; then
-		log_begin_msg "Already running."
-		log_end_msg 0
-		exit 0
-	fi
+    # Prepare environment
+    mkdir -p "$LOG_DIR" "$DATA_DIR" && chown "$GRAFANA_USER":"$GRAFANA_GROUP" "$LOG_DIR" "$DATA_DIR"
+    touch "$PID_FILE" && chown "$GRAFANA_USER":"$GRAFANA_GROUP" "$PID_FILE"
 
-	# Prepare environment
-	mkdir -p "$LOG_DIR" "$DATA_DIR" && chown "$GRAFANA_USER":"$GRAFANA_GROUP" "$LOG_DIR" "$DATA_DIR"
-	touch "$PID_FILE" && chown "$GRAFANA_USER":"$GRAFANA_GROUP" "$PID_FILE"
+    if [ -n "$MAX_OPEN_FILES" ]; then
+      ulimit -n $MAX_OPEN_FILES
+    fi
 
-  if [ -n "$MAX_OPEN_FILES" ]; then
-		ulimit -n $MAX_OPEN_FILES
-	fi
+    # Start Daemon
+    start-stop-daemon --start -b --chdir "$WORK_DIR" --user "$GRAFANA_USER" -c "$GRAFANA_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
+    return=$?
+    if [ $return -eq 0 ]
+    then
+      sleep 1
+      # check if pid file has been written to
+      if ! [[ -s $PID_FILE ]]; then
+        log_end_msg 1
+        exit 1
+      fi
+      i=0
+      timeout=10
+      # Wait for the process to be properly started before exiting
+      until { cat "$PID_FILE" | xargs kill -0; } >/dev/null 2>&1
+      do
+        sleep 1
+        i=$(($i + 1))
+        if [ $i -gt $timeout ]; then
+          log_end_msg 1
+          exit 1
+        fi
+      done
+    fi
 
-	# Start Daemon
-	start-stop-daemon --start -b --chdir "$WORK_DIR" --user "$GRAFANA_USER" -c "$GRAFANA_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
-	return=$?
-	if [ $return -eq 0 ]
-	then
-	  sleep 1
-
-    # check if pid file has been written to
-	  if ! [[ -s $PID_FILE ]]; then
-	    log_end_msg 1
-	    exit 1
-	  fi
-
-		i=0
-		timeout=10
-		# Wait for the process to be properly started before exiting
-		until { cat "$PID_FILE" | xargs kill -0; } >/dev/null 2>&1
-		do
-			sleep 1
-			i=$(($i + 1))
-      if [ $i -gt $timeout ]; then
-			  log_end_msg 1
-			  exit 1
-			fi
-		done
-  fi
-  log_end_msg $return
-	;;
+    log_end_msg $return
+    ;;
   stop)
-  checkUser
-	log_daemon_msg "Stopping $DESC"
+    checkUser
+    log_daemon_msg "Stopping $DESC"
 
-	if [ -f "$PID_FILE" ]; then
-		start-stop-daemon --stop --pidfile "$PID_FILE" \
-			--user "$GRAFANA_USER" \
-			--retry=TERM/20/KILL/5 >/dev/null
-		if [ $? -eq 1 ]; then
-			log_progress_msg "$DESC is not running but pid file exists, cleaning up"
-		elif [ $? -eq 3 ]; then
-			PID="`cat $PID_FILE`"
-			log_failure_msg "Failed to stop $DESC (pid $PID)"
-			exit 1
-		fi
-		rm -f "$PID_FILE"
-	else
-		log_progress_msg "(not running)"
-	fi
-	log_end_msg 0
-	;;
+    if [ -f "$PID_FILE" ]; then
+      start-stop-daemon --stop --pidfile "$PID_FILE" \
+        --user "$GRAFANA_USER" \
+        --retry=TERM/20/KILL/5 >/dev/null
+      if [ $? -eq 1 ]; then
+        log_progress_msg "$DESC is not running but pid file exists, cleaning up"
+      elif [ $? -eq 3 ]; then
+        PID="`cat $PID_FILE`"
+        log_failure_msg "Failed to stop $DESC (pid $PID)"
+        exit 1
+      fi
+      rm -f "$PID_FILE"
+    else
+      log_progress_msg "(not running)"
+    fi
+    log_end_msg 0
+    ;;
   status)
-	status_of_proc -p $PID_FILE grafana grafana && exit 0 || exit $?
+    status_of_proc -p $PID_FILE grafana grafana && exit 0 || exit $?
     ;;
   restart|force-reload)
-	if [ -f "$PID_FILE" ]; then
-		$0 stop
-		sleep 1
-	fi
-	$0 start
-	;;
+    if [ -f "$PID_FILE" ]; then
+      $0 stop
+      sleep 1
+    fi
+    $0 start
+    ;;
   *)
-	log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}"
-	exit 3
-	;;
+    log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}"
+    exit 3
+    ;;
 esac
diff --git a/packaging/deb/systemd/grafana-server.service b/packaging/deb/systemd/grafana-server.service
index 54be80c06bb..2d66ce889e3 100644
--- a/packaging/deb/systemd/grafana-server.service
+++ b/packaging/deb/systemd/grafana-server.service
@@ -14,15 +14,14 @@ Restart=on-failure
 WorkingDirectory=/usr/share/grafana
 RuntimeDirectory=grafana
 RuntimeDirectoryMode=0750
-ExecStart=/usr/sbin/grafana-server                                                  \
+ExecStart=/usr/share/grafana/bin/grafana server                                     \
                             --config=${CONF_FILE}                                   \
                             --pidfile=${PID_FILE_DIR}/grafana-server.pid            \
                             --packaging=deb                                         \
                             cfg:default.paths.logs=${LOG_DIR}                       \
                             cfg:default.paths.data=${DATA_DIR}                      \
                             cfg:default.paths.plugins=${PLUGINS_DIR}                \
-                            cfg:default.paths.provisioning=${PROVISIONING_CFG_DIR}  
-
+                            cfg:default.paths.provisioning=${PROVISIONING_CFG_DIR}
 
 LimitNOFILE=10000
 TimeoutStopSec=20
diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh
index 30a70759616..ac1f9ea45a6 100755
--- a/packaging/docker/run.sh
+++ b/packaging/docker/run.sh
@@ -70,14 +70,14 @@ if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then
     if [[ $plugin =~ .*\;.* ]]; then
         pluginUrl=$(echo "$plugin" | cut -d';' -f 1)
         pluginInstallFolder=$(echo "$plugin" | cut -d';' -f 2)
-        grafana-cli --pluginUrl ${pluginUrl} --pluginsDir "${GF_PATHS_PLUGINS}" plugins install "${pluginInstallFolder}"
+        grafana cli --pluginUrl ${pluginUrl} --pluginsDir "${GF_PATHS_PLUGINS}" plugins install "${pluginInstallFolder}"
     else
-        grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin}
+        grafana cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin}
     fi
   done
 fi
 
-exec grafana-server                                         \
+exec grafana server                                         \
   --homepath="$GF_PATHS_HOME"                               \
   --config="$GF_PATHS_CONFIG"                               \
   --packaging=docker                                        \
diff --git a/packaging/mac/bin/grafana b/packaging/mac/bin/grafana
index 74f4b00662b..a995c37d9cc 100755
--- a/packaging/mac/bin/grafana
+++ b/packaging/mac/bin/grafana
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 DAEMON=grafana-server
-EXECUTABLE=/usr/local/bin/grafana-server
+EXECUTABLE=/usr/share/grafana/bin/grafana
 CONFIG=/usr/local/etc/grafana/grafana.ini
 HOMEPATH=/usr/local/share/grafana
 LOGPATH=/usr/local/var/log/grafana
@@ -11,7 +11,7 @@ DASHBOARDSCFGPATH=/usr/local/etc/grafana/dashboards
 
 case "$1" in
 start)
-  $EXECUTABLE --config=$CONFIG --homepath=$HOMEPATH cfg:default.paths.datasources=$DATASOURCECFGPATH cfg:default.paths.dashboards=$DASHBOARDSCFGPATH cfg:default.paths.logs=$LOGPATH cfg:default.paths.data=$DATAPATH cfg:default.paths.plugins=$PLUGINPATH 2> /dev/null &
+  $EXECUTABLE server --config=$CONFIG --homepath=$HOMEPATH cfg:default.paths.datasources=$DATASOURCECFGPATH cfg:default.paths.dashboards=$DASHBOARDSCFGPATH cfg:default.paths.logs=$LOGPATH cfg:default.paths.data=$DATAPATH cfg:default.paths.plugins=$PLUGINPATH 2> /dev/null &
   [ $? -eq 0 ] && echo "$DAEMON started"
 ;;
 stop)
diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst
index bde2accb9bd..4ec126c3355 100755
--- a/packaging/rpm/control/postinst
+++ b/packaging/rpm/control/postinst
@@ -7,37 +7,42 @@ set -e
 startGrafana() {
   if [ -x /bin/systemctl ] ; then
     /bin/systemctl daemon-reload
-		/bin/systemctl start grafana-server.service
-	elif [ -x /etc/init.d/grafana-server ] ; then
-		/etc/init.d/grafana-server start
-	elif [ -x /etc/rc.d/init.d/grafana-server ] ; then
-		/etc/rc.d/init.d/grafana-server start
-	fi
+    /bin/systemctl start grafana-server.service
+  elif [ -x /etc/init.d/grafana-server ] ; then
+    /etc/init.d/grafana-server start
+  elif [ -x /etc/rc.d/init.d/grafana-server ] ; then
+    /etc/rc.d/init.d/grafana-server start
+  fi
 }
 
 stopGrafana() {
-	if [ -x /bin/systemctl ] ; then
-		/bin/systemctl stop grafana-server.service > /dev/null 2>&1 || :
-	elif [ -x /etc/init.d/grafana-service ] ; then
-		/etc/init.d/grafana-service stop
-	elif [ -x /etc/rc.d/init.d/grafana-service ] ; then
-		/etc/rc.d/init.d/grafana-service stop
-	fi
+  if [ -x /bin/systemctl ] ; then
+    /bin/systemctl stop grafana-server.service > /dev/null 2>&1 || :
+  elif [ -x /etc/init.d/grafana-service ] ; then
+    /etc/init.d/grafana-service stop
+  elif [ -x /etc/rc.d/init.d/grafana-service ] ; then
+    /etc/rc.d/init.d/grafana-service stop
+  fi
 }
 
 
 # Initial installation: $1 == 1
 # Upgrade: $1 == 2, and configured to restart on upgrade
 if [ $1 -eq 1 ] ; then
-	[ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
-	[ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
-	if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
+  [ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
+  [ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
+  if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
     groupadd -r "$GRAFANA_GROUP"
-	fi
-	if ! getent passwd "$GRAFANA_USER" > /dev/null 2>&1 ; then
-    useradd -r -g grafana -d /usr/share/grafana -s /sbin/nologin \
-    -c "grafana user" grafana
-	fi
+  fi
+  if ! getent passwd "$GRAFANA_USER" > /dev/null 2>&1 ; then
+    useradd -r -g "$GRAFANA_GROUP" -d /usr/share/grafana -s /sbin/nologin \
+      -c "grafana user" "$GRAFANA_USER"
+  fi
+
+  # Set user permissions on /var/log/grafana, /var/lib/grafana
+  mkdir -p /var/log/grafana /var/lib/grafana
+  chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
+  chmod 755 /var/log/grafana /var/lib/grafana
 
   # copy user config files
   if [ ! -f $CONF_FILE ]; then
@@ -71,11 +76,6 @@ if [ $1 -eq 1 ] ; then
     cp /usr/share/grafana/conf/provisioning/alerting/sample.yaml $PROVISIONING_CFG_DIR/alerting/sample.yaml
   fi
 
- 	# Set user permissions on /var/log/grafana, /var/lib/grafana
-	mkdir -p /var/log/grafana /var/lib/grafana
-	chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
-	chmod 755 /var/log/grafana /var/lib/grafana
-
 	# configuration files should not be modifiable by grafana user, as this can be a security issue
 	chown -Rh root:$GRAFANA_GROUP /etc/grafana/*
 	chmod 755 /etc/grafana
diff --git a/packaging/rpm/init.d/grafana-server b/packaging/rpm/init.d/grafana-server
index b7b41e58e8d..5803717eb30 100755
--- a/packaging/rpm/init.d/grafana-server
+++ b/packaging/rpm/init.d/grafana-server
@@ -22,6 +22,7 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NAME=grafana-server
 DESC="Grafana Server"
+DEFAULT=/etc/sysconfig/$NAME
 
 GRAFANA_USER=grafana
 GRAFANA_GROUP=grafana
@@ -35,7 +36,7 @@ CONF_FILE=$CONF_DIR/grafana.ini
 PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
 MAX_OPEN_FILES=10000
 PID_FILE=/var/run/$NAME.pid
-DAEMON=/usr/sbin/$NAME
+DAEMON=$GRAFANA_HOME/bin/grafana
 
 if [ ! -x $DAEMON ]; then
   echo "Program not installed or not executable"
@@ -58,9 +59,11 @@ if [ -f /etc/rc.d/init.d/functions ]; then
 fi
 
 # overwrite settings from default file
-[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+if [ -f "$DEFAULT" ]; then
+  . "$DEFAULT"
+fi
 
-DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} --packaging=rpm cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR} cfg:default.paths.plugins=${PLUGINS_DIR}"
+DAEMON_OPTS="server --pidfile=${PID_FILE} --config=${CONF_FILE} --packaging=rpm cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR} cfg:default.paths.plugins=${PLUGINS_DIR}"
 
 function isRunning() {
   status -p $PID_FILE $NAME > /dev/null 2>&1
diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
index e9af40136e4..9752271c6e4 100644
--- a/packaging/rpm/systemd/grafana-server.service
+++ b/packaging/rpm/systemd/grafana-server.service
@@ -14,14 +14,14 @@ Restart=on-failure
 WorkingDirectory=/usr/share/grafana
 RuntimeDirectory=grafana
 RuntimeDirectoryMode=0750
-ExecStart=/usr/sbin/grafana-server                                                  \
+ExecStart=/usr/share/grafana/bin/grafana server                                     \
                             --config=${CONF_FILE}                                   \
                             --pidfile=${PID_FILE_DIR}/grafana-server.pid            \
                             --packaging=rpm                                         \
                             cfg:default.paths.logs=${LOG_DIR}                       \
                             cfg:default.paths.data=${DATA_DIR}                      \
                             cfg:default.paths.plugins=${PLUGINS_DIR}                \
-                            cfg:default.paths.provisioning=${PROVISIONING_CFG_DIR}  
+                            cfg:default.paths.provisioning=${PROVISIONING_CFG_DIR}
 
 LimitNOFILE=10000
 TimeoutStopSec=20
diff --git a/packaging/wrappers/grafana b/packaging/wrappers/grafana
new file mode 100755
index 00000000000..86e0fc9faa2
--- /dev/null
+++ b/packaging/wrappers/grafana
@@ -0,0 +1,49 @@
+#! /usr/bin/env bash
+
+# Wrapper for the grafana binary
+# This file serves as a wrapper for the grafana binary. It ensures we set
+# the system-wide Grafana configuration that was bundled with the package as we
+# use the binary.
+
+DEFAULT=/etc/default/grafana
+
+GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
+
+CONF_DIR=/etc/grafana
+DATA_DIR=/var/lib/grafana
+PLUGINS_DIR=/var/lib/grafana/plugins
+LOG_DIR=/var/log/grafana
+
+CONF_FILE=$CONF_DIR/grafana.ini
+PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
+
+EXECUTABLE="$GRAFANA_HOME/bin/grafana"
+
+if [ ! -x $EXECUTABLE ]; then
+ echo "$EXECUTABLE not installed or not executable"
+ exit 5
+fi
+
+# overwrite settings from default file
+if [ -f "$DEFAULT" ]; then
+  . "$DEFAULT"
+fi
+
+OPTS="--homepath=${GRAFANA_HOME} \
+      --config=${CONF_FILE} \
+      --configOverrides='cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR \
+                        cfg:default.paths.data=${DATA_DIR} \
+                        cfg:default.paths.logs=${LOG_DIR} \
+                        cfg:default.paths.plugins=${PLUGINS_DIR}'"
+
+CMD="${1:-}"
+shift
+
+# special handling to pass --pluginsDir to cli
+# can remove once it fully supports cfg:default.paths.plugins
+if [ "$CMD" = cli ]; then
+  OPTS="$OPTS \
+       --pluginsDir=${PLUGINS_DIR}"
+fi
+
+eval $EXECUTABLE "$CMD" "$OPTS" "$@"
diff --git a/packaging/wrappers/grafana-cli b/packaging/wrappers/grafana-cli
index dafa075a2cf..7c6c46aef9e 100755
--- a/packaging/wrappers/grafana-cli
+++ b/packaging/wrappers/grafana-cli
@@ -1,13 +1,14 @@
 #! /usr/bin/env bash
 
-# Wrapper for the grafana-cli binary
-# This file serves as a wrapper for the grafana-cli binary. It ensures we set
+# Wrapper for the grafana binary
+# This file serves as a wrapper for the grafana binary. It ensures we set
 # the system-wide Grafana configuration that was bundled with the package as we
 # use the binary.
 
 DEFAULT=/etc/default/grafana
 
-GRAFANA_HOME=/usr/share/grafana
+GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
+
 CONF_DIR=/etc/grafana
 DATA_DIR=/var/lib/grafana
 PLUGINS_DIR=/var/lib/grafana/plugins
@@ -16,10 +17,10 @@ LOG_DIR=/var/log/grafana
 CONF_FILE=$CONF_DIR/grafana.ini
 PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
 
-EXECUTABLE=$GRAFANA_HOME/bin/grafana-cli
+EXECUTABLE="$GRAFANA_HOME/bin/grafana"
 
 if [ ! -x $EXECUTABLE ]; then
- echo "Program not installed or not executable"
+ echo "$EXECUTABLE not installed or not executable"
  exit 5
 fi
 
@@ -36,4 +37,6 @@ OPTS="--homepath=${GRAFANA_HOME} \
                         cfg:default.paths.logs=${LOG_DIR} \
                         cfg:default.paths.plugins=${PLUGINS_DIR}'"
 
-eval $EXECUTABLE "$OPTS" '$@'
+CMD=cli
+
+eval $EXECUTABLE "$CMD" "$OPTS" "$@"
diff --git a/packaging/wrappers/grafana-server b/packaging/wrappers/grafana-server
new file mode 100755
index 00000000000..d8a4fa930fc
--- /dev/null
+++ b/packaging/wrappers/grafana-server
@@ -0,0 +1,41 @@
+#! /usr/bin/env bash
+
+# Wrapper for the grafana binary
+# This file serves as a wrapper for the grafana binary. It ensures we set
+# the system-wide Grafana configuration that was bundled with the package as we
+# use the binary.
+
+DEFAULT=/etc/default/grafana
+
+GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
+
+CONF_DIR=/etc/grafana
+DATA_DIR=/var/lib/grafana
+PLUGINS_DIR=/var/lib/grafana/plugins
+LOG_DIR=/var/log/grafana
+
+CONF_FILE=$CONF_DIR/grafana.ini
+PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
+
+EXECUTABLE="$GRAFANA_HOME/bin/grafana"
+
+if [ ! -x $EXECUTABLE ]; then
+ echo "$EXECUTABLE not installed or not executable"
+ exit 5
+fi
+
+# overwrite settings from default file
+if [ -f "$DEFAULT" ]; then
+  . "$DEFAULT"
+fi
+
+OPTS="--homepath=${GRAFANA_HOME} \
+      --config=${CONF_FILE} \
+      --configOverrides='cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR \
+                        cfg:default.paths.data=${DATA_DIR} \
+                        cfg:default.paths.logs=${LOG_DIR} \
+                        cfg:default.paths.plugins=${PLUGINS_DIR}'"
+
+CMD=server
+
+eval $EXECUTABLE "$CMD" "$OPTS" "$@"
diff --git a/pkg/build/cmd.go b/pkg/build/cmd.go
index bd0128d0cd4..2476caf2d42 100644
--- a/pkg/build/cmd.go
+++ b/pkg/build/cmd.go
@@ -17,11 +17,12 @@ const (
 	GoOSWindows = "windows"
 	GoOSLinux   = "linux"
 
-	ServerBinary = "grafana-server"
-	CLIBinary    = "grafana-cli"
+	BackendBinary = "grafana"
+	ServerBinary  = "grafana-server"
+	CLIBinary     = "grafana-cli"
 )
 
-var binaries = []string{ServerBinary, CLIBinary}
+var binaries = []string{BackendBinary, ServerBinary, CLIBinary}
 
 func logError(message string, err error) int {
 	log.Println(message, err)
@@ -64,6 +65,16 @@ func RunCmd() int {
 		case "setup":
 			setup(opts.goos)
 
+		case "build-backend":
+			if !opts.isDev {
+				clean(opts)
+			}
+
+			if err := doBuild("grafana", "./pkg/cmd/grafana", opts); err != nil {
+				log.Println(err)
+				return 1
+			}
+
 		case "build-srv", "build-server":
 			if !opts.isDev {
 				clean(opts)
diff --git a/pkg/build/cmd/package.go b/pkg/build/cmd/package.go
index 59beff98520..37b8d2e81fd 100644
--- a/pkg/build/cmd/package.go
+++ b/pkg/build/cmd/package.go
@@ -31,12 +31,9 @@ func Package(c *cli.Context) error {
 	}
 
 	cfg := config.Config{
-		NumWorkers: c.Int("jobs"),
+		NumWorkers:   c.Int("jobs"),
+		SignPackages: c.Bool("sign"),
 	}
-	if err := gpg.LoadGPGKeys(&cfg); err != nil {
-		return cli.Exit(err, 1)
-	}
-	defer gpg.RemoveGPGFiles(cfg)
 
 	ctx := context.Background()
 
@@ -57,8 +54,14 @@ func Package(c *cli.Context) error {
 	log.Printf("Packaging Grafana version %q, version mode %s, %s edition, variants %s", metadata.GrafanaVersion, releaseMode.Mode,
 		edition, strings.Join(variantStrs, ","))
 
-	if err := gpg.Import(cfg); err != nil {
-		return cli.Exit(err, 1)
+	if cfg.SignPackages {
+		if err := gpg.LoadGPGKeys(&cfg); err != nil {
+			return cli.Exit(err, 1)
+		}
+		defer gpg.RemoveGPGFiles(cfg)
+		if err := gpg.Import(cfg); err != nil {
+			return cli.Exit(err, 1)
+		}
 	}
 
 	p := syncutil.NewWorkerPool(cfg.NumWorkers)
diff --git a/pkg/build/config/config.go b/pkg/build/config/config.go
index 2f7dbe7358f..7c8b4b133bf 100644
--- a/pkg/build/config/config.go
+++ b/pkg/build/config/config.go
@@ -16,4 +16,5 @@ type Config struct {
 	PullEnterprise     bool
 	NetworkConcurrency bool
 	PackageVersion     string
+	SignPackages       bool
 }
diff --git a/pkg/build/grafana/build.go b/pkg/build/grafana/build.go
index b8fa022c396..4d661e8d851 100644
--- a/pkg/build/grafana/build.go
+++ b/pkg/build/grafana/build.go
@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/build/golangutils"
 )
 
-var binaries = []string{"grafana-server", "grafana-cli"}
+var binaries = []string{"grafana", "grafana-server", "grafana-cli"}
 
 const (
 	SuffixEnterprise2 = "-enterprise2"
diff --git a/pkg/build/packaging/grafana.go b/pkg/build/packaging/grafana.go
index 6d48dbb8b57..84e083c3844 100644
--- a/pkg/build/packaging/grafana.go
+++ b/pkg/build/packaging/grafana.go
@@ -75,9 +75,13 @@ func PackageGrafana(
 	if err := packageGrafana(ctx, edition, version, grafanaDir, variants, shouldSign, p); err != nil {
 		return err
 	}
-	if err := signRPMPackages(edition, cfg, grafanaDir); err != nil {
-		return err
+
+	if cfg.SignPackages {
+		if err := signRPMPackages(edition, cfg, grafanaDir); err != nil {
+			return err
+		}
 	}
+
 	if err := checksumPackages(grafanaDir, edition); err != nil {
 		return err
 	}
@@ -282,6 +286,7 @@ func shaFile(fpath string) error {
 
 // createPackage creates a Linux package.
 func createPackage(srcDir string, options linuxPackageOptions) error {
+	binary := "grafana"
 	cliBinary := "grafana-cli"
 	serverBinary := "grafana-server"
 
@@ -310,10 +315,15 @@ func createPackage(srcDir string, options linuxPackageOptions) error {
 		}
 	}
 
-	if err := fs.CopyFile(options.cliBinaryWrapperSrc, filepath.Join(packageRoot, "usr", "sbin", cliBinary)); err != nil {
+	if err := fs.CopyFile(filepath.Join(options.wrapperFilePath, binary),
+		filepath.Join(packageRoot, "usr", "sbin", binary)); err != nil {
 		return err
 	}
-	if err := fs.CopyFile(filepath.Join(srcDir, "bin", serverBinary),
+	if err := fs.CopyFile(filepath.Join(options.wrapperFilePath, cliBinary),
+		filepath.Join(packageRoot, "usr", "sbin", cliBinary)); err != nil {
+		return err
+	}
+	if err := fs.CopyFile(filepath.Join(options.wrapperFilePath, serverBinary),
 		filepath.Join(packageRoot, "usr", "sbin", serverBinary)); err != nil {
 		return err
 	}
@@ -329,19 +339,17 @@ func createPackage(srcDir string, options linuxPackageOptions) error {
 	if err := fs.CopyRecursive(srcDir, filepath.Join(packageRoot, options.homeDir)); err != nil {
 		return err
 	}
-	homeBinDir := filepath.Join(packageRoot, options.homeBinDir)
-	if err := os.RemoveAll(homeBinDir); err != nil {
-		return fmt.Errorf("failed to remove %q: %w", homeBinDir, err)
-	}
-	//nolint
-	if err := os.MkdirAll(homeBinDir, 0o755); err != nil {
-		return fmt.Errorf("failed to make directory %q: %w", homeBinDir, err)
-	}
-	// The grafana-cli binary is exposed through a wrapper to ensure a proper
-	// configuration is in place. To enable that, we need to store the original
-	// binary in a separate location to avoid conflicts.
-	if err := fs.CopyFile(filepath.Join(srcDir, "bin", cliBinary), filepath.Join(homeBinDir, cliBinary)); err != nil {
-		return err
+
+	// remove unneeded binaries, these are exposed via wrappers that provide the needed configuration
+	for _, fileName := range []string{
+		cliBinary,
+		cliBinary + ".md5",
+		serverBinary,
+		serverBinary + ".md5",
+	} {
+		if err := os.Remove(filepath.Join(packageRoot, options.homeBinDir, fileName)); err != nil {
+			return fmt.Errorf("failed to remove %q: %w", filepath.Join(options.homeBinDir, fileName), err)
+		}
 	}
 
 	if err := executeFPM(options, packageRoot, srcDir); err != nil {
@@ -475,43 +483,6 @@ func copyBinaries(grafanaDir, tmpDir string, args grafana.BuildArgs, edition con
 	return nil
 }
 
-// copyScripts copies scripts from grafanaDir into tmpDir.
-func copyScripts(grafanaDir, tmpDir string) error {
-	//nolint
-	if err := os.MkdirAll(filepath.Join(tmpDir, "scripts"), 0o755); err != nil {
-		return fmt.Errorf("failed to create dir %q: %w", filepath.Join(tmpDir, "scripts"), err)
-	}
-	scriptsDir := filepath.Join(grafanaDir, "scripts")
-	infos, err := os.ReadDir(scriptsDir)
-	if err != nil {
-		return fmt.Errorf("failed to list files in %q: %w", scriptsDir, err)
-	}
-	for _, file := range infos {
-		info, err := file.Info()
-		if err != nil {
-			return err
-		}
-
-		if info.IsDir() {
-			continue
-		}
-
-		if info.Mode()&os.ModeSymlink != 0 {
-			continue
-		}
-
-		path := ""
-
-		path = filepath.Join(scriptsDir, info.Name())
-
-		if err := fs.CopyFile(path, filepath.Join(tmpDir, "scripts", info.Name())); err != nil {
-			return fmt.Errorf("failed to copy %q to %q: %w", path, tmpDir, err)
-		}
-	}
-
-	return nil
-}
-
 // copyConfFiles copies configuration files from grafanaDir into tmpDir.
 func copyConfFiles(grafanaDir, tmpDir string) error {
 	//nolint:gosec
@@ -717,9 +688,6 @@ func realPackageVariant(ctx context.Context, v config.Variant, edition config.Ed
 	if err := copyBinaries(grafanaDir, tmpDir, args, edition); err != nil {
 		return err
 	}
-	if err := copyScripts(grafanaDir, tmpDir); err != nil {
-		return err
-	}
 	if err := copyConfFiles(grafanaDir, tmpDir); err != nil {
 		return err
 	}
@@ -773,7 +741,7 @@ func realPackageVariant(ctx context.Context, v config.Variant, edition config.Ed
 			initdScriptSrc:         filepath.Join(grafanaDir, "packaging", "deb", "init.d", "grafana-server"),
 			defaultFileSrc:         filepath.Join(grafanaDir, "packaging", "deb", "default", "grafana-server"),
 			systemdFileSrc:         filepath.Join(grafanaDir, "packaging", "deb", "systemd", "grafana-server.service"),
-			cliBinaryWrapperSrc:    filepath.Join(grafanaDir, "packaging", "wrappers", "grafana-cli"),
+			wrapperFilePath:        filepath.Join(grafanaDir, "packaging", "wrappers"),
 			depends:                []string{"adduser", "libfontconfig1"},
 		}); err != nil {
 			return err
@@ -807,7 +775,7 @@ func realPackageVariant(ctx context.Context, v config.Variant, edition config.Ed
 		initdScriptSrc:         filepath.Join(grafanaDir, "packaging", "rpm", "init.d", "grafana-server"),
 		defaultFileSrc:         filepath.Join(grafanaDir, "packaging", "rpm", "sysconfig", "grafana-server"),
 		systemdFileSrc:         filepath.Join(grafanaDir, "packaging", "rpm", "systemd", "grafana-server.service"),
-		cliBinaryWrapperSrc:    filepath.Join(grafanaDir, "packaging", "wrappers", "grafana-cli"),
+		wrapperFilePath:        filepath.Join(grafanaDir, "packaging", "wrappers"),
 		// chkconfig is depended on since our systemd service wraps a SysV init script, and that requires chkconfig
 		depends: []string{"/sbin/service", "chkconfig", "fontconfig", "freetype", "urw-fonts"},
 	}); err != nil {
@@ -889,7 +857,7 @@ type linuxPackageOptions struct {
 	initdScriptSrc         string
 	defaultFileSrc         string
 	systemdFileSrc         string
-	cliBinaryWrapperSrc    string
+	wrapperFilePath        string
 
 	depends []string
 }
@@ -929,7 +897,7 @@ func createZip(srcDir, version, variantStr, sfx, grafanaDir string) error {
 		return fmt.Errorf("failed to create %q: %w", fpath, err)
 	}
 	defer func() {
-		if err := tgt.Close(); err != nil {
+		if err := tgt.Close(); err != nil && !errors.Is(err, os.ErrClosed) {
 			log.Println(err)
 		}
 	}()
@@ -1045,7 +1013,7 @@ func createTarball(srcDir, version, variantStr, sfx, grafanaDir string) error {
 		return fmt.Errorf("failed to create %q: %w", fpath, err)
 	}
 	defer func() {
-		if err := tgt.Close(); err != nil {
+		if err := tgt.Close(); err != nil && !errors.Is(err, os.ErrClosed) {
 			log.Println(err)
 		}
 	}()
diff --git a/pkg/cmd/grafana-cli/commands/cli.go b/pkg/cmd/grafana-cli/commands/cli.go
index 17a2f1258d4..e9a77d97ce3 100644
--- a/pkg/cmd/grafana-cli/commands/cli.go
+++ b/pkg/cmd/grafana-cli/commands/cli.go
@@ -1,11 +1,9 @@
 package commands
 
 import (
-	"fmt"
 	"os"
 	"runtime"
 
-	"github.com/fatih/color"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
@@ -13,18 +11,10 @@ import (
 )
 
 // RunCLI is the entrypoint for the grafana-cli command. It returns the exit code for the grafana-cli program.
-func RunCLI(version string) int {
-	setupLogging()
-
-	app := &cli.App{
-		Name: "Grafana CLI",
-		Authors: []*cli.Author{
-			{
-				Name:  "Grafana Project",
-				Email: "hello@grafana.com",
-			},
-		},
-		Version: version,
+func CLICommand(version string) *cli.Command {
+	return &cli.Command{
+		Name:  "cli",
+		Usage: "run the grafana cli",
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:    "pluginsDir",
@@ -64,39 +54,19 @@ func RunCLI(version string) int {
 				Name:  "config",
 				Usage: "Path to config file",
 			},
+			cli.VersionFlag,
 		},
-		Commands:        Commands,
-		CommandNotFound: cmdNotFound,
-	}
+		Subcommands: Commands,
+		Before: func(c *cli.Context) error {
+			// backward-compatible handling for cli version flag
+			if c.Bool("version") {
+				cli.ShowVersion(c)
+				os.Exit(0)
+			}
 
-	app.Before = func(c *cli.Context) error {
-		services.Init(version, c.Bool("insecure"), c.Bool("debug"))
-		return nil
-	}
-
-	if err := app.Run(os.Args); err != nil {
-		logger.Errorf("%s: %s %s\n", color.RedString("Error"), color.RedString("✗"), err)
-		return 1
-	}
-
-	return 0
-}
-
-func setupLogging() {
-	for _, f := range os.Args {
-		if f == "-d" || f == "--debug" || f == "-debug" {
-			logger.SetDebug(true)
-		}
+			logger.SetDebug(c.Bool("debug"))
+			services.Init(version, c.Bool("insecure"), c.Bool("debug"))
+			return nil
+		},
 	}
 }
-
-func cmdNotFound(c *cli.Context, command string) {
-	fmt.Printf(
-		"%s: '%s' is not a %s command. See '%s --help'.\n",
-		c.App.Name,
-		command,
-		c.App.Name,
-		os.Args[0],
-	)
-	os.Exit(1)
-}
diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
index 0b7ef9461d7..a4edda3aabe 100644
--- a/pkg/cmd/grafana-cli/commands/commands.go
+++ b/pkg/cmd/grafana-cli/commands/commands.go
@@ -78,7 +78,8 @@ func initCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, error) {
 	cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{
 		Config:   cmd.ConfigFile(),
 		HomePath: cmd.HomePath(),
-		Args:     append(configOptions, cmd.Args().Slice()...), // tailing arguments have precedence over the options string
+		// tailing arguments have precedence over the options string
+		Args: append(configOptions, cmd.Args().Slice()...),
 	})
 
 	if err != nil {
diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
index 3f300aec687..af5636c210d 100644
--- a/pkg/cmd/grafana-cli/main.go
+++ b/pkg/cmd/grafana-cli/main.go
@@ -3,12 +3,9 @@ package main
 import (
 	"os"
 
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
+	"github.com/grafana/grafana/pkg/util/cmd"
 )
 
-// Version is overridden by build flags
-var version = "main"
-
 func main() {
-	os.Exit(commands.RunCLI(version))
+	os.Exit(cmd.RunGrafanaCmd("cli"))
 }
diff --git a/pkg/cmd/grafana-server/commands/cli.go b/pkg/cmd/grafana-server/commands/cli.go
index ab1bf653e97..10ffd4668b2 100644
--- a/pkg/cmd/grafana-server/commands/cli.go
+++ b/pkg/cmd/grafana-server/commands/cli.go
@@ -13,6 +13,7 @@ import (
 	"runtime/debug"
 	"runtime/trace"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -32,6 +33,7 @@ type ServerOptions struct {
 	Commit      string
 	BuildBranch string
 	BuildStamp  string
+	Args        []string
 }
 
 type exitWithCode struct {
@@ -54,6 +56,8 @@ func RunServer(opt ServerOptions) int {
 		pidFile    = serverFs.String("pidfile", "", "path to pid file")
 		packaging  = serverFs.String("packaging", "unknown", "describes the way Grafana was installed")
 
+		configOverrides = serverFs.String("configOverrides", "", "Configuration options to override defaults as a string. e.g. cfg:default.paths.log=/dev/null")
+
 		v           = serverFs.Bool("v", false, "prints current version and exits")
 		vv          = serverFs.Bool("vv", false, "prints current version, all dependencies and exits")
 		profile     = serverFs.Bool("profile", false, "Turn on pprof profiling")
@@ -63,7 +67,7 @@ func RunServer(opt ServerOptions) int {
 		tracingFile = serverFs.String("tracing-file", "trace.out", "Define tracing output file")
 	)
 
-	if err := serverFs.Parse(os.Args[1:]); err != nil {
+	if err := serverFs.Parse(opt.Args); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		return 1
 	}
@@ -108,7 +112,7 @@ func RunServer(opt ServerOptions) int {
 		}()
 	}
 
-	if err := executeServer(*configFile, *homePath, *pidFile, *packaging, traceDiagnostics, opt); err != nil {
+	if err := executeServer(*configFile, *homePath, *pidFile, *packaging, *configOverrides, traceDiagnostics, opt); err != nil {
 		code := 1
 		var ewc exitWithCode
 		if errors.As(err, &ewc) {
@@ -124,7 +128,7 @@ func RunServer(opt ServerOptions) int {
 	return 0
 }
 
-func executeServer(configFile, homePath, pidFile, packaging string, traceDiagnostics *tracingDiagnostics, opt ServerOptions) error {
+func executeServer(configFile, homePath, pidFile, packaging, configOverrides string, traceDiagnostics *tracingDiagnostics, opt ServerOptions) error {
 	defer func() {
 		if err := log.Close(); err != nil {
 			fmt.Fprintf(os.Stderr, "Failed to close log: %s\n", err)
@@ -185,11 +189,23 @@ func executeServer(configFile, homePath, pidFile, packaging string, traceDiagnos
 		fmt.Println("Grafana server is running with elevated privileges. This is not recommended")
 	}
 
-	s, err := server.Initialize(setting.CommandLineArgs{
-		Config: configFile, HomePath: homePath, Args: serverFs.Args(),
-	}, server.Options{
-		PidFile: pidFile, Version: opt.Version, Commit: opt.Commit, BuildBranch: opt.BuildBranch,
-	}, api.ServerOptions{})
+	configOptions := strings.Split(configOverrides, " ")
+
+	s, err := server.Initialize(
+		setting.CommandLineArgs{
+			Config:   configFile,
+			HomePath: homePath,
+			// tailing arguments have precedence over the options string
+			Args: append(configOptions, serverFs.Args()...),
+		},
+		server.Options{
+			PidFile:     pidFile,
+			Version:     opt.Version,
+			Commit:      opt.Commit,
+			BuildBranch: opt.BuildBranch,
+		},
+		api.ServerOptions{},
+	)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to start grafana. error: %s\n", err.Error())
 		return err
diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
index d615125d74d..8df5e6f7b26 100644
--- a/pkg/cmd/grafana-server/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -3,20 +3,9 @@ package main
 import (
 	"os"
 
-	"github.com/grafana/grafana/pkg/cmd/grafana-server/commands"
+	"github.com/grafana/grafana/pkg/util/cmd"
 )
 
-// The following variables cannot be constants, since they can be overridden through the -X link flag
-var version = "9.2.0"
-var commit = "NA"
-var buildBranch = "main"
-var buildstamp string
-
 func main() {
-	os.Exit(commands.RunServer(commands.ServerOptions{
-		Version:     version,
-		Commit:      commit,
-		BuildBranch: buildBranch,
-		BuildStamp:  buildstamp,
-	}))
+	os.Exit(cmd.RunGrafanaCmd("server"))
 }
diff --git a/pkg/cmd/grafana/main.go b/pkg/cmd/grafana/main.go
new file mode 100644
index 00000000000..291a0b1cc9f
--- /dev/null
+++ b/pkg/cmd/grafana/main.go
@@ -0,0 +1,68 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/fatih/color"
+	gcli "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
+	gsrv "github.com/grafana/grafana/pkg/cmd/grafana-server/commands"
+	"github.com/urfave/cli/v2"
+)
+
+// The following variables cannot be constants, since they can be overridden through the -X link flag
+var version = "9.2.0"
+var commit = "NA"
+var buildBranch = "main"
+var buildstamp string
+
+func main() {
+	app := &cli.App{
+		Name:  "grafana",
+		Usage: "Grafana server and command line interface",
+		Authors: []*cli.Author{
+			{
+				Name:  "Grafana Project",
+				Email: "hello@grafana.com",
+			},
+		},
+		Version: version,
+		Commands: []*cli.Command{
+			gcli.CLICommand(version),
+			{
+				Name:  "server",
+				Usage: "server <server options>",
+				Action: func(context *cli.Context) error {
+					os.Exit(gsrv.RunServer(gsrv.ServerOptions{
+						Version:     version,
+						Commit:      commit,
+						BuildBranch: buildBranch,
+						BuildStamp:  buildstamp,
+						Args:        context.Args().Slice(),
+					}))
+					return nil
+				},
+				SkipFlagParsing: true,
+			},
+		},
+		CommandNotFound: cmdNotFound,
+	}
+
+	if err := app.Run(os.Args); err != nil {
+		fmt.Printf("%s: %s %s\n", color.RedString("Error"), color.RedString("✗"), err)
+		os.Exit(1)
+	}
+
+	os.Exit(0)
+}
+
+func cmdNotFound(c *cli.Context, command string) {
+	fmt.Printf(
+		"%s: '%s' is not a %s command. See '%s --help'.\n",
+		c.App.Name,
+		command,
+		c.App.Name,
+		os.Args[0],
+	)
+	os.Exit(1)
+}
diff --git a/pkg/util/cmd/cmd.go b/pkg/util/cmd/cmd.go
new file mode 100644
index 00000000000..b0ec8b07501
--- /dev/null
+++ b/pkg/util/cmd/cmd.go
@@ -0,0 +1,65 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"syscall"
+)
+
+func RunGrafanaCmd(subCmd string) int {
+	curr, err := os.Executable()
+	if err != nil {
+		fmt.Println("Error locating executable:", err)
+		return 1
+	}
+
+	executable := "grafana"
+	if runtime.GOOS == "windows" {
+		executable += ".exe"
+	}
+
+	binary := filepath.Join(filepath.Dir(filepath.Clean(curr)), executable)
+	if _, err := os.Stat(binary); err != nil {
+		binary, err = exec.LookPath(executable)
+		if err != nil {
+			fmt.Printf("Error locating %s: %s\n", executable, err)
+			return 1
+		}
+	}
+
+	// windows doesn't support syscall.Exec so we just run the main binary as a command
+	if runtime.GOOS == "windows" {
+		// bypassing gosec G204 because we need to build the command programmatically
+		// nolint:gosec
+		cmd := exec.Command(binary, append([]string{subCmd}, os.Args[1:]...)...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		cmd.Stdin = os.Stdin
+		cmd.Env = os.Environ()
+		err := cmd.Run()
+		if err == nil {
+			return 0
+		}
+		var exitError *exec.ExitError
+		if errors.As(err, &exitError) {
+			return exitError.ExitCode()
+		}
+		return 1
+	}
+
+	args := append([]string{"grafana", subCmd}, os.Args[1:]...)
+
+	// bypassing gosec G204 because we need to build the command programmatically
+	// nolint:gosec
+	execErr := syscall.Exec(binary, args, os.Environ())
+	if execErr != nil {
+		fmt.Printf("Error running %s: %s\n", binary, execErr)
+		return 1
+	}
+
+	return 0
+}

From b875ca08c6e8538f1a8d70895c36eec68bd3f72c Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Tue, 22 Nov 2022 18:02:39 +0100
Subject: [PATCH 086/153] SQLStore: Make addOrgUser private (#59142)

make addOrgUser private
---
 pkg/api/org_invite_test.go               |  2 +-
 pkg/api/org_users_test.go                | 22 ++++++++++++----------
 pkg/services/sqlstore/org_test.go        |  4 ++--
 pkg/services/sqlstore/org_users.go       |  2 +-
 pkg/services/sqlstore/org_users_test.go  |  4 ++--
 pkg/services/sqlstore/stats_test.go      |  6 +++---
 pkg/services/user/userimpl/store_test.go | 17 +++++++++++------
 7 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/pkg/api/org_invite_test.go b/pkg/api/org_invite_test.go
index ea0960bb5a2..e264b76a865 100644
--- a/pkg/api/org_invite_test.go
+++ b/pkg/api/org_invite_test.go
@@ -72,7 +72,7 @@ func TestOrgInvitesAPIEndpointAccess(t *testing.T) {
 			userService.ExpectedUser = &user.User{ID: 2}
 			sc.hs.userService = userService
 			setInitCtxSignedInViewer(sc.initCtx)
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 			setAccessControlPermissions(sc.acmock, test.permissions, sc.initCtx.OrgID)
 
 			input := strings.NewReader(test.input)
diff --git a/pkg/api/org_users_test.go b/pkg/api/org_users_test.go
index 3dbe71300ae..d861734c572 100644
--- a/pkg/api/org_users_test.go
+++ b/pkg/api/org_users_test.go
@@ -328,7 +328,7 @@ var (
 // setupOrgUsersDBForAccessControlTests creates three users placed in two orgs
 // Org1: testServerAdminViewer, testEditorOrg1
 // Org2: testServerAdminViewer, testAdminOrg2
-func setupOrgUsersDBForAccessControlTests(t *testing.T, db *sqlstore.SQLStore) {
+func setupOrgUsersDBForAccessControlTests(t *testing.T, db *sqlstore.SQLStore, orgService org.Service) {
 	t.Helper()
 
 	var err error
@@ -346,9 +346,9 @@ func setupOrgUsersDBForAccessControlTests(t *testing.T, db *sqlstore.SQLStore) {
 	_, err = db.CreateOrgWithMember(testAdminOrg2.OrgName, testServerAdminViewer.UserID)
 	require.NoError(t, err)
 
-	err = db.AddOrgUser(context.Background(), &models.AddOrgUserCommand{LoginOrEmail: testAdminOrg2.Login, Role: testAdminOrg2.OrgRole, OrgId: testAdminOrg2.OrgID, UserId: testAdminOrg2.UserID})
+	err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{LoginOrEmail: testAdminOrg2.Login, Role: testAdminOrg2.OrgRole, OrgID: testAdminOrg2.OrgID, UserID: testAdminOrg2.UserID})
 	require.NoError(t, err)
-	err = db.AddOrgUser(context.Background(), &models.AddOrgUserCommand{LoginOrEmail: testEditorOrg1.Login, Role: testEditorOrg1.OrgRole, OrgId: testEditorOrg1.OrgID, UserId: testEditorOrg1.UserID})
+	err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{LoginOrEmail: testEditorOrg1.Login, Role: testEditorOrg1.OrgRole, OrgID: testEditorOrg1.OrgID, UserID: testEditorOrg1.UserID})
 	require.NoError(t, err)
 }
 
@@ -398,7 +398,7 @@ func TestGetOrgUsersAPIEndpoint_AccessControlMetadata(t *testing.T) {
 				hs.orgService, err = orgimpl.ProvideService(hs.SQLStore, cfg, quotatest.New(false, nil))
 				require.NoError(t, err)
 			})
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 			setInitCtxSignedInUser(sc.initCtx, tc.user)
 
 			// Perform test
@@ -506,7 +506,7 @@ func TestGetOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 				require.NoError(t, err)
 			})
 			setInitCtxSignedInUser(sc.initCtx, tc.user)
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 
 			// Perform test
 			response := callAPI(sc.server, http.MethodGet, fmt.Sprintf(url, tc.targetOrg), nil, t)
@@ -606,12 +606,14 @@ func TestPostOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 			cfg.RBACEnabled = tc.enableAccessControl
 			var err error
 			sc := setupHTTPServerWithCfg(t, false, cfg, func(hs *HTTPServer) {
+				hs.orgService, err = orgimpl.ProvideService(hs.SQLStore, cfg, quotatest.New(false, nil))
+				require.NoError(t, err)
 				hs.userService, err = userimpl.ProvideService(
-					hs.SQLStore, nil, cfg, teamimpl.ProvideService(hs.SQLStore.(*sqlstore.SQLStore), cfg), localcache.ProvideService(), quotatest.New(false, nil))
+					hs.SQLStore, hs.orgService, cfg, teamimpl.ProvideService(hs.SQLStore.(*sqlstore.SQLStore), cfg), localcache.ProvideService(), quotatest.New(false, nil))
 				require.NoError(t, err)
 			})
 
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 			setInitCtxSignedInUser(sc.initCtx, tc.user)
 
 			// Perform request
@@ -731,7 +733,7 @@ func TestOrgUsersAPIEndpointWithSetPerms_AccessControl(t *testing.T) {
 				require.NoError(t, err)
 			})
 			setInitCtxSignedInViewer(sc.initCtx)
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 			setAccessControlPermissions(sc.acmock, test.permissions, sc.initCtx.OrgID)
 
 			input := strings.NewReader(test.input)
@@ -852,7 +854,7 @@ func TestPatchOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 				hs.orgService, err = orgimpl.ProvideService(hs.SQLStore, cfg, quotaService)
 				require.NoError(t, err)
 			})
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 			setInitCtxSignedInUser(sc.initCtx, tc.user)
 
 			// Perform request
@@ -982,7 +984,7 @@ func TestDeleteOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 				hs.orgService, err = orgimpl.ProvideService(hs.SQLStore, cfg, quotaService)
 				require.NoError(t, err)
 			})
-			setupOrgUsersDBForAccessControlTests(t, sc.db)
+			setupOrgUsersDBForAccessControlTests(t, sc.db, sc.hs.orgService)
 			setInitCtxSignedInUser(sc.initCtx, tc.user)
 
 			response := callAPI(sc.server, http.MethodDelete, fmt.Sprintf(url, tc.targetOrg, tc.targetUserId), nil, t)
diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go
index 86186adfee9..4a085f55e7d 100644
--- a/pkg/services/sqlstore/org_test.go
+++ b/pkg/services/sqlstore/org_test.go
@@ -73,7 +73,7 @@ func TestIntegrationAccountDataAccess(t *testing.T) {
 					Role:   org.RoleViewer,
 				}
 
-				err := sqlStore.AddOrgUser(context.Background(), &cmd)
+				err := sqlStore.addOrgUser(context.Background(), &cmd)
 				t.Run("Should have been saved without error", func(t *testing.T) {
 					require.NoError(t, err)
 				})
@@ -142,7 +142,7 @@ func TestIntegrationAccountDataAccess(t *testing.T) {
 						Role:   org.RoleViewer,
 					}
 
-					err = sqlStore.AddOrgUser(context.Background(), &orgUserCmd)
+					err = sqlStore.addOrgUser(context.Background(), &orgUserCmd)
 					require.NoError(t, err)
 
 					dash1 := insertTestDashboard(t, sqlStore, "1 test dash", ac1.OrgID, 0, false, "prod", "webapp")
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index 34de541d591..9290a6c4670 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -8,7 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
-func (ss *SQLStore) AddOrgUser(ctx context.Context, cmd *models.AddOrgUserCommand) error {
+func (ss *SQLStore) addOrgUser(ctx context.Context, cmd *models.AddOrgUserCommand) error {
 	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
 		// check if user exists
 		var usr user.User
diff --git a/pkg/services/sqlstore/org_users_test.go b/pkg/services/sqlstore/org_users_test.go
index a2ca123f4f4..7528e679805 100644
--- a/pkg/services/sqlstore/org_users_test.go
+++ b/pkg/services/sqlstore/org_users_test.go
@@ -32,7 +32,7 @@ func TestSQLStore_AddOrgUser(t *testing.T) {
 	require.Equal(t, int64(-1), sa.OrgID)
 
 	// assign the sa to the org but without the override. should fail
-	err = store.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+	err = store.addOrgUser(context.Background(), &models.AddOrgUserCommand{
 		Role:   "Viewer",
 		OrgId:  orgID,
 		UserId: sa.ID,
@@ -40,7 +40,7 @@ func TestSQLStore_AddOrgUser(t *testing.T) {
 	require.Error(t, err)
 
 	// assign the sa to the org with the override. should succeed
-	err = store.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+	err = store.addOrgUser(context.Background(), &models.AddOrgUserCommand{
 		Role:                      "Viewer",
 		OrgId:                     orgID,
 		UserId:                    sa.ID,
diff --git a/pkg/services/sqlstore/stats_test.go b/pkg/services/sqlstore/stats_test.go
index a7c6e71506f..1b0eca543e9 100644
--- a/pkg/services/sqlstore/stats_test.go
+++ b/pkg/services/sqlstore/stats_test.go
@@ -86,7 +86,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
 		UserId: users[1].ID,
 		Role:   org.RoleEditor,
 	}
-	err := sqlStore.AddOrgUser(context.Background(), cmd)
+	err := sqlStore.addOrgUser(context.Background(), cmd)
 	require.NoError(t, err)
 
 	// add 3rd user as viewer
@@ -95,7 +95,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
 		UserId: users[2].ID,
 		Role:   org.RoleViewer,
 	}
-	err = sqlStore.AddOrgUser(context.Background(), cmd)
+	err = sqlStore.addOrgUser(context.Background(), cmd)
 	require.NoError(t, err)
 
 	// add 1st user as admin
@@ -104,7 +104,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
 		UserId: users[0].ID,
 		Role:   org.RoleAdmin,
 	}
-	err = sqlStore.AddOrgUser(context.Background(), cmd)
+	err = sqlStore.addOrgUser(context.Background(), cmd)
 	require.NoError(t, err)
 
 	// force renewal of user stats
diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go
index a460949a706..55c1f35a8db 100644
--- a/pkg/services/user/userimpl/store_test.go
+++ b/pkg/services/user/userimpl/store_test.go
@@ -13,6 +13,8 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/org/orgimpl"
+	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -25,6 +27,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 	}
 
 	ss := db.InitTestDB(t)
+	quotaService := quotaimpl.ProvideService(ss, ss.Cfg)
+	orgService, err := orgimpl.ProvideService(ss, ss.Cfg, quotaService)
+	require.NoError(t, err)
 	userStore := ProvideStore(ss, setting.NewCfg())
 	usr := &user.SignedInUser{
 		OrgID:       1,
@@ -265,9 +270,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 				IsDisabled: false,
 			}
 		})
-		err := ss.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+		err := orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{
 			LoginOrEmail: users[1].Login, Role: org.RoleViewer,
-			OrgId: users[0].OrgID, UserId: users[1].ID,
+			OrgID: users[0].OrgID, UserID: users[1].ID,
 		})
 		require.Nil(t, err)
 
@@ -402,9 +407,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 			}
 		})
 
-		err = ss.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+		err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{
 			LoginOrEmail: users[1].Login, Role: org.RoleViewer,
-			OrgId: users[0].OrgID, UserId: users[1].ID,
+			OrgID: users[0].OrgID, UserID: users[1].ID,
 		})
 		require.Nil(t, err)
 
@@ -441,9 +446,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 				IsDisabled: false,
 			}
 		})
-		err = ss.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+		err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{
 			LoginOrEmail: users[1].Login, Role: org.RoleViewer,
-			OrgId: users[0].OrgID, UserId: users[1].ID,
+			OrgID: users[0].OrgID, UserID: users[1].ID,
 		})
 		require.Nil(t, err)
 

From ee8f292c6a536a7b5cf981abbc10cbcbe65e3fc9 Mon Sep 17 00:00:00 2001
From: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:24:56 -0800
Subject: [PATCH 087/153] Geomap: Improve location editor (#58017)

* add custom component for location editor

* FC cleanup

* Apply filter to add location fields call

* Create custom editor for location mode

* Apply validation logic and render warning

* Improve alert styling

* Add help url button to location alert

* Add success alert for auto

* Remove completed TODOs

* Only use alert on error, not success

* Change location mode to dropdown

* Change alert severity to less severe, info

* Prevent auto field selection during manual

* Update location testing to be for auto mode

* Run geo transformer editor init once

* Fix breaking test

* Clean up some anys

* Update styling for alert

* Remove auto success styling

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
---
 .betterer.results                             |   6 -
 .../geo/editor/GazetteerPathEditor.tsx        |   8 +-
 .../app/features/geo/editor/locationEditor.ts |  43 ++----
 .../geo/editor/locationModeEditor.tsx         | 126 ++++++++++++++++++
 .../app/features/geo/utils/location.test.ts   |   8 +-
 public/app/features/geo/utils/location.ts     |  22 ++-
 .../spatial/SpatialTransformerEditor.tsx      |   3 +-
 .../panel/geomap/editor/layerEditor.tsx       |  11 +-
 8 files changed, 176 insertions(+), 51 deletions(-)
 create mode 100644 public/app/features/geo/editor/locationModeEditor.tsx

diff --git a/.betterer.results b/.betterer.results
index b05e872e997..21865cd8692 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3995,12 +3995,6 @@ exports[`better eslint`] = {
     "public/app/features/folders/state/actions.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/geo/editor/GazetteerPathEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/features/geo/format/geohash.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
diff --git a/public/app/features/geo/editor/GazetteerPathEditor.tsx b/public/app/features/geo/editor/GazetteerPathEditor.tsx
index c85fe657f5f..067b488956c 100644
--- a/public/app/features/geo/editor/GazetteerPathEditor.tsx
+++ b/public/app/features/geo/editor/GazetteerPathEditor.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { FC, useMemo, useState, useEffect } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 
 import { StandardEditorProps, SelectableValue, GrafanaTheme2 } from '@grafana/data';
 import { Alert, Select, stylesFactory, useTheme2 } from '@grafana/ui';
@@ -28,15 +28,15 @@ export interface GazetteerPathEditorConfigSettings {
   options?: Array<SelectableValue<string>>;
 }
 
-export const GazetteerPathEditor: FC<StandardEditorProps<string, any, any, GazetteerPathEditorConfigSettings>> = ({
+export const GazetteerPathEditor = ({
   value,
   onChange,
   context,
   item,
-}) => {
+}: StandardEditorProps<string, GazetteerPathEditorConfigSettings>) => {
   const styles = getStyles(useTheme2());
   const [gaz, setGaz] = useState<Gazetteer>();
-  const settings = item.settings as any;
+  const settings = item.settings;
 
   useEffect(() => {
     async function fetchData() {
diff --git a/public/app/features/geo/editor/locationEditor.ts b/public/app/features/geo/editor/locationEditor.ts
index 0358b3eb8ef..5f7d6da044f 100644
--- a/public/app/features/geo/editor/locationEditor.ts
+++ b/public/app/features/geo/editor/locationEditor.ts
@@ -4,47 +4,28 @@ import {
   FrameGeometrySource,
   FrameGeometrySourceMode,
   PanelOptionsEditorBuilder,
+  DataFrame,
 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors/src';
 import { GazetteerPathEditor } from 'app/features/geo/editor/GazetteerPathEditor';
 
+import { LocationModeEditor } from './locationModeEditor';
+
 export function addLocationFields<TOptions>(
   title: string,
   prefix: string,
-  builder: PanelOptionsEditorBuilder<TOptions>,
-  source?: FrameGeometrySource
+  builder: PanelOptionsEditorBuilder<TOptions>, // ??? Perhaps pass in the filtered data?
+  source?: FrameGeometrySource,
+  data?: DataFrame[]
 ) {
-  builder.addRadio({
+  builder.addCustomEditor({
+    id: 'modeEditor',
     path: `${prefix}mode`,
-    name: title,
-    description: '',
-    defaultValue: FrameGeometrySourceMode.Auto,
-    settings: {
-      options: [
-        {
-          value: FrameGeometrySourceMode.Auto,
-          label: 'Auto',
-          ariaLabel: selectors.components.Transforms.SpatialOperations.location.autoOption,
-        },
-        {
-          value: FrameGeometrySourceMode.Coords,
-          label: 'Coords',
-          ariaLabel: selectors.components.Transforms.SpatialOperations.location.coords.option,
-        },
-        {
-          value: FrameGeometrySourceMode.Geohash,
-          label: 'Geohash',
-          ariaLabel: selectors.components.Transforms.SpatialOperations.location.geohash.option,
-        },
-        {
-          value: FrameGeometrySourceMode.Lookup,
-          label: 'Lookup',
-          ariaLabel: selectors.components.Transforms.SpatialOperations.location.lookup.option,
-        },
-      ],
-    },
+    name: 'Location Mode',
+    editor: LocationModeEditor,
+    settings: { data, source },
   });
 
+  // TODO apply data filter to field pickers
   switch (source?.mode) {
     case FrameGeometrySourceMode.Coords:
       builder
diff --git a/public/app/features/geo/editor/locationModeEditor.tsx b/public/app/features/geo/editor/locationModeEditor.tsx
new file mode 100644
index 00000000000..34cc551f4cd
--- /dev/null
+++ b/public/app/features/geo/editor/locationModeEditor.tsx
@@ -0,0 +1,126 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+
+import {
+  StandardEditorProps,
+  FrameGeometrySourceMode,
+  DataFrame,
+  FrameGeometrySource,
+  GrafanaTheme2,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { Alert, HorizontalGroup, Icon, Select, useStyles2 } from '@grafana/ui';
+
+import { FrameGeometryField, getGeometryField, getLocationMatchers } from '../utils/location';
+
+const MODE_OPTIONS = [
+  {
+    value: FrameGeometrySourceMode.Auto,
+    label: 'Auto',
+    ariaLabel: selectors.components.Transforms.SpatialOperations.location.autoOption,
+    description: 'Automatically identify location data based on default field names',
+  },
+  {
+    value: FrameGeometrySourceMode.Coords,
+    label: 'Coords',
+    ariaLabel: selectors.components.Transforms.SpatialOperations.location.coords.option,
+    description: 'Specify latitude and longitude fields',
+  },
+  {
+    value: FrameGeometrySourceMode.Geohash,
+    label: 'Geohash',
+    ariaLabel: selectors.components.Transforms.SpatialOperations.location.geohash.option,
+    description: 'Specify geohash field',
+  },
+  {
+    value: FrameGeometrySourceMode.Lookup,
+    label: 'Lookup',
+    ariaLabel: selectors.components.Transforms.SpatialOperations.location.lookup.option,
+    description: 'Specify Gazetteer and lookup field',
+  },
+];
+
+interface ModeEditorSettings {
+  data?: DataFrame[];
+  source?: FrameGeometrySource;
+}
+
+const helpUrl = 'https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/geomap/#location';
+
+export const LocationModeEditor = ({
+  value,
+  onChange,
+  context,
+  item,
+}: StandardEditorProps<string, ModeEditorSettings, unknown, unknown>) => {
+  const [info, setInfo] = useState<FrameGeometryField>();
+
+  useEffect(() => {
+    if (item.settings?.source && item.settings?.data?.length && item.settings.data[0]) {
+      getLocationMatchers(item.settings.source).then((location) => {
+        if (item.settings && item.settings.data) {
+          setInfo(getGeometryField(item.settings.data[0], location));
+        }
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [item.settings]);
+
+  const styles = useStyles2(getStyles);
+
+  const dataValidation = () => {
+    if (info) {
+      if (info.warning) {
+        return (
+          <Alert
+            title={info.warning}
+            severity="warning"
+            buttonContent={<Icon name="question-circle" size="xl" />}
+            className={styles.alert}
+            onRemove={() => {
+              const newWindow = window.open(helpUrl, '_blank', 'noopener,noreferrer');
+              if (newWindow) {
+                newWindow.opener = null;
+              }
+            }}
+          />
+        );
+      } else if (value === FrameGeometrySourceMode.Auto && info.description) {
+        return <span>{info.description}</span>;
+      }
+    }
+    return null;
+  };
+
+  return (
+    <>
+      <Select
+        options={MODE_OPTIONS}
+        value={value}
+        onChange={(v) => {
+          onChange(v.value);
+        }}
+      />
+      <HorizontalGroup className={styles.hGroup}>{dataValidation()}</HorizontalGroup>
+    </>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    alert: css`
+      & div {
+        padding: 4px;
+      }
+      margin-bottom: 0px;
+      margin-top: 5px;
+      padding: 2px;
+    `,
+    // TODO apply styling to horizontal group (currently not working)
+    hGroup: css`
+      & div {
+        width: 100%;
+      }
+    `,
+  };
+};
diff --git a/public/app/features/geo/utils/location.test.ts b/public/app/features/geo/utils/location.test.ts
index b6f47000035..6257e890376 100644
--- a/public/app/features/geo/utils/location.test.ts
+++ b/public/app/features/geo/utils/location.test.ts
@@ -11,6 +11,10 @@ const geohash = ['9q94r', 'dr5rs'];
 const names = ['A', 'B'];
 
 describe('handle location parsing', () => {
+  beforeEach(() => {
+    jest.spyOn(console, 'warn').mockImplementation();
+  });
+
   it('auto should find geohash field', async () => {
     const frame = toDataFrame({
       name: 'simple',
@@ -20,7 +24,7 @@ describe('handle location parsing', () => {
       ],
     });
 
-    const matchers = await getLocationMatchers();
+    const matchers = await getLocationMatchers({ mode: FrameGeometrySourceMode.Auto });
     const fields = getLocationFields(frame, matchers);
     expect(fields.mode).toEqual(FrameGeometrySourceMode.Geohash);
     expect(fields.geohash).toBeDefined();
@@ -78,7 +82,7 @@ describe('handle location parsing', () => {
     });
 
     const matchers = await getLocationMatchers({
-      mode: FrameGeometrySourceMode.Geohash,
+      mode: FrameGeometrySourceMode.Auto,
     });
     const geo = getGeometryField(frame, matchers).field!;
     expect(geo.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
diff --git a/public/app/features/geo/utils/location.ts b/public/app/features/geo/utils/location.ts
index c9f552fa1c2..42661776f5a 100644
--- a/public/app/features/geo/utils/location.ts
+++ b/public/app/features/geo/utils/location.ts
@@ -73,24 +73,32 @@ export async function getLocationMatchers(src?: FrameGeometrySource): Promise<Lo
     ...defaultMatchers,
     mode: src?.mode ?? FrameGeometrySourceMode.Auto,
   };
+  info.gazetteer = await getGazetteer(src?.gazetteer); // Always have gazetteer selected (or default) for smooth transition
   switch (info.mode) {
     case FrameGeometrySourceMode.Geohash:
       if (src?.geohash) {
         info.geohash = getFieldFinder(getFieldMatcher({ id: FieldMatcherID.byName, options: src.geohash }));
+      } else {
+        info.geohash = () => undefined; // In manual mode, don't automatically find field
       }
       break;
     case FrameGeometrySourceMode.Lookup:
       if (src?.lookup) {
         info.lookup = getFieldFinder(getFieldMatcher({ id: FieldMatcherID.byName, options: src.lookup }));
+      } else {
+        info.lookup = () => undefined; // In manual mode, don't automatically find field
       }
-      info.gazetteer = await getGazetteer(src?.gazetteer);
       break;
     case FrameGeometrySourceMode.Coords:
       if (src?.latitude) {
         info.latitude = getFieldFinder(getFieldMatcher({ id: FieldMatcherID.byName, options: src.latitude }));
+      } else {
+        info.latitude = () => undefined; // In manual mode, don't automatically find field
       }
       if (src?.longitude) {
         info.longitude = getFieldFinder(getFieldMatcher({ id: FieldMatcherID.byName, options: src.longitude }));
+      } else {
+        info.longitude = () => undefined; // In manual mode, don't automatically find field
       }
       break;
   }
@@ -132,7 +140,7 @@ export function getLocationFields(frame: DataFrame, location: LocationFieldMatch
       fields.mode = FrameGeometrySourceMode.Geohash;
       return fields;
     }
-    fields.lookup = location.geohash(frame);
+    fields.lookup = location.lookup(frame);
     if (fields.lookup) {
       fields.mode = FrameGeometrySourceMode.Lookup;
       return fields;
@@ -159,6 +167,7 @@ export interface FrameGeometryField {
   field?: Field<Geometry | undefined>;
   warning?: string;
   derived?: boolean;
+  description?: string;
 }
 
 export function getGeometryField(frame: DataFrame, location: LocationFieldMatchers): FrameGeometryField {
@@ -179,10 +188,11 @@ export function getGeometryField(frame: DataFrame, location: LocationFieldMatche
         return {
           field: pointFieldFromLonLat(fields.longitude, fields.latitude),
           derived: true,
+          description: `${fields.mode}: ${fields.latitude.name}, ${fields.longitude.name}`,
         };
       }
       return {
-        warning: 'Missing latitude/longitude fields',
+        warning: 'Select latitude/longitude fields',
       };
 
     case FrameGeometrySourceMode.Geohash:
@@ -190,10 +200,11 @@ export function getGeometryField(frame: DataFrame, location: LocationFieldMatche
         return {
           field: pointFieldFromGeohash(fields.geohash),
           derived: true,
+          description: `${fields.mode}`,
         };
       }
       return {
-        warning: 'Missing geohash field',
+        warning: 'Select geohash field',
       };
 
     case FrameGeometrySourceMode.Lookup:
@@ -202,6 +213,7 @@ export function getGeometryField(frame: DataFrame, location: LocationFieldMatche
           return {
             field: getGeoFieldFromGazetteer(location.gazetteer, fields.lookup),
             derived: true,
+            description: `${fields.mode}: ${location.gazetteer.path}`, // TODO get better name for this
           };
         }
         return {
@@ -209,7 +221,7 @@ export function getGeometryField(frame: DataFrame, location: LocationFieldMatche
         };
       }
       return {
-        warning: 'Missing lookup field',
+        warning: 'Select lookup field',
       };
   }
 
diff --git a/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx b/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
index f61bfb2ffd5..e499d1845e6 100644
--- a/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
+++ b/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
@@ -122,7 +122,8 @@ export const SetGeometryTransformerEditor: React.FC<TransformerUIProps<SpatialTr
       props.onChange({ ...opts, ...props.options });
       console.log('geometry useEffect', opts);
     }
-  });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const styles = getStyles(useTheme2());
 
diff --git a/public/app/plugins/panel/geomap/editor/layerEditor.tsx b/public/app/plugins/panel/geomap/editor/layerEditor.tsx
index 4793f7a2dec..fbfdf6c6d2b 100644
--- a/public/app/plugins/panel/geomap/editor/layerEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/layerEditor.tsx
@@ -1,6 +1,6 @@
 import { get as lodashGet, isEqual } from 'lodash';
 
-import { FrameGeometrySourceMode, MapLayerOptions } from '@grafana/data';
+import { FrameGeometrySourceMode, getFrameMatchers, MapLayerOptions } from '@grafana/data';
 import { NestedPanelOptions, NestedValueAccess } from '@grafana/data/src/utils/OptionsUIBuilders';
 import { setOptionImmutably } from 'app/features/dashboard/components/PanelEditor/utils';
 import { addLocationFields } from 'app/features/geo/editor/locationEditor';
@@ -96,7 +96,14 @@ export function getLayerEditor(opts: LayerEditorOptions): NestedPanelOptions<Map
       }
 
       if (layer.showLocation) {
-        addLocationFields('Location', 'location.', builder, options.location);
+        let data = context.data;
+        // If `filterData` exists filter data feeding into location editor
+        if (options.filterData) {
+          const matcherFunc = getFrameMatchers(options.filterData);
+          data = data.filter(matcherFunc);
+        }
+
+        addLocationFields('Location', 'location.', builder, options.location, data);
       }
       if (handler.registerOptionsUI) {
         handler.registerOptionsUI(builder);

From a93b8a03cb1a36243cc1b986e035bc9f43ed0e6c Mon Sep 17 00:00:00 2001
From: juanicabanas <juan.cabanas@grafana.com>
Date: Tue, 22 Nov 2022 19:11:06 -0300
Subject: [PATCH 088/153] PublicDashboards: Orphaned public dashboard deletion
 script added (#57917)

* Adds migration to remove orphaned public dashboards.

Co-authored-by: Jeff Levin <jeff@levinology.com>
---
 pkg/services/sqlstore/migrations/dashboard_public_mig.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/sqlstore/migrations/dashboard_public_mig.go b/pkg/services/sqlstore/migrations/dashboard_public_mig.go
index 1dfc3512018..abbdd136751 100644
--- a/pkg/services/sqlstore/migrations/dashboard_public_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_public_mig.go
@@ -74,4 +74,7 @@ func addPublicDashboardMigration(mg *Migrator) {
 		Nullable: false,
 		Default:  "0",
 	}))
+
+	mg.AddMigration("delete orphaned public dashboards", NewRawSQLMigration(
+		"DELETE FROM dashboard_public WHERE dashboard_uid NOT IN (SELECT uid FROM dashboard)"))
 }

From 51359fe90d335eb7e7aa1bd30a26e9bc811f4748 Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Tue, 22 Nov 2022 22:19:35 +0000
Subject: [PATCH 089/153] Chore: Refactor Tween.test.js to TypeScript (#58655)

---
 .../src/{Tween.test.js => Tween.test.ts}             | 12 +++++++-----
 packages/jaeger-ui-components/src/Tween.tsx          |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename packages/jaeger-ui-components/src/{Tween.test.js => Tween.test.ts} (96%)

diff --git a/packages/jaeger-ui-components/src/Tween.test.js b/packages/jaeger-ui-components/src/Tween.test.ts
similarity index 96%
rename from packages/jaeger-ui-components/src/Tween.test.js
rename to packages/jaeger-ui-components/src/Tween.test.ts
index 0b0d1e73893..fbfd014924d 100644
--- a/packages/jaeger-ui-components/src/Tween.test.js
+++ b/packages/jaeger-ui-components/src/Tween.test.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Tween from './Tween';
+import Tween, { TweenState } from './Tween';
 
 describe('Tween', () => {
   const oldNow = Date.now;
@@ -24,8 +24,10 @@ describe('Tween', () => {
 
   const baseOptions = { duration: 10, from: 0, to: 1 };
 
+  jest.useFakeTimers();
+  jest.spyOn(global, 'setTimeout');
+
   Date.now = nowFn;
-  window.setTimeout = setTimeoutFn;
   window.requestAnimationFrame = rafFn;
 
   beforeEach(() => {
@@ -60,7 +62,7 @@ describe('Tween', () => {
       it('schedules setTimeout if there is a delay', () => {
         const delay = 10;
         const tween = new Tween({ ...baseOptions, delay, onUpdate: jest.fn() });
-        expect(setTimeoutFn).lastCalledWith(tween._frameCallback, delay);
+        expect(setTimeout).lastCalledWith(tween._frameCallback, delay);
       });
 
       it('schedules animation frame if there is not a delay', () => {
@@ -110,7 +112,7 @@ describe('Tween', () => {
 
   describe('_frameCallback', () => {
     it('freezes the callback argument', () => {
-      let current;
+      let current: TweenState | undefined;
       const fn = jest.fn((_current) => {
         current = _current;
       });
@@ -119,7 +121,7 @@ describe('Tween', () => {
       expect(current).toBeDefined();
       const copy = { ...current };
       try {
-        current.done = !current.done;
+        current!.done = !current!.done;
         // eslint-disable-next-line no-empty
       } catch (_) {}
       expect(current).toEqual(copy);
diff --git a/packages/jaeger-ui-components/src/Tween.tsx b/packages/jaeger-ui-components/src/Tween.tsx
index 5a49fb28ec6..c9c082a7379 100644
--- a/packages/jaeger-ui-components/src/Tween.tsx
+++ b/packages/jaeger-ui-components/src/Tween.tsx
@@ -16,7 +16,7 @@ import ease from 'tween-functions';
 
 import { TNil } from './types';
 
-interface TweenState {
+export interface TweenState {
   done: boolean;
   value: number;
 }

From e157ef1171d67a85ea2dc2fc24085f0fa427398f Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Tue, 22 Nov 2022 15:39:19 -0700
Subject: [PATCH 090/153] Canvas: Add icon value mapping (#59013)

---
 .../app/features/dimensions/resource.test.ts  | 19 +++++++++++++++++++
 public/app/features/dimensions/resource.ts    |  8 ++++++--
 public/app/plugins/panel/canvas/module.tsx    | 12 ++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 public/app/features/dimensions/resource.test.ts

diff --git a/public/app/features/dimensions/resource.test.ts b/public/app/features/dimensions/resource.test.ts
new file mode 100644
index 00000000000..489e6339abd
--- /dev/null
+++ b/public/app/features/dimensions/resource.test.ts
@@ -0,0 +1,19 @@
+import { getResourceDimension } from './resource';
+import { ResourceDimensionMode } from './types';
+
+describe('getResourceDimension', () => {
+  const publicPath = '/public/';
+  beforeAll(() => {
+    window.__grafana_public_path__ = publicPath;
+  });
+
+  it('fixed mode', () => {
+    const frame = undefined;
+    const fixedValue = 'img/icons/unicons/question-circle.svg';
+    const config = { mode: ResourceDimensionMode.Fixed, fixed: fixedValue };
+
+    expect(getResourceDimension(frame, config).fixed).toEqual(publicPath + fixedValue);
+  });
+
+  // TODO: write tests for field and mapping modes
+});
diff --git a/public/app/features/dimensions/resource.ts b/public/app/features/dimensions/resource.ts
index 523a044f666..57fed7cb6a9 100644
--- a/public/app/features/dimensions/resource.ts
+++ b/public/app/features/dimensions/resource.ts
@@ -50,8 +50,12 @@ export function getResourceDimension(
 
   // mode === ResourceDimensionMode.Field case
   const getIcon = (value: string): string => {
-    const display = field.display!;
-    return getPublicOrAbsoluteUrl(display(value).icon ?? value ?? '');
+    if (field && field.display) {
+      const icon = field.display(value).icon;
+      return getPublicOrAbsoluteUrl(icon ?? '');
+    }
+
+    return '';
   };
 
   return {
diff --git a/public/app/plugins/panel/canvas/module.tsx b/public/app/plugins/panel/canvas/module.tsx
index aa0488ab356..092afb38e0a 100644
--- a/public/app/plugins/panel/canvas/module.tsx
+++ b/public/app/plugins/panel/canvas/module.tsx
@@ -1,4 +1,4 @@
-import { PanelOptionsEditorBuilder, PanelPlugin } from '@grafana/data';
+import { FieldConfigProperty, PanelOptionsEditorBuilder, PanelPlugin } from '@grafana/data';
 import { FrameState } from 'app/features/canvas/runtime/frame';
 
 import { CanvasPanel, InstanceState } from './CanvasPanel';
@@ -25,7 +25,15 @@ export const addStandardCanvasEditorOptions = (builder: PanelOptionsEditorBuilde
 
 export const plugin = new PanelPlugin<PanelOptions>(CanvasPanel)
   .setNoPadding() // extend to panel edges
-  .useFieldConfig()
+  .useFieldConfig({
+    standardOptions: {
+      [FieldConfigProperty.Mappings]: {
+        settings: {
+          icon: true,
+        },
+      },
+    },
+  })
   .setMigrationHandler(canvasMigrationHandler)
   .setPanelOptions((builder, context) => {
     const state: InstanceState = context.instanceState;

From 2a8706b0254d5ae4d79f17a210cd5c6edc0729ba Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Tue, 22 Nov 2022 21:54:54 -0600
Subject: [PATCH 091/153] Heatmap: Fix tooltip y range of top and bottom
 buckets in calculated heatmaps (#59172)

Co-authored-by: xdavidwu <xdavidwuph@gmail.com>
---
 .../panel/heatmap/HeatmapHoverView.tsx        | 37 ++++++++++++++++---
 public/app/plugins/panel/heatmap/fields.ts    | 15 ++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
index 5682bc137f3..a615bc6d8f4 100644
--- a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
@@ -48,16 +48,43 @@ const HeatmapHoverCell = ({ data, hover, showHistogram }: Props) => {
 
   // labeled buckets
   const meta = readHeatmapRowsCustomMeta(data.heatmap);
-  const yDispSrc = meta.yOrdinalDisplay ?? yVals;
   const yDisp = yField?.display ? (v: any) => formattedValueToString(yField.display!(v)) : (v: any) => `${v}`;
 
   const yValueIdx = index % data.yBucketCount! ?? 0;
 
-  const yMinIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx - 1 : yValueIdx;
-  const yMaxIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx : yValueIdx + 1;
+  let yBucketMin: string;
+  let yBucketMax: string;
 
-  const yBucketMin = yDispSrc?.[yMinIdx];
-  const yBucketMax = yDispSrc?.[yMaxIdx];
+  if (meta.yOrdinalDisplay) {
+    const yMinIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx - 1 : yValueIdx;
+    const yMaxIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx : yValueIdx + 1;
+    yBucketMin = `${meta.yOrdinalDisplay[yMinIdx]}`;
+    yBucketMax = `${meta.yOrdinalDisplay[yMaxIdx]}`;
+  } else {
+    const value = yVals?.[yValueIdx];
+
+    if (data.yLayout === HeatmapCellLayout.le) {
+      yBucketMax = `${value}`;
+
+      if (data.yLog) {
+        let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
+        let exp = logFn(value) - 1 / data.yLogSplit!;
+        yBucketMin = `${data.yLog ** exp}`;
+      } else {
+        yBucketMin = `${value - data.yBucketSize!}`;
+      }
+    } else {
+      yBucketMin = `${value}`;
+
+      if (data.yLog) {
+        let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
+        let exp = logFn(value) + 1 / data.yLogSplit!;
+        yBucketMax = `${data.yLog ** exp}`;
+      } else {
+        yBucketMax = `${value + data.yBucketSize!}`;
+      }
+    }
+  }
 
   let xBucketMin: number;
   let xBucketMax: number;
diff --git a/public/app/plugins/panel/heatmap/fields.ts b/public/app/plugins/panel/heatmap/fields.ts
index 8009ee9fb75..d6491a31161 100644
--- a/public/app/plugins/panel/heatmap/fields.ts
+++ b/public/app/plugins/panel/heatmap/fields.ts
@@ -35,6 +35,12 @@ export interface HeatmapData {
   xLayout?: HeatmapCellLayout;
   yLayout?: HeatmapCellLayout;
 
+  xLog?: number;
+  yLog?: number;
+
+  xLogSplit?: number;
+  yLogSplit?: number;
+
   // color scale range
   minValue?: number;
   maxValue?: number;
@@ -224,6 +230,9 @@ const getDenseHeatmapData = (
     options.filterValues?.ge
   );
 
+  let calcX = options.calculation?.xBuckets;
+  let calcY = options.calculation?.yBuckets;
+
   const data: HeatmapData = {
     heatmap: frame,
     exemplars: exemplars?.length ? exemplars : undefined,
@@ -232,6 +241,12 @@ const getDenseHeatmapData = (
     xBucketCount: xBinQty,
     yBucketCount: yBinQty,
 
+    yLog: calcY?.scale?.log ?? 0,
+    xLog: calcX?.scale?.log ?? 0,
+
+    xLogSplit: calcX?.scale?.log ? +(calcX?.value ?? '1') : 1,
+    yLogSplit: calcY?.scale?.log ? +(calcY?.value ?? '1') : 1,
+
     minValue,
     maxValue,
 

From 9512f1e1af8fa1d7742e8058db8953d60e6399d1 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Tue, 22 Nov 2022 21:58:48 -0600
Subject: [PATCH 092/153] StateTimeline: Prevent label text from overflowing
 state rects (#59169)

Co-authored-by: Vegard Vatn <vegard.vatn@avento.no>
---
 .../plugins/panel/state-timeline/timeline.ts  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/panel/state-timeline/timeline.ts b/public/app/plugins/panel/state-timeline/timeline.ts
index 420a93b9328..eeb0c634fdf 100644
--- a/public/app/plugins/panel/state-timeline/timeline.ts
+++ b/public/app/plugins/panel/state-timeline/timeline.ts
@@ -13,6 +13,8 @@ const { round, min, ceil } = Math;
 
 const textPadding = 2;
 
+let pxPerChar = 6;
+
 const laneDistr = SPACE_BETWEEN;
 
 type WalkCb = (idx: number, offPx: number, dimPx: number) => void;
@@ -318,19 +320,20 @@ export function getConfig(opts: TimelineCoreOptions) {
                 if (dataY[ix] != null) {
                   const boxRect = boxRectsBySeries[sidx - 1][ix];
 
-                  // Todo refine this to better know when to not render text (when values do not fit)
-                  if (!boxRect || (showValue === VisibilityMode.Auto && boxRect.w < 25)) {
+                  if (!boxRect || boxRect.x >= xDim) {
                     continue;
                   }
 
-                  if (boxRect.x >= xDim) {
-                    continue; // out of view
+                  let maxChars = Math.floor(boxRect?.w / pxPerChar);
+
+                  if (showValue === VisibilityMode.Auto && maxChars < 2) {
+                    continue;
                   }
 
+                  let txt = formatValue(sidx, dataY[ix]);
+
                   // center-aligned
                   let x = round(boxRect.x + xOff + boxRect.w / 2);
-                  const txt = formatValue(sidx, dataY[ix]);
-
                   if (mode === TimelineMode.Changes) {
                     if (alignValue === 'left') {
                       x = round(boxRect.x + xOff + strokeWidth + textPadding);
@@ -341,7 +344,7 @@ export function getConfig(opts: TimelineCoreOptions) {
 
                   // TODO: cache by fillColor to avoid setting ctx for label
                   u.ctx.fillStyle = theme.colors.getContrastText(boxRect.fillColor, 3);
-                  u.ctx.fillText(txt, x, y);
+                  u.ctx.fillText(txt.slice(0, maxChars), x, y);
                 }
               }
             }
@@ -354,6 +357,15 @@ export function getConfig(opts: TimelineCoreOptions) {
 
   const init = (u: uPlot) => {
     let over = u.over;
+    let chars = '';
+    for (let i = 32; i <= 126; i++) {
+      chars += String.fromCharCode(i);
+    }
+    pxPerChar = Math.ceil((u.ctx.measureText(chars).width / chars.length) * uPlot.pxRatio);
+
+    // be a bit more conservtive to prevent overlap
+    pxPerChar += 2.5;
+
     over.style.overflow = 'hidden';
     hoverMarks.forEach((m) => {
       over.appendChild(m);

From 4a628f18b0ca07d73e8994521c716b5d41fad766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Wed, 23 Nov 2022 09:34:53 +0100
Subject: [PATCH 093/153] Internationalization: Translate menu items (#59088)

---
 public/app/core/components/NavBar/NavBarMenu.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/core/components/NavBar/NavBarMenu.tsx b/public/app/core/components/NavBar/NavBarMenu.tsx
index 2a93cd7707e..ce3e58679c2 100644
--- a/public/app/core/components/NavBar/NavBarMenu.tsx
+++ b/public/app/core/components/NavBar/NavBarMenu.tsx
@@ -256,7 +256,7 @@ export function NavItem({
                   }}
                   styleOverrides={styles.item}
                   target={childLink.target}
-                  text={childLink.text}
+                  text={getNavTitle(childLink.id) ?? childLink.text}
                   url={childLink.url}
                   isMobile={true}
                 />
@@ -297,7 +297,7 @@ export function NavItem({
                 <NavBarItemIcon link={link} />
               </FeatureHighlightWrapper>
             </div>
-            <span className={styles.linkText}>{link.text}</span>
+            <span className={styles.linkText}>{getNavTitle(link.id) ?? link.text}</span>
           </div>
         </NavBarItemWithoutMenu>
       </li>
@@ -398,7 +398,7 @@ function CollapsibleNavItem({
           contentClassName={styles.collapseContent}
           label={
             <div className={cx(styles.labelWrapper, { [styles.primary]: isActive })}>
-              <span className={styles.linkText}>{link.text}</span>
+              <span className={styles.linkText}>{getNavTitle(link.id) ?? link.text}</span>
             </div>
           }
         >

From 02b6b091215c6d28afe55b515464243bd7f189a0 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Wed, 23 Nov 2022 11:13:47 +0200
Subject: [PATCH 094/153] Nested Folders: Set user in the API level (#59148)

---
 pkg/api/dashboard.go                          |  5 +-
 pkg/api/folder.go                             |  5 +-
 pkg/api/folder_permission.go                  |  4 +-
 .../dashboardimport/service/service.go        | 11 ++-
 pkg/services/folder/folderimpl/folder.go      | 37 ++++++----
 pkg/services/folder/folderimpl/folder_test.go | 71 ++++++++++++-------
 pkg/services/folder/model.go                  | 11 +++
 pkg/services/libraryelements/api.go           |  8 +--
 pkg/services/libraryelements/guard.go         |  4 +-
 .../libraryelements/libraryelements_test.go   |  2 +-
 .../librarypanels/librarypanels_test.go       |  2 +-
 pkg/services/ngalert/store/alert_rule.go      |  4 +-
 pkg/services/ngalert/tests/util.go            |  4 +-
 13 files changed, 108 insertions(+), 60 deletions(-)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index ffb0f0098bc..84fc103a2d2 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -396,8 +396,9 @@ func (hs *HTTPServer) postDashboard(c *models.ReqContext, cmd models.SaveDashboa
 	cmd.UserId = c.UserID
 	if cmd.FolderUid != "" {
 		folder, err := hs.folderService.Get(ctx, &folder.GetFolderQuery{
-			OrgID: c.OrgID,
-			UID:   &cmd.FolderUid,
+			OrgID:        c.OrgID,
+			UID:          &cmd.FolderUid,
+			SignedInUser: c.SignedInUser,
 		})
 		if err != nil {
 			if errors.Is(err, dashboards.ErrFolderNotFound) {
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 4373bb2d54f..78544cacedf 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -68,7 +68,7 @@ func (hs *HTTPServer) GetFolders(c *models.ReqContext) response.Response {
 // 500: internalServerError
 func (hs *HTTPServer) GetFolderByUID(c *models.ReqContext) response.Response {
 	uid := web.Params(c.Req)[":uid"]
-	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: &uid})
+	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: &uid, SignedInUser: c.SignedInUser})
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
 	}
@@ -94,7 +94,7 @@ func (hs *HTTPServer) GetFolderByID(c *models.ReqContext) response.Response {
 	if err != nil {
 		return response.Error(http.StatusBadRequest, "id is invalid", err)
 	}
-	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{ID: &id, OrgID: c.OrgID})
+	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{ID: &id, OrgID: c.OrgID, SignedInUser: c.SignedInUser})
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
 	}
@@ -122,6 +122,7 @@ func (hs *HTTPServer) CreateFolder(c *models.ReqContext) response.Response {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
 	cmd.OrgID = c.OrgID
+	cmd.SignedInUser = c.SignedInUser
 
 	folder, err := hs.folderService.Create(c.Req.Context(), &cmd)
 	if err != nil {
diff --git a/pkg/api/folder_permission.go b/pkg/api/folder_permission.go
index 555d1a67c8e..09ccd441e11 100644
--- a/pkg/api/folder_permission.go
+++ b/pkg/api/folder_permission.go
@@ -28,7 +28,7 @@ import (
 // 500: internalServerError
 func (hs *HTTPServer) GetFolderPermissionList(c *models.ReqContext) response.Response {
 	uid := web.Params(c.Req)[":uid"]
-	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: &uid})
+	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: &uid, SignedInUser: c.SignedInUser})
 
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
@@ -90,7 +90,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *models.ReqContext) response.Res
 	}
 
 	uid := web.Params(c.Req)[":uid"]
-	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: &uid})
+	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: &uid, SignedInUser: c.SignedInUser})
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
 	}
diff --git a/pkg/services/dashboardimport/service/service.go b/pkg/services/dashboardimport/service/service.go
index 0b345d21886..1178654d299 100644
--- a/pkg/services/dashboardimport/service/service.go
+++ b/pkg/services/dashboardimport/service/service.go
@@ -86,15 +86,20 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
 	// here we need to get FolderId from FolderUID if it present in the request, if both exist, FolderUID would overwrite FolderID
 	if req.FolderUid != "" {
 		folder, err := s.folderService.Get(ctx, &folder.GetFolderQuery{
-			OrgID: req.User.OrgID,
-			UID:   &req.FolderUid,
+			OrgID:        req.User.OrgID,
+			UID:          &req.FolderUid,
+			SignedInUser: req.User,
 		})
 		if err != nil {
 			return nil, err
 		}
 		req.FolderId = folder.ID
 	} else {
-		folder, err := s.folderService.Get(ctx, &folder.GetFolderQuery{ID: &req.FolderId, OrgID: req.User.OrgID})
+		folder, err := s.folderService.Get(ctx, &folder.GetFolderQuery{
+			ID:           &req.FolderId,
+			OrgID:        req.User.OrgID,
+			SignedInUser: req.User,
+		})
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 61aa379b549..02f16b4b775 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -93,13 +93,12 @@ func (s *Service) DBMigration(db db.DB) {
 }
 
 func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
-	user, err := appcontext.User(ctx)
-	if err != nil {
-		return nil, err
+	if cmd.SignedInUser == nil {
+		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 
 	if s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagNestedFolders) {
-		if ok, err := s.accessControl.Evaluate(ctx, user, accesscontrol.EvalPermission(
+		if ok, err := s.accessControl.Evaluate(ctx, cmd.SignedInUser, accesscontrol.EvalPermission(
 			dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(*cmd.UID),
 		)); !ok {
 			if err != nil {
@@ -112,11 +111,11 @@ func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.
 
 	switch {
 	case cmd.UID != nil:
-		return s.getFolderByUID(ctx, user, cmd.OrgID, *cmd.UID)
+		return s.getFolderByUID(ctx, cmd.SignedInUser, cmd.OrgID, *cmd.UID)
 	case cmd.ID != nil:
-		return s.getFolderByID(ctx, user, *cmd.ID, cmd.OrgID)
+		return s.getFolderByID(ctx, cmd.SignedInUser, *cmd.ID, cmd.OrgID)
 	case cmd.Title != nil:
-		return s.getFolderByTitle(ctx, user, cmd.OrgID, *cmd.Title)
+		return s.getFolderByTitle(ctx, cmd.SignedInUser, cmd.OrgID, *cmd.Title)
 	default:
 		return nil, folder.ErrBadRequest.Errorf("either on of UID, ID, Title fields must be present")
 	}
@@ -217,10 +216,10 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 
 	dashFolder.SetUid(trimmedUID)
 
-	user, err := appcontext.User(ctx)
-	if err != nil {
-		return nil, err
+	if cmd.SignedInUser == nil {
+		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
+	user := cmd.SignedInUser
 	userID := user.UserID
 	if userID == 0 {
 		userID = -1
@@ -433,9 +432,14 @@ func (s *Service) DeleteFolder(ctx context.Context, cmd *folder.DeleteFolderComm
 }
 
 func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*folder.Folder, error) {
+	if cmd.SignedInUser == nil {
+		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
+	}
+
 	foldr, err := s.Get(ctx, &folder.GetFolderQuery{
-		UID:   &cmd.UID,
-		OrgID: cmd.OrgID,
+		UID:          &cmd.UID,
+		OrgID:        cmd.OrgID,
+		SignedInUser: cmd.SignedInUser,
 	})
 	if err != nil {
 		return nil, err
@@ -448,9 +452,14 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
 }
 
 func (s *Service) Delete(ctx context.Context, cmd *folder.DeleteFolderCommand) error {
+	if cmd.SignedInUser == nil {
+		return folder.ErrBadRequest.Errorf("missing signed in user")
+	}
+
 	_, err := s.Get(ctx, &folder.GetFolderQuery{
-		UID:   &cmd.UID,
-		OrgID: cmd.OrgID,
+		UID:          &cmd.UID,
+		OrgID:        cmd.OrgID,
+		SignedInUser: cmd.SignedInUser,
 	})
 	if err != nil {
 		return err
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index 19ca8e8ddba..cdf5c53603b 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	"github.com/xorcare/pointer"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/appcontext"
@@ -88,18 +89,30 @@ func TestIntegrationFolderService(t *testing.T) {
 			dashStore.On("GetFolderByUID", mock.Anything, orgID, folderUID).Return(f, nil)
 
 			t.Run("When get folder by id should return access denied error", func(t *testing.T) {
-				_, err := service.getFolderByID(context.Background(), usr, folderId, orgID)
+				_, err := service.Get(context.Background(), &folder.GetFolderQuery{
+					ID:           &folderId,
+					OrgID:        orgID,
+					SignedInUser: usr,
+				})
 				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
 			t.Run("When get folder by id, with id = 0 should return default folder", func(t *testing.T) {
-				foldr, err := service.getFolderByID(context.Background(), usr, 0, orgID)
+				foldr, err := service.Get(context.Background(), &folder.GetFolderQuery{
+					ID:           pointer.Int64(0),
+					OrgID:        orgID,
+					SignedInUser: usr,
+				})
 				require.NoError(t, err)
 				require.Equal(t, foldr, &folder.Folder{ID: 0, Title: "General"})
 			})
 
 			t.Run("When get folder by uid should return access denied error", func(t *testing.T) {
-				_, err := service.getFolderByUID(context.Background(), usr, orgID, folderUID)
+				_, err := service.Get(context.Background(), &folder.GetFolderQuery{
+					UID:          &folderUID,
+					OrgID:        orgID,
+					SignedInUser: usr,
+				})
 				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
@@ -107,9 +120,10 @@ func TestIntegrationFolderService(t *testing.T) {
 				dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*models.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil).Times(2)
 				ctx := appcontext.WithUser(context.Background(), usr)
 				_, err := service.Create(ctx, &folder.CreateFolderCommand{
-					OrgID: orgID,
-					Title: f.Title,
-					UID:   folderUID,
+					OrgID:        orgID,
+					Title:        f.Title,
+					UID:          folderUID,
+					SignedInUser: usr,
 				})
 				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
@@ -141,6 +155,7 @@ func TestIntegrationFolderService(t *testing.T) {
 					UID:              folderUID,
 					OrgID:            orgID,
 					ForceDeleteRules: false,
+					SignedInUser:     usr,
 				})
 				require.Error(t, err)
 				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
@@ -166,9 +181,10 @@ func TestIntegrationFolderService(t *testing.T) {
 
 				ctx := appcontext.WithUser(context.Background(), usr)
 				actualFolder, err := service.Create(ctx, &folder.CreateFolderCommand{
-					OrgID: orgID,
-					Title: dash.Title,
-					UID:   "someuid",
+					OrgID:        orgID,
+					Title:        dash.Title,
+					UID:          "someuid",
+					SignedInUser: usr,
 				})
 				require.NoError(t, err)
 				require.Equal(t, f, actualFolder)
@@ -180,9 +196,10 @@ func TestIntegrationFolderService(t *testing.T) {
 
 				ctx := appcontext.WithUser(context.Background(), usr)
 				_, err := service.Create(ctx, &folder.CreateFolderCommand{
-					OrgID: orgID,
-					Title: dash.Title,
-					UID:   "general",
+					OrgID:        orgID,
+					Title:        dash.Title,
+					UID:          "general",
+					SignedInUser: usr,
 				})
 				require.ErrorIs(t, err, dashboards.ErrFolderInvalidUID)
 			})
@@ -225,6 +242,7 @@ func TestIntegrationFolderService(t *testing.T) {
 					UID:              f.UID,
 					OrgID:            orgID,
 					ForceDeleteRules: expectedForceDeleteRules,
+					SignedInUser:     usr,
 				})
 				require.NoError(t, err)
 				require.NotNil(t, actualCmd)
@@ -334,7 +352,7 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 	t.Run("create folder", func(t *testing.T) {
 		folderStore.ExpectedFolder = &folder.Folder{}
 		ctx := appcontext.WithUser(context.Background(), usr)
-		res, err := folderService.Create(ctx, &folder.CreateFolderCommand{})
+		res, err := folderService.Create(ctx, &folder.CreateFolderCommand{SignedInUser: usr})
 		require.NoError(t, err)
 		require.NotNil(t, res.UID)
 	})
@@ -399,9 +417,10 @@ func TestNestedFolderService(t *testing.T) {
 
 			ctx = appcontext.WithUser(ctx, usr)
 			_, err := foldersvc.Create(ctx, &folder.CreateFolderCommand{
-				OrgID: orgID,
-				Title: "myFolder",
-				UID:   "myFolder",
+				OrgID:        orgID,
+				Title:        "myFolder",
+				UID:          "myFolder",
+				SignedInUser: usr,
 			})
 			require.NoError(t, err)
 			// CreateFolder should not call the folder store create if the feature toggle is not enabled.
@@ -418,7 +437,7 @@ func TestNestedFolderService(t *testing.T) {
 			g := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
 
-			err := foldersvc.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID})
+			err := foldersvc.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)
 			require.NotNil(t, actualCmd)
 
@@ -460,9 +479,10 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 			ctx = appcontext.WithUser(ctx, usr)
 			_, err := foldersvc.Create(ctx, &folder.CreateFolderCommand{
-				OrgID: orgID,
-				Title: "myFolder",
-				UID:   "myFolder",
+				OrgID:        orgID,
+				Title:        "myFolder",
+				UID:          "myFolder",
+				SignedInUser: usr,
 			})
 			require.NoError(t, err)
 			// CreateFolder should also call the folder store's create method.
@@ -488,9 +508,10 @@ func TestNestedFolderService(t *testing.T) {
 			// the service return success as long as the legacy create succeeds
 			ctx = appcontext.WithUser(ctx, usr)
 			_, err := foldersvc.Create(ctx, &folder.CreateFolderCommand{
-				OrgID: orgID,
-				Title: "myFolder",
-				UID:   "myFolder",
+				OrgID:        orgID,
+				Title:        "myFolder",
+				UID:          "myFolder",
+				SignedInUser: usr,
 			})
 			require.Error(t, err, "FAILED")
 
@@ -505,7 +526,7 @@ func TestNestedFolderService(t *testing.T) {
 		t.Run("move, no error", func(t *testing.T) {
 			store.ExpectedError = nil
 			store.ExpectedFolder = &folder.Folder{UID: "myFolder", ParentUID: "newFolder"}
-			f, err := foldersvc.Move(ctx, &folder.MoveFolderCommand{UID: "myFolder", NewParentUID: "newFolder", OrgID: orgID})
+			f, err := foldersvc.Move(ctx, &folder.MoveFolderCommand{UID: "myFolder", NewParentUID: "newFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)
 			require.NotNil(t, f)
 		})
@@ -520,7 +541,7 @@ func TestNestedFolderService(t *testing.T) {
 			g := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
 
-			err := foldersvc.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID})
+			err := foldersvc.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)
 			require.NotNil(t, actualCmd)
 
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index ea736371ef5..87b592c5d97 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
@@ -66,6 +67,8 @@ type CreateFolderCommand struct {
 	Title       string `json:"title"`
 	Description string `json:"description"`
 	ParentUID   string `json:"parent_uid"`
+
+	SignedInUser *user.SignedInUser `json:"-"`
 }
 
 // UpdateFolderCommand captures the information required by the folder service
@@ -75,6 +78,8 @@ type UpdateFolderCommand struct {
 	NewUID         *string `json:"uid" xorm:"uid"`
 	NewTitle       *string `json:"title"`
 	NewDescription *string `json:"description"`
+
+	SignedInUser *user.SignedInUser `json:"-"`
 }
 
 // MoveFolderCommand captures the information required by the folder service
@@ -83,6 +88,8 @@ type MoveFolderCommand struct {
 	UID          string `json:"uid"`
 	NewParentUID string `json:"new_parent_uid"`
 	OrgID        int64  `json:"-"`
+
+	SignedInUser *user.SignedInUser `json:"-"`
 }
 
 // DeleteFolderCommand captures the information required by the folder service
@@ -91,6 +98,8 @@ type DeleteFolderCommand struct {
 	UID              string `json:"uid" xorm:"uid"`
 	OrgID            int64  `json:"orgId" xorm:"org_id"`
 	ForceDeleteRules bool   `json:"forceDeleteRules"`
+
+	SignedInUser *user.SignedInUser `json:"-"`
 }
 
 // GetFolderQuery is used for all folder Get requests. Only one of UID, ID, or
@@ -102,6 +111,8 @@ type GetFolderQuery struct {
 	ID    *int64
 	Title *string
 	OrgID int64
+
+	SignedInUser *user.SignedInUser `json:"-"`
 }
 
 // GetParentsQuery captures the information required by the folder service to
diff --git a/pkg/services/libraryelements/api.go b/pkg/services/libraryelements/api.go
index d499390b593..d6afb11f1a2 100644
--- a/pkg/services/libraryelements/api.go
+++ b/pkg/services/libraryelements/api.go
@@ -48,7 +48,7 @@ func (l *LibraryElementService) createHandler(c *models.ReqContext) response.Res
 		if *cmd.FolderUID == "" {
 			cmd.FolderID = 0
 		} else {
-			folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: cmd.FolderUID})
+			folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: cmd.FolderUID, SignedInUser: c.SignedInUser})
 			if err != nil || folder == nil {
 				return response.Error(http.StatusBadRequest, "failed to get folder", err)
 			}
@@ -62,7 +62,7 @@ func (l *LibraryElementService) createHandler(c *models.ReqContext) response.Res
 	}
 
 	if element.FolderID != 0 {
-		folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, ID: &element.FolderID})
+		folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, ID: &element.FolderID, SignedInUser: c.SignedInUser})
 		if err != nil {
 			return response.Error(http.StatusInternalServerError, "failed to get folder", err)
 		}
@@ -176,7 +176,7 @@ func (l *LibraryElementService) patchHandler(c *models.ReqContext) response.Resp
 		if *cmd.FolderUID == "" {
 			cmd.FolderID = 0
 		} else {
-			folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: cmd.FolderUID})
+			folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, UID: cmd.FolderUID, SignedInUser: c.SignedInUser})
 			if err != nil || folder == nil {
 				return response.Error(http.StatusBadRequest, "failed to get folder", err)
 			}
@@ -190,7 +190,7 @@ func (l *LibraryElementService) patchHandler(c *models.ReqContext) response.Resp
 	}
 
 	if element.FolderID != 0 {
-		folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, ID: &element.FolderID})
+		folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.OrgID, ID: &element.FolderID, SignedInUser: c.SignedInUser})
 		if err != nil {
 			return response.Error(http.StatusInternalServerError, "failed to get folder", err)
 		}
diff --git a/pkg/services/libraryelements/guard.go b/pkg/services/libraryelements/guard.go
index 958ded662d6..e216507e84a 100644
--- a/pkg/services/libraryelements/guard.go
+++ b/pkg/services/libraryelements/guard.go
@@ -40,7 +40,7 @@ func (l *LibraryElementService) requireEditPermissionsOnFolder(ctx context.Conte
 	if isGeneralFolder(folderID) && user.HasRole(org.RoleViewer) {
 		return dashboards.ErrFolderAccessDenied
 	}
-	folder, err := l.folderService.Get(ctx, &folder.GetFolderQuery{ID: &folderID, OrgID: user.OrgID})
+	folder, err := l.folderService.Get(ctx, &folder.GetFolderQuery{ID: &folderID, OrgID: user.OrgID, SignedInUser: user})
 	if err != nil {
 		return err
 	}
@@ -63,7 +63,7 @@ func (l *LibraryElementService) requireViewPermissionsOnFolder(ctx context.Conte
 		return nil
 	}
 
-	folder, err := l.folderService.Get(ctx, &folder.GetFolderQuery{ID: &folderID, OrgID: user.OrgID})
+	folder, err := l.folderService.Get(ctx, &folder.GetFolderQuery{ID: &folderID, OrgID: user.OrgID, SignedInUser: user})
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/libraryelements/libraryelements_test.go b/pkg/services/libraryelements/libraryelements_test.go
index 0a273577558..49e02f71790 100644
--- a/pkg/services/libraryelements/libraryelements_test.go
+++ b/pkg/services/libraryelements/libraryelements_test.go
@@ -321,7 +321,7 @@ func createFolderWithACL(t *testing.T, sqlStore db.DB, title string, user user.S
 	t.Logf("Creating folder with title and UID %q", title)
 	ctx := appcontext.WithUser(context.Background(), &user)
 	folder, err := s.Create(ctx, &folder.CreateFolderCommand{
-		OrgID: user.OrgID, Title: title, UID: title,
+		OrgID: user.OrgID, Title: title, UID: title, SignedInUser: &user,
 	})
 	require.NoError(t, err)
 
diff --git a/pkg/services/librarypanels/librarypanels_test.go b/pkg/services/librarypanels/librarypanels_test.go
index 202f09eae26..356ea61e045 100644
--- a/pkg/services/librarypanels/librarypanels_test.go
+++ b/pkg/services/librarypanels/librarypanels_test.go
@@ -728,7 +728,7 @@ func createFolderWithACL(t *testing.T, sqlStore db.DB, title string, user *user.
 
 	t.Logf("Creating folder with title and UID %q", title)
 	ctx := appcontext.WithUser(context.Background(), user)
-	folder, err := s.Create(ctx, &folder.CreateFolderCommand{OrgID: user.OrgID, Title: title, UID: title})
+	folder, err := s.Create(ctx, &folder.CreateFolderCommand{OrgID: user.OrgID, Title: title, UID: title, SignedInUser: user})
 	require.NoError(t, err)
 
 	updateFolderACL(t, dashboardStore, folder.ID, items)
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index 581d09594fe..6f0df1ca244 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -368,7 +368,7 @@ func (st DBstore) GetUserVisibleNamespaces(ctx context.Context, orgID int64, use
 
 // GetNamespaceByTitle is a handler for retrieving a namespace by its title. Alerting rules follow a Grafana folder-like structure which we call namespaces.
 func (st DBstore) GetNamespaceByTitle(ctx context.Context, namespace string, orgID int64, user *user.SignedInUser, withCanSave bool) (*folder.Folder, error) {
-	folder, err := st.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &namespace})
+	folder, err := st.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &namespace, SignedInUser: user})
 	if err != nil {
 		return nil, err
 	}
@@ -389,7 +389,7 @@ func (st DBstore) GetNamespaceByTitle(ctx context.Context, namespace string, org
 
 // GetNamespaceByUID is a handler for retrieving a namespace by its UID. Alerting rules follow a Grafana folder-like structure which we call namespaces.
 func (st DBstore) GetNamespaceByUID(ctx context.Context, uid string, orgID int64, user *user.SignedInUser) (*folder.Folder, error) {
-	folder, err := st.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &uid})
+	folder, err := st.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &uid, SignedInUser: user})
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/ngalert/tests/util.go b/pkg/services/ngalert/tests/util.go
index b0db8636df4..0adc53b6e95 100644
--- a/pkg/services/ngalert/tests/util.go
+++ b/pkg/services/ngalert/tests/util.go
@@ -130,10 +130,10 @@ func CreateTestAlertRuleWithLabels(t testing.TB, ctx context.Context, dbstore *s
 	}
 
 	ctx = appcontext.WithUser(ctx, user)
-	_, err := dbstore.FolderService.Create(ctx, &folder.CreateFolderCommand{OrgID: orgID, Title: "FOLDER-" + util.GenerateShortUID(), UID: folderUID})
+	_, err := dbstore.FolderService.Create(ctx, &folder.CreateFolderCommand{OrgID: orgID, Title: "FOLDER-" + util.GenerateShortUID(), UID: folderUID, SignedInUser: user})
 	// var foldr *folder.Folder
 	if errors.Is(err, dashboards.ErrFolderWithSameUIDExists) || errors.Is(err, dashboards.ErrFolderVersionMismatch) {
-		_, err = dbstore.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, UID: &folderUID})
+		_, err = dbstore.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, UID: &folderUID, SignedInUser: user})
 	}
 	require.NoError(t, err)
 

From 245a59548c6846b69496156ac065bdcd6bc6108e Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Wed, 23 Nov 2022 10:22:52 +0100
Subject: [PATCH 095/153] Chore: Remove DeleteOrg method from sqlstore (#59162)

remove DeleteOrg method from sqlstore
---
 pkg/services/org/orgimpl/store_test.go |  2 +-
 pkg/services/sqlstore/org.go           | 41 --------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/pkg/services/org/orgimpl/store_test.go b/pkg/services/org/orgimpl/store_test.go
index 357b86c6c82..e14d60369f2 100644
--- a/pkg/services/org/orgimpl/store_test.go
+++ b/pkg/services/org/orgimpl/store_test.go
@@ -402,7 +402,7 @@ func TestIntegrationOrgUserDataAccess(t *testing.T) {
 
 		t.Run("Removing user from org should delete user completely if in no other org", func(t *testing.T) {
 			// make sure ac2 has no org
-			err := ss.DeleteOrg(context.Background(), &models.DeleteOrgCommand{Id: ac2.OrgID})
+			err := orgUserStore.Delete(context.Background(), &org.DeleteOrgCommand{ID: ac2.OrgID})
 			require.NoError(t, err)
 
 			// remove ac2 user from ac1 org
diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go
index 1231c2ea081..ce5a45e9ea7 100644
--- a/pkg/services/sqlstore/org.go
+++ b/pkg/services/sqlstore/org.go
@@ -113,47 +113,6 @@ func (ss *SQLStore) UpdateOrgAddress(ctx context.Context, cmd *models.UpdateOrgA
 	})
 }
 
-func (ss *SQLStore) DeleteOrg(ctx context.Context, cmd *models.DeleteOrgCommand) error {
-	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
-		if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.Id); err != nil {
-			return err
-		} else if len(res) != 1 {
-			return models.ErrOrgNotFound
-		}
-
-		deletes := []string{
-			"DELETE FROM star WHERE EXISTS (SELECT 1 FROM dashboard WHERE org_id = ? AND star.dashboard_id = dashboard.id)",
-			"DELETE FROM dashboard_tag WHERE EXISTS (SELECT 1 FROM dashboard WHERE org_id = ? AND dashboard_tag.dashboard_id = dashboard.id)",
-			"DELETE FROM dashboard WHERE org_id = ?",
-			"DELETE FROM api_key WHERE org_id = ?",
-			"DELETE FROM data_source WHERE org_id = ?",
-			"DELETE FROM org_user WHERE org_id = ?",
-			"DELETE FROM org WHERE id = ?",
-			"DELETE FROM temp_user WHERE org_id = ?",
-			"DELETE FROM ngalert_configuration WHERE org_id = ?",
-			"DELETE FROM alert_configuration WHERE org_id = ?",
-			"DELETE FROM alert_instance WHERE rule_org_id = ?",
-			"DELETE FROM alert_notification WHERE org_id = ?",
-			"DELETE FROM alert_notification_state WHERE org_id = ?",
-			"DELETE FROM alert_rule WHERE org_id = ?",
-			"DELETE FROM alert_rule_tag WHERE EXISTS (SELECT 1 FROM alert WHERE alert.org_id = ? AND alert.id = alert_rule_tag.alert_id)",
-			"DELETE FROM alert_rule_version WHERE rule_org_id = ?",
-			"DELETE FROM alert WHERE org_id = ?",
-			"DELETE FROM annotation WHERE org_id = ?",
-			"DELETE FROM kv_store WHERE org_id = ?",
-		}
-
-		for _, sql := range deletes {
-			_, err := sess.Exec(sql, cmd.Id)
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
-	})
-}
-
 func verifyExistingOrg(sess *DBSession, orgId int64) error {
 	var org models.Org
 	has, err := sess.Where("id=?", orgId).Get(&org)

From cae5d89d0f4e4eb02d75639f4e3670841328c71c Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konrad.lalik@grafana.com>
Date: Wed, 23 Nov 2022 10:27:49 +0100
Subject: [PATCH 096/153] Alerting: Add dashboard and panel picker to the rule
 form (#58304)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../alerting/unified/api/dashboardApi.ts      |  22 ++
 .../rule-editor/AnnotationsField.test.tsx     | 276 +++++++++++++++++
 .../rule-editor/AnnotationsField.tsx          |  69 ++++-
 .../rule-editor/DashboardPicker.tsx           | 280 ++++++++++++++++++
 .../components/rule-editor/DetailsStep.tsx    |   2 +-
 .../hooks/useExternalAMSelector.test.tsx      |   8 +-
 6 files changed, 639 insertions(+), 18 deletions(-)
 create mode 100644 public/app/features/alerting/unified/api/dashboardApi.ts
 create mode 100644 public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
 create mode 100644 public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx

diff --git a/public/app/features/alerting/unified/api/dashboardApi.ts b/public/app/features/alerting/unified/api/dashboardApi.ts
new file mode 100644
index 00000000000..15c71cb7508
--- /dev/null
+++ b/public/app/features/alerting/unified/api/dashboardApi.ts
@@ -0,0 +1,22 @@
+import { DashboardDTO } from '../../../../types';
+import { DashboardSearchItem } from '../../../search/types';
+
+import { alertingApi } from './alertingApi';
+
+export const dashboardApi = alertingApi.injectEndpoints({
+  endpoints: (build) => ({
+    search: build.query<DashboardSearchItem[], { query?: string }>({
+      query: ({ query }) => {
+        const params = new URLSearchParams({ type: 'dash-db', limit: '1000', page: '1', sort: 'name_sort' });
+        if (query) {
+          params.set('query', query);
+        }
+
+        return { url: `/api/search?${params.toString()}` };
+      },
+    }),
+    dashboard: build.query<DashboardDTO, { uid: string }>({
+      query: ({ uid }) => ({ url: `/api/dashboards/uid/${uid}` }),
+    }),
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
new file mode 100644
index 00000000000..0b40d78d138
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
@@ -0,0 +1,276 @@
+import { findByText, findByTitle, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import React from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import { Provider } from 'react-redux';
+import { byRole, byTestId } from 'testing-library-selector';
+
+import { setBackendSrv } from '@grafana/runtime';
+import { backendSrv } from 'app/core/services/backend_srv';
+
+import { DashboardDTO } from '../../../../../types';
+import { DashboardSearchItem, DashboardSearchItemType } from '../../../../search/types';
+import { mockStore } from '../../mocks';
+import { RuleFormValues } from '../../types/rule-form';
+import { Annotation } from '../../utils/constants';
+import { getDefaultFormValues } from '../../utils/rule-form';
+
+import 'whatwg-fetch';
+
+import AnnotationsField from './AnnotationsField';
+
+// To get anything displayed inside the Autosize component we need to mock it
+// Ref https://github.com/bvaughn/react-window/issues/454#issuecomment-646031139
+jest.mock(
+  'react-virtualized-auto-sizer',
+  () =>
+    ({ children }: { children: ({ height, width }: { height: number; width: number }) => JSX.Element }) =>
+      children({ height: 500, width: 330 })
+);
+
+const ui = {
+  setDashboardButton: byRole('button', { name: 'Set dashboard and panel' }),
+  annotationKeys: byTestId('annotation-key-', { exact: false }),
+  annotationValues: byTestId('annotation-value-', { exact: false }),
+  dashboardPicker: {
+    dialog: byRole('dialog'),
+    heading: byRole('heading', { name: 'Select dashboard and panel' }),
+    confirmButton: byRole('button', { name: 'Confirm' }),
+  },
+} as const;
+
+const server = setupServer();
+
+beforeAll(() => {
+  setBackendSrv(backendSrv);
+  server.listen({ onUnhandledRequest: 'error' });
+});
+
+beforeEach(() => {
+  server.resetHandlers();
+});
+
+afterAll(() => {
+  server.close();
+});
+
+function FormWrapper({ formValues }: { formValues?: Partial<RuleFormValues> }) {
+  const store = mockStore(() => null);
+  const formApi = useForm<RuleFormValues>({ defaultValues: { ...getDefaultFormValues(), ...formValues } });
+
+  return (
+    <Provider store={store}>
+      <FormProvider {...formApi}>
+        <AnnotationsField />
+      </FormProvider>
+    </Provider>
+  );
+}
+
+describe('AnnotationsField', function () {
+  it('should display default list of annotations', function () {
+    render(<FormWrapper />);
+
+    const annotationElements = ui.annotationKeys.getAll();
+
+    expect(annotationElements).toHaveLength(3);
+    expect(annotationElements[0]).toHaveTextContent('Summary');
+    expect(annotationElements[1]).toHaveTextContent('Description');
+    expect(annotationElements[2]).toHaveTextContent('Runbook URL');
+  });
+
+  describe('Dashboard and panel picker', function () {
+    it('should display dashboard and panel selector when select button clicked', async function () {
+      mockSearchResponse([]);
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper />);
+
+      await user.click(ui.setDashboardButton.get());
+
+      expect(ui.dashboardPicker.dialog.get()).toBeInTheDocument();
+      expect(ui.dashboardPicker.heading.get()).toBeInTheDocument();
+    });
+
+    it('should enable Confirm button only when dashboard and panel selected', async function () {
+      mockSearchResponse([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+      ]);
+
+      mockGetDashboardResponse(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel' },
+            { id: 2, title: 'Second panel' },
+          ],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper />);
+
+      await user.click(ui.setDashboardButton.get());
+      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
+
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
+      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
+
+      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'First panel'));
+      expect(ui.dashboardPicker.confirmButton.get()).toBeEnabled();
+    });
+
+    it('should add selected dashboard and panel as annotations', async function () {
+      mockSearchResponse([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+      ]);
+
+      mockGetDashboardResponse(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel' },
+            { id: 2, title: 'Second panel' },
+          ],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper formValues={{ annotations: [] }} />);
+
+      await user.click(ui.setDashboardButton.get());
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
+
+      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'Second panel'));
+
+      await user.click(ui.dashboardPicker.confirmButton.get());
+
+      const annotationKeyElements = ui.annotationKeys.getAll();
+      const annotationValueElements = ui.annotationValues.getAll();
+
+      expect(ui.dashboardPicker.dialog.query()).not.toBeInTheDocument();
+
+      expect(annotationKeyElements).toHaveLength(2);
+      expect(annotationValueElements).toHaveLength(2);
+
+      expect(annotationKeyElements[0]).toHaveTextContent('Dashboard UID');
+      expect(annotationValueElements[0]).toHaveTextContent('dash-test-uid');
+
+      expect(annotationKeyElements[1]).toHaveTextContent('Panel ID');
+      expect(annotationValueElements[1]).toHaveTextContent('2');
+    });
+
+    // this test _should_ work in theory but something is stopping the 'onClick' function on the dashboard item
+    // to trigger "handleDashboardChange" – skipping it for now but has been manually tested.
+    it.skip('should update existing dashboard and panel identifies', async function () {
+      mockSearchResponse([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+        mockDashboardSearchItem({
+          title: 'My other dashboard',
+          uid: 'dash-other-uid',
+          type: DashboardSearchItemType.DashDB,
+        }),
+      ]);
+
+      mockGetDashboardResponse(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel' },
+            { id: 2, title: 'Second panel' },
+          ],
+        })
+      );
+      mockGetDashboardResponse(
+        mockDashboardDto({
+          title: 'My other dashboard',
+          uid: 'dash-other-uid',
+          panels: [{ id: 3, title: 'Third panel' }],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(
+        <FormWrapper
+          formValues={{
+            annotations: [
+              { key: Annotation.dashboardUID, value: 'dash-test-uid' },
+              { key: Annotation.panelID, value: '1' },
+            ],
+          }}
+        />
+      );
+
+      let annotationValueElements = ui.annotationValues.getAll();
+      expect(annotationValueElements[0]).toHaveTextContent('dash-test-uid');
+      expect(annotationValueElements[1]).toHaveTextContent('1');
+
+      await user.click(ui.setDashboardButton.get());
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My other dashboard'));
+      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'Third panel'));
+      await user.click(ui.dashboardPicker.confirmButton.get());
+
+      expect(ui.dashboardPicker.dialog.query()).not.toBeInTheDocument();
+
+      const annotationKeyElements = ui.annotationKeys.getAll();
+      annotationValueElements = ui.annotationValues.getAll();
+
+      expect(annotationKeyElements).toHaveLength(2);
+      expect(annotationValueElements).toHaveLength(2);
+
+      expect(annotationKeyElements[0]).toHaveTextContent('Dashboard UID');
+      expect(annotationValueElements[0]).toHaveTextContent('dash-other-uid');
+
+      expect(annotationKeyElements[1]).toHaveTextContent('Panel ID');
+      expect(annotationValueElements[1]).toHaveTextContent('3');
+    });
+  });
+});
+
+function mockSearchResponse(searchResult: DashboardSearchItem[]) {
+  server.use(rest.get('/api/search', (req, res, ctx) => res(ctx.json<DashboardSearchItem[]>(searchResult))));
+}
+
+function mockGetDashboardResponse(dashboard: DashboardDTO) {
+  server.use(
+    rest.get(`/api/dashboards/uid/${dashboard.dashboard.uid}`, (req, res, ctx) =>
+      res(ctx.json<DashboardDTO>(dashboard))
+    )
+  );
+}
+
+function mockDashboardSearchItem(searchItem: Partial<DashboardSearchItem>) {
+  return {
+    title: '',
+    uid: '',
+    type: DashboardSearchItemType.DashDB,
+    url: '',
+    uri: '',
+    items: [],
+    tags: [],
+    isStarred: false,
+    ...searchItem,
+  };
+}
+
+function mockDashboardDto(dashboard: Partial<DashboardDTO['dashboard']>) {
+  return {
+    dashboard: {
+      title: '',
+      uid: '',
+      templating: { list: [] },
+      panels: [],
+      ...dashboard,
+    },
+    meta: {},
+  };
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
index be34a7d3e4c..58df2ededd9 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
@@ -1,21 +1,29 @@
 import { css, cx } from '@emotion/css';
+import produce from 'immer';
 import React, { useCallback } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
+import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
 import { Button, Field, Input, InputControl, Label, TextArea, useStyles2 } from '@grafana/ui';
 
 import { RuleFormValues } from '../../types/rule-form';
+import { Annotation } from '../../utils/constants';
 
 import { AnnotationKeyInput } from './AnnotationKeyInput';
+import { DashboardPicker } from './DashboardPicker';
 
 const AnnotationsField = () => {
   const styles = useStyles2(getStyles);
+  const [showPanelSelector, setShowPanelSelector] = useToggle(false);
+
   const {
     control,
     register,
     watch,
     formState: { errors },
+    setValue,
   } = useFormContext<RuleFormValues>();
   const annotations = watch('annotations');
 
@@ -26,6 +34,31 @@ const AnnotationsField = () => {
 
   const { fields, append, remove } = useFieldArray({ control, name: 'annotations' });
 
+  const selectedDashboardUid = annotations.find((annotation) => annotation.key === Annotation.dashboardUID)?.value;
+  const selectedPanelId = annotations.find((annotation) => annotation.key === Annotation.panelID)?.value;
+
+  const setSelectedDashboardAndPanelId = (dashboardUid: string, panelId: string) => {
+    const updatedAnnotations = produce(annotations, (draft) => {
+      const dashboardAnnotation = draft.find((a) => a.key === Annotation.dashboardUID);
+      const panelAnnotation = draft.find((a) => a.key === Annotation.panelID);
+
+      if (dashboardAnnotation) {
+        dashboardAnnotation.value = dashboardUid;
+      } else {
+        draft.push({ key: Annotation.dashboardUID, value: dashboardUid });
+      }
+
+      if (panelAnnotation) {
+        panelAnnotation.value = panelId;
+      } else {
+        draft.push({ key: Annotation.panelID, value: panelId });
+      }
+    });
+
+    setValue('annotations', updatedAnnotations);
+    setShowPanelSelector(false);
+  };
+
   return (
     <>
       <Label>Summary and annotations</Label>
@@ -81,17 +114,31 @@ const AnnotationsField = () => {
             </div>
           );
         })}
-        <Button
-          className={styles.addAnnotationsButton}
-          icon="plus-circle"
-          type="button"
-          variant="secondary"
-          onClick={() => {
-            append({ key: '', value: '' });
-          }}
-        >
-          Add info
-        </Button>
+        <Stack direction="row" gap={1}>
+          <Button
+            className={styles.addAnnotationsButton}
+            icon="plus-circle"
+            type="button"
+            variant="secondary"
+            onClick={() => {
+              append({ key: '', value: '' });
+            }}
+          >
+            Add annotation
+          </Button>
+          <Button type="button" variant="secondary" icon="dashboard" onClick={() => setShowPanelSelector(true)}>
+            Set dashboard and panel
+          </Button>
+        </Stack>
+        {showPanelSelector && (
+          <DashboardPicker
+            isOpen={true}
+            dashboardUid={selectedDashboardUid}
+            panelId={selectedPanelId}
+            onChange={setSelectedDashboardAndPanelId}
+            onDismiss={() => setShowPanelSelector(false)}
+          />
+        )}
       </div>
     </>
   );
diff --git a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
new file mode 100644
index 00000000000..ab0fd01aa52
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
@@ -0,0 +1,280 @@
+import { css, cx } from '@emotion/css';
+import React, { CSSProperties, useCallback, useMemo, useState } from 'react';
+import { useDebounce } from 'react-use';
+import AutoSizer from 'react-virtualized-auto-sizer';
+import { FixedSizeList } from 'react-window';
+
+import { GrafanaTheme2 } from '@grafana/data/src';
+import { FilterInput, LoadingPlaceholder, useStyles2, Icon, Modal, Button, Alert } from '@grafana/ui';
+
+import { dashboardApi } from '../../api/dashboardApi';
+
+export interface PanelDTO {
+  id: number;
+  title?: string;
+}
+
+function panelSort(a: PanelDTO, b: PanelDTO) {
+  if (a.title && b.title) {
+    return a.title.localeCompare(b.title);
+  }
+  if (a.title && !b.title) {
+    return 1;
+  } else if (!a.title && b.title) {
+    return -1;
+  }
+
+  return 0;
+}
+
+interface DashboardPickerProps {
+  isOpen: boolean;
+  dashboardUid?: string | undefined;
+  panelId?: string | undefined;
+  onChange: (dashboardUid: string, panelId: string) => void;
+  onDismiss: () => void;
+}
+
+export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDismiss }: DashboardPickerProps) => {
+  const styles = useStyles2(getPickerStyles);
+
+  const [selectedDashboardUid, setSelectedDashboardUid] = useState(dashboardUid);
+  const [selectedPanelId, setSelectedPanelId] = useState(panelId);
+
+  const [dashboardFilter, setDashboardFilter] = useState('');
+  const [debouncedDashboardFilter, setDebouncedDashboardFilter] = useState('');
+
+  const [panelFilter, setPanelFilter] = useState('');
+  const { useSearchQuery, useDashboardQuery } = dashboardApi;
+
+  const { currentData: filteredDashboards = [], isFetching: isDashSearchFetching } = useSearchQuery({
+    query: debouncedDashboardFilter,
+  });
+  const { currentData: dashboardResult, isFetching: isDashboardFetching } = useDashboardQuery(
+    { uid: selectedDashboardUid ?? '' },
+    { skip: !selectedDashboardUid }
+  );
+
+  const handleDashboardChange = useCallback((dashboardUid: string) => {
+    setSelectedDashboardUid(dashboardUid);
+    setSelectedPanelId(undefined);
+  }, []);
+
+  const filteredPanels =
+    dashboardResult?.dashboard?.panels
+      ?.filter((panel): panel is PanelDTO => typeof panel.id === 'number')
+      ?.filter((panel) => panel.title?.toLowerCase().includes(panelFilter.toLowerCase()))
+      .sort(panelSort) ?? [];
+
+  const currentPanel = dashboardResult?.dashboard?.panels?.find((panel) => panel.id.toString() === selectedPanelId);
+
+  const selectedDashboardIndex = useMemo(() => {
+    return filteredDashboards.map((dashboard) => dashboard.uid).indexOf(selectedDashboardUid ?? '');
+  }, [filteredDashboards, selectedDashboardUid]);
+
+  const isDefaultSelection = dashboardUid && dashboardUid === selectedDashboardUid;
+  const selectedDashboardIsInPageResult = selectedDashboardIndex >= 0;
+
+  const scrollToItem = useCallback(
+    (node) => {
+      const canScroll = selectedDashboardIndex >= 0;
+
+      if (isDefaultSelection && canScroll) {
+        node?.scrollToItem(selectedDashboardIndex, 'smart');
+      }
+    },
+    [isDefaultSelection, selectedDashboardIndex]
+  );
+
+  useDebounce(
+    () => {
+      setDebouncedDashboardFilter(dashboardFilter);
+    },
+    500,
+    [dashboardFilter]
+  );
+
+  const DashboardRow = ({ index, style }: { index: number; style?: CSSProperties }) => {
+    const dashboard = filteredDashboards[index];
+    const isSelected = selectedDashboardUid === dashboard.uid;
+
+    return (
+      <div
+        title={dashboard.title}
+        style={style}
+        className={cx(styles.row, { [styles.rowOdd]: index % 2 === 1, [styles.rowSelected]: isSelected })}
+        onClick={() => handleDashboardChange(dashboard.uid)}
+      >
+        <div className={styles.dashboardTitle}>{dashboard.title}</div>
+        <div className={styles.dashboardFolder}>
+          <Icon name="folder" /> {dashboard.folderTitle ?? 'General'}
+        </div>
+      </div>
+    );
+  };
+
+  const PanelRow = ({ index, style }: { index: number; style: CSSProperties }) => {
+    const panel = filteredPanels[index];
+    const isSelected = selectedPanelId === panel.id.toString();
+
+    return (
+      <div
+        style={style}
+        className={cx(styles.row, { [styles.rowOdd]: index % 2 === 1, [styles.rowSelected]: isSelected })}
+        onClick={() => setSelectedPanelId(panel.id.toString())}
+      >
+        {panel.title || '<No title>'}
+      </div>
+    );
+  };
+
+  return (
+    <Modal
+      title="Select dashboard and panel"
+      closeOnEscape
+      isOpen={isOpen}
+      onDismiss={onDismiss}
+      className={styles.modal}
+      contentClassName={styles.modalContent}
+    >
+      {/* This alert shows if the selected dashboard is not found in the first page of dashboards */}
+      {!selectedDashboardIsInPageResult && dashboardUid && (
+        <Alert title="Current selection" severity="info" topSpacing={0} bottomSpacing={1} className={styles.modalAlert}>
+          <div>
+            Dashboard: {dashboardResult?.dashboard.title} ({dashboardResult?.dashboard.uid}) in folder{' '}
+            {dashboardResult?.meta.folderTitle ?? 'General'}
+          </div>
+          {Boolean(currentPanel) && (
+            <div>
+              Panel: {currentPanel.title} ({currentPanel.id})
+            </div>
+          )}
+        </Alert>
+      )}
+      <div className={styles.container}>
+        <FilterInput
+          value={dashboardFilter}
+          onChange={setDashboardFilter}
+          title="Search dashboard"
+          placeholder="Search dashboard"
+          autoFocus
+        />
+        <FilterInput value={panelFilter} onChange={setPanelFilter} title="Search panel" placeholder="Search panel" />
+
+        <div className={styles.column}>
+          {isDashSearchFetching && (
+            <LoadingPlaceholder text="Loading dashboards..." className={styles.loadingPlaceholder} />
+          )}
+
+          {!isDashSearchFetching && (
+            <AutoSizer>
+              {({ height, width }) => (
+                <FixedSizeList
+                  ref={scrollToItem}
+                  itemSize={50}
+                  height={height}
+                  width={width}
+                  itemCount={filteredDashboards.length}
+                >
+                  {DashboardRow}
+                </FixedSizeList>
+              )}
+            </AutoSizer>
+          )}
+        </div>
+
+        <div className={styles.column}>
+          {!dashboardUid && !isDashboardFetching && <div>Select a dashboard to get a list of available panels</div>}
+          {isDashboardFetching && (
+            <LoadingPlaceholder text="Loading dashboard..." className={styles.loadingPlaceholder} />
+          )}
+
+          {!isDashboardFetching && (
+            <AutoSizer>
+              {({ width, height }) => (
+                <FixedSizeList itemSize={32} height={height} width={width} itemCount={filteredPanels.length}>
+                  {PanelRow}
+                </FixedSizeList>
+              )}
+            </AutoSizer>
+          )}
+        </div>
+      </div>
+      <Modal.ButtonRow>
+        <Button type="button" variant="secondary" onClick={onDismiss}>
+          Cancel
+        </Button>
+        <Button
+          type="button"
+          variant="primary"
+          disabled={!(selectedDashboardUid && selectedPanelId)}
+          onClick={() => {
+            if (selectedDashboardUid && selectedPanelId) {
+              onChange(selectedDashboardUid, selectedPanelId);
+            }
+          }}
+        >
+          Confirm
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
+
+const getPickerStyles = (theme: GrafanaTheme2) => ({
+  container: css`
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-template-rows: min-content auto;
+    gap: ${theme.spacing(2)};
+    flex: 1;
+  `,
+  column: css`
+    flex: 1 1 auto;
+  `,
+  dashboardTitle: css`
+    height: 22px;
+    font-weight: ${theme.typography.fontWeightBold};
+  `,
+  dashboardFolder: css`
+    height: 20px;
+    font-size: ${theme.typography.bodySmall.fontSize};
+    color: ${theme.colors.text.secondary};
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    column-gap: ${theme.spacing(1)};
+    align-items: center;
+  `,
+  row: css`
+    padding: ${theme.spacing(0.5)};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    cursor: pointer;
+    border: 2px solid transparent;
+  `,
+  rowSelected: css`
+    border-color: ${theme.colors.primary.border};
+  `,
+  rowOdd: css`
+    background-color: ${theme.colors.background.secondary};
+  `,
+  loadingPlaceholder: css`
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  `,
+  modal: css`
+    height: 100%;
+  `,
+  modalContent: css`
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  `,
+  modalAlert: css`
+    flex-grow: 0;
+  `,
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
index c40b8fa405f..4c6bcf2adae 100644
--- a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
@@ -18,7 +18,7 @@ export function DetailsStep() {
     <RuleEditorSection
       stepNo={type === RuleFormType.cloudRecording ? 3 : 4}
       title={
-        type === RuleFormType.cloudRecording ? 'Add details for your recording rule' : 'Add details for your alert'
+        type === RuleFormType.cloudRecording ? 'Add details for your recording rule' : 'Add details for your alert rule'
       }
       description={
         type === RuleFormType.cloudRecording
diff --git a/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx b/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
index 9c0d44d652c..0f2c8d3f112 100644
--- a/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
@@ -6,7 +6,7 @@ import { Provider } from 'react-redux';
 import 'whatwg-fetch';
 
 import { DataSourceJsonData, DataSourceSettings } from '@grafana/data';
-import { config } from '@grafana/runtime';
+import { config, setBackendSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
 
@@ -17,12 +17,8 @@ import { useExternalDataSourceAlertmanagers } from './useExternalAmSelector';
 
 const server = setupServer();
 
-jest.mock('@grafana/runtime', () => ({
-  ...(jest.requireActual('@grafana/runtime') as unknown as object),
-  getBackendSrv: () => backendSrv,
-}));
-
 beforeAll(() => {
+  setBackendSrv(backendSrv);
   server.listen({ onUnhandledRequest: 'error' });
 });
 

From 7376eee6ff12c167952842a94779e69bcbad3628 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Wed, 23 Nov 2022 09:28:24 +0000
Subject: [PATCH 097/153] Alerting: Support From and To when taking screenshots
 (#59166)

This commit adds support for the From and To parameters that set the
time range for the graph. The default is 6 hours, which can sometimes
be too large of a time range.
---
 pkg/services/screenshot/option.go          | 16 +++++++-
 pkg/services/screenshot/option_test.go     | 48 +++++++++++++++++++---
 pkg/services/screenshot/screenshot.go      |  5 ++-
 pkg/services/screenshot/screenshot_test.go |  5 ++-
 4 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/pkg/services/screenshot/option.go b/pkg/services/screenshot/option.go
index e84d2ed3a55..f19381abdae 100644
--- a/pkg/services/screenshot/option.go
+++ b/pkg/services/screenshot/option.go
@@ -9,16 +9,20 @@ import (
 )
 
 var (
-	DefaultTheme   = models.ThemeDark
-	DefaultTimeout = 15 * time.Second
+	DefaultFrom    = "now-1h"
+	DefaultTo      = "now"
 	DefaultHeight  = 500
 	DefaultWidth   = 1000
+	DefaultTheme   = models.ThemeDark
+	DefaultTimeout = 15 * time.Second
 )
 
 // ScreenshotOptions are the options for taking a screenshot.
 type ScreenshotOptions struct {
 	DashboardUID string
 	PanelID      int64
+	From         string
+	To           string
 	Width        int
 	Height       int
 	Theme        models.Theme
@@ -27,6 +31,12 @@ type ScreenshotOptions struct {
 
 // SetDefaults sets default values for missing or invalid options.
 func (s ScreenshotOptions) SetDefaults() ScreenshotOptions {
+	if s.From == "" {
+		s.From = DefaultFrom
+	}
+	if s.To == "" {
+		s.To = DefaultTo
+	}
 	if s.Width <= 0 {
 		s.Width = DefaultWidth
 	}
@@ -48,6 +58,8 @@ func (s ScreenshotOptions) Hash() []byte {
 	h := fnv.New64()
 	_, _ = h.Write([]byte(s.DashboardUID))
 	_, _ = h.Write([]byte(strconv.FormatInt(s.PanelID, 10)))
+	_, _ = h.Write([]byte(s.From))
+	_, _ = h.Write([]byte(s.To))
 	_, _ = h.Write([]byte(strconv.FormatInt(int64(s.Width), 10)))
 	_, _ = h.Write([]byte(strconv.FormatInt(int64(s.Height), 10)))
 	_, _ = h.Write([]byte(s.Theme))
diff --git a/pkg/services/screenshot/option_test.go b/pkg/services/screenshot/option_test.go
index 50552c1431b..2187b032391 100644
--- a/pkg/services/screenshot/option_test.go
+++ b/pkg/services/screenshot/option_test.go
@@ -12,6 +12,30 @@ func TestScreenshotOptions(t *testing.T) {
 
 	o = o.SetDefaults()
 	assert.Equal(t, ScreenshotOptions{
+		From:    DefaultFrom,
+		To:      DefaultTo,
+		Width:   DefaultWidth,
+		Height:  DefaultHeight,
+		Theme:   DefaultTheme,
+		Timeout: DefaultTimeout,
+	}, o)
+
+	o.From = "now-6h"
+	o = o.SetDefaults()
+	assert.Equal(t, ScreenshotOptions{
+		From:    "now-6h",
+		To:      DefaultTo,
+		Width:   DefaultWidth,
+		Height:  DefaultHeight,
+		Theme:   DefaultTheme,
+		Timeout: DefaultTimeout,
+	}, o)
+
+	o.To = "now-2h"
+	o = o.SetDefaults()
+	assert.Equal(t, ScreenshotOptions{
+		From:    "now-6h",
+		To:      "now-2h",
 		Width:   DefaultWidth,
 		Height:  DefaultHeight,
 		Theme:   DefaultTheme,
@@ -21,6 +45,8 @@ func TestScreenshotOptions(t *testing.T) {
 	o.Width = 100
 	o = o.SetDefaults()
 	assert.Equal(t, ScreenshotOptions{
+		From:    "now-6h",
+		To:      "now-2h",
 		Width:   100,
 		Height:  DefaultHeight,
 		Theme:   DefaultTheme,
@@ -30,6 +56,8 @@ func TestScreenshotOptions(t *testing.T) {
 	o.Height = 100
 	o = o.SetDefaults()
 	assert.Equal(t, ScreenshotOptions{
+		From:    "now-6h",
+		To:      "now-2h",
 		Width:   100,
 		Height:  100,
 		Theme:   DefaultTheme,
@@ -39,6 +67,8 @@ func TestScreenshotOptions(t *testing.T) {
 	o.Theme = "Not a theme"
 	o = o.SetDefaults()
 	assert.Equal(t, ScreenshotOptions{
+		From:    "now-6h",
+		To:      "now-2h",
 		Width:   100,
 		Height:  100,
 		Theme:   DefaultTheme,
@@ -47,6 +77,8 @@ func TestScreenshotOptions(t *testing.T) {
 
 	o.Timeout = DefaultTimeout + 1
 	assert.Equal(t, ScreenshotOptions{
+		From:    "now-6h",
+		To:      "now-2h",
 		Width:   100,
 		Height:  100,
 		Theme:   DefaultTheme,
@@ -59,21 +91,27 @@ func TestScreenshotOptions_Hash(t *testing.T) {
 	assert.Equal(t, []byte{0xd9, 0x83, 0x82, 0x18, 0x6c, 0x3d, 0x7d, 0x47}, o.Hash())
 
 	o = o.SetDefaults()
-	assert.Equal(t, []byte{0x6, 0x7, 0x97, 0x6, 0x53, 0xf, 0x8b, 0xf1}, o.Hash())
+	assert.Equal(t, []byte{0x3, 0x52, 0x33, 0x5f, 0xed, 0x96, 0x47, 0xb5}, o.Hash())
+
+	o.From = "now-6h"
+	assert.Equal(t, []byte{0x1b, 0x61, 0xc4, 0x40, 0x1f, 0xae, 0xa0, 0xe0}, o.Hash())
+
+	o.To = "now-2h"
+	assert.Equal(t, []byte{0x2, 0x4f, 0xfd, 0xd5, 0x68, 0xdd, 0xd1, 0x99}, o.Hash())
 
 	o.Width = 100
 	o = o.SetDefaults()
-	assert.Equal(t, []byte{0x25, 0x50, 0xb4, 0x4b, 0x43, 0xcd, 0x3, 0x49}, o.Hash())
+	assert.Equal(t, []byte{0x16, 0x6c, 0xd, 0xad, 0x9f, 0x32, 0x9d, 0x1}, o.Hash())
 
 	o.Height = 100
 	o = o.SetDefaults()
-	assert.Equal(t, []byte{0x51, 0xe2, 0x6f, 0x2c, 0x62, 0x7b, 0x3b, 0xc5}, o.Hash())
+	assert.Equal(t, []byte{0x2, 0x82, 0x96, 0x68, 0x2b, 0x57, 0x7d, 0xdd}, o.Hash())
 
 	o.Theme = "Not a theme"
 	o = o.SetDefaults()
-	assert.Equal(t, []byte{0x51, 0xe2, 0x6f, 0x2c, 0x62, 0x7b, 0x3b, 0xc5}, o.Hash())
+	assert.Equal(t, []byte{0x2, 0x82, 0x96, 0x68, 0x2b, 0x57, 0x7d, 0xdd}, o.Hash())
 
 	// the timeout should not change the sum
 	o.Timeout = DefaultTimeout + 1
-	assert.Equal(t, []byte{0x51, 0xe2, 0x6f, 0x2c, 0x62, 0x7b, 0x3b, 0xc5}, o.Hash())
+	assert.Equal(t, []byte{0x2, 0x82, 0x96, 0x68, 0x2b, 0x57, 0x7d, 0xdd}, o.Hash())
 }
diff --git a/pkg/services/screenshot/screenshot.go b/pkg/services/screenshot/screenshot.go
index 468e3202d35..e8d6b41b695 100644
--- a/pkg/services/screenshot/screenshot.go
+++ b/pkg/services/screenshot/screenshot.go
@@ -92,14 +92,17 @@ func (s *HeadlessScreenshotService) Take(ctx context.Context, opts ScreenshotOpt
 		return nil, err
 	}
 
+	opts = opts.SetDefaults()
+
 	u := url.URL{}
 	u.Path = path.Join("d-solo", q.Result.Uid, q.Result.Slug)
 	p := u.Query()
 	p.Add("orgId", strconv.FormatInt(q.Result.OrgId, 10))
 	p.Add("panelId", strconv.FormatInt(opts.PanelID, 10))
+	p.Add("from", opts.From)
+	p.Add("to", opts.To)
 	u.RawQuery = p.Encode()
 
-	opts = opts.SetDefaults()
 	renderOpts := rendering.Opts{
 		AuthOpts: rendering.AuthOpts{
 			OrgID:   q.Result.OrgId,
diff --git a/pkg/services/screenshot/screenshot_test.go b/pkg/services/screenshot/screenshot_test.go
index caeea6a98b2..d4382bbd960 100644
--- a/pkg/services/screenshot/screenshot_test.go
+++ b/pkg/services/screenshot/screenshot_test.go
@@ -34,6 +34,7 @@ func TestHeadlessScreenshotService(t *testing.T) {
 	assert.EqualError(t, err, "Dashboard not found")
 	assert.Nil(t, screenshot)
 
+	// should take a screenshot
 	d.On("GetDashboard", mock.Anything, mock.AnythingOfType("*models.GetDashboardQuery")).Run(func(args mock.Arguments) {
 		q := args.Get(1).(*models.GetDashboardQuery)
 		q.Result = &models.Dashboard{Id: 1, Uid: "foo", Slug: "bar", OrgId: 2}
@@ -54,10 +55,12 @@ func TestHeadlessScreenshotService(t *testing.T) {
 		Width:           DefaultWidth,
 		Height:          DefaultHeight,
 		Theme:           DefaultTheme,
-		Path:            "d-solo/foo/bar?orgId=2&panelId=4",
+		Path:            "d-solo/foo/bar?from=now-6h&orgId=2&panelId=4&to=now-2h",
 		ConcurrentLimit: setting.AlertingRenderLimit,
 	}
 
+	opts.From = "now-6h"
+	opts.To = "now-2h"
 	opts.DashboardUID = "foo"
 	opts.PanelID = 4
 	r.EXPECT().

From 75097b99fb68a5c7b1dad2c41d4927afc493d3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Wed, 23 Nov 2022 10:36:07 +0100
Subject: [PATCH 098/153] SQL: Fix code editor for SQL datasources (#58116)

* SQL: Fix code editor for sql datasources

* Fix: mysql completion with defaultdb
---
 .../query-editor-raw/QueryEditorRaw.tsx       |  11 +-
 .../components/query-editor-raw/RawEditor.tsx |   4 +-
 .../visual-query-builder/SQLSelectRow.tsx     |  10 +-
 public/app/features/plugins/sql/constants.ts  | 113 +------
 public/app/features/plugins/sql/types.ts      |  29 +-
 .../CompletionItemProvider.test.ts            |   2 +-
 .../plugins/datasource/mssql/datasource.ts    |  26 +-
 .../datasource/mssql/sqlCompletionProvider.ts |  99 ++----
 .../datasource/mysql/MySqlDatasource.ts       |  57 ++--
 .../app/plugins/datasource/mysql/functions.ts |  20 --
 .../datasource/mysql/sqlCompletionProvider.ts | 288 +-----------------
 .../plugins/datasource/postgres/datasource.ts |  28 +-
 .../postgres/sqlCompletionProvider.ts         |  21 +-
 13 files changed, 109 insertions(+), 599 deletions(-)
 delete mode 100644 public/app/plugins/datasource/mysql/functions.ts

diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx b/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx
index 74265916ab0..ea235547fb8 100644
--- a/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx
+++ b/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx
@@ -1,9 +1,8 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 
-import { SQLEditor } from '@grafana/experimental';
+import { LanguageDefinition, SQLEditor } from '@grafana/experimental';
 
-import { LanguageCompletionProvider, SQLQuery } from '../../types';
-import { formatSQL } from '../../utils/formatSQL';
+import { SQLQuery } from '../../types';
 
 type Props = {
   query: SQLQuery;
@@ -11,10 +10,10 @@ type Props = {
   children?: (props: { formatQuery: () => void }) => React.ReactNode;
   width?: number;
   height?: number;
-  completionProvider: LanguageCompletionProvider;
+  editorLanguageDefinition: LanguageDefinition;
 };
 
-export function QueryEditorRaw({ children, onChange, query, width, height, completionProvider }: Props) {
+export function QueryEditorRaw({ children, onChange, query, width, height, editorLanguageDefinition }: Props) {
   // We need to pass query via ref to SQLEditor as onChange is executed via monacoEditor.onDidChangeModelContent callback, not onChange property
   const queryRef = useRef<SQLQuery>(query);
   useEffect(() => {
@@ -39,7 +38,7 @@ export function QueryEditorRaw({ children, onChange, query, width, height, compl
       height={height}
       query={query.rawSql!}
       onChange={onRawQueryChange}
-      language={{ id: 'sql', completionProvider, formatter: formatSQL }}
+      language={editorLanguageDefinition}
     >
       {children}
     </SQLEditor>
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx b/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx
index 994c26267e9..9844a934cdb 100644
--- a/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx
+++ b/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx
@@ -25,12 +25,12 @@ export function RawEditor({ db, query, onChange, onRunQuery, onValidate, queryTo
   const [toolboxRef, toolboxMeasure] = useMeasure<HTMLDivElement>();
   const [editorRef, editorMeasure] = useMeasure<HTMLDivElement>();
 
-  const completionProvider = useMemo(() => db.getSqlCompletionProvider(), [db]);
+  const editorLanguageDefinition = useMemo(() => db.getEditorLanguageDefinition(), [db]);
 
   const renderQueryEditor = (width?: number, height?: number) => {
     return (
       <QueryEditorRaw
-        completionProvider={completionProvider}
+        editorLanguageDefinition={editorLanguageDefinition}
         query={query}
         width={width}
         height={height ? height - toolboxMeasure.height : undefined}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx
index b486d4998ff..b6de6b27552 100644
--- a/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx
+++ b/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import { useAsync } from 'react-use';
 
 import { SelectableValue, toOption } from '@grafana/data';
 
+import { COMMON_AGGREGATE_FNS } from '../../constants';
 import { QueryWithDefaults } from '../../defaults';
 import { DB, SQLQuery } from '../../types';
 import { useSqlChange } from '../../utils/useSqlChange';
@@ -18,18 +18,14 @@ interface SQLSelectRowProps {
 
 export function SQLSelectRow({ fields, query, onQueryChange, db }: SQLSelectRowProps) {
   const { onSqlChange } = useSqlChange({ query, onQueryChange, db });
-
-  const state = useAsync(async () => {
-    const functions = await db.functions();
-    return functions.map((f) => toOption(f.name));
-  }, [db]);
+  const functions = [...COMMON_AGGREGATE_FNS, ...(db.functions?.() || [])].map(toOption);
 
   return (
     <SelectRow
       columns={fields}
       sql={query.sql!}
       format={query.format}
-      functions={state.value}
+      functions={functions}
       onSqlChange={onSqlChange}
     />
   );
diff --git a/public/app/features/plugins/sql/constants.ts b/public/app/features/plugins/sql/constants.ts
index d466f2163d3..0d3466aecc6 100644
--- a/public/app/features/plugins/sql/constants.ts
+++ b/public/app/features/plugins/sql/constants.ts
@@ -1,115 +1,4 @@
-import { OperatorType } from './types';
-
-export const AGGREGATE_FNS = [
-  {
-    id: 'AVG',
-    name: 'AVG',
-    description: `AVG(
-    [DISTINCT]
-    expression
-  )
-  [OVER (...)]
-
-  Returns the average of non-NULL input values, or NaN if the input contains a NaN.`,
-  },
-  {
-    id: 'COUNT',
-    name: 'COUNT',
-    description: `COUNT(*)  [OVER (...)]
-  Returns the number of rows in the input.
-
-  COUNT(
-    [DISTINCT]
-    expression
-  )
-  [OVER (...)]
-
-  Returns the number of rows with expression evaluated to any value other than NULL.
-  `,
-  },
-  {
-    id: 'MAX',
-    name: 'MAX',
-    description: `MAX(
-    expression
-  )
-  [OVER (...)]
-
-  Returns the maximum value of non-NULL expressions. Returns NULL if there are zero input rows or expression evaluates to NULL for all rows. Returns NaN if the input contains a NaN.
-  `,
-  },
-  {
-    id: 'MIN',
-    name: 'MIN',
-    description: `MIN(
-    expression
-  )
-  [OVER (...)]
-
-  Returns the minimum value of non-NULL expressions. Returns NULL if there are zero input rows or expression evaluates to NULL for all rows. Returns NaN if the input contains a NaN.
-  `,
-  },
-  {
-    id: 'SUM',
-    name: 'SUM',
-    description: `SUM(
-    [DISTINCT]
-    expression
-  )
-  [OVER (...)]
-
-  Returns the sum of non-null values.
-
-  If the expression is a floating point value, the sum is non-deterministic, which means you might receive a different result each time you use this function.
-  `,
-  },
-];
-
-export const OPERATORS = [
-  { type: OperatorType.Comparison, id: 'LESS_THAN', operator: '<', description: 'Returns TRUE if X is less than Y.' },
-  {
-    type: OperatorType.Comparison,
-    id: 'LESS_THAN_EQUAL',
-    operator: '<=',
-    description: 'Returns TRUE if X is less than or equal to Y.',
-  },
-  {
-    type: OperatorType.Comparison,
-    id: 'GREATER_THAN',
-    operator: '>',
-    description: 'Returns TRUE if X is greater than Y.',
-  },
-  {
-    type: OperatorType.Comparison,
-    id: 'GREATER_THAN_EQUAL',
-    operator: '>=',
-    description: 'Returns TRUE if X is greater than or equal to Y.',
-  },
-  { type: OperatorType.Comparison, id: 'EQUAL', operator: '=', description: 'Returns TRUE if X is equal to Y.' },
-  {
-    type: OperatorType.Comparison,
-    id: 'NOT_EQUAL',
-    operator: '!=',
-    description: 'Returns TRUE if X is not equal to Y.',
-  },
-  {
-    type: OperatorType.Comparison,
-    id: 'NOT_EQUAL_ALT',
-    operator: '<>',
-    description: 'Returns TRUE if X is not equal to Y.',
-  },
-  {
-    type: OperatorType.Comparison,
-    id: 'LIKE',
-    operator: 'LIKE',
-    description: `Checks if the STRING in the first operand X matches a pattern specified by the second operand Y. Expressions can contain these characters:
-- A percent sign "%" matches any number of characters or bytes
-- An underscore "_" matches a single character or byte
-- You can escape "\", "_", or "%" using two backslashes. For example, "\\%". If you are using raw strings, only a single backslash is required. For example, r"\%".`,
-  },
-  { type: OperatorType.Logical, id: 'AND', operator: 'AND' },
-  { type: OperatorType.Logical, id: 'OR', operator: 'OR' },
-];
+export const COMMON_AGGREGATE_FNS = ['AVG', 'COUNT', 'MAX', 'MIN', 'SUM'];
 
 export const MACRO_NAMES = [
   '$__time',
diff --git a/public/app/features/plugins/sql/types.ts b/public/app/features/plugins/sql/types.ts
index 2f630799d55..71e2c036d3d 100644
--- a/public/app/features/plugins/sql/types.ts
+++ b/public/app/features/plugins/sql/types.ts
@@ -9,7 +9,7 @@ import {
   TimeRange,
   toOption as toOptionFromData,
 } from '@grafana/data';
-import { CompletionItemKind, EditorMode, LanguageCompletionProvider } from '@grafana/experimental';
+import { CompletionItemKind, EditorMode, LanguageDefinition } from '@grafana/experimental';
 
 import { QueryWithDefaults } from './defaults';
 import {
@@ -122,12 +122,6 @@ export interface SQLSelectableValue extends SelectableValue {
   raqbFieldType?: RAQBFieldTypes;
 }
 
-export interface Aggregate {
-  id: string;
-  name: string;
-  description?: string;
-}
-
 export interface DB {
   init?: (datasourceId?: string) => Promise<boolean>;
   datasets: () => Promise<string[]>;
@@ -136,10 +130,10 @@ export interface DB {
   validateQuery: (query: SQLQuery, range?: TimeRange) => Promise<ValidationResults>;
   dsID: () => number;
   dispose?: (dsID?: string) => void;
-  lookup: (path?: string) => Promise<Array<{ name: string; completion: string }>>;
-  getSqlCompletionProvider: () => LanguageCompletionProvider;
+  lookup?: (path?: string) => Promise<Array<{ name: string; completion: string }>>;
+  getEditorLanguageDefinition: () => LanguageDefinition;
   toRawSql?: (query: SQLQuery) => string;
-  functions: () => Promise<Aggregate[]>;
+  functions?: () => string[];
 }
 
 export interface QueryEditorProps {
@@ -173,18 +167,3 @@ export interface MetaDefinition {
   completion?: string;
   kind: CompletionItemKind;
 }
-
-export {
-  CompletionItemKind,
-  LanguageCompletionProvider,
-  LinkedToken,
-  ColumnDefinition,
-  CompletionItemPriority,
-  StatementPlacementProvider,
-  SuggestionKindProvider,
-  TableDefinition,
-  TokenType,
-  OperatorType,
-  StatementPosition,
-  PositionContext,
-} from '@grafana/experimental';
diff --git a/public/app/plugins/datasource/cloudwatch/dynamic-labels/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/dynamic-labels/CompletionItemProvider.test.ts
index ac72a4f30b7..faad6652c1a 100644
--- a/public/app/plugins/datasource/cloudwatch/dynamic-labels/CompletionItemProvider.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/dynamic-labels/CompletionItemProvider.test.ts
@@ -1,5 +1,5 @@
+import { CompletionItemPriority } from '@grafana/experimental';
 import { Monaco, monacoTypes } from '@grafana/ui';
-import { CompletionItemPriority } from 'app/features/plugins/sql';
 
 import { afterLabelValue, insideLabelValue } from '../__mocks__/dynamic-label-test-data';
 import MonacoMock from '../__mocks__/monarch/Monaco';
diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts
index 308cebaf6e6..0ceacf28e0a 100644
--- a/public/app/plugins/datasource/mssql/datasource.ts
+++ b/public/app/plugins/datasource/mssql/datasource.ts
@@ -1,8 +1,9 @@
 import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
+import { LanguageDefinition } from '@grafana/experimental';
 import { TemplateSrv } from '@grafana/runtime';
-import { AGGREGATE_FNS } from 'app/features/plugins/sql/constants';
 import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { DB, LanguageCompletionProvider, SQLQuery, SQLSelectableValue } from 'app/features/plugins/sql/types';
+import { DB, SQLQuery, SQLSelectableValue } from 'app/features/plugins/sql/types';
+import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
 
 import { getSchema, showDatabases, getSchemaAndName } from './MSSqlMetaQuery';
 import { MSSqlQueryModel } from './MSSqlQueryModel';
@@ -11,7 +12,7 @@ import { getIcon, getRAQBType, toRawSql } from './sqlUtil';
 import { MssqlOptions } from './types';
 
 export class MssqlDatasource extends SqlDatasource {
-  completionProvider: LanguageCompletionProvider | undefined = undefined;
+  sqlLanguageDefinition: LanguageDefinition | undefined = undefined;
   constructor(instanceSettings: DataSourceInstanceSettings<MssqlOptions>) {
     super(instanceSettings);
   }
@@ -48,16 +49,20 @@ export class MssqlDatasource extends SqlDatasource {
     return result;
   }
 
-  getSqlCompletionProvider(db: DB): LanguageCompletionProvider {
-    if (this.completionProvider !== undefined) {
-      return this.completionProvider;
+  getSqlLanguageDefinition(db: DB): LanguageDefinition {
+    if (this.sqlLanguageDefinition !== undefined) {
+      return this.sqlLanguageDefinition;
     }
     const args = {
       getColumns: { current: (query: SQLQuery) => fetchColumns(db, query) },
       getTables: { current: (dataset?: string) => fetchTables(db, dataset) },
     };
-    this.completionProvider = getSqlCompletionProvider(args);
-    return this.completionProvider;
+    this.sqlLanguageDefinition = {
+      id: 'sql',
+      completionProvider: getSqlCompletionProvider(args),
+      formatter: formatSQL,
+    };
+    return this.sqlLanguageDefinition;
   }
 
   getDB(): DB {
@@ -68,7 +73,7 @@ export class MssqlDatasource extends SqlDatasource {
       init: () => Promise.resolve(true),
       datasets: () => this.fetchDatasets(),
       tables: (dataset?: string) => this.fetchTables(dataset),
-      getSqlCompletionProvider: () => this.getSqlCompletionProvider(this.db),
+      getEditorLanguageDefinition: () => this.getSqlLanguageDefinition(this.db),
       fields: async (query: SQLQuery) => {
         if (!query?.dataset || !query?.table) {
           return [];
@@ -83,7 +88,7 @@ export class MssqlDatasource extends SqlDatasource {
       lookup: async (path?: string) => {
         if (!path) {
           const datasets = await this.fetchDatasets();
-          return datasets.map((d) => ({ name: d, completion: d }));
+          return datasets.map((d) => ({ name: d, completion: `${d}.` }));
         } else {
           const parts = path.split('.').filter((s: string) => s);
           if (parts.length > 2) {
@@ -97,7 +102,6 @@ export class MssqlDatasource extends SqlDatasource {
           }
         }
       },
-      functions: async () => AGGREGATE_FNS,
     };
   }
 }
diff --git a/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts b/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts
index 00f1ae63b44..c49b65d241d 100644
--- a/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts
+++ b/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts
@@ -1,18 +1,13 @@
-import { TableIdentifier } from '@grafana/experimental';
-import { AGGREGATE_FNS, OPERATORS } from 'app/features/plugins/sql/constants';
 import {
   ColumnDefinition,
-  CompletionItemKind,
-  CompletionItemPriority,
-  DB,
+  getStandardSQLCompletionProvider,
   LanguageCompletionProvider,
   LinkedToken,
-  SQLQuery,
-  StatementPlacementProvider,
-  SuggestionKindProvider,
   TableDefinition,
+  TableIdentifier,
   TokenType,
-} from 'app/features/plugins/sql/types';
+} from '@grafana/experimental';
+import { DB, SQLQuery } from 'app/features/plugins/sql/types';
 
 interface CompletionProviderGetterArgs {
   getColumns: React.MutableRefObject<(t: SQLQuery) => Promise<ColumnDefinition[]>>;
@@ -21,13 +16,17 @@ interface CompletionProviderGetterArgs {
 
 export const getSqlCompletionProvider: (args: CompletionProviderGetterArgs) => LanguageCompletionProvider =
   ({ getColumns, getTables }) =>
-  () => ({
-    triggerCharacters: ['.', ' ', '$', ',', '(', "'"],
+  (monaco, language) => ({
+    ...(language && getStandardSQLCompletionProvider(monaco, language)),
     tables: {
-      resolve: async () => {
-        return await getTables.current();
+      resolve: async (identifier) => {
+        return await getTables.current(identifier.table);
       },
       parseName: (token: LinkedToken) => {
+        if (!token) {
+          return { table: '' };
+        }
+
         let processedToken = token;
         let tablePath = processedToken.value;
 
@@ -36,6 +35,10 @@ export const getSqlCompletionProvider: (args: CompletionProviderGetterArgs) => L
           processedToken = processedToken.next;
         }
 
+        if (processedToken.value.endsWith('.')) {
+          tablePath = processedToken.value.slice(0, processedToken.value.length - 1);
+        }
+
         return { table: tablePath };
       },
     },
@@ -50,74 +53,8 @@ export const getSqlCompletionProvider: (args: CompletionProviderGetterArgs) => L
         return await getColumns.current({ table: `${schema}.${tableName}`, dataset: database, refId: 'A' });
       },
     },
-    supportedFunctions: () => AGGREGATE_FNS,
-    supportedOperators: () => OPERATORS,
-    customSuggestionKinds: customSuggestionKinds(getTables, getColumns),
-    customStatementPlacement,
   });
 
-export enum CustomStatementPlacement {
-  AfterDatabase = 'afterDatabase',
-}
-
-export enum CustomSuggestionKind {
-  TablesWithinDatabase = 'tablesWithinDatabase',
-}
-
-export const customStatementPlacement: StatementPlacementProvider = () => [
-  {
-    id: CustomStatementPlacement.AfterDatabase,
-    resolve: (currentToken, previousKeyword) => {
-      return Boolean(
-        currentToken?.is(TokenType.Delimiter, '.') ||
-          (currentToken?.is(TokenType.Whitespace) && currentToken?.previous?.is(TokenType.Delimiter, '.')) ||
-          (currentToken?.isNumber() && currentToken.value.endsWith('.'))
-      );
-    },
-  },
-];
-
-export const customSuggestionKinds: (
-  getTables: CompletionProviderGetterArgs['getTables'],
-  getFields: CompletionProviderGetterArgs['getColumns']
-) => SuggestionKindProvider = (getTables) => () =>
-  [
-    {
-      id: CustomSuggestionKind.TablesWithinDatabase,
-      applyTo: [CustomStatementPlacement.AfterDatabase],
-      suggestionsResolver: async (ctx) => {
-        const tablePath = ctx.currentToken ? getDatabaseName(ctx.currentToken) : '';
-        const t = await getTables.current(tablePath);
-
-        return t.map((table) => ({
-          label: table.name,
-          insertText: table.completion ?? table.name,
-          command: { id: 'editor.action.triggerSuggest', title: '' },
-          kind: CompletionItemKind.Field,
-          sortText: CompletionItemPriority.High,
-          range: {
-            ...ctx.range,
-            startColumn: ctx.range.endColumn,
-            endColumn: ctx.range.endColumn,
-          },
-        }));
-      },
-    },
-  ];
-
-export function getDatabaseName(token: LinkedToken) {
-  let processedToken = token;
-  let database = '';
-  while (processedToken?.previous && !processedToken.previous.isWhiteSpace()) {
-    processedToken = processedToken.previous;
-    database = processedToken.value + database;
-  }
-
-  database = database.trim();
-
-  return database;
-}
-
 export async function fetchColumns(db: DB, q: SQLQuery) {
   const cols = await db.fields(q);
   if (cols.length > 0) {
@@ -130,6 +67,6 @@ export async function fetchColumns(db: DB, q: SQLQuery) {
 }
 
 export async function fetchTables(db: DB, dataset?: string) {
-  const tables = await db.lookup(dataset);
-  return tables;
+  const tables = await db.lookup?.(dataset);
+  return tables || [];
 }
diff --git a/public/app/plugins/datasource/mysql/MySqlDatasource.ts b/public/app/plugins/datasource/mysql/MySqlDatasource.ts
index 48e89788fd0..31dabe46f1e 100644
--- a/public/app/plugins/datasource/mysql/MySqlDatasource.ts
+++ b/public/app/plugins/datasource/mysql/MySqlDatasource.ts
@@ -1,39 +1,41 @@
 import { DataSourceInstanceSettings, ScopedVars, TimeRange } from '@grafana/data';
+import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/experimental';
 import { TemplateSrv } from '@grafana/runtime';
 import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { CompletionItemKind, DB, LanguageCompletionProvider, SQLQuery } from 'app/features/plugins/sql/types';
+import { DB, SQLQuery } from 'app/features/plugins/sql/types';
+import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
 
 import MySQLQueryModel from './MySqlQueryModel';
 import { mapFieldsToTypes } from './fields';
 import { buildColumnQuery, buildTableQuery, showDatabases } from './mySqlMetaQuery';
-import { fetchColumns, fetchTables, getFunctions, getSqlCompletionProvider } from './sqlCompletionProvider';
+import { getSqlCompletionProvider } from './sqlCompletionProvider';
 import { MySQLOptions } from './types';
 
 export class MySqlDatasource extends SqlDatasource {
-  completionProvider: LanguageCompletionProvider | undefined;
+  sqlLanguageDefinition: LanguageDefinition | undefined;
 
   constructor(private instanceSettings: DataSourceInstanceSettings<MySQLOptions>) {
     super(instanceSettings);
-    this.completionProvider = undefined;
   }
 
   getQueryModel(target?: Partial<SQLQuery>, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): MySQLQueryModel {
     return new MySQLQueryModel(target!, templateSrv, scopedVars);
   }
 
-  getSqlCompletionProvider(db: DB): LanguageCompletionProvider {
-    if (this.completionProvider !== undefined) {
-      return this.completionProvider;
+  getSqlLanguageDefinition(db: DB): LanguageDefinition {
+    if (this.sqlLanguageDefinition !== undefined) {
+      return this.sqlLanguageDefinition;
     }
 
     const args = {
-      getColumns: { current: (query: SQLQuery) => fetchColumns(db, query) },
-      getTables: { current: (dataset?: string) => fetchTables(db, { dataset }) },
-      fetchMeta: { current: (path?: string) => this.fetchMeta(path) },
-      getFunctions: { current: () => getFunctions() },
+      getMeta: { current: (identifier?: TableIdentifier) => this.fetchMeta(identifier) },
     };
-    this.completionProvider = getSqlCompletionProvider(args);
-    return this.completionProvider;
+    this.sqlLanguageDefinition = {
+      id: 'sql',
+      completionProvider: getSqlCompletionProvider(args),
+      formatter: formatSQL,
+    };
+    return this.sqlLanguageDefinition;
   }
 
   async fetchDatasets(): Promise<string[]> {
@@ -56,28 +58,20 @@ export class MySqlDatasource extends SqlDatasource {
     return mapFieldsToTypes(fields);
   }
 
-  async fetchMeta(path?: string) {
+  async fetchMeta(identifier?: TableIdentifier) {
     const defaultDB = this.instanceSettings.jsonData.database;
-    path = path?.trim();
-    if (!path && defaultDB) {
+    if (!identifier?.schema && defaultDB) {
       const tables = await this.fetchTables(defaultDB);
-      return tables.map((t) => ({ name: t, completion: t, kind: CompletionItemKind.Class }));
-    } else if (!path) {
+      return tables.map((t) => ({ name: t, completion: `${defaultDB}.${t}`, kind: CompletionItemKind.Class }));
+    } else if (!identifier?.schema && !defaultDB) {
       const datasets = await this.fetchDatasets();
       return datasets.map((d) => ({ name: d, completion: `${d}.`, kind: CompletionItemKind.Module }));
     } else {
-      const parts = path.split('.').filter((s: string) => s);
-      if (parts.length > 2) {
-        return [];
-      }
-      if (parts.length === 1 && !defaultDB) {
-        const tables = await this.fetchTables(parts[0]);
+      if (!identifier?.table && !defaultDB) {
+        const tables = await this.fetchTables(identifier?.schema);
         return tables.map((t) => ({ name: t, completion: t, kind: CompletionItemKind.Class }));
-      } else if (parts.length === 1 && defaultDB) {
-        const fields = await this.fetchFields({ dataset: defaultDB, table: parts[0] });
-        return fields.map((t) => ({ name: t.value, completion: t.value, kind: CompletionItemKind.Field }));
-      } else if (parts.length === 2 && !defaultDB) {
-        const fields = await this.fetchFields({ dataset: parts[0], table: parts[1] });
+      } else if (identifier?.table && identifier.schema) {
+        const fields = await this.fetchFields({ dataset: identifier.schema, table: identifier.table });
         return fields.map((t) => ({ name: t.value, completion: t.value, kind: CompletionItemKind.Field }));
       } else {
         return [];
@@ -96,9 +90,8 @@ export class MySqlDatasource extends SqlDatasource {
       validateQuery: (query: SQLQuery, range?: TimeRange) =>
         Promise.resolve({ query, error: '', isError: false, isValid: true }),
       dsID: () => this.id,
-      lookup: (path?: string) => this.fetchMeta(path),
-      getSqlCompletionProvider: () => this.getSqlCompletionProvider(this.db),
-      functions: async () => getFunctions(),
+      functions: () => ['VARIANCE', 'STDDEV'],
+      getEditorLanguageDefinition: () => this.getSqlLanguageDefinition(this.db),
     };
   }
 }
diff --git a/public/app/plugins/datasource/mysql/functions.ts b/public/app/plugins/datasource/mysql/functions.ts
deleted file mode 100644
index 0ccb8ce0165..00000000000
--- a/public/app/plugins/datasource/mysql/functions.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export const FUNCTIONS = [
-  {
-    id: 'STDDEV',
-    name: 'STDDEV',
-    description: `STDDEV(
-    expression
-  )
-
-  Returns the standard deviation of non-NULL input values, or NaN if the input contains a NaN.`,
-  },
-  {
-    id: 'VARIANCE',
-    name: 'VARIANCE',
-    description: `VARIANCE(
-    expression
-  )
-
-  Returns the variance of non-NULL input values, or NaN if the input contains a NaN.`,
-  },
-];
diff --git a/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts b/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts
index 6025456c4e5..8500d59dfa1 100644
--- a/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts
+++ b/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts
@@ -1,284 +1,22 @@
-import { AGGREGATE_FNS, OPERATORS } from 'app/features/plugins/sql/constants';
 import {
-  Aggregate,
-  ColumnDefinition,
-  CompletionItemKind,
-  CompletionItemPriority,
-  DB,
+  getStandardSQLCompletionProvider,
   LanguageCompletionProvider,
-  LinkedToken,
-  MetaDefinition,
-  PositionContext,
-  SQLQuery,
-  StatementPlacementProvider,
-  StatementPosition,
-  SuggestionKindProvider,
   TableDefinition,
-  TokenType,
-} from 'app/features/plugins/sql/types';
-
-import { FUNCTIONS } from './functions';
+  TableIdentifier,
+} from '@grafana/experimental';
 
 interface CompletionProviderGetterArgs {
-  getColumns: React.MutableRefObject<(t: SQLQuery) => Promise<ColumnDefinition[]>>;
-  getTables: React.MutableRefObject<(d?: string) => Promise<TableDefinition[]>>;
-  fetchMeta: React.MutableRefObject<(d?: string) => Promise<MetaDefinition[]>>;
-  getFunctions: React.MutableRefObject<(d?: string) => Aggregate[]>;
+  getMeta: React.MutableRefObject<(t?: TableIdentifier) => Promise<TableDefinition[]>>;
 }
 
 export const getSqlCompletionProvider: (args: CompletionProviderGetterArgs) => LanguageCompletionProvider =
-  ({ getColumns, getTables, fetchMeta, getFunctions }) =>
-  () => ({
-    triggerCharacters: ['.', ' ', '$', ',', '(', "'"],
-    supportedFunctions: () => getFunctions.current(),
-    supportedOperators: () => OPERATORS,
-    customSuggestionKinds: customSuggestionKinds(getTables, getColumns, fetchMeta),
-    customStatementPlacement,
+  ({ getMeta }) =>
+  (monaco, language) => ({
+    ...(language && getStandardSQLCompletionProvider(monaco, language)),
+    tables: {
+      resolve: getMeta.current,
+    },
+    columns: {
+      resolve: getMeta.current,
+    },
   });
-
-export enum CustomStatementPlacement {
-  AfterDataset = 'afterDataset',
-  AfterFrom = 'afterFrom',
-  AfterSelect = 'afterSelect',
-}
-
-export enum CustomSuggestionKind {
-  TablesWithinDataset = 'tablesWithinDataset',
-}
-
-export enum Direction {
-  Next = 'next',
-  Previous = 'previous',
-}
-
-const TRIGGER_SUGGEST = 'editor.action.triggerSuggest';
-
-enum Keyword {
-  Select = 'SELECT',
-  Where = 'WHERE',
-  From = 'FROM',
-}
-
-export const customStatementPlacement: StatementPlacementProvider = () => [
-  {
-    id: CustomStatementPlacement.AfterDataset,
-    resolve: (currentToken, previousKeyword) => {
-      return Boolean(
-        currentToken?.is(TokenType.Delimiter, '.') ||
-          (currentToken?.is(TokenType.Whitespace) && currentToken?.previous?.is(TokenType.Delimiter, '.'))
-      );
-    },
-  },
-  {
-    id: CustomStatementPlacement.AfterFrom,
-    resolve: (currentToken, previousKeyword) => {
-      return Boolean(isAfterFrom(currentToken));
-    },
-  },
-  {
-    id: CustomStatementPlacement.AfterSelect,
-    resolve: (token, previousKeyword) => {
-      const is =
-        isDirectlyAfter(token, Keyword.Select) ||
-        (isAfterSelect(token) && token?.previous?.is(TokenType.Delimiter, ','));
-      return Boolean(is);
-    },
-  },
-];
-
-export const customSuggestionKinds: (
-  getTables: CompletionProviderGetterArgs['getTables'],
-  getFields: CompletionProviderGetterArgs['getColumns'],
-  fetchMeta: CompletionProviderGetterArgs['fetchMeta']
-) => SuggestionKindProvider = (getTables, _, fetchMeta) => () =>
-  [
-    {
-      id: CustomSuggestionKind.TablesWithinDataset,
-      applyTo: [CustomStatementPlacement.AfterDataset],
-      suggestionsResolver: async (ctx) => {
-        const tablePath = ctx.currentToken ? getTablePath(ctx.currentToken) : '';
-        const t = await getTables.current(tablePath);
-        return t.map((table) => suggestion(table.name, table.completion ?? table.name, CompletionItemKind.Field, ctx));
-      },
-    },
-    {
-      id: 'metaAfterSelect',
-      applyTo: [CustomStatementPlacement.AfterSelect],
-      suggestionsResolver: async (ctx) => {
-        const path = getPath(ctx.currentToken, Direction.Next);
-        const t = await fetchMeta.current(path);
-        return t.map((meta) => {
-          const completion = meta.kind === CompletionItemKind.Class ? `${meta.completion}.` : meta.completion;
-          return suggestion(meta.name, completion!, meta.kind, ctx);
-        });
-      },
-    },
-    {
-      id: 'metaAfterSelectFuncArg',
-      applyTo: [StatementPosition.AfterSelectFuncFirstArgument],
-      suggestionsResolver: async (ctx) => {
-        const path = getPath(ctx.currentToken, Direction.Next);
-        const t = await fetchMeta.current(path);
-        return t.map((meta) => {
-          const completion = meta.kind === CompletionItemKind.Class ? `${meta.completion}.` : meta.completion;
-          return suggestion(meta.name, completion!, meta.kind, ctx);
-        });
-      },
-    },
-    {
-      id: 'metaAfterFrom',
-      applyTo: [CustomStatementPlacement.AfterFrom],
-      suggestionsResolver: async (ctx) => {
-        // TODO: why is this triggering when isAfterFrom is false
-        if (!isAfterFrom(ctx.currentToken)) {
-          return [];
-        }
-        const path = ctx.currentToken?.value || '';
-        const t = await fetchMeta.current(path);
-        return t.map((meta) => suggestion(meta.name, meta.completion!, meta.kind, ctx));
-      },
-    },
-    {
-      id: `MYSQL${StatementPosition.WhereKeyword}`,
-      applyTo: [StatementPosition.WhereKeyword],
-      suggestionsResolver: async (ctx) => {
-        const path = getPath(ctx.currentToken, Direction.Previous);
-        const t = await fetchMeta.current(path);
-        return t.map((meta) => {
-          const completion = meta.kind === CompletionItemKind.Class ? `${meta.completion}.` : meta.completion;
-          return suggestion(meta.name, completion!, meta.kind, ctx);
-        });
-      },
-    },
-    {
-      id: StatementPosition.WhereComparisonOperator,
-      applyTo: [StatementPosition.WhereComparisonOperator],
-      suggestionsResolver: async (ctx) => {
-        if (!isAfterWhere(ctx.currentToken)) {
-          return [];
-        }
-        const path = getPath(ctx.currentToken, Direction.Previous);
-        const t = await fetchMeta.current(path);
-        const sugg = t.map((meta) => {
-          const completion = meta.kind === CompletionItemKind.Class ? `${meta.completion}.` : meta.completion;
-          return suggestion(meta.name, completion!, meta.kind, ctx);
-        });
-        return sugg;
-      },
-    },
-  ];
-
-function getPath(token: LinkedToken | null, direction: Direction) {
-  let path = token?.value || '';
-  const fromValue = keywordValue(token, Keyword.From, direction);
-  if (fromValue) {
-    path = fromValue;
-  }
-  return path;
-}
-
-export function getTablePath(token: LinkedToken) {
-  let processedToken = token;
-  let tablePath = '';
-  while (processedToken?.previous && !processedToken.previous.isWhiteSpace()) {
-    processedToken = processedToken.previous;
-    tablePath = processedToken.value + tablePath;
-  }
-
-  tablePath = tablePath.trim();
-  return tablePath;
-}
-
-function suggestion(label: string, completion: string, kind: CompletionItemKind, ctx: PositionContext) {
-  return {
-    label,
-    insertText: completion,
-    command: { id: TRIGGER_SUGGEST, title: '' },
-    kind,
-    sortText: CompletionItemPriority.High,
-    range: {
-      ...ctx.range,
-      startColumn: ctx.range.endColumn,
-      endColumn: ctx.range.endColumn,
-    },
-  };
-}
-
-function isAfterSelect(token: LinkedToken | null) {
-  return isAfterKeyword(token, Keyword.Select);
-}
-
-function isAfterFrom(token: LinkedToken | null) {
-  return isDirectlyAfter(token, Keyword.From);
-}
-
-function isAfterWhere(token: LinkedToken | null) {
-  return isAfterKeyword(token, Keyword.Where);
-}
-
-function isAfterKeyword(token: LinkedToken | null, keyword: string) {
-  if (!token?.is(TokenType.Keyword)) {
-    let curToken = token;
-    while (true) {
-      if (!curToken) {
-        return false;
-      }
-      if (curToken.is(TokenType.Keyword, keyword)) {
-        return true;
-      }
-      if (curToken.isKeyword()) {
-        return false;
-      }
-      curToken = curToken?.previous || null;
-    }
-  }
-  return false;
-}
-
-function isDirectlyAfter(token: LinkedToken | null, keyword: string) {
-  return token?.is(TokenType.Whitespace) && token?.previous?.is(TokenType.Keyword, keyword);
-}
-
-function keywordValue(token: LinkedToken | null, keyword: Keyword, direction: Direction) {
-  let next = token;
-  while (next) {
-    if (next.is(TokenType.Keyword, keyword)) {
-      return tokenValue(next);
-    }
-    next = next[direction];
-  }
-  return false;
-}
-
-function tokenValue(token: LinkedToken | null): string | undefined {
-  const ws = token?.next;
-  if (ws?.isWhiteSpace()) {
-    const v = ws.next;
-    const delim = v?.next;
-    if (!delim?.is(TokenType.Delimiter)) {
-      return v?.value;
-    }
-    return `${v?.value}${delim?.value}${delim.next?.value}`;
-  }
-  return undefined;
-}
-
-export async function fetchColumns(db: DB, q: SQLQuery) {
-  const cols = await db.fields(q);
-  if (cols.length > 0) {
-    return cols.map((c) => {
-      return { name: c.value, type: c.value, description: c.value };
-    });
-  } else {
-    return [];
-  }
-}
-
-export async function fetchTables(db: DB, q: Partial<SQLQuery>) {
-  const tables = await db.lookup(q.dataset);
-  return tables;
-}
-
-export function getFunctions(): Aggregate[] {
-  return [...AGGREGATE_FNS, ...FUNCTIONS];
-}
diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts
index 88d87cafabb..8ec07b794ce 100644
--- a/public/app/plugins/datasource/postgres/datasource.ts
+++ b/public/app/plugins/datasource/postgres/datasource.ts
@@ -1,11 +1,10 @@
 import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
-import { AGGREGATE_FNS } from 'app/features/plugins/sql/constants';
+import { LanguageDefinition } from '@grafana/experimental';
 import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { DB, LanguageCompletionProvider, SQLQuery, SQLSelectableValue } from 'app/features/plugins/sql/types';
+import { DB, SQLQuery, SQLSelectableValue } from 'app/features/plugins/sql/types';
+import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
-import { FUNCTIONS } from '../mysql/functions';
-
 import { PostgresQueryModel } from './PostgresQueryModel';
 import { getSchema, getTimescaleDBVersion, getVersion, showTables } from './postgresMetaQuery';
 import { fetchColumns, fetchTables, getSqlCompletionProvider } from './sqlCompletionProvider';
@@ -13,7 +12,7 @@ import { getFieldConfig, toRawSql } from './sqlUtil';
 import { PostgresOptions } from './types';
 
 export class PostgresDatasource extends SqlDatasource {
-  completionProvider: LanguageCompletionProvider | undefined = undefined;
+  sqlLanguageDefinition: LanguageDefinition | undefined = undefined;
 
   constructor(instanceSettings: DataSourceInstanceSettings<PostgresOptions>) {
     super(instanceSettings);
@@ -40,19 +39,21 @@ export class PostgresDatasource extends SqlDatasource {
     return tables.fields.table.values.toArray().flat();
   }
 
-  getSqlCompletionProvider(db: DB): LanguageCompletionProvider {
-    if (this.completionProvider !== undefined) {
-      return this.completionProvider;
+  getSqlLanguageDefinition(db: DB): LanguageDefinition {
+    if (this.sqlLanguageDefinition !== undefined) {
+      return this.sqlLanguageDefinition;
     }
 
     const args = {
       getColumns: { current: (query: SQLQuery) => fetchColumns(db, query) },
       getTables: { current: () => fetchTables(db) },
-      //TODO: Add aggregate functions
-      getFunctions: { current: () => [...AGGREGATE_FNS, ...FUNCTIONS] },
     };
-    this.completionProvider = getSqlCompletionProvider(args);
-    return this.completionProvider;
+    this.sqlLanguageDefinition = {
+      id: 'pgsql',
+      completionProvider: getSqlCompletionProvider(args),
+      formatter: formatSQL,
+    };
+    return this.sqlLanguageDefinition;
   }
 
   async fetchFields(query: SQLQuery): Promise<SQLSelectableValue[]> {
@@ -74,7 +75,7 @@ export class PostgresDatasource extends SqlDatasource {
       init: () => Promise.resolve(true),
       datasets: () => Promise.resolve([]),
       tables: () => this.fetchTables(),
-      getSqlCompletionProvider: () => this.getSqlCompletionProvider(this.db),
+      getEditorLanguageDefinition: () => this.getSqlLanguageDefinition(this.db),
       fields: async (query: SQLQuery) => {
         if (!query?.table) {
           return [];
@@ -89,7 +90,6 @@ export class PostgresDatasource extends SqlDatasource {
         const tables = await this.fetchTables();
         return tables.map((t) => ({ name: t, completion: t }));
       },
-      functions: async () => AGGREGATE_FNS,
     };
   }
 }
diff --git a/public/app/plugins/datasource/postgres/sqlCompletionProvider.ts b/public/app/plugins/datasource/postgres/sqlCompletionProvider.ts
index 85f9c4a7133..485e972582d 100644
--- a/public/app/plugins/datasource/postgres/sqlCompletionProvider.ts
+++ b/public/app/plugins/datasource/postgres/sqlCompletionProvider.ts
@@ -1,14 +1,11 @@
-import { TableIdentifier } from '@grafana/experimental';
-import { AGGREGATE_FNS, OPERATORS } from 'app/features/plugins/sql/constants';
 import {
   ColumnDefinition,
-  DB,
+  getStandardSQLCompletionProvider,
   LanguageCompletionProvider,
-  SQLQuery,
   TableDefinition,
-} from 'app/features/plugins/sql/types';
-
-import { FUNCTIONS } from '../mysql/functions';
+  TableIdentifier,
+} from '@grafana/experimental';
+import { DB, SQLQuery } from 'app/features/plugins/sql/types';
 
 interface CompletionProviderGetterArgs {
   getColumns: React.MutableRefObject<(t: SQLQuery) => Promise<ColumnDefinition[]>>;
@@ -17,8 +14,8 @@ interface CompletionProviderGetterArgs {
 
 export const getSqlCompletionProvider: (args: CompletionProviderGetterArgs) => LanguageCompletionProvider =
   ({ getColumns, getTables }) =>
-  () => ({
-    triggerCharacters: ['.', ' ', '$', ',', '(', "'"],
+  (monaco, language) => ({
+    ...(language && getStandardSQLCompletionProvider(monaco, language)),
     tables: {
       resolve: async () => {
         return await getTables.current();
@@ -29,8 +26,6 @@ export const getSqlCompletionProvider: (args: CompletionProviderGetterArgs) => L
         return await getColumns.current({ table: t?.table, refId: 'A' });
       },
     },
-    supportedFunctions: () => [...AGGREGATE_FNS, ...FUNCTIONS],
-    supportedOperators: () => OPERATORS,
   });
 
 export async function fetchColumns(db: DB, q: SQLQuery) {
@@ -45,6 +40,6 @@ export async function fetchColumns(db: DB, q: SQLQuery) {
 }
 
 export async function fetchTables(db: DB) {
-  const tables = await db.lookup();
-  return tables;
+  const tables = await db.lookup?.();
+  return tables || [];
 }

From c2e847d0b009c0899838047b38d4032543dcf65b Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Wed, 23 Nov 2022 10:37:04 +0100
Subject: [PATCH 099/153] Chore: Remove createorgwithmember (#59161)

remove createorgwithmember
---
 pkg/api/annotations_test.go                      |  4 ++--
 pkg/api/org_test.go                              | 16 +++++++++-------
 pkg/api/org_users_test.go                        |  4 ++--
 pkg/api/preferences_test.go                      | 13 +++++++------
 pkg/api/team_members_test.go                     |  4 +++-
 .../resourcepermissions/store_test.go            |  4 +++-
 pkg/services/sqlstore/org.go                     |  5 -----
 pkg/tests/api/alerting/api_alertmanager_test.go  |  5 ++++-
 8 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go
index 20c0fc6dcf6..6abdceba3f2 100644
--- a/pkg/api/annotations_test.go
+++ b/pkg/api/annotations_test.go
@@ -385,7 +385,7 @@ func deleteAnnotationsScenario(t *testing.T, desc string, url string, routePatte
 func TestAPI_Annotations_AccessControl(t *testing.T) {
 	sc := setupHTTPServer(t, true)
 	setInitCtxSignedInEditor(sc.initCtx)
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	dashboardAnnotation := &annotations.Item{Id: 1, DashboardId: 1}
@@ -787,7 +787,7 @@ func TestService_AnnotationTypeScopeResolver(t *testing.T) {
 func TestAPI_MassDeleteAnnotations_AccessControl(t *testing.T) {
 	sc := setupHTTPServer(t, true)
 	setInitCtxSignedInEditor(sc.initCtx)
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	type args struct {
diff --git a/pkg/api/org_test.go b/pkg/api/org_test.go
index 49ed8000aae..4dcd2fe2e3e 100644
--- a/pkg/api/org_test.go
+++ b/pkg/api/org_test.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"strings"
@@ -9,6 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
@@ -49,7 +51,7 @@ func TestAPIEndpoint_GetCurrentOrg_LegacyAccessControl(t *testing.T) {
 	sc := setupHTTPServerWithCfg(t, true, cfg)
 	setInitCtxSignedInViewer(sc.initCtx)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	t.Run("Viewer can view CurrentOrg", func(t *testing.T) {
@@ -68,7 +70,7 @@ func TestAPIEndpoint_GetCurrentOrg_AccessControl(t *testing.T) {
 	sc := setupHTTPServer(t, true)
 	setInitCtxSignedInViewer(sc.initCtx)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	t.Run("AccessControl allows viewing CurrentOrg with correct permissions", func(t *testing.T) {
@@ -93,7 +95,7 @@ func TestAPIEndpoint_PutCurrentOrg_LegacyAccessControl(t *testing.T) {
 	cfg.RBACEnabled = false
 	sc := setupHTTPServerWithCfg(t, true, cfg)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	input := strings.NewReader(testUpdateOrgNameForm)
@@ -117,7 +119,7 @@ func TestAPIEndpoint_PutCurrentOrg_AccessControl(t *testing.T) {
 	sc := setupHTTPServer(t, true)
 	setInitCtxSignedInViewer(sc.initCtx)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", sc.initCtx.UserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: sc.initCtx.UserID})
 	require.NoError(t, err)
 
 	sc.hs.orgService, err = orgimpl.ProvideService(sc.db, sc.cfg, quotatest.New(false, nil))
@@ -148,7 +150,7 @@ func TestAPIEndpoint_PutCurrentOrgAddress_LegacyAccessControl(t *testing.T) {
 	cfg.RBACEnabled = false
 	sc := setupHTTPServerWithCfg(t, true, cfg)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	input := strings.NewReader(testUpdateOrgAddressForm)
@@ -170,7 +172,7 @@ func TestAPIEndpoint_PutCurrentOrgAddress_AccessControl(t *testing.T) {
 	sc := setupHTTPServer(t, true)
 	setInitCtxSignedInViewer(sc.initCtx)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	input := strings.NewReader(testUpdateOrgAddressForm)
@@ -206,7 +208,7 @@ func setupOrgsDBForAccessControlTests(t *testing.T, db *sqlstore.SQLStore, c acc
 
 	// Create `orgsCount` orgs
 	for i := 1; i <= int(orgID); i++ {
-		_, err := db.CreateOrgWithMember(fmt.Sprintf("TestOrg%v", i), 0)
+		err := db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: fmt.Sprintf("TestOrg%v", i), UserId: 0})
 		require.NoError(t, err)
 	}
 }
diff --git a/pkg/api/org_users_test.go b/pkg/api/org_users_test.go
index d861734c572..caf88809c64 100644
--- a/pkg/api/org_users_test.go
+++ b/pkg/api/org_users_test.go
@@ -341,9 +341,9 @@ func setupOrgUsersDBForAccessControlTests(t *testing.T, db *sqlstore.SQLStore, o
 	require.NoError(t, err)
 
 	// Create both orgs with server admin
-	_, err = db.CreateOrgWithMember(testServerAdminViewer.OrgName, testServerAdminViewer.UserID)
+	err = db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: testServerAdminViewer.OrgName, UserId: testServerAdminViewer.UserID})
 	require.NoError(t, err)
-	_, err = db.CreateOrgWithMember(testAdminOrg2.OrgName, testServerAdminViewer.UserID)
+	err = db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: testAdminOrg2.OrgName, UserId: testServerAdminViewer.UserID})
 	require.NoError(t, err)
 
 	err = orgService.AddOrgUser(context.Background(), &org.AddOrgUserCommand{LoginOrEmail: testAdminOrg2.Login, Role: testAdminOrg2.OrgRole, OrgID: testAdminOrg2.OrgID, UserID: testAdminOrg2.UserID})
diff --git a/pkg/api/preferences_test.go b/pkg/api/preferences_test.go
index 3e11d2a13a6..2edd6d75951 100644
--- a/pkg/api/preferences_test.go
+++ b/pkg/api/preferences_test.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -50,7 +51,7 @@ func TestAPIEndpoint_GetCurrentOrgPreferences_LegacyAccessControl(t *testing.T)
 	prefService.ExpectedPreference = &pref.Preference{HomeDashboardID: 1, Theme: "dark"}
 	sc.hs.preferenceService = prefService
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	setInitCtxSignedInViewer(sc.initCtx)
@@ -79,7 +80,7 @@ func TestAPIEndpoint_GetCurrentOrgPreferences_AccessControl(t *testing.T) {
 	prefService.ExpectedPreference = &pref.Preference{HomeDashboardID: 1, Theme: "dark"}
 	sc.hs.preferenceService = prefService
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	t.Run("AccessControl allows getting org preferences with correct permissions", func(t *testing.T) {
@@ -104,7 +105,7 @@ func TestAPIEndpoint_PutCurrentOrgPreferences_LegacyAccessControl(t *testing.T)
 	cfg.RBACEnabled = false
 	sc := setupHTTPServerWithCfg(t, true, cfg)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	setInitCtxSignedInViewer(sc.initCtx)
@@ -126,7 +127,7 @@ func TestAPIEndpoint_PutCurrentOrgPreferences_AccessControl(t *testing.T) {
 	sc := setupHTTPServer(t, true)
 	setInitCtxSignedInViewer(sc.initCtx)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	input := strings.NewReader(testUpdateOrgPreferencesCmd)
@@ -156,7 +157,7 @@ func TestAPIEndpoint_PatchUserPreferences(t *testing.T) {
 	cfg.RBACEnabled = false
 	sc := setupHTTPServerWithCfg(t, true, cfg)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	setInitCtxSignedInOrgAdmin(sc.initCtx)
@@ -189,7 +190,7 @@ func TestAPIEndpoint_PatchOrgPreferences(t *testing.T) {
 	cfg.RBACEnabled = false
 	sc := setupHTTPServerWithCfg(t, true, cfg)
 
-	_, err := sc.db.CreateOrgWithMember("TestOrg", testUserID)
+	err := sc.db.CreateOrg(context.Background(), &models.CreateOrgCommand{Name: "TestOrg", UserId: testUserID})
 	require.NoError(t, err)
 
 	setInitCtxSignedInOrgAdmin(sc.initCtx)
diff --git a/pkg/api/team_members_test.go b/pkg/api/team_members_test.go
index ea05e46753c..41128c9cf37 100644
--- a/pkg/api/team_members_test.go
+++ b/pkg/api/team_members_test.go
@@ -127,8 +127,10 @@ func setupTeamTestScenario(userCount int, db *sqlstore.SQLStore, t *testing.T) i
 	teamService := teamimpl.ProvideService(db, setting.NewCfg()) // FIXME
 	user, err := db.CreateUser(context.Background(), user.CreateUserCommand{SkipOrgSetup: true, Login: testUserLogin})
 	require.NoError(t, err)
-	testOrg, err := db.CreateOrgWithMember("TestOrg", user.ID)
+	cmd := &models.CreateOrgCommand{Name: "TestOrg", UserId: user.ID}
+	err = db.CreateOrg(context.Background(), cmd)
 	require.NoError(t, err)
+	testOrg := cmd.Result
 
 	team, err := teamService.CreateTeam("test", "test@test.com", testOrg.Id)
 	require.NoError(t, err)
diff --git a/pkg/services/accesscontrol/resourcepermissions/store_test.go b/pkg/services/accesscontrol/resourcepermissions/store_test.go
index 16694fb7bf4..a852d79e682 100644
--- a/pkg/services/accesscontrol/resourcepermissions/store_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/store_test.go
@@ -486,8 +486,10 @@ func seedResourcePermissions(t *testing.T, store *store, sql *sqlstore.SQLStore,
 	var org *models.Org
 	for i := 0; i < numUsers; i++ {
 		if org == nil {
-			addedOrg, err := sql.CreateOrgWithMember("test", int64(i))
+			cmd := &models.CreateOrgCommand{Name: "test", UserId: int64(i)}
+			err := sql.CreateOrg(context.Background(), cmd)
 			require.NoError(t, err)
+			addedOrg := cmd.Result
 			org = &addedOrg
 		}
 
diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go
index ce5a45e9ea7..dfad3bcd4ae 100644
--- a/pkg/services/sqlstore/org.go
+++ b/pkg/services/sqlstore/org.go
@@ -71,11 +71,6 @@ func (ss *SQLStore) createOrg(ctx context.Context, name string, userID int64, en
 	return orga, nil
 }
 
-// CreateOrgWithMember creates an organization with a certain name and a certain user as member.
-func (ss *SQLStore) CreateOrgWithMember(name string, userID int64) (models.Org, error) {
-	return ss.createOrg(context.Background(), name, userID, ss.engine)
-}
-
 func (ss *SQLStore) CreateOrg(ctx context.Context, cmd *models.CreateOrgCommand) error {
 	org, err := ss.createOrg(ctx, cmd.Name, cmd.UserId, ss.engine)
 	if err != nil {
diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
index a4ca9ab479a..a5464ddfdae 100644
--- a/pkg/tests/api/alerting/api_alertmanager_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/models"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	ngstore "github.com/grafana/grafana/pkg/services/ngalert/store"
@@ -2540,8 +2541,10 @@ func createUser(t *testing.T, store *sqlstore.SQLStore, cmd user.CreateUserComma
 }
 
 func createOrg(t *testing.T, store *sqlstore.SQLStore, name string, userID int64) int64 {
-	org, err := store.CreateOrgWithMember(name, userID)
+	cmd := &models.CreateOrgCommand{Name: name, UserId: userID}
+	err := store.CreateOrg(context.Background(), cmd)
 	require.NoError(t, err)
+	org := cmd.Result
 	return org.Id
 }
 

From 8761a71da2746f681faf51ba163d00f9299312c0 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 23 Nov 2022 10:01:57 +0000
Subject: [PATCH 100/153] Navigation: use correct id to find cloud access
 policies page (#59123)

use correct id to find cloud access policies page
---
 pkg/services/navtree/models.go               | 2 +-
 pkg/services/navtree/navtreeimpl/applinks.go | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 0ff907e17fa..e73929d123a 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -206,7 +206,7 @@ func ApplyAdminIA(root *NavTreeRoot) {
 		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))
 		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts"))
 		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys"))
-		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("plugin-page-grafana-auth-app")) // Cloud Access Policies
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app")) // Cloud Access Policies
 
 		generalNode := &NavLink{
 			Text:     "General",
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index 189315b8e1f..e59a4d6bd09 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -262,7 +262,6 @@ func (s *ServiceImpl) readNavigationSettings() {
 		"grafana-incident-app":             {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incident"},
 		"grafana-ml-app":                   {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"},
 		"grafana-cloud-link-app":           {SectionID: navtree.NavIDCfg},
-		"grafana-auth-app":                 {SectionID: navtree.NavIDCfg},
 		"grafana-easystart-app":            {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightSavedItems + 1, Text: "Connections"},
 	}
 

From 054d87e52ec6c2676228ac5dcc55d9a29c3dd4ea Mon Sep 17 00:00:00 2001
From: idafurjes <36131195+idafurjes@users.noreply.github.com>
Date: Wed, 23 Nov 2022 11:15:48 +0100
Subject: [PATCH 101/153] Chore: Remove DeleteUser from sqlstore (#59180)

* Remove DeleteUser from sqlstore

* Use Delete instead of DeleteUser

* Remove unused method
---
 pkg/services/sqlstore/user.go            |  6 -----
 pkg/services/user/userimpl/store_test.go | 31 ++----------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 8cd1270e9b2..9b97b5fda9c 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -394,12 +394,6 @@ func getTeamSelectSQLBase(filteredUsers []string) string {
 		` FROM team as team `
 }
 
-func (ss *SQLStore) DeleteUser(ctx context.Context, cmd *models.DeleteUserCommand) error {
-	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
-		return deleteUserInTransaction(ss, sess, cmd)
-	})
-}
-
 func (ss *SQLStore) DeleteUserInSession(ctx context.Context, sess *DBSession, cmd *models.DeleteUserCommand) error {
 	return deleteUserInTransaction(ss, sess, cmd)
 }
diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go
index 55c1f35a8db..ee50e622781 100644
--- a/pkg/services/user/userimpl/store_test.go
+++ b/pkg/services/user/userimpl/store_test.go
@@ -420,15 +420,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		require.Nil(t, err)
 
 		// When the user is deleted
-		err = ss.DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].ID})
+		err = userStore.Delete(context.Background(), users[1].ID)
 		require.Nil(t, err)
 
-		query1 := &org.GetOrgUsersQuery{OrgID: users[0].OrgID, User: usr}
-		query1Result, err := userStore.getOrgUsersForTest(context.Background(), query1)
-		require.Nil(t, err)
-
-		require.Len(t, query1Result, 1)
-
 		permQuery := &models.GetDashboardACLInfoListQuery{DashboardID: 1, OrgID: users[0].OrgID}
 		err = userStore.getDashboardACLInfoList(permQuery)
 		require.Nil(t, err)
@@ -492,16 +486,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		require.EqualValues(t, query5Result.TotalCount, 5)
 
 		// the user is deleted
-		err = ss.DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].ID})
+		err = userStore.Delete(context.Background(), users[1].ID)
 		require.Nil(t, err)
 
-		// delete connected org users and permissions
-		query2 := &org.GetOrgUsersQuery{OrgID: users[0].OrgID}
-		query2Result, err := userStore.getOrgUsersForTest(context.Background(), query2)
-		require.Nil(t, err)
-
-		require.Len(t, query2Result, 1)
-
 		permQuery = &models.GetDashboardACLInfoListQuery{DashboardID: 1, OrgID: users[0].OrgID}
 		err = userStore.getDashboardACLInfoList(permQuery)
 		require.Nil(t, err)
@@ -850,20 +837,6 @@ func updateDashboardACL(t *testing.T, sqlStore db.DB, dashboardID int64, items .
 	return err
 }
 
-func (ss *sqlStore) getOrgUsersForTest(ctx context.Context, query *org.GetOrgUsersQuery) ([]*org.OrgUserDTO, error) {
-	result := make([]*org.OrgUserDTO, 0)
-	err := ss.db.WithDbSession(ctx, func(dbSess *db.Session) error {
-		sess := dbSess.Table("org_user")
-		sess.Join("LEFT ", ss.dialect.Quote("user"), fmt.Sprintf("org_user.user_id=%s.id", ss.dialect.Quote("user")))
-		sess.Where("org_user.org_id=?", query.OrgID)
-		sess.Cols("org_user.org_id", "org_user.user_id", "user.email", "user.login", "org_user.role")
-
-		err := sess.Find(&result)
-		return err
-	})
-	return result, err
-}
-
 // This function was copied from pkg/services/dashboards/database to circumvent
 // import cycles. When this org-related code is refactored into a service the
 // tests can the real GetDashboardACLInfoList functions

From f1ef63791ad17d4c3b16cd296148c403515ad37d Mon Sep 17 00:00:00 2001
From: Yann Vigara <yvigara@users.noreply.github.com>
Date: Wed, 23 Nov 2022 10:31:50 +0000
Subject: [PATCH 102/153] Fix #58598 X-ID-Token header missing on Loki
 Datasource (#58784)

* Fix #58598 X-ID-Token header missing on Loki Datasource

* Remove unecessary continue statements

* Add getAuthHeadersForCallResource unit tests

* Fix test and switch statement issues introduced during merge
---
 pkg/tsdb/loki/loki.go      | 31 ++++++++--------
 pkg/tsdb/loki/loki_test.go | 74 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 pkg/tsdb/loki/loki_test.go

diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index 12a2d8561a7..6742398a226 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/textproto"
 	"regexp"
 	"strings"
 	"sync"
@@ -122,22 +123,24 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 func getHeadersForCallResource(headers map[string][]string) map[string]string {
 	data := make(map[string]string)
 
-	if auth := arrayHeaderFirstValue(headers["Authorization"]); auth != "" {
-		data["Authorization"] = auth
-	}
+	for k, values := range headers {
+		k = textproto.CanonicalMIMEHeaderKey(k)
+		firstValue := arrayHeaderFirstValue(values)
 
-	if cookie := arrayHeaderFirstValue(headers["Cookie"]); cookie != "" {
-		data["Cookie"] = cookie
+		if firstValue == "" {
+			continue
+		}
+		switch k {
+		case "Authorization":
+			data["Authorization"] = firstValue
+		case "X-Id-Token":
+			data["X-ID-Token"] = firstValue
+		case "Cookie":
+			data["Cookie"] = firstValue
+		case "Accept-Encoding":
+			data["Accept-Encoding"] = firstValue
+		}
 	}
-
-	if idToken := arrayHeaderFirstValue(headers["X-ID-Token"]); idToken != "" {
-		data["X-ID-Token"] = idToken
-	}
-
-	if encType := arrayHeaderFirstValue(headers["Accept-Encoding"]); encType != "" {
-		data["Accept-Encoding"] = encType
-	}
-
 	return data
 }
 
diff --git a/pkg/tsdb/loki/loki_test.go b/pkg/tsdb/loki/loki_test.go
new file mode 100644
index 00000000000..a7aa8a29524
--- /dev/null
+++ b/pkg/tsdb/loki/loki_test.go
@@ -0,0 +1,74 @@
+package loki
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetHeadersForCallResource(t *testing.T) {
+	const idTokn1 = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+	const idTokn2 = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjoiSm9obiBEb2UiLCJleHAiOjE2Njg2MjExODQsImlhdCI6MTY2ODYyMTE4NH0.bg0Y0S245DeANhNnnLBCfGYBseTld29O0xynhQwZZlU"
+	const authTokn1 = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+	const authTokn2 = "Bearer eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjoiSm9obiBEb2UiLCJleHAiOjE2Njg2MjExODQsImlhdCI6MTY2ODYyMTE4NH0.bg0Y0S245DeANhNnnLBCfGYBseTld29O0xynhQwZZlU"
+
+	testCases := map[string]struct {
+		headers         map[string][]string
+		expectedHeaders map[string]string
+	}{
+		"Headers with empty value": {
+			headers: map[string][]string{
+				"X-Grafana-Org-Id": {"1"},
+				"Cookie":           {""},
+				"X-Id-Token":       {""},
+				"Accept-Encoding":  {""},
+				"Authorization":    {""},
+			},
+			expectedHeaders: map[string]string{},
+		},
+		"Headers with multiple values": {
+			headers: map[string][]string{
+				"Authorization":    {authTokn1, authTokn2},
+				"Cookie":           {"a=1"},
+				"X-Grafana-Org-Id": {"1"},
+				"Accept-Encoding":  {"gzip", "compress"},
+				"X-Id-Token":       {idTokn1, idTokn2},
+			},
+			expectedHeaders: map[string]string{
+				"Authorization":   authTokn1,
+				"Cookie":          "a=1",
+				"Accept-Encoding": "gzip",
+				"X-ID-Token":      idTokn1,
+			},
+		},
+		"Headers with single value": {
+			headers: map[string][]string{
+				"Authorization":    {authTokn1},
+				"X-Grafana-Org-Id": {"1"},
+				"Cookie":           {"a=1"},
+				"Accept-Encoding":  {"gzip"},
+				"X-Id-Token":       {idTokn1},
+			},
+			expectedHeaders: map[string]string{
+				"Authorization":   authTokn1,
+				"Cookie":          "a=1",
+				"Accept-Encoding": "gzip",
+				"X-ID-Token":      idTokn1,
+			},
+		},
+		"Non Canonical 'X-Id-Token' header key": {
+			headers: map[string][]string{
+				"X-ID-TOKEN": {idTokn1},
+			},
+			expectedHeaders: map[string]string{
+				"X-ID-Token": idTokn1,
+			},
+		},
+	}
+	for name, test := range testCases {
+		t.Run(name, func(t *testing.T) {
+			headers := getHeadersForCallResource(test.headers)
+			assert.Equal(t, test.expectedHeaders, headers)
+		})
+	}
+}

From c02f2321c177bbb0af6d55a1bb6759b5017a92ee Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 23 Nov 2022 10:32:20 +0000
Subject: [PATCH 103/153] I18n: Fix variables not interpolating with pseudo
 localisation (#59145)

* I18n: Don't pseudolocalise string variables

* clean up
---
 public/locales/pseudo-LOCALE/grafana.json | 12 ++++++------
 public/locales/psuedo.js                  |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index a757286d3ce..05a7d6ea8f3 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -20,8 +20,8 @@
       "meta-tab": "Męŧä Đäŧä",
       "query-tab": "Qūęřy",
       "stats-tab": "Ŝŧäŧş",
-      "subtitle": "{{qūęřyCőūʼnŧ}} qūęřįęş ŵįŧĥ ŧőŧäľ qūęřy ŧįmę őƒ {{ƒőřmäŧŧęđ}}",
-      "title": "Ĩʼnşpęčŧ: {{päʼnęľŦįŧľę}}"
+      "subtitle": "{{queryCount}} qūęřįęş ŵįŧĥ ŧőŧäľ qūęřy ŧįmę őƒ {{formatted}}",
+      "title": "Ĩʼnşpęčŧ: {{panelTitle}}"
     },
     "inspect-data": {
       "data-options": "Đäŧä őpŧįőʼnş",
@@ -51,7 +51,7 @@
       "panel-json-description": "Ŧĥę mőđęľ şävęđ įʼn ŧĥę đäşĥþőäřđ ĴŜØŃ ŧĥäŧ čőʼnƒįģūřęş ĥőŵ ęvęřyŧĥįʼnģ ŵőřĸş.",
       "panel-json-label": "Päʼnęľ ĴŜØŃ",
       "select-source": "Ŝęľęčŧ şőūřčę",
-      "unknown": "Ůʼnĸʼnőŵʼn Øþĵęčŧ: {{şĥőŵ}}"
+      "unknown": "Ůʼnĸʼnőŵʼn Øþĵęčŧ: {{show}}"
     },
     "inspect-meta": {
       "no-inspector": "Ńő Męŧäđäŧä Ĩʼnşpęčŧőř"
@@ -95,7 +95,7 @@
   },
   "library-panels": {
     "save": {
-      "error": "Ēřřőř şävįʼnģ ľįþřäřy päʼnęľ: \"{{ęřřőřMşģ}}\"",
+      "error": "Ēřřőř şävįʼnģ ľįþřäřy päʼnęľ: \"{{errorMsg}}\"",
       "success": "Ŀįþřäřy päʼnęľ şävęđ"
     }
   },
@@ -333,7 +333,7 @@
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Åūŧő řęƒřęşĥ ŧūřʼnęđ őƒƒ. Cĥőőşę řęƒřęşĥ ŧįmę įʼnŧęřväľ",
-      "duration-selected": "Cĥőőşę řęƒřęşĥ ŧįmę įʼnŧęřväľ ŵįŧĥ čūřřęʼnŧ įʼnŧęřväľ {{đūřäŧįőʼnÅřįäĿäþęľ}} şęľęčŧęđ"
+      "duration-selected": "Cĥőőşę řęƒřęşĥ ŧįmę įʼnŧęřväľ ŵįŧĥ čūřřęʼnŧ įʼnŧęřväľ {{durationAriaLabel}} şęľęčŧęđ"
     },
     "live-option": {
       "aria-label": "Ŧūřʼn őʼn ľįvę şŧřęämįʼnģ",
@@ -474,7 +474,7 @@
     },
     "range-picker": {
       "backwards-time-aria-label": "Mővę ŧįmę řäʼnģę þäčĸŵäřđş",
-      "current-time-selected": "Ŧįmę řäʼnģę şęľęčŧęđ: {{čūřřęʼnŧŦįmęŖäʼnģę}}",
+      "current-time-selected": "Ŧįmę řäʼnģę şęľęčŧęđ: {{currentTimeRange}}",
       "forwards-time-aria-label": "Mővę ŧįmę řäʼnģę ƒőřŵäřđş",
       "to": "ŧő",
       "zoom-out-button": "Żőőm őūŧ ŧįmę řäʼnģę",
diff --git a/public/locales/psuedo.js b/public/locales/psuedo.js
index 64329e0476a..451cd4f02bd 100644
--- a/public/locales/psuedo.js
+++ b/public/locales/psuedo.js
@@ -3,7 +3,10 @@ const pseudoizer = require('pseudoizer');
 
 function pseudoizeJsonReplacer(key, value) {
   if (typeof value === 'string') {
-    return pseudoizer.pseudoize(value);
+    // Split string on brace-enclosed segments. Odd indices will be {{variables}}
+    const phraseParts = value.split(/(\{\{[^}]+}\})/g);
+    const translatedParts = phraseParts.map((str, index) => index % 2 ? str : pseudoizer.pseudoize(str))
+    return translatedParts.join("")
   }
 
   return value;

From d7a652ff7f865660a9108801e0c20c0868c6e35c Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Wed, 23 Nov 2022 11:04:38 +0000
Subject: [PATCH 104/153] User: Optimize signed in user cache management
 (#59090)

* only access the cache if a user ID is set

* ignore all negative values
---
 pkg/services/user/userimpl/user.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkg/services/user/userimpl/user.go b/pkg/services/user/userimpl/user.go
index f2250a5245d..132f556a1c2 100644
--- a/pkg/services/user/userimpl/user.go
+++ b/pkg/services/user/userimpl/user.go
@@ -232,11 +232,15 @@ func (s *Service) SetUsingOrg(ctx context.Context, cmd *user.SetUsingOrgCommand)
 
 func (s *Service) GetSignedInUserWithCacheCtx(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) {
 	var signedInUser *user.SignedInUser
-	cacheKey := newSignedInUserCacheKey(query.OrgID, query.UserID)
-	if cached, found := s.cacheService.Get(cacheKey); found {
-		cachedUser := cached.(user.SignedInUser)
-		signedInUser = &cachedUser
-		return signedInUser, nil
+
+	// only check cache if we have a user ID and an org ID in query
+	if query.OrgID > 0 && query.UserID > 0 {
+		cacheKey := newSignedInUserCacheKey(query.OrgID, query.UserID)
+		if cached, found := s.cacheService.Get(cacheKey); found {
+			cachedUser := cached.(user.SignedInUser)
+			signedInUser = &cachedUser
+			return signedInUser, nil
+		}
 	}
 
 	result, err := s.GetSignedInUser(ctx, query)
@@ -244,7 +248,7 @@ func (s *Service) GetSignedInUserWithCacheCtx(ctx context.Context, query *user.G
 		return nil, err
 	}
 
-	cacheKey = newSignedInUserCacheKey(result.OrgID, query.UserID)
+	cacheKey := newSignedInUserCacheKey(result.OrgID, result.UserID)
 	s.cacheService.Set(cacheKey, *result, time.Second*5)
 	return result, nil
 }

From a0334a92f52178da4d01b81f9704e523b3336bbe Mon Sep 17 00:00:00 2001
From: Selene <selenepinillos@gmail.com>
Date: Wed, 23 Nov 2022 12:14:35 +0100
Subject: [PATCH 105/153] Solo Panel: Configurable timezone (#59153)

* Allow to set timezone in query

* Use optional timestamp

* Update timeZone
---
 public/app/features/dashboard/containers/SoloPanelPage.tsx | 7 +++++--
 public/app/features/dashboard/dashgrid/DashboardPanel.tsx  | 4 +++-
 .../app/features/dashboard/dashgrid/PanelStateWrapper.tsx  | 5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/app/features/dashboard/containers/SoloPanelPage.tsx b/public/app/features/dashboard/containers/SoloPanelPage.tsx
index 3573aeeee31..f81bcfcb5e3 100644
--- a/public/app/features/dashboard/containers/SoloPanelPage.tsx
+++ b/public/app/features/dashboard/containers/SoloPanelPage.tsx
@@ -26,7 +26,7 @@ const mapDispatchToProps = {
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
-export type Props = GrafanaRouteComponentProps<DashboardPageRouteParams, { panelId: string }> &
+export type Props = GrafanaRouteComponentProps<DashboardPageRouteParams, { panelId: string; timezone?: string }> &
   ConnectedProps<typeof connector>;
 
 export interface State {
@@ -87,6 +87,7 @@ export class SoloPanelPage extends Component<Props, State> {
         notFound={this.state.notFound}
         panel={this.state.panel}
         panelId={this.getPanelId()}
+        timezone={this.props.queryParams.timezone}
       />
     );
   }
@@ -95,9 +96,10 @@ export class SoloPanelPage extends Component<Props, State> {
 export interface SoloPanelProps extends State {
   dashboard: DashboardModel | null;
   panelId: number;
+  timezone?: string;
 }
 
-export const SoloPanel = ({ dashboard, notFound, panel, panelId }: SoloPanelProps) => {
+export const SoloPanel = ({ dashboard, notFound, panel, panelId, timezone }: SoloPanelProps) => {
   if (notFound) {
     return <div className="alert alert-error">Panel with id {panelId} not found</div>;
   }
@@ -123,6 +125,7 @@ export const SoloPanel = ({ dashboard, notFound, panel, panelId }: SoloPanelProp
               isEditing={false}
               isViewing={false}
               lazy={false}
+              timezone={timezone}
             />
           );
         }}
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index f6b6a0cf367..4f76e07a792 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -20,6 +20,7 @@ export interface OwnProps {
   width: number;
   height: number;
   lazy?: boolean;
+  timezone?: string;
 }
 
 const mapStateToProps = (state: StoreState, props: OwnProps) => {
@@ -70,7 +71,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
   };
 
   renderPanel = (isInView: boolean) => {
-    const { dashboard, panel, isViewing, isEditing, width, height, plugin } = this.props;
+    const { dashboard, panel, isViewing, isEditing, width, height, plugin, timezone } = this.props;
 
     if (!plugin) {
       return null;
@@ -102,6 +103,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
         width={width}
         height={height}
         onInstanceStateChange={this.onInstanceStateChange}
+        timezone={timezone}
       />
     );
   };
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index c296384eec0..bcd7ebbef26 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -61,6 +61,7 @@ export interface Props {
   width: number;
   height: number;
   onInstanceStateChange: (value: any) => void;
+  timezone?: string;
 }
 
 export interface State {
@@ -521,6 +522,8 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
     // Yes this is called ever render for a function that is triggered on every mouse move
     this.eventFilter.onlyLocal = dashboard.graphTooltip === 0;
 
+    const timeZone = this.props.timezone || this.props.dashboard.getTimezone();
+
     return (
       <>
         <div className={panelContentClassNames}>
@@ -531,7 +534,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
                 data={data}
                 title={panel.title}
                 timeRange={timeRange}
-                timeZone={this.props.dashboard.getTimezone()}
+                timeZone={timeZone}
                 options={panelOptions}
                 fieldConfig={panel.fieldConfig}
                 transparent={panel.transparent}

From 0af96936be5bcc834bd83a8cce5a1c82775eb4bd Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Wed, 23 Nov 2022 13:16:00 +0200
Subject: [PATCH 106/153] Nested Folders: Do not refer to the configuration for
 checking for the flag (#59197)

* Nested Folders: Do not refer to the configuration for checking for the flag

Use always features.IsEnabled() instead

* Depend on the interface instead
---
 pkg/services/folder/folderimpl/folder.go      |  6 +++---
 pkg/services/folder/folderimpl/folder_test.go | 20 +++----------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 02f16b4b775..a274e2bcc61 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -34,7 +34,7 @@ type Service struct {
 	dashboardService dashboards.DashboardService
 	dashboardStore   dashboards.Store
 	searchService    *search.SearchService
-	features         *featuremgmt.FeatureManager
+	features         featuremgmt.FeatureToggles
 	permissions      accesscontrol.FolderPermissionsService
 	accessControl    accesscontrol.AccessControl
 
@@ -49,7 +49,7 @@ func ProvideService(
 	dashboardService dashboards.DashboardService,
 	dashboardStore dashboards.Store,
 	db db.DB, // DB for the (new) nested folder store
-	features *featuremgmt.FeatureManager,
+	features featuremgmt.FeatureToggles,
 	folderPermissionsService accesscontrol.FolderPermissionsService,
 	searchService *search.SearchService,
 ) folder.Service {
@@ -97,7 +97,7 @@ func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.
 		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 
-	if s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagNestedFolders) {
+	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
 		if ok, err := s.accessControl.Evaluate(ctx, cmd.SignedInUser, accesscontrol.EvalPermission(
 			dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(*cmd.UID),
 		)); !ok {
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index cdf5c53603b..6a30e6e5485 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -57,7 +57,6 @@ func TestIntegrationFolderService(t *testing.T) {
 		cfg := setting.NewCfg()
 		cfg.RBACEnabled = false
 		features := featuremgmt.WithFeatures()
-		cfg.IsFeatureToggleEnabled = features.IsEnabled
 		folderPermissions := acmock.NewMockedPermissionsService()
 		dashboardPermissions := acmock.NewMockedPermissionsService()
 		dashboardService := dashboardsvc.ProvideDashboardService(cfg, dashStore, nil, features, folderPermissions, dashboardPermissions, acmock.New())
@@ -333,21 +332,12 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 	dashStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 	cfg := setting.NewCfg()
 	cfg.RBACEnabled = false
-	nestedFoldersEnabled := true
-	features := featuremgmt.WithFeatures()
-	cfg.IsFeatureToggleEnabled = func(key string) bool {
-		if key == featuremgmt.FlagNestedFolders {
-			return nestedFoldersEnabled
-		}
-		return false
-	}
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
 	folderService := &Service{
 		cfg:              cfg,
 		store:            folderStore,
 		dashboardStore:   &dashStore,
 		dashboardService: &dashboardsvc,
-		features:         features,
+		features:         featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 	}
 	t.Run("create folder", func(t *testing.T) {
 		folderStore.ExpectedFolder = &folder.Folder{}
@@ -396,15 +386,13 @@ func TestNestedFolderService(t *testing.T) {
 		// nothing enabled yet
 		cfg := setting.NewCfg()
 		cfg.RBACEnabled = false
-		features := featuremgmt.WithFeatures()
-		cfg.IsFeatureToggleEnabled = features.IsEnabled
 		foldersvc := &Service{
 			cfg:              cfg,
 			log:              log.New("test-folder-service"),
 			dashboardService: &dashboardsvc,
 			dashboardStore:   &dashStore,
 			store:            store,
-			features:         features,
+			features:         featuremgmt.WithFeatures(),
 		}
 
 		t.Run("When create folder, no create in folder table done", func(t *testing.T) {
@@ -456,15 +444,13 @@ func TestNestedFolderService(t *testing.T) {
 		// nothing enabled yet
 		cfg := setting.NewCfg()
 		cfg.RBACEnabled = false
-		features := featuremgmt.WithFeatures("nestedFolders")
-		cfg.IsFeatureToggleEnabled = features.IsEnabled
 		foldersvc := &Service{
 			cfg:              cfg,
 			log:              log.New("test-folder-service"),
 			dashboardService: dashboardsvc,
 			dashboardStore:   dashStore,
 			store:            store,
-			features:         features,
+			features:         featuremgmt.WithFeatures("nestedFolders"),
 			accessControl: actest.FakeAccessControl{
 				ExpectedEvaluate: true,
 			},

From c2f31c26857f9fbc0003e2087e9d2585cd78b5e4 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 23 Nov 2022 11:34:00 +0000
Subject: [PATCH 107/153] =?UTF-8?q?Navigation:=20always=20show=20`GetStart?=
 =?UTF-8?q?edWithPlugin`=20even=20if=20there's=20install=20control=20wa?=
 =?UTF-8?q?=E2=80=A6=20(#59127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

always show `GetStartedWithPlugin` even if there's install control warnings
---
 .../app/features/plugins/admin/components/PluginActions.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/features/plugins/admin/components/PluginActions.tsx b/public/app/features/plugins/admin/components/PluginActions.tsx
index c7b9663a81b..6819da2b6e0 100644
--- a/public/app/features/plugins/admin/components/PluginActions.tsx
+++ b/public/app/features/plugins/admin/components/PluginActions.tsx
@@ -17,17 +17,19 @@ export const PluginActions = ({ plugin }: Props) => {
   const isRemotePluginsAvailable = useIsRemotePluginsAvailable();
   const latestCompatibleVersion = getLatestCompatibleVersion(plugin?.details?.versions);
 
-  if (!plugin || hasInstallControlWarning(plugin, isRemotePluginsAvailable, latestCompatibleVersion)) {
+  if (!plugin) {
     return null;
   }
 
+  const hasInstallWarning = hasInstallControlWarning(plugin, isRemotePluginsAvailable, latestCompatibleVersion);
   const isExternallyManaged = config.pluginAdminExternalManageEnabled;
   const pluginStatus = plugin.isInstalled
     ? plugin.hasUpdate
       ? PluginStatus.UPDATE
       : PluginStatus.UNINSTALL
     : PluginStatus.INSTALL;
-  const isInstallControlsDisabled = plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled();
+  const isInstallControlsDisabled =
+    plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled() || hasInstallWarning;
 
   return (
     <>

From 4e6b8f658edaa80220f0e993e4fe05a7a079e76f Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Wed, 23 Nov 2022 11:48:25 +0000
Subject: [PATCH 108/153] Chore: Refactor TreeNode.js & TreeNode.test.js to
 TypeScript (#58540)

---
 .../src/model/transform-trace-data.tsx        |  5 +-
 .../{TreeNode.test.js => TreeNode.test.ts}    |  8 ++-
 .../src/utils/{TreeNode.js => TreeNode.ts}    | 51 +++++++++++--------
 3 files changed, 40 insertions(+), 24 deletions(-)
 rename packages/jaeger-ui-components/src/utils/{TreeNode.test.js => TreeNode.test.ts} (97%)
 rename packages/jaeger-ui-components/src/utils/{TreeNode.js => TreeNode.ts} (55%)

diff --git a/packages/jaeger-ui-components/src/model/transform-trace-data.tsx b/packages/jaeger-ui-components/src/model/transform-trace-data.tsx
index f57036cde50..49c10fac0aa 100644
--- a/packages/jaeger-ui-components/src/model/transform-trace-data.tsx
+++ b/packages/jaeger-ui-components/src/model/transform-trace-data.tsx
@@ -135,10 +135,13 @@ export default function transformTraceData(data: TraceResponse | undefined): Tra
 
   // Eslint complains about number type not needed but then TS complains it is implicitly any.
   // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-  tree.walk((spanID: string, node: TreeNode, depth: number = 0) => {
+  tree.walk((spanID: string | number | undefined, node: TreeNode, depth: number = 0) => {
     if (spanID === '__root__') {
       return;
     }
+    if (typeof spanID !== 'string') {
+      return;
+    }
     const span = spanMap.get(spanID) as TraceSpan;
     if (!span) {
       return;
diff --git a/packages/jaeger-ui-components/src/utils/TreeNode.test.js b/packages/jaeger-ui-components/src/utils/TreeNode.test.ts
similarity index 97%
rename from packages/jaeger-ui-components/src/utils/TreeNode.test.js
rename to packages/jaeger-ui-components/src/utils/TreeNode.test.ts
index 9ed70686c42..5136cdccb2b 100644
--- a/packages/jaeger-ui-components/src/utils/TreeNode.test.js
+++ b/packages/jaeger-ui-components/src/utils/TreeNode.test.ts
@@ -280,7 +280,7 @@ it('walk() should iterate over every item and compute the right deep on each nod
   const nodeB0 = new TreeNode('B0');
   const nodeB1 = new TreeNode('B1');
   const nodeC3 = new TreeNode('C3');
-  const depthMap = { A: 0, B0: 1, B1: 1, C0: 2, C1: 2, C2: 2, C3: 2, D: 3 };
+  const depthMap: { [key: string]: number } = { A: 0, B0: 1, B1: 1, C0: 2, C1: 2, C2: 2, C3: 2, D: 3 };
   nodeA.addChild(nodeB0);
   nodeA.addChild(nodeB0);
   nodeA.addChild(nodeB1);
@@ -289,5 +289,9 @@ it('walk() should iterate over every item and compute the right deep on each nod
   nodeB1.addChild('C2');
   nodeB1.addChild(nodeC3);
   nodeC3.addChild('D');
-  nodeA.walk((value, node, depth) => expect(depth).toBe(depthMap[value]));
+  nodeA.walk((value, _, depth) => {
+    if (typeof value === 'string') {
+      expect(depth).toBe(depthMap[value]);
+    }
+  });
 });
diff --git a/packages/jaeger-ui-components/src/utils/TreeNode.js b/packages/jaeger-ui-components/src/utils/TreeNode.ts
similarity index 55%
rename from packages/jaeger-ui-components/src/utils/TreeNode.js
rename to packages/jaeger-ui-components/src/utils/TreeNode.ts
index 3235b0a9972..8f8edeeea1e 100644
--- a/packages/jaeger-ui-components/src/utils/TreeNode.js
+++ b/packages/jaeger-ui-components/src/utils/TreeNode.ts
@@ -12,26 +12,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+type SearchFn = (value: string | number | undefined, node: TreeNode, depth?: number) => boolean;
+
 export default class TreeNode {
-  static iterFunction(fn, depth = 0) {
-    return (node) => fn(node.value, node, depth);
+  value: string | number | undefined;
+  children: TreeNode[];
+
+  static iterFunction(fn: SearchFn, depth = 0) {
+    return (node: TreeNode) => fn(node.value, node, depth);
   }
 
-  static searchFunction(search) {
+  static searchFunction(search: TreeNode | number | SearchFn) {
     if (typeof search === 'function') {
       return search;
     }
 
-    return (value, node) => (search instanceof TreeNode ? node === search : value === search);
+    return (value: string | number | undefined, node: TreeNode) =>
+      search instanceof TreeNode ? node === search : value === search;
   }
 
-  constructor(value, children = []) {
+  constructor(value?: string | number, children: TreeNode[] = []) {
     this.value = value;
     this.children = children;
   }
 
-  get depth() {
-    return this.children.reduce((depth, child) => Math.max(child.depth + 1, depth), 1);
+  get depth(): number {
+    return this.children?.reduce((depth: number, child: { depth: number }) => Math.max(child.depth + 1, depth), 1);
   }
 
   get size() {
@@ -40,12 +46,12 @@ export default class TreeNode {
     return i;
   }
 
-  addChild(child) {
-    this.children.push(child instanceof TreeNode ? child : new TreeNode(child));
+  addChild(child: string | number | TreeNode) {
+    this.children?.push(child instanceof TreeNode ? child : new TreeNode(child));
     return this;
   }
 
-  find(search) {
+  find(search: TreeNode | number | SearchFn): TreeNode | null {
     const searchFn = TreeNode.iterFunction(TreeNode.searchFunction(search));
     if (searchFn(this)) {
       return this;
@@ -59,10 +65,10 @@ export default class TreeNode {
     return null;
   }
 
-  getPath(search) {
+  getPath(search: TreeNode) {
     const searchFn = TreeNode.iterFunction(TreeNode.searchFunction(search));
 
-    const findPath = (currentNode, currentPath) => {
+    const findPath = (currentNode: TreeNode, currentPath: TreeNode[]): TreeNode[] | null => {
       // skip if we already found the result
       const attempt = currentPath.concat([currentNode]);
       // base case: return the array when there is a match
@@ -82,18 +88,21 @@ export default class TreeNode {
     return findPath(this, []);
   }
 
-  walk(fn, depth = 0) {
-    const nodeStack = [];
+  walk(fn: (value: string | number | undefined, node: TreeNode, depth?: number) => void, depth = 0) {
+    const nodeStack: Array<{ node: TreeNode; depth?: number }> = [];
     let actualDepth = depth;
     nodeStack.push({ node: this, depth: actualDepth });
     while (nodeStack.length) {
-      const { node, depth: nodeDepth } = nodeStack.pop();
-      fn(node.value, node, nodeDepth);
-      actualDepth = nodeDepth + 1;
-      let i = node.children.length - 1;
-      while (i >= 0) {
-        nodeStack.push({ node: node.children[i], depth: actualDepth });
-        i--;
+      const popped = nodeStack.pop();
+      if (popped) {
+        const { node, depth: nodeDepth } = popped;
+        fn(node.value, node, nodeDepth);
+        actualDepth = (nodeDepth || 0) + 1;
+        let i = node.children.length - 1;
+        while (i >= 0) {
+          nodeStack.push({ node: node.children[i], depth: actualDepth });
+          i--;
+        }
       }
     }
   }

From 7d82a27835d6604bc9a1ce110fa3ecaf6b55988f Mon Sep 17 00:00:00 2001
From: Leo <108552997+lpskdl@users.noreply.github.com>
Date: Wed, 23 Nov 2022 13:08:36 +0100
Subject: [PATCH 109/153] Folder: Provide adhoc ui for nested folder creation
 (#59126)

chore: provide adhoc ui for nested folder creation
---
 .../components/NewDashboardsFolder.tsx        | 85 +++++++++----------
 public/app/features/folders/state/actions.ts  |  4 +-
 .../search/components/DashboardActions.tsx    | 12 ++-
 3 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx
index f7743e4e80d..6bcc584ab3b 100644
--- a/public/app/features/folders/components/NewDashboardsFolder.tsx
+++ b/public/app/features/folders/components/NewDashboardsFolder.tsx
@@ -1,10 +1,11 @@
-import React, { PureComponent } from 'react';
+import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { NavModelItem } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Button, Input, Form, Field } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
+import { useQueryParams } from 'app/core/hooks/useQueryParams';
 
 import { validationSrv } from '../../manage-dashboards/services/ValidationSrv';
 import { createNewFolder } from '../state/actions';
@@ -21,16 +22,22 @@ interface FormModel {
   folderName: string;
 }
 
-const initialFormModel: FormModel = { folderName: '' };
-
 type Props = OwnProps & ConnectedProps<typeof connector>;
 
-export class NewDashboardsFolder extends PureComponent<Props> {
-  onSubmit = (formData: FormModel) => {
-    this.props.createNewFolder(formData.folderName);
-  };
+const initialFormModel: FormModel = { folderName: '' };
 
-  validateFolderName = (folderName: string) => {
+const pageNav: NavModelItem = {
+  text: 'Create a new folder',
+  subTitle: 'Folders provide a way to group dashboards and alert rules.',
+  breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
+};
+
+function NewDashboardsFolder({ createNewFolder }: Props) {
+  const [queryParams] = useQueryParams();
+  const onSubmit = (formData: FormModel) => {
+    createNewFolder(formData.folderName, String(queryParams['folderUid']));
+  };
+  const validateFolderName = (folderName: string) => {
     return validationSrv
       .validateNewFolderName(folderName)
       .then(() => {
@@ -41,41 +48,33 @@ export class NewDashboardsFolder extends PureComponent<Props> {
       });
   };
 
-  pageNav: NavModelItem = {
-    text: 'Create a new folder',
-    subTitle: 'Folders provide a way to group dashboards and alert rules.',
-    breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
-  };
-
-  render() {
-    return (
-      <Page navId="dashboards/browse" pageNav={this.pageNav}>
-        <Page.Contents>
-          {!config.featureToggles.topnav && <h3>New dashboard folder</h3>}
-          <Form defaultValues={initialFormModel} onSubmit={this.onSubmit}>
-            {({ register, errors }) => (
-              <>
-                <Field
-                  label="Folder name"
-                  invalid={!!errors.folderName}
-                  error={errors.folderName && errors.folderName.message}
-                >
-                  <Input
-                    id="folder-name-input"
-                    {...register('folderName', {
-                      required: 'Folder name is required.',
-                      validate: async (v) => await this.validateFolderName(v),
-                    })}
-                  />
-                </Field>
-                <Button type="submit">Create</Button>
-              </>
-            )}
-          </Form>
-        </Page.Contents>
-      </Page>
-    );
-  }
+  return (
+    <Page navId="dashboards/browse" pageNav={pageNav}>
+      <Page.Contents>
+        {!config.featureToggles.topnav && <h3>New dashboard folder</h3>}
+        <Form defaultValues={initialFormModel} onSubmit={onSubmit}>
+          {({ register, errors }) => (
+            <>
+              <Field
+                label="Folder name"
+                invalid={!!errors.folderName}
+                error={errors.folderName && errors.folderName.message}
+              >
+                <Input
+                  id="folder-name-input"
+                  {...register('folderName', {
+                    required: 'Folder name is required.',
+                    validate: async (v) => await validateFolderName(v),
+                  })}
+                />
+              </Field>
+              <Button type="submit">Create</Button>
+            </>
+          )}
+        </Form>
+      </Page.Contents>
+    </Page>
+  );
 }
 
 export default connector(NewDashboardsFolder);
diff --git a/public/app/features/folders/state/actions.ts b/public/app/features/folders/state/actions.ts
index 68743eef477..e98f48a7475 100644
--- a/public/app/features/folders/state/actions.ts
+++ b/public/app/features/folders/state/actions.ts
@@ -143,9 +143,9 @@ export function addFolderPermission(newItem: NewDashboardAclItem): ThunkResult<v
   };
 }
 
-export function createNewFolder(folderName: string): ThunkResult<void> {
+export function createNewFolder(folderName: string, uid?: string): ThunkResult<void> {
   return async (dispatch) => {
-    const newFolder = await getBackendSrv().post('/api/folders', { title: folderName });
+    const newFolder = await getBackendSrv().post('/api/folders', { title: folderName, parentUid: uid });
     await contextSrv.fetchUserPermissions();
     dispatch(notifyApp(createSuccessNotification('Folder Created', 'OK')));
     locationService.push(locationUtil.stripBaseFromUrl(newFolder.url));
diff --git a/public/app/features/search/components/DashboardActions.tsx b/public/app/features/search/components/DashboardActions.tsx
index 07dfdbe4408..ffea5252147 100644
--- a/public/app/features/search/components/DashboardActions.tsx
+++ b/public/app/features/search/components/DashboardActions.tsx
@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
 
+import { config } from '@grafana/runtime';
 import { Menu, Dropdown, Button, Icon } from '@grafana/ui';
 
 export interface Props {
@@ -11,8 +12,13 @@ export interface Props {
 export const DashboardActions: FC<Props> = ({ folderUid, canCreateFolders = false, canCreateDashboards = false }) => {
   const actionUrl = (type: string) => {
     let url = `dashboard/${type}`;
+    const isTypeNewFolder = type === 'new_folder';
 
-    if (folderUid) {
+    if (isTypeNewFolder) {
+      url = `dashboards/folder/new/`;
+    }
+
+    if ((isTypeNewFolder && config.featureToggles.nestedFolders) || folderUid) {
       url += `?folderUid=${folderUid}`;
     }
 
@@ -23,7 +29,9 @@ export const DashboardActions: FC<Props> = ({ folderUid, canCreateFolders = fals
     return (
       <Menu>
         {canCreateDashboards && <Menu.Item url={actionUrl('new')} label="New Dashboard" />}
-        {!folderUid && canCreateFolders && <Menu.Item url="dashboards/folder/new" label="New Folder" />}
+        {canCreateFolders && (config.featureToggles.nestedFolders || !folderUid) && (
+          <Menu.Item url={actionUrl('new_folder')} label="New Folder" />
+        )}
         {canCreateDashboards && <Menu.Item url={actionUrl('import')} label="Import" />}
       </Menu>
     );

From f180bb46f8e46e2dd8927a6750420e2c7d8d7a28 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 23 Nov 2022 12:12:33 +0000
Subject: [PATCH 110/153] I18n: Translate Dashboard Starred notification
 (#59138)

---
 .../dashboard/services/DashboardSrv.ts        | 34 +++++++++++--------
 public/locales/de-DE/grafana.json             |  4 +++
 public/locales/en-US/grafana.json             |  4 +++
 public/locales/es-ES/grafana.json             |  4 +++
 public/locales/fr-FR/grafana.json             |  4 +++
 public/locales/pseudo-LOCALE/grafana.json     |  4 +++
 public/locales/zh-Hans/grafana.json           |  4 +++
 7 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index 11e32a26eeb..41f7ca91703 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -1,7 +1,9 @@
 import { lastValueFrom } from 'rxjs';
 
+import { AppEvents } from '@grafana/data';
 import { BackendSrvRequest } from '@grafana/runtime';
 import { appEvents } from 'app/core/app_events';
+import { t } from 'app/core/internationalization';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { saveDashboard } from 'app/features/manage-dashboards/state/actions';
 import { DashboardMeta } from 'app/types';
@@ -92,23 +94,27 @@ export class DashboardSrv {
 
   starDashboard(dashboardId: string, isStarred: boolean) {
     const backendSrv = getBackendSrv();
-    let promise;
 
-    if (isStarred) {
-      promise = backendSrv.delete('/api/user/stars/dashboard/' + dashboardId).then(() => {
-        return false;
-      });
-    } else {
-      promise = backendSrv.post('/api/user/stars/dashboard/' + dashboardId).then(() => {
-        return true;
-      });
-    }
+    const request = {
+      showSuccessAlert: false,
+      url: '/api/user/stars/dashboard/' + dashboardId,
+      method: isStarred ? 'DELETE' : 'POST',
+    };
 
-    return promise.then((res: boolean) => {
-      if (this.dashboard && this.dashboard.id === dashboardId) {
-        this.dashboard.meta.isStarred = res;
+    return backendSrv.request(request).then(() => {
+      const newIsStarred = !isStarred;
+
+      if (this.dashboard?.id === dashboardId) {
+        this.dashboard.meta.isStarred = newIsStarred;
       }
-      return res;
+
+      const message = newIsStarred
+        ? t('notifications.starred-dashboard', 'Dashboard starred')
+        : t('notifications.unstarred-dashboard', 'Dashboard unstarred');
+
+      appEvents.emit(AppEvents.alertSuccess, [message]);
+
+      return newIsStarred;
     });
   }
 }
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 02df8d71da9..3d974b4a744 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -318,6 +318,10 @@
   "news": {
     "title": "Das Neueste aus dem Blog"
   },
+  "notifications": {
+    "starred-dashboard": "",
+    "unstarred-dashboard": ""
+  },
   "panel": {
     "header-menu": {
       "hide-legend": "",
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index d59f3850cf2..99188ce13ff 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -318,6 +318,10 @@
   "news": {
     "title": "Latest from the blog"
   },
+  "notifications": {
+    "starred-dashboard": "Dashboard starred",
+    "unstarred-dashboard": "Dashboard unstarred"
+  },
   "panel": {
     "header-menu": {
       "hide-legend": "Hide legend",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 3aef2967296..45a61832a48 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -318,6 +318,10 @@
   "news": {
     "title": "Últimas entradas del blog"
   },
+  "notifications": {
+    "starred-dashboard": "",
+    "unstarred-dashboard": ""
+  },
   "panel": {
     "header-menu": {
       "hide-legend": "",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index f6d9d51910e..4a39449860f 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -318,6 +318,10 @@
   "news": {
     "title": "Dernières nouvelles sur le blog"
   },
+  "notifications": {
+    "starred-dashboard": "",
+    "unstarred-dashboard": ""
+  },
   "panel": {
     "header-menu": {
       "hide-legend": "",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 05a7d6ea8f3..abce1243e4c 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -318,6 +318,10 @@
   "news": {
     "title": "Ŀäŧęşŧ ƒřőm ŧĥę þľőģ"
   },
+  "notifications": {
+    "starred-dashboard": "Đäşĥþőäřđ şŧäřřęđ",
+    "unstarred-dashboard": "Đäşĥþőäřđ ūʼnşŧäřřęđ"
+  },
   "panel": {
     "header-menu": {
       "hide-legend": "Ħįđę ľęģęʼnđ",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index c9ec58cdae6..87201688324 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -318,6 +318,10 @@
   "news": {
     "title": "最新博客"
   },
+  "notifications": {
+    "starred-dashboard": "",
+    "unstarred-dashboard": ""
+  },
   "panel": {
     "header-menu": {
       "hide-legend": "",

From 343f65fffb01d6e1786b181592c627e7364fbc58 Mon Sep 17 00:00:00 2001
From: Grafana I18n Bot <110095610+grafana-i18n-bot@users.noreply.github.com>
Date: Wed, 23 Nov 2022 12:24:54 +0000
Subject: [PATCH 111/153] I18n: Crowdin sync (#59210)

* New translations grafana.json (French)

* New translations grafana.json (Spanish)

* New translations grafana.json (German)

* New translations grafana.json (Chinese Simplified)
---
 public/locales/de-DE/grafana.json   | 16 +++++++-------
 public/locales/es-ES/grafana.json   | 34 ++++++++++++++---------------
 public/locales/fr-FR/grafana.json   | 26 +++++++++++-----------
 public/locales/zh-Hans/grafana.json | 16 +++++++-------
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 3d974b4a744..0266cc2c960 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -198,8 +198,8 @@
     },
     "global-users": {
       "subtitle": "Erstelle und verwalte Benutzer auf dem gesamten Grafana-Server",
-      "title": "Benutzer",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "Benutzer"
     },
     "help": {
       "title": "Hilfe"
@@ -242,8 +242,8 @@
     },
     "org-settings": {
       "subtitle": "Verwalte Einstellungen in der gesamten Organisation",
-      "title": "Einstellungen",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "Einstellungen"
     },
     "playlists": {
       "subtitle": "Gruppen von Dashboards, die in einer bestimmten Reihenfolge angezeigt werden",
@@ -336,7 +336,7 @@
   },
   "refresh-picker": {
     "aria-label": {
-      "choose-interval": "",
+      "choose-interval": "Automatische Aktualisierung deaktiviert. Zeitintervall für Aktualisierungen auswählen",
       "duration-selected": ""
     },
     "live-option": {
@@ -344,8 +344,8 @@
       "label": ""
     },
     "off-option": {
-      "aria-label": "",
-      "label": ""
+      "aria-label": "Automatische Aktualisierung deaktivieren",
+      "label": "Aus"
     },
     "select-button": {
       "auto-refresh": ""
@@ -454,7 +454,7 @@
     },
     "calendar": {
       "apply-button": "",
-      "cancel-button": "",
+      "cancel-button": "Abbrechen",
       "select-time": ""
     },
     "content": {
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 45a61832a48..cd3d7d76230 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -86,17 +86,17 @@
   "library-panel": {
     "add-modal": {
       "cancel": "Cancelar",
-      "create": "Crear panel de biblioteca",
-      "error": "Ya existe un panel de biblioteca con este nombre",
+      "create": "Crear panel de librería",
+      "error": "Ya existe un panel de librería con este nombre",
       "folder": "Guardar en carpeta",
-      "folder-description": "Los permisos del panel de biblioteca se derivan de los permisos de la carpeta",
-      "name": "Nombre del panel de biblioteca"
+      "folder-description": "Los permisos del panel de librería se derivan de los permisos de la carpeta",
+      "name": "Nombre del panel de librería"
     }
   },
   "library-panels": {
     "save": {
-      "error": "Error al guardar el panel de la biblioteca: «{{errorMsg}}»",
-      "success": "Panel de biblioteca guardado"
+      "error": "Error al guardar el panel de la librería: «{{errorMsg}}»",
+      "success": "Panel de librería guardado"
     }
   },
   "nav": {
@@ -198,8 +198,8 @@
     },
     "global-users": {
       "subtitle": "Gestione y cree usuarios en todo el servidor Grafana",
-      "title": "Usuarios",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "Usuarios"
     },
     "help": {
       "title": "Ayuda"
@@ -213,7 +213,7 @@
     },
     "library-panels": {
       "subtitle": "Paneles reutilizables que se pueden añadir a varios paneles de control",
-      "title": "Paneles de la biblioteca"
+      "title": "Paneles de la librería"
     },
     "live": {
       "title": "Transmisión de eventos"
@@ -242,8 +242,8 @@
     },
     "org-settings": {
       "subtitle": "Gestionar las preferencias en una organización",
-      "title": "Preferencias",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "Preferencias"
     },
     "playlists": {
       "subtitle": "Grupos de paneles de control que se muestran en una secuencia",
@@ -336,7 +336,7 @@
   },
   "refresh-picker": {
     "aria-label": {
-      "choose-interval": "",
+      "choose-interval": "Actualización automática desactivada. Elija un intervalo de tiempo de actualización",
       "duration-selected": ""
     },
     "live-option": {
@@ -344,8 +344,8 @@
       "label": ""
     },
     "off-option": {
-      "aria-label": "",
-      "label": ""
+      "aria-label": "Desactivar actualización automática",
+      "label": "Apagado"
     },
     "select-button": {
       "auto-refresh": ""
@@ -372,7 +372,7 @@
       "view-button": "Ver JSON"
     },
     "library": {
-      "info": "Cree un panel de biblioteca."
+      "info": "Cree un panel de librería."
     },
     "link": {
       "copy-link-button": "Copiar",
@@ -412,7 +412,7 @@
     "tab-title": {
       "embed": "Incrustar",
       "export": "Exportar",
-      "library-panel": "Panel de biblioteca",
+      "library-panel": "Panel de librería",
       "link": "Enlace",
       "snapshot": "Vista rápida"
     },
@@ -454,7 +454,7 @@
     },
     "calendar": {
       "apply-button": "",
-      "cancel-button": "",
+      "cancel-button": "Cancelar",
       "select-time": ""
     },
     "content": {
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 4a39449860f..7230a71d11d 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -21,7 +21,7 @@
       "query-tab": "Requête",
       "stats-tab": "Statistiques",
       "subtitle": "{{queryCount}} requêtes avec un délai total de requête de {{formatted}}",
-      "title": "Inspecter\u00a0: {{panelTitle}}"
+      "title": "Inspecter : {{panelTitle}}"
     },
     "inspect-data": {
       "data-options": "Options de données",
@@ -51,7 +51,7 @@
       "panel-json-description": "Le modèle enregistré dans le tableau de bord JSON qui configure comment tout fonctionne.",
       "panel-json-label": "Panneau JSON",
       "select-source": "Sélectionner la source",
-      "unknown": "Objet inconnu\u00a0: {{show}}"
+      "unknown": "Objet inconnu : {{show}}"
     },
     "inspect-meta": {
       "no-inspector": "Pas d'inspecteur de métadonnées"
@@ -95,7 +95,7 @@
   },
   "library-panels": {
     "save": {
-      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque\u00a0: \"{{errorMsg}}\"",
+      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque : \"{{errorMsg}}\"",
       "success": "Panneau de bibliothèque enregistré"
     }
   },
@@ -198,8 +198,8 @@
     },
     "global-users": {
       "subtitle": "Gérer et créer des utilisateurs sur l'ensemble du serveur Grafana",
-      "title": "Utilisateurs",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "Utilisateurs"
     },
     "help": {
       "title": "Aide"
@@ -242,8 +242,8 @@
     },
     "org-settings": {
       "subtitle": "Gérer les préférences au sein d'une organisation",
-      "title": "Préférences",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "Préférences"
     },
     "playlists": {
       "subtitle": "Groupes de tableaux de bord affichés dans une séquence",
@@ -336,7 +336,7 @@
   },
   "refresh-picker": {
     "aria-label": {
-      "choose-interval": "",
+      "choose-interval": "Actualisation automatique désactivée. Choisir un intervalle de temps d'actualisation",
       "duration-selected": ""
     },
     "live-option": {
@@ -344,8 +344,8 @@
       "label": ""
     },
     "off-option": {
-      "aria-label": "",
-      "label": ""
+      "aria-label": "Désactiver l'actualisation automatique",
+      "label": "Désactivé"
     },
     "select-button": {
       "auto-refresh": ""
@@ -403,7 +403,7 @@
       "info-text-1": "Un instantané est un moyen instantané de partager publiquement un tableau de bord interactif. Lors de la création, nous supprimons les données sensibles telles que les requêtes (métrique, modèle et annotation) et les liens du panneau, pour ne laisser que les métriques visibles et les noms de séries intégrés dans votre tableau de bord.",
       "info-text-2": "N'oubliez pas que votre instantané <1>peut être consulté par une personne</1> qui dispose du lien et qui peut accéder à l'URL. Partagez judicieusement.",
       "local-button": "Instantané local",
-      "mistake-message": "Avez-vous commis une erreur\u00a0? ",
+      "mistake-message": "Avez-vous commis une erreur ? ",
       "name": "Nom de l'instantané",
       "timeout": "Délai d’expiration (secondes)",
       "timeout-description": "Vous devrez peut-être configurer la valeur du délai d'expiration si la collecte des métriques de votre tableau de bord prend beaucoup de temps.",
@@ -454,7 +454,7 @@
     },
     "calendar": {
       "apply-button": "",
-      "cancel-button": "",
+      "cancel-button": "Annuler",
       "select-time": ""
     },
     "content": {
@@ -508,7 +508,7 @@
       "email-label": "Adresse e-mail",
       "name-error": "Un nom est obligatoire",
       "name-label": "Nom",
-      "username-label": "Nom d´utilisateur"
+      "username-label": "Nom d’utilisateur"
     },
     "title": "Modifier le profil"
   },
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 87201688324..14bdf2ef7ff 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -198,8 +198,8 @@
     },
     "global-users": {
       "subtitle": "在整个 Grafana 服务器上管理和创建用户",
-      "title": "用户",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "用户"
     },
     "help": {
       "title": "帮助"
@@ -242,8 +242,8 @@
     },
     "org-settings": {
       "subtitle": "管理整个组织的首选项",
-      "title": "首选项",
-      "titleBeforeTopnav": ""
+      "title": "",
+      "titleBeforeTopnav": "首选项"
     },
     "playlists": {
       "subtitle": "以序列显示的仪表板组",
@@ -336,7 +336,7 @@
   },
   "refresh-picker": {
     "aria-label": {
-      "choose-interval": "",
+      "choose-interval": "自动刷新已关闭。选择刷新时间间隔",
       "duration-selected": ""
     },
     "live-option": {
@@ -344,8 +344,8 @@
       "label": ""
     },
     "off-option": {
-      "aria-label": "",
-      "label": ""
+      "aria-label": "关闭自动刷新",
+      "label": "关"
     },
     "select-button": {
       "auto-refresh": ""
@@ -454,7 +454,7 @@
     },
     "calendar": {
       "apply-button": "",
-      "cancel-button": "",
+      "cancel-button": "取消",
       "select-time": ""
     },
     "content": {

From 5af9a511c0e2b77f7d7aa5ca8c7a92ff2083d554 Mon Sep 17 00:00:00 2001
From: Timur Olzhabayev <timur.olzhabayev@grafana.com>
Date: Wed, 23 Nov 2022 14:09:27 +0100
Subject: [PATCH 112/153] Chore: Reordering codeowners file (#59198)

Reordering codeowners file
---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b37118ec8a7..b7b617c6eac 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -114,6 +114,8 @@ go.sum @grafana/backend-platform
 /contribute/architecture/backend @grafana/backend-platform
 /contribute/engineering/backend @grafana/backend-platform
 
+package.json @grafana/frontend-ops
+tsconfig.json @grafana/frontend-ops
 /crowdin.yml @grafana/user-essentials
 /public/locales @grafana/user-essentials
 /public/app/core/internationalization @grafana/user-essentials
@@ -167,8 +169,6 @@ go.sum @grafana/backend-platform
 /scripts/grunt @grafana/frontend-ops
 /scripts/webpack @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/user-essentials
-package.json @grafana/frontend-ops
-tsconfig.json @grafana/frontend-ops
 lerna.json @grafana/frontend-ops
 .babelrc @grafana/frontend-ops
 .prettierrc.js @grafana/frontend-ops

From 6d94fa6aa5ed5fed23d36094256c680557618861 Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Wed, 23 Nov 2022 13:45:10 +0000
Subject: [PATCH 113/153] Tempo: Send the correct start time when making a
 TraceQL query (#59128)

---
 public/app/plugins/datasource/tempo/datasource.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 2c93be88cbe..2bac0022990 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -184,7 +184,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
           this._request('/api/search', {
             q: targets.traceql[0].query,
             limit: options.targets[0].limit,
-            start: 0, // Currently the API doesn't return traces when using the 'From' time selected in Explore
+            start: options.range.from.unix(),
             end: options.range.to.unix(),
           }).pipe(
             map((response) => {

From ba0ac08465d4133db837eedbe2dbb070ca279832 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 23 Nov 2022 14:23:26 +0000
Subject: [PATCH 114/153] Internationalization: Enable internationalization by
 default (#59204)

* Enable internationalization feature flag by default

* Change i18n feature to beta

* Set i18n feature flag to stable

* update features
---
 conf/defaults.ini                                             | 2 ++
 pkg/services/featuremgmt/registry.go                          | 4 ++--
 pkg/services/featuremgmt/toggles_gen.go                       | 2 +-
 .../core/components/SharedPreferences/SharedPreferences.tsx   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 050437bf0aa..49c4582a280 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1272,6 +1272,8 @@ license_path =
 # enable = feature1,feature2
 enable =
 
+internationalization = true
+
 # feature1 = true
 # feature2 = false
 
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 62352cfe6a3..542f9b4a53c 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -270,8 +270,8 @@ var (
 		},
 		{
 			Name:        "internationalization",
-			Description: "Enables work-in-progress internationalization",
-			State:       FeatureStateAlpha,
+			Description: "Enables internationalization",
+			State:       FeatureStateStable,
 		},
 		{
 			Name:        "topnav",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 2441a1ab0fe..2af681298cf 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -196,7 +196,7 @@ const (
 	FlagDataConnectionsConsole = "dataConnectionsConsole"
 
 	// FlagInternationalization
-	// Enables work-in-progress internationalization
+	// Enables internationalization
 	FlagInternationalization = "internationalization"
 
 	// FlagTopnav
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index c5cc50cc4f5..f82808a350e 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -187,7 +187,7 @@ export class SharedPreferences extends PureComponent<Props, State> {
                       <span className={styles.labelText}>
                         <Trans i18nKey="shared-preferences.fields.locale-label">Language</Trans>
                       </span>
-                      <FeatureBadge featureState={FeatureState.alpha} />
+                      <FeatureBadge featureState={FeatureState.beta} />
                     </Label>
                   }
                   data-testid="User preferences language drop down"

From 2d8910d9de19a0effbfd3403e12eafae3629fd93 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 23 Nov 2022 14:31:40 +0000
Subject: [PATCH 115/153] Chore: gitignore storage.json (#59225)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c7f6ce8ec9e..a4c02bfa4ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,7 @@ debug.test
 /packaging/**/*.tar.gz
 /packaging/**/*.tar.gz.sha256
 pkg/cmd/grafana-server/__debug_bin
+pkg/services/quota/quotaimpl/storage/storage.json
 
 # Ignore OSX indexing
 .DS_Store

From c9286ff79464de3e368b3ca95b215a6d674d8437 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Wed, 23 Nov 2022 14:37:15 +0000
Subject: [PATCH 116/153] Alerting: Remove comments for fixed behavior (#58951)

---
 pkg/expr/classic/classic_test.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkg/expr/classic/classic_test.go b/pkg/expr/classic/classic_test.go
index 266640fc1bc..fd656b2de4a 100644
--- a/pkg/expr/classic/classic_test.go
+++ b/pkg/expr/classic/classic_test.go
@@ -226,7 +226,6 @@ func TestConditionsCmd(t *testing.T) {
 		},
 		expected: func() mathexp.Results {
 			v := newNumber(ptr.Float64(1))
-			// This too seems incorrect, looks like we don't call the evaluator
 			v.SetMeta([]EvalMatch{{Value: nil}})
 			return newResults(v)
 		},
@@ -251,7 +250,6 @@ func TestConditionsCmd(t *testing.T) {
 		},
 		expected: func() mathexp.Results {
 			v := newNumber(ptr.Float64(1))
-			// This seems incorrect
 			v.SetMeta([]EvalMatch{{Value: nil}})
 			return newResults(v)
 		},

From 980a2cb949863dd58beaa8c1769b1f57d95d8b20 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:43:38 +0100
Subject: [PATCH 117/153] Use Stack from experimental instead of css styles for
 flex containers (#59201)

---
 .../rule-editor/GrafanaEvaluationBehavior.tsx | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
index b52eaac7bd2..2e93419ae59 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { RegisterOptions, useFormContext } from 'react-hook-form';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
 import { Button, Card, Field, InlineLabel, Input, InputControl, useStyles2 } from '@grafana/ui';
 import { RulerRuleDTO, RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto';
 
@@ -132,7 +133,7 @@ function FolderGroupAndEvaluationInterval({
         <Card className={styles.cardContainer}>
           <Card.Heading>Evaluation behavior</Card.Heading>
           <Card.Meta>
-            <div className={styles.evaluationDescription}>
+            <Stack direction="column">
               <div className={styles.evaluateLabel}>
                 {`Alert rules in the `} <span className={styles.bold}>{group}</span> group are evaluated every{' '}
                 <span className={styles.bold}>{evaluateEvery}</span>.
@@ -145,10 +146,10 @@ function FolderGroupAndEvaluationInterval({
                 </div>
               )}
               <br />
-            </div>
+            </Stack>
           </Card.Meta>
           <Card.Actions>
-            <div className={styles.editGroup}>
+            <Stack direction="row" justify-content="right" align-items="center">
               {isNewGroup && (
                 <div className={styles.warningMessage}>
                   {`To edit the evaluation group interval, save the alert rule.`}
@@ -163,7 +164,7 @@ function FolderGroupAndEvaluationInterval({
               >
                 <span>{'Edit evaluation group'}</span>
               </Button>
-            </div>
+            </Stack>
           </Card.Actions>
         </Card>
       )}
@@ -181,7 +182,7 @@ function ForInput({ evaluateEvery }: { evaluateEvery: string }) {
   const evaluateForId = 'eval-for-input';
 
   return (
-    <div className={styles.flexRow}>
+    <Stack direction="row" justify-content="flex-start" align-items="flex-start">
       <InlineLabel
         htmlFor={evaluateForId}
         width={7}
@@ -197,7 +198,7 @@ function ForInput({ evaluateEvery }: { evaluateEvery: string }) {
       >
         <Input id={evaluateForId} width={8} {...register('evaluateFor', forValidationOptions(evaluateEvery))} />
       </Field>
-    </div>
+    </Stack>
   );
 }
 
@@ -216,14 +217,14 @@ export function GrafanaEvaluationBehavior({
   return (
     // TODO remove "and alert condition" for recording rules
     <RuleEditorSection stepNo={3} title="Alert evaluation behavior">
-      <div className={styles.flexColumn}>
+      <Stack direction="column" justify-content="flex-start" align-items="flex-start">
         <FolderGroupAndEvaluationInterval
           initialFolder={initialFolder}
           setEvaluateEvery={setEvaluateEvery}
           evaluateEvery={evaluateEvery}
         />
         <ForInput evaluateEvery={evaluateEvery} />
-      </div>
+      </Stack>
       <CollapseToggle
         isCollapsed={!showErrorHandling}
         onToggle={(collapsed) => setShowErrorHandling(!collapsed)}
@@ -269,21 +270,9 @@ export function GrafanaEvaluationBehavior({
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  flexRow: css`
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: flex-start;
-  `,
   inlineField: css`
     margin-bottom: 0;
   `,
-  flexColumn: css`
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: flex-start;
-  `,
   collapseToggle: css`
     margin: ${theme.spacing(2, 0, 2, -1)};
   `,
@@ -305,16 +294,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   warningMessage: css`
     color: ${theme.colors.warning.text};
   `,
-  editGroup: css`
-    display: flex;
-    align-items: center;
-    justify-content: right;
-  `,
   bold: css`
     font-weight: bold;
   `,
-  evaluationDescription: css`
-    display: flex;
-    flex-direction: column;
-  `,
 });

From ad96b240fc8214dbda9f8d5376d7371111f56979 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Wed, 23 Nov 2022 16:44:45 +0200
Subject: [PATCH 118/153] Nested Folder: Enforce maximum nested folder depth
 (#59213)

* Nested Folder: Enforce maximum nested folder depth

* Cleanup

* Fix logging
---
 pkg/api/folder.go                             |  2 +-
 pkg/services/folder/folderimpl/folder.go      | 73 ++++++++++-------
 pkg/services/folder/folderimpl/folder_test.go | 79 ++++++++++++-------
 pkg/services/folder/folderimpl/sqlstore.go    |  8 +-
 .../folder/folderimpl/sqlstore_test.go        | 22 ------
 5 files changed, 101 insertions(+), 83 deletions(-)

diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 78544cacedf..6c2c1174366 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -212,7 +212,7 @@ func (hs *HTTPServer) DeleteFolder(c *models.ReqContext) response.Response { //
 	}
 
 	uid := web.Params(c.Req)[":uid"]
-	err = hs.folderService.DeleteFolder(c.Req.Context(), &folder.DeleteFolderCommand{UID: uid, OrgID: c.OrgID, ForceDeleteRules: c.QueryBool("forceDeleteRules")})
+	err = hs.folderService.DeleteFolder(c.Req.Context(), &folder.DeleteFolderCommand{UID: uid, OrgID: c.OrgID, ForceDeleteRules: c.QueryBool("forceDeleteRules"), SignedInUser: c.SignedInUser})
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
 	}
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index a274e2bcc61..491e6940cc6 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/events"
-	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
@@ -206,6 +205,8 @@ func (s *Service) getFolderByTitle(ctx context.Context, user *user.SignedInUser,
 }
 
 func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
+	logger := s.log.FromContext(ctx)
+
 	dashFolder := models.NewDashboardFolder(cmd.Title)
 	dashFolder.OrgId = cmd.OrgID
 
@@ -270,36 +271,28 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 	}
 
 	if permissionErr != nil {
-		s.log.Error("Could not make user admin", "folder", createdFolder.Title, "user", userID, "error", permissionErr)
+		logger.Error("Could not make user admin", "folder", createdFolder.Title, "user", userID, "error", permissionErr)
 	}
 
 	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		var description string
-		if dash.Data != nil {
-			description = dash.Data.Get("description").MustString()
-		}
-
-		parentUID := folder.RootFolderUID
-		if cmd.ParentUID != "" {
-			parentUID = cmd.ParentUID
-		}
-		_, err := s.store.Create(ctx, folder.CreateFolderCommand{
+		cmd := &folder.CreateFolderCommand{
 			// TODO: Today, if a UID isn't specified, the dashboard store
 			// generates a new UID. The new folder store will need to do this as
 			// well, but for now we take the UID from the newly created folder.
 			UID:         dash.Uid,
 			OrgID:       cmd.OrgID,
 			Title:       cmd.Title,
-			Description: description,
-			ParentUID:   parentUID,
-		})
-		if err != nil {
+			Description: cmd.Description,
+			ParentUID:   cmd.ParentUID,
+		}
+		if err := s.nestedFolderCreate(ctx, cmd); err != nil {
 			// We'll log the error and also roll back the previously-created
 			// (legacy) folder.
-			s.log.Error("error saving folder to nested folder store", err)
-			err = s.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: createdFolder.UID, OrgID: cmd.OrgID, ForceDeleteRules: true})
-			if err != nil {
-				s.log.Error("error deleting folder after failed save to nested folder store", err)
+			logger.Error("error saving folder to nested folder store", "error", err)
+			// do not shallow create error if the legacy folder delete fails
+			deleteErr := s.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: createdFolder.UID, OrgID: cmd.OrgID, ForceDeleteRules: true, SignedInUser: user})
+			if deleteErr != nil {
+				logger.Error("error deleting folder after failed save to nested folder store", "error", err)
 			}
 			return folder.FromDashboard(dash), err
 		}
@@ -346,6 +339,8 @@ func (s *Service) Update(ctx context.Context, user *user.SignedInUser, orgID int
 }
 
 func (s *Service) legacyUpdate(ctx context.Context, user *user.SignedInUser, orgID int64, existingUid string, cmd *models.UpdateFolderCommand) (*folder.Folder, error) {
+	logger := s.log.FromContext(ctx)
+
 	query := models.GetDashboardQuery{OrgId: orgID, Uid: existingUid}
 	_, err := s.dashboardStore.GetDashboard(ctx, &query)
 	if err != nil {
@@ -392,30 +387,31 @@ func (s *Service) legacyUpdate(ctx context.Context, user *user.SignedInUser, org
 			UID:       dash.Uid,
 			OrgID:     orgID,
 		}); err != nil {
-			s.log.Error("failed to publish FolderTitleUpdated event", "folder", foldr.Title, "user", user.UserID, "error", err)
+			logger.Error("failed to publish FolderTitleUpdated event", "folder", foldr.Title, "user", user.UserID, "error", err)
 		}
 	}
 	return foldr, nil
 }
 
 func (s *Service) DeleteFolder(ctx context.Context, cmd *folder.DeleteFolderCommand) error {
+	logger := s.log.FromContext(ctx)
+	if cmd.SignedInUser == nil {
+		return folder.ErrBadRequest.Errorf("missing signed in user")
+	}
+
 	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
 		err := s.Delete(ctx, cmd)
 		if err != nil {
-			s.log.Error("the delete folder on folder table failed with err: ", err.Error())
+			logger.Error("the delete folder on folder table failed with err: ", "error", err)
 		}
 	}
-	user, err := appcontext.User(ctx)
-	if err != nil {
-		return err
-	}
 
 	dashFolder, err := s.dashboardStore.GetFolderByUID(ctx, cmd.OrgID, cmd.UID)
 	if err != nil {
 		return err
 	}
 
-	guard := guardian.New(ctx, dashFolder.ID, cmd.OrgID, user)
+	guard := guardian.New(ctx, dashFolder.ID, cmd.OrgID, cmd.SignedInUser)
 	if canSave, err := guard.CanDelete(); err != nil || !canSave {
 		if err != nil {
 			return toFolderError(err)
@@ -498,6 +494,29 @@ func (s *Service) MakeUserAdmin(ctx context.Context, orgID int64, userID, folder
 	return s.dashboardService.MakeUserAdmin(ctx, orgID, userID, folderID, setViewAndEditPermissions)
 }
 
+func (s *Service) nestedFolderCreate(ctx context.Context, cmd *folder.CreateFolderCommand) error {
+	if cmd.ParentUID != "" {
+		if err := s.validateParent(ctx, cmd.OrgID, cmd.ParentUID); err != nil {
+			return err
+		}
+	}
+	_, err := s.store.Create(ctx, *cmd)
+	return err
+}
+
+func (s *Service) validateParent(ctx context.Context, orgID int64, parentUID string) error {
+	ancestors, err := s.store.GetParents(ctx, folder.GetParentsQuery{UID: parentUID, OrgID: orgID})
+	if err != nil {
+		return err
+	}
+
+	if len(ancestors) == folder.MaxNestedFolderDepth {
+		return folder.ErrMaximumDepthReached
+	}
+
+	return nil
+}
+
 func toFolderError(err error) error {
 	if errors.Is(err, dashboards.ErrDashboardTitleEmpty) {
 		return dashboards.ErrFolderTitleEmpty
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index 6a30e6e5485..fc2785e8847 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -3,6 +3,7 @@ package folderimpl
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/rand"
 	"testing"
 
@@ -12,7 +13,6 @@ import (
 	"github.com/xorcare/pointer"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/models"
@@ -117,8 +117,7 @@ func TestIntegrationFolderService(t *testing.T) {
 
 			t.Run("When creating folder should return access denied error", func(t *testing.T) {
 				dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*models.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil).Times(2)
-				ctx := appcontext.WithUser(context.Background(), usr)
-				_, err := service.Create(ctx, &folder.CreateFolderCommand{
+				_, err := service.Create(context.Background(), &folder.CreateFolderCommand{
 					OrgID:        orgID,
 					Title:        f.Title,
 					UID:          folderUID,
@@ -141,16 +140,13 @@ func TestIntegrationFolderService(t *testing.T) {
 			})
 
 			t.Run("When deleting folder by uid should return access denied error", func(t *testing.T) {
-				ctx := context.Background()
-				ctx = appcontext.WithUser(ctx, usr)
-
 				newFolder := models.NewFolder("Folder")
 				newFolder.Uid = folderUID
 
 				dashStore.On("GetFolderByID", mock.Anything, orgID, folderId).Return(newFolder, nil)
 				dashStore.On("GetFolderByUID", mock.Anything, orgID, folderUID).Return(newFolder, nil)
 
-				err := service.DeleteFolder(ctx, &folder.DeleteFolderCommand{
+				err := service.DeleteFolder(context.Background(), &folder.DeleteFolderCommand{
 					UID:              folderUID,
 					OrgID:            orgID,
 					ForceDeleteRules: false,
@@ -178,8 +174,7 @@ func TestIntegrationFolderService(t *testing.T) {
 				dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("models.SaveDashboardCommand")).Return(dash, nil).Once()
 				dashStore.On("GetFolderByID", mock.Anything, orgID, dash.Id).Return(f, nil)
 
-				ctx := appcontext.WithUser(context.Background(), usr)
-				actualFolder, err := service.Create(ctx, &folder.CreateFolderCommand{
+				actualFolder, err := service.Create(context.Background(), &folder.CreateFolderCommand{
 					OrgID:        orgID,
 					Title:        dash.Title,
 					UID:          "someuid",
@@ -193,8 +188,7 @@ func TestIntegrationFolderService(t *testing.T) {
 				dash := models.NewDashboardFolder("Test-Folder")
 				dash.Id = rand.Int63()
 
-				ctx := appcontext.WithUser(context.Background(), usr)
-				_, err := service.Create(ctx, &folder.CreateFolderCommand{
+				_, err := service.Create(context.Background(), &folder.CreateFolderCommand{
 					OrgID:        orgID,
 					Title:        dash.Title,
 					UID:          "general",
@@ -235,9 +229,7 @@ func TestIntegrationFolderService(t *testing.T) {
 				}).Return(nil).Once()
 
 				expectedForceDeleteRules := rand.Int63()%2 == 0
-				ctx := context.Background()
-				ctx = appcontext.WithUser(ctx, usr)
-				err := service.DeleteFolder(ctx, &folder.DeleteFolderCommand{
+				err := service.DeleteFolder(context.Background(), &folder.DeleteFolderCommand{
 					UID:              f.UID,
 					OrgID:            orgID,
 					ForceDeleteRules: expectedForceDeleteRules,
@@ -338,11 +330,11 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 		dashboardStore:   &dashStore,
 		dashboardService: &dashboardsvc,
 		features:         featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+		log:              log.New("test-folder-service"),
 	}
 	t.Run("create folder", func(t *testing.T) {
 		folderStore.ExpectedFolder = &folder.Folder{}
-		ctx := appcontext.WithUser(context.Background(), usr)
-		res, err := folderService.Create(ctx, &folder.CreateFolderCommand{SignedInUser: usr})
+		res, err := folderService.Create(context.Background(), &folder.CreateFolderCommand{SignedInUser: usr})
 		require.NoError(t, err)
 		require.NotNil(t, res.UID)
 	})
@@ -379,7 +371,6 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 
 func TestNestedFolderService(t *testing.T) {
 	t.Run("with feature flag unset", func(t *testing.T) {
-		ctx := appcontext.WithUser(context.Background(), usr)
 		store := &FakeStore{}
 		dashStore := dashboards.FakeDashboardStore{}
 		dashboardsvc := dashboards.FakeDashboardService{}
@@ -403,8 +394,7 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("models.SaveDashboardCommand")).Return(&models.Dashboard{}, nil)
 			dashStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 
-			ctx = appcontext.WithUser(ctx, usr)
-			_, err := foldersvc.Create(ctx, &folder.CreateFolderCommand{
+			_, err := foldersvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
 				Title:        "myFolder",
 				UID:          "myFolder",
@@ -425,7 +415,7 @@ func TestNestedFolderService(t *testing.T) {
 			g := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
 
-			err := foldersvc.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
+			err := foldersvc.DeleteFolder(context.Background(), &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)
 			require.NotNil(t, actualCmd)
 
@@ -437,7 +427,6 @@ func TestNestedFolderService(t *testing.T) {
 	})
 
 	t.Run("with nested folder feature flag on", func(t *testing.T) {
-		ctx := appcontext.WithUser(context.Background(), usr)
 		store := &FakeStore{}
 		dashStore := &dashboards.FakeDashboardStore{}
 		dashboardsvc := &dashboards.FakeDashboardService{}
@@ -463,8 +452,7 @@ func TestNestedFolderService(t *testing.T) {
 				mock.AnythingOfType("bool"), mock.AnythingOfType("bool")).Return(&models.SaveDashboardCommand{}, nil)
 			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("models.SaveDashboardCommand")).Return(&models.Dashboard{}, nil)
 			dashStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
-			ctx = appcontext.WithUser(ctx, usr)
-			_, err := foldersvc.Create(ctx, &folder.CreateFolderCommand{
+			_, err := foldersvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
 				Title:        "myFolder",
 				UID:          "myFolder",
@@ -492,8 +480,7 @@ func TestNestedFolderService(t *testing.T) {
 			store.ExpectedError = errors.New("FAILED")
 
 			// the service return success as long as the legacy create succeeds
-			ctx = appcontext.WithUser(ctx, usr)
-			_, err := foldersvc.Create(ctx, &folder.CreateFolderCommand{
+			_, err := foldersvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
 				Title:        "myFolder",
 				UID:          "myFolder",
@@ -512,7 +499,7 @@ func TestNestedFolderService(t *testing.T) {
 		t.Run("move, no error", func(t *testing.T) {
 			store.ExpectedError = nil
 			store.ExpectedFolder = &folder.Folder{UID: "myFolder", ParentUID: "newFolder"}
-			f, err := foldersvc.Move(ctx, &folder.MoveFolderCommand{UID: "myFolder", NewParentUID: "newFolder", OrgID: orgID, SignedInUser: usr})
+			f, err := foldersvc.Move(context.Background(), &folder.MoveFolderCommand{UID: "myFolder", NewParentUID: "newFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)
 			require.NotNil(t, f)
 		})
@@ -527,7 +514,7 @@ func TestNestedFolderService(t *testing.T) {
 			g := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
 
-			err := foldersvc.DeleteFolder(ctx, &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
+			err := foldersvc.DeleteFolder(context.Background(), &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)
 			require.NotNil(t, actualCmd)
 
@@ -536,5 +523,43 @@ func TestNestedFolderService(t *testing.T) {
 			})
 			require.True(t, store.DeleteCalled)
 		})
+
+		t.Run("create returns error if maximum depth reached", func(t *testing.T) {
+			// This test creates and deletes the dashboard, so needs some extra setup.
+			g := guardian.New
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
+			t.Cleanup(func() {
+				guardian.New = g
+			})
+
+			// dashboard store & service commands that should be called.
+			dashboardsvc.On("BuildSaveDashboardCommand",
+				mock.Anything, mock.AnythingOfType("*dashboards.SaveDashboardDTO"),
+				mock.AnythingOfType("bool"), mock.AnythingOfType("bool")).Return(&models.SaveDashboardCommand{}, nil)
+			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("models.SaveDashboardCommand")).Return(&models.Dashboard{}, nil)
+			dashStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
+			dashStore.On("GetFolderByUID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).Return(&folder.Folder{}, nil)
+			var actualCmd *models.DeleteDashboardCommand
+			dashStore.On("DeleteDashboard", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+				actualCmd = args.Get(1).(*models.DeleteDashboardCommand)
+			}).Return(nil).Once()
+
+			parents := make([]*folder.Folder, 0, folder.MaxNestedFolderDepth)
+			for i := 0; i < folder.MaxNestedFolderDepth; i++ {
+				parents = append(parents, &folder.Folder{UID: fmt.Sprintf("folder%d", i)})
+			}
+			store.ExpectedFolders = parents
+			store.ExpectedError = nil
+
+			_, err := foldersvc.Create(context.Background(), &folder.CreateFolderCommand{
+				Title:        "folder",
+				OrgID:        orgID,
+				ParentUID:    parents[len(parents)-1].UID,
+				UID:          util.GenerateShortUID(),
+				SignedInUser: usr,
+			})
+			assert.ErrorIs(t, err, folder.ErrMaximumDepthReached)
+			require.NotNil(t, actualCmd)
+		})
 	})
 }
diff --git a/pkg/services/folder/folderimpl/sqlstore.go b/pkg/services/folder/folderimpl/sqlstore.go
index 92390db472f..b8dbfbe9351 100644
--- a/pkg/services/folder/folderimpl/sqlstore.go
+++ b/pkg/services/folder/folderimpl/sqlstore.go
@@ -38,13 +38,9 @@ func (ss *sqlStore) Create(ctx context.Context, cmd folder.CreateFolderCommand)
 
 	var foldr *folder.Folder
 	/*
-		user, err := appcontext.User(ctx)
-		if err != nil {
-			return nil, err
-		}
 		version := 1
-		updatedBy := user.UserID
-		createdBy := user.UserID
+		updatedBy := cmd.SignedInUser.UserID
+		createdBy := cmd.SignedInUser.UserID
 	*/
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		var sqlOrArgs []interface{}
diff --git a/pkg/services/folder/folderimpl/sqlstore_test.go b/pkg/services/folder/folderimpl/sqlstore_test.go
index 6a6dcb85182..4824d934d38 100644
--- a/pkg/services/folder/folderimpl/sqlstore_test.go
+++ b/pkg/services/folder/folderimpl/sqlstore_test.go
@@ -133,28 +133,6 @@ func TestIntegrationCreate(t *testing.T) {
 		assert.Equal(t, "folder desc", ff.Description)
 		assert.Equal(t, parentUID, ff.ParentUID)
 	})
-
-	/*
-		t.Run("creating a nested folder with the maximum nested folder depth should fail", func(t *testing.T) {
-			ancestorUIDs := createSubTree(t, folderStore, orgID, accesscontrol.GeneralFolderUID, folder.MaxNestedFolderDepth, "")
-
-			t.Cleanup(func() {
-				for _, uid := range ancestorUIDs[1:] {
-					err := folderStore.Delete(context.Background(), uid, orgID)
-					require.NoError(t, err)
-				}
-			})
-
-			title := fmt.Sprintf("folder-%d", len(ancestorUIDs))
-			_, err := folderStore.Create(context.Background(), folder.CreateFolderCommand{
-				Title:     "folder1",
-				OrgID:     orgID,
-				ParentUID: ancestorUIDs[len(ancestorUIDs)-1],
-				UID:       util.GenerateShortUID(),
-			})
-			assert.Error(t, err)
-		})
-	*/
 }
 
 func TestIntegrationDelete(t *testing.T) {

From 9d88e14f01f7c9ced282815b3d48eb70dec01c95 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 23 Nov 2022 16:15:18 +0100
Subject: [PATCH 119/153] Azure Monitor Logs: Avoid warning when the response
 is empty (#59211)

---
 .../loganalytics/azure-log-analytics-datasource.go       | 4 ++++
 .../loganalytics/azure-log-analytics-datasource_test.go  | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index cda34cea065..b05254bf52f 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -315,6 +315,10 @@ type LogAnalyticsMeta struct {
 }
 
 func setAdditionalFrameMeta(frame *data.Frame, query, subscriptionID, workspace string) error {
+	if frame.Meta == nil || frame.Meta.Custom == nil {
+		// empty response
+		return nil
+	}
 	frame.Meta.ExecutedQueryString = query
 	la, ok := frame.Meta.Custom.(*LogAnalyticsMeta)
 	if !ok {
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 008d85f329a..e70fd49fe75 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -242,3 +243,11 @@ func Test_executeQueryErrorWithDifferentLogAnalyticsCreds(t *testing.T) {
 		t.Error("expecting the error to inform of bad credentials")
 	}
 }
+
+func Test_setAdditionalFrameMeta(t *testing.T) {
+	t.Run("it should not error with an empty response", func(t *testing.T) {
+		frame := data.NewFrame("test")
+		err := setAdditionalFrameMeta(frame, "", "", "")
+		require.NoError(t, err)
+	})
+}

From 83c101dc34c948978bc8d1e7772c5c519d70a482 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Wed, 23 Nov 2022 16:57:18 +0100
Subject: [PATCH 120/153] LoginAttempts: Reset attempts on successfull password
 reset (#59215)

* LoginAttempt: Add function to reset attemtps for username

* PasswordReset: Reset attempts on successful password reset
---
 pkg/api/password.go                           |  8 ++++
 pkg/services/loginattempt/login_attempt.go    |  2 +
 .../loginattemptimpl/login_attempt.go         |  4 ++
 .../loginattemptimpl/login_attempt_test.go    |  4 ++
 .../loginattempt/loginattemptimpl/models.go   |  4 ++
 .../loginattempt/loginattemptimpl/store.go    | 43 ++++---------------
 .../loginattempt/loginattempttest/fake.go     |  4 ++
 .../loginattempt/loginattempttest/mock.go     |  6 +++
 8 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/pkg/api/password.go b/pkg/api/password.go
index fe41c9ca5fa..c21c30f0ae2 100644
--- a/pkg/api/password.go
+++ b/pkg/api/password.go
@@ -60,7 +60,11 @@ func (hs *HTTPServer) ResetPassword(c *models.ReqContext) response.Response {
 	}
 	query := models.ValidateResetPasswordCodeQuery{Code: form.Code}
 
+	// For now the only way to know the username to clear login attempts for is
+	// to set it in the function provided to NotificationService
+	var username string
 	getUserByLogin := func(ctx context.Context, login string) (*user.User, error) {
+		username = login
 		userQuery := user.GetUserByLoginQuery{LoginOrEmail: login}
 		usr, err := hs.userService.GetByLogin(ctx, &userQuery)
 		return usr, err
@@ -94,5 +98,9 @@ func (hs *HTTPServer) ResetPassword(c *models.ReqContext) response.Response {
 		return response.Error(500, "Failed to change user password", err)
 	}
 
+	if err := hs.loginAttemptService.Reset(c.Req.Context(), username); err != nil {
+		c.Logger.Warn("could not reset login attempts", "err", err, "username", username)
+	}
+
 	return response.Success("User password changed")
 }
diff --git a/pkg/services/loginattempt/login_attempt.go b/pkg/services/loginattempt/login_attempt.go
index 897ebbccf1f..ce3233f0f3b 100644
--- a/pkg/services/loginattempt/login_attempt.go
+++ b/pkg/services/loginattempt/login_attempt.go
@@ -10,6 +10,8 @@ type Service interface {
 	// Validate checks if username has to many login attempts inside a window.
 	// Will return true if provided username do not have too many attempts.
 	Validate(ctx context.Context, username string) (bool, error)
+	// Reset resets all login attempts attached to username
+	Reset(ctx context.Context, username string) error
 }
 
 type LoginAttempt struct {
diff --git a/pkg/services/loginattempt/loginattemptimpl/login_attempt.go b/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
index 11bba09a786..76a07d6305e 100644
--- a/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
+++ b/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
@@ -59,6 +59,10 @@ func (s *Service) Add(ctx context.Context, username, IPAddress string) error {
 	})
 }
 
+func (s *Service) Reset(ctx context.Context, username string) error {
+	return s.store.DeleteLoginAttempts(ctx, DeleteLoginAttemptsCommand{username})
+}
+
 func (s *Service) Validate(ctx context.Context, username string) (bool, error) {
 	if s.cfg.DisableBruteForceLoginProtection {
 		return true, nil
diff --git a/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go b/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
index ae4de8b931f..84e93e0049f 100644
--- a/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
+++ b/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
@@ -96,3 +96,7 @@ func (f fakeStore) CreateLoginAttempt(ctx context.Context, command CreateLoginAt
 func (f fakeStore) DeleteOldLoginAttempts(ctx context.Context, command DeleteOldLoginAttemptsCommand) (int64, error) {
 	return f.ExpectedDeletedRows, f.ExpectedErr
 }
+
+func (f fakeStore) DeleteLoginAttempts(ctx context.Context, cmd DeleteLoginAttemptsCommand) error {
+	return f.ExpectedErr
+}
diff --git a/pkg/services/loginattempt/loginattemptimpl/models.go b/pkg/services/loginattempt/loginattemptimpl/models.go
index b372e2df6c9..85fc944f577 100644
--- a/pkg/services/loginattempt/loginattemptimpl/models.go
+++ b/pkg/services/loginattempt/loginattemptimpl/models.go
@@ -21,3 +21,7 @@ type GetUserLoginAttemptCountQuery struct {
 type DeleteOldLoginAttemptsCommand struct {
 	OlderThan time.Time
 }
+
+type DeleteLoginAttemptsCommand struct {
+	Username string
+}
diff --git a/pkg/services/loginattempt/loginattemptimpl/store.go b/pkg/services/loginattempt/loginattemptimpl/store.go
index 6721eefb99b..75456d7a9f8 100644
--- a/pkg/services/loginattempt/loginattemptimpl/store.go
+++ b/pkg/services/loginattempt/loginattemptimpl/store.go
@@ -2,7 +2,6 @@ package loginattemptimpl
 
 import (
 	"context"
-	"strconv"
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -17,6 +16,7 @@ type xormStore struct {
 type store interface {
 	CreateLoginAttempt(ctx context.Context, cmd CreateLoginAttemptCommand) error
 	DeleteOldLoginAttempts(ctx context.Context, cmd DeleteOldLoginAttemptsCommand) (int64, error)
+	DeleteLoginAttempts(ctx context.Context, cmd DeleteLoginAttemptsCommand) error
 	GetUserLoginAttemptCount(ctx context.Context, query GetUserLoginAttemptCountQuery) (int64, error)
 }
 
@@ -41,26 +41,7 @@ func (xs *xormStore) CreateLoginAttempt(ctx context.Context, cmd CreateLoginAtte
 func (xs *xormStore) DeleteOldLoginAttempts(ctx context.Context, cmd DeleteOldLoginAttemptsCommand) (int64, error) {
 	var deletedRows int64
 	err := xs.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		var maxId int64
-		sql := "SELECT max(id) as id FROM login_attempt WHERE created < ?"
-		result, err := sess.Query(sql, cmd.OlderThan.Unix())
-		if err != nil {
-			return err
-		}
-		if len(result) == 0 || result[0] == nil {
-			return nil
-		}
-
-		// TODO: why don't we know the type of ID?
-		maxId = toInt64(result[0]["id"])
-
-		if maxId == 0 {
-			return nil
-		}
-
-		sql = "DELETE FROM login_attempt WHERE id <= ?"
-
-		deleteResult, err := sess.Exec(sql, maxId)
+		deleteResult, err := sess.Exec("DELETE FROM login_attempt WHERE created < ?", cmd.OlderThan.Unix())
 		if err != nil {
 			return err
 		}
@@ -74,6 +55,13 @@ func (xs *xormStore) DeleteOldLoginAttempts(ctx context.Context, cmd DeleteOldLo
 	return deletedRows, err
 }
 
+func (xs *xormStore) DeleteLoginAttempts(ctx context.Context, cmd DeleteLoginAttemptsCommand) error {
+	return xs.db.WithDbSession(ctx, func(sess *db.Session) error {
+		_, err := sess.Exec("DELETE FROM login_attempt WHERE username = ?", cmd.Username)
+		return err
+	})
+}
+
 func (xs *xormStore) GetUserLoginAttemptCount(ctx context.Context, query GetUserLoginAttemptCountQuery) (int64, error) {
 	var total int64
 	err := xs.db.WithDbSession(ctx, func(dbSession *db.Session) error {
@@ -93,16 +81,3 @@ func (xs *xormStore) GetUserLoginAttemptCount(ctx context.Context, query GetUser
 
 	return total, err
 }
-
-func toInt64(i interface{}) int64 {
-	switch i := i.(type) {
-	case []byte:
-		n, _ := strconv.ParseInt(string(i), 10, 64)
-		return n
-	case int:
-		return int64(i)
-	case int64:
-		return i
-	}
-	return 0
-}
diff --git a/pkg/services/loginattempt/loginattempttest/fake.go b/pkg/services/loginattempt/loginattempttest/fake.go
index 1168989af98..581aeae1742 100644
--- a/pkg/services/loginattempt/loginattempttest/fake.go
+++ b/pkg/services/loginattempt/loginattempttest/fake.go
@@ -17,6 +17,10 @@ func (f FakeLoginAttemptService) Add(ctx context.Context, username, IPAddress st
 	return f.ExpectedErr
 }
 
+func (f FakeLoginAttemptService) Reset(ctx context.Context, username string) error {
+	return f.ExpectedErr
+}
+
 func (f FakeLoginAttemptService) Validate(ctx context.Context, username string) (bool, error) {
 	return f.ExpectedValid, f.ExpectedErr
 }
diff --git a/pkg/services/loginattempt/loginattempttest/mock.go b/pkg/services/loginattempt/loginattempttest/mock.go
index a74c37fd3d9..c775323a9a3 100644
--- a/pkg/services/loginattempt/loginattempttest/mock.go
+++ b/pkg/services/loginattempt/loginattempttest/mock.go
@@ -10,6 +10,7 @@ var _ loginattempt.Service = new(MockLoginAttemptService)
 
 type MockLoginAttemptService struct {
 	AddCalled      bool
+	ResetCalled    bool
 	ValidateCalled bool
 
 	ExpectedValid bool
@@ -21,6 +22,11 @@ func (f *MockLoginAttemptService) Add(ctx context.Context, username, IPAddress s
 	return f.ExpectedErr
 }
 
+func (f *MockLoginAttemptService) Reset(ctx context.Context, username string) error {
+	f.ResetCalled = true
+	return f.ExpectedErr
+}
+
 func (f *MockLoginAttemptService) Validate(ctx context.Context, username string) (bool, error) {
 	f.ValidateCalled = true
 	return f.ExpectedValid, f.ExpectedErr

From ae508c12f3dd9d9c69b0611b28df57c00dc5891f Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 23 Nov 2022 17:05:17 +0100
Subject: [PATCH 121/153] Changelog: Updated changelog for 9.2.6 (#59232)

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1efe236831..f8ed5a9e9dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -167,6 +167,24 @@ The following functions and classes related to logs are deprecated in the `grafa
 - **Toolkit:** Deprecate `component:create` command. [#56086](https://github.com/grafana/grafana/pull/56086), [@academo](https://github.com/academo)
 - **Toolkit:** Remove changelog command. [#56073](https://github.com/grafana/grafana/pull/56073), [@gitstart](https://github.com/gitstart)
 
+<!-- 9.2.6 START -->
+
+# 9.2.6 (2022-11-22)
+
+### Features and enhancements
+
+- **Alerting:** Support Prometheus durations in Provisioning API. [#58293](https://github.com/grafana/grafana/pull/58293), [@bartpeeters](https://github.com/bartpeeters)
+- **SSE:** Keep value name from numeric table. [#58831](https://github.com/grafana/grafana/pull/58831), [@kylebrandt](https://github.com/kylebrandt)
+- **Transformations:** Make Card Descriptions Clickable. [#58717](https://github.com/grafana/grafana/pull/58717), [@zuchka](https://github.com/zuchka)
+
+### Bug fixes
+
+- **MS/My/PostgresSQL:** Migrate annotation query. [#58847](https://github.com/grafana/grafana/pull/58847), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Search:** Fixes issue with Recent/Starred section always displaying "General" folder. [#58746](https://github.com/grafana/grafana/pull/58746), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Server:** Write internal server error on missing write. [#57813](https://github.com/grafana/grafana/pull/57813), [@sakjur](https://github.com/sakjur)
+
+<!-- 9.2.6 END -->
+
 <!-- 9.2.5 START -->
 
 # 9.2.5 (2022-11-16)

From 94372f5f23a5ae8a78741fdc9c00d5a0a6452415 Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Wed, 23 Nov 2022 16:07:59 +0000
Subject: [PATCH 122/153] Loki: Remove raw query toggle (#59125)

* set default query expression

* always show raw query

* remove raw query title

* remove test for raw query toggle

* remove raw query toggle

* remove default expression

* hide raw query preview if empty

* remove e2e test for raw query toggle

* update test name
---
 e2e/various-suite/loki-query-builder.spec.ts   |  4 ----
 .../loki/components/LokiQueryEditor.test.tsx   |  9 +--------
 .../loki/components/LokiQueryEditor.tsx        | 18 +-----------------
 .../LokiQueryBuilderContainer.test.tsx         |  1 -
 .../components/LokiQueryBuilderContainer.tsx   |  5 ++---
 .../querybuilder/components/QueryPreview.tsx   |  6 ++----
 6 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/e2e/various-suite/loki-query-builder.spec.ts b/e2e/various-suite/loki-query-builder.spec.ts
index 6557a993c4c..96bf1230a86 100644
--- a/e2e/various-suite/loki-query-builder.spec.ts
+++ b/e2e/various-suite/loki-query-builder.spec.ts
@@ -72,10 +72,6 @@ describe('Loki query builder', () => {
     e2e().contains(MISSING_LABEL_FILTER_ERROR_MESSAGE).should('not.exist');
     e2e().contains(finalQuery).should('be.visible');
 
-    // Toggle raw query
-    e2e().contains('label', 'Raw query').click();
-    e2e().contains('Raw query').should('have.length', 1);
-
     // Change to code editor
     e2e().contains('label', 'Code').click();
     // We need to test this manually because the final query is split into separate DOM elements using e2e().contains(finalQuery).should('be.visible'); does not detect the query.
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
index abc3a9e1336..3e943ee6b88 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
@@ -94,14 +94,7 @@ describe('LokiQueryEditorSelector', () => {
     });
   });
 
-  it('Can enable raw query', async () => {
-    renderWithMode(QueryEditorMode.Builder);
-    expect(await screen.findByLabelText('selector')).toBeInTheDocument();
-    screen.getByLabelText('Raw query').click();
-    expect(screen.queryByLabelText('selector')).not.toBeInTheDocument();
-  });
-
-  it('Should show raw query by default', async () => {
+  it('Should show the query by default', async () => {
     renderWithProps({
       editorMode: QueryEditorMode.Builder,
       expr: '{job="grafana"}',
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index 5002328ce3f..5e65d770ebe 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -9,11 +9,7 @@ import { QueryEditorModeToggle } from 'app/plugins/datasource/prometheus/querybu
 import { QueryHeaderSwitch } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch';
 import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
 
-import {
-  lokiQueryEditorExplainKey,
-  lokiQueryEditorRawQueryKey,
-  useFlag,
-} from '../../prometheus/querybuilder/shared/hooks/useFlag';
+import { lokiQueryEditorExplainKey, useFlag } from '../../prometheus/querybuilder/shared/hooks/useFlag';
 import { LokiQueryBuilderContainer } from '../querybuilder/components/LokiQueryBuilderContainer';
 import { LokiQueryBuilderOptions } from '../querybuilder/components/LokiQueryBuilderOptions';
 import { LokiQueryCodeEditor } from '../querybuilder/components/LokiQueryCodeEditor';
@@ -34,7 +30,6 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
   const [queryPatternsModalOpen, setQueryPatternsModalOpen] = useState(false);
   const [dataIsStale, setDataIsStale] = useState(false);
   const { flag: explain, setFlag: setExplain } = useFlag(lokiQueryEditorExplainKey);
-  const { flag: rawQuery, setFlag: setRawQuery } = useFlag(lokiQueryEditorRawQueryKey, true);
 
   const query = getQueryWithDefaults(props.query);
   // This should be filled in from the defaults by now.
@@ -75,11 +70,6 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
     onChange(query);
   };
 
-  const onQueryPreviewChange = (event: SyntheticEvent<HTMLInputElement>) => {
-    const isEnabled = event.currentTarget.checked;
-    setRawQuery(isEnabled);
-  };
-
   return (
     <>
       <ConfirmModal
@@ -123,11 +113,6 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
           Kick start your query
         </Button>
         <QueryHeaderSwitch label="Explain" value={explain} onChange={onExplainChange} />
-        {editorMode === QueryEditorMode.Builder && (
-          <>
-            <QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} />
-          </>
-        )}
         <FlexItem grow={1} />
         {app !== CoreApp.Explore && (
           <Button
@@ -153,7 +138,6 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
             query={query}
             onChange={onChangeInternal}
             onRunQuery={props.onRunQuery}
-            showRawQuery={rawQuery}
             showExplain={explain}
           />
         )}
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
index 3138f9795eb..ad9d01d6722 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
@@ -32,7 +32,6 @@ describe('LokiQueryBuilderContainer', () => {
       ),
       onChange: jest.fn(),
       onRunQuery: () => {},
-      showRawQuery: true,
       showExplain: false,
     };
     props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx
index be7d88def36..6ad2b7bed13 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx
@@ -16,7 +16,6 @@ export interface Props {
   datasource: LokiDatasource;
   onChange: (update: LokiQuery) => void;
   onRunQuery: () => void;
-  showRawQuery: boolean;
   showExplain: boolean;
 }
 
@@ -29,7 +28,7 @@ export interface State {
  * This component is here just to contain the translation logic between string query and the visual query builder model.
  */
 export function LokiQueryBuilderContainer(props: Props) {
-  const { query, onChange, onRunQuery, datasource, showRawQuery, showExplain } = props;
+  const { query, onChange, onRunQuery, datasource, showExplain } = props;
   const [state, dispatch] = useReducer(stateSlice.reducer, {
     expr: query.expr,
     // Use initial visual query only if query.expr is empty string
@@ -67,7 +66,7 @@ export function LokiQueryBuilderContainer(props: Props) {
         showExplain={showExplain}
         data-testid={testIds.editor}
       />
-      {showRawQuery && <QueryPreview query={query.expr} />}
+      {query.expr !== '' && <QueryPreview query={query.expr} />}
     </>
   );
 }
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx b/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
index fac87a30563..ad64cdc3036 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { EditorRow, EditorFieldGroup, EditorField } from '@grafana/experimental';
+import { EditorRow, EditorFieldGroup } from '@grafana/experimental';
 
 import { RawQuery } from '../../../prometheus/querybuilder/shared/RawQuery';
 import { lokiGrammar } from '../../syntax';
@@ -13,9 +13,7 @@ export function QueryPreview({ query }: Props) {
   return (
     <EditorRow>
       <EditorFieldGroup>
-        <EditorField label="Raw query">
-          <RawQuery query={query} lang={{ grammar: lokiGrammar, name: 'lokiql' }} />
-        </EditorField>
+        <RawQuery query={query} lang={{ grammar: lokiGrammar, name: 'lokiql' }} />
       </EditorFieldGroup>
     </EditorRow>
   );

From 7cec30f0e100b8f4515fe0c37a8761f9978c1c1e Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Wed, 23 Nov 2022 17:13:47 +0100
Subject: [PATCH 123/153] CloudWatch: Fix flaky test assertions (#59234)

---
 .../cloudwatch/routes/dimension_keys_test.go    | 15 ++++++++-------
 .../cloudwatch/routes/dimension_values_test.go  | 17 +++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go b/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
index e48fa7dabb6..068e0fd4bca 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
@@ -24,7 +24,14 @@ var logger = &logtest.Fake{}
 func Test_DimensionKeys_Route(t *testing.T) {
 	t.Run("calls FilterDimensionKeysRequest when a StandardDimensionKeysRequest is passed", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionKeysByDimensionFilter", mock.Anything).Return([]string{}, nil).Once()
+		mockListMetricsService.On("GetDimensionKeysByDimensionFilter", mock.MatchedBy(func(r resources.DimensionKeysRequest) bool {
+			return r.ResourceRequest != nil && *r.ResourceRequest == resources.ResourceRequest{Region: "us-east-2"} &&
+				r.Namespace == "AWS/EC2" &&
+				r.MetricName == "CPUUtilization" &&
+				len(r.DimensionFilter) == 2 &&
+				assert.Contains(t, r.DimensionFilter, &resources.Dimension{Name: "NodeID", Value: "Shared"}) &&
+				assert.Contains(t, r.DimensionFilter, &resources.Dimension{Name: "stage", Value: "QueryCommit"})
+		})).Return([]string{}, nil).Once()
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
@@ -32,12 +39,6 @@ func Test_DimensionKeys_Route(t *testing.T) {
 		req := httptest.NewRequest("GET", `/dimension-keys?region=us-east-2&namespace=AWS/EC2&metricName=CPUUtilization&dimensionFilters={"NodeID":["Shared"],"stage":["QueryCommit"]}`, nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(DimensionKeysHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
-		mockListMetricsService.AssertCalled(t, "GetDimensionKeysByDimensionFilter", resources.DimensionKeysRequest{
-			ResourceRequest: &resources.ResourceRequest{Region: "us-east-2"},
-			Namespace:       "AWS/EC2",
-			MetricName:      "CPUUtilization",
-			DimensionFilter: []*resources.Dimension{{Name: "NodeID", Value: "Shared"}, {Name: "stage", Value: "QueryCommit"}},
-		})
 	})
 
 	t.Run("calls GetHardCodedDimensionKeysByNamespace when a StandardDimensionKeysRequest is passed", func(t *testing.T) {
diff --git a/pkg/tsdb/cloudwatch/routes/dimension_values_test.go b/pkg/tsdb/cloudwatch/routes/dimension_values_test.go
index c2853a8c98b..cf365c1a090 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_values_test.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_values_test.go
@@ -18,7 +18,15 @@ import (
 func Test_DimensionValues_Route(t *testing.T) {
 	t.Run("Calls GetDimensionValuesByDimensionFilter when a valid request is passed", func(t *testing.T) {
 		mockListMetricsService := mocks.ListMetricsServiceMock{}
-		mockListMetricsService.On("GetDimensionValuesByDimensionFilter", mock.Anything).Return([]string{}, nil).Once()
+		mockListMetricsService.On("GetDimensionValuesByDimensionFilter", mock.MatchedBy(func(r resources.DimensionValuesRequest) bool {
+			return r.ResourceRequest != nil && *r.ResourceRequest == resources.ResourceRequest{Region: "us-east-2"} &&
+				r.Namespace == "AWS/EC2" &&
+				r.MetricName == "CPUUtilization" &&
+				r.DimensionKey == "instanceId" &&
+				len(r.DimensionFilter) == 2 &&
+				assert.Contains(t, r.DimensionFilter, &resources.Dimension{Name: "NodeID", Value: "Shared"}) &&
+				assert.Contains(t, r.DimensionFilter, &resources.Dimension{Name: "stage", Value: "QueryCommit"})
+		})).Return([]string{}, nil).Once()
 		newListMetricsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.ListMetricsProvider, error) {
 			return &mockListMetricsService, nil
 		}
@@ -26,13 +34,6 @@ func Test_DimensionValues_Route(t *testing.T) {
 		req := httptest.NewRequest("GET", `/dimension-values?region=us-east-2&dimensionKey=instanceId&namespace=AWS/EC2&metricName=CPUUtilization&dimensionFilters={"NodeID":["Shared"],"stage":["QueryCommit"]}`, nil)
 		handler := http.HandlerFunc(ResourceRequestMiddleware(DimensionValuesHandler, logger, nil))
 		handler.ServeHTTP(rr, req)
-		mockListMetricsService.AssertCalled(t, "GetDimensionValuesByDimensionFilter", resources.DimensionValuesRequest{
-			ResourceRequest: &resources.ResourceRequest{Region: "us-east-2"},
-			Namespace:       "AWS/EC2",
-			MetricName:      "CPUUtilization",
-			DimensionKey:    "instanceId",
-			DimensionFilter: []*resources.Dimension{{Name: "NodeID", Value: "Shared"}, {Name: "stage", Value: "QueryCommit"}},
-		})
 	})
 
 	t.Run("returns 500 if GetDimensionValuesByDimensionFilter returns an error", func(t *testing.T) {

From ed72b02b27dcd54197b63d0cac60de79228cde0f Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@grafana.com>
Date: Wed, 23 Nov 2022 11:32:42 -0500
Subject: [PATCH 124/153] Chore: update vscode "Run Server" config for
 single-binary (#59237)

update vscode "Run Server" config for single-binary
---
 .vscode/launch.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 22f7c49d9a9..a6b91b2f521 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,10 +6,10 @@
       "type": "go",
       "request": "launch",
       "mode": "auto",
-      "program": "${workspaceFolder}/pkg/cmd/grafana-server/",
+      "program": "${workspaceFolder}/pkg/cmd/grafana/",
       "env": {},
       "cwd": "${workspaceFolder}",
-      "args": ["--homepath", "${workspaceFolder}", "--packaging", "dev"]
+      "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },
     {
       "name": "Attach to Chrome",

From a098bdef589547c1ffcea537df82446ed16fb543 Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Wed, 23 Nov 2022 16:48:41 +0000
Subject: [PATCH 125/153] Loki: Make label browser accessible in query builder
 (#58525)

* add label browser button to query editor header

* add dynamic button label text

* add LabelBrowserModal.tsx

* toggle label browser modal on click

* pass required props to LabelBrowserModal

* add placeholder to text input

* render label browser inside of the modal

* change button based on label status

* remove label browser button from code mode

* fix element overlap in label browser

* fix undefined app in feature tracking

* remove all any types

* add tests for label browser button

* update modal component width

* update label loading function

* add tests to LabelBrowserModal

* fix broken mock datasource

* update test names

* use stack component for button spacing

* revert modal width

* update label search placeholder

* remove unused import

* add test assertion for closed modal

* remove redundant if statement

* remove unnecessary code

* update error message and fix position

* fix input placeholder text
---
 .../loki/components/LokiLabelBrowser.tsx      | 22 ++---
 .../loki/components/LokiQueryEditor.test.tsx  |  5 ++
 .../loki/components/LokiQueryEditor.tsx       | 87 ++++++++++++++-----
 .../loki/components/LokiQueryField.tsx        | 38 --------
 .../components/LabelBrowserModal.test.tsx     | 42 +++++++++
 .../components/LabelBrowserModal.tsx          | 57 ++++++++++++
 6 files changed, 182 insertions(+), 69 deletions(-)
 create mode 100644 public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx
 create mode 100644 public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx

diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
index a9903e08db1..2fd67e7169a 100644
--- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
@@ -131,16 +131,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
     margin-bottom: ${theme.spacing(1)};
   `,
   status: css`
-    padding: ${theme.spacing(0.5)};
+    margin-bottom: ${theme.spacing(1)};
     color: ${theme.colors.text.secondary};
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    /* using absolute positioning because flex interferes with ellipsis */
-    position: absolute;
-    width: 50%;
-    right: 0;
-    text-align: right;
     transition: opacity 100ms linear;
     opacity: 0;
   `,
@@ -367,7 +362,7 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
   async fetchSeries(selector: string, lastFacetted?: string) {
     const { languageProvider } = this.props;
     if (lastFacetted) {
-      this.updateLabelState(lastFacetted, { loading: true }, `Facetting labels for ${selector}`);
+      this.updateLabelState(lastFacetted, { loading: true }, `Loading labels for ${selector}`);
     }
     try {
       const possibleLabels = await languageProvider.fetchSeriesLabels(selector, true);
@@ -467,7 +462,12 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
             2. Find values for the selected labels
           </Label>
           <div>
-            <Input onChange={this.onChangeSearch} aria-label="Filter expression for values" value={searchTerm} />
+            <Input
+              onChange={this.onChangeSearch}
+              aria-label="Filter expression for values"
+              value={searchTerm}
+              placeholder={'Enter a label value'}
+            />
           </div>
           <div className={styles.valueListArea}>
             {selectedLabels.map((label) => (
@@ -520,6 +520,9 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
             {selector}
           </div>
           {validationStatus && <div className={styles.validationStatus}>{validationStatus}</div>}
+          <div className={cx(styles.status, (status || error) && styles.statusShowing)}>
+            <span className={error ? styles.error : ''}>{error || status}</span>
+          </div>
           <HorizontalGroup>
             <Button aria-label="Use selector as logs button" disabled={empty} onClick={this.onClickRunLogsQuery}>
               Show logs
@@ -543,9 +546,6 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
             <Button aria-label="Selector clear button" variant="secondary" onClick={this.onClickClear}>
               Clear
             </Button>
-            <div className={cx(styles.status, (status || error) && styles.statusShowing)}>
-              <span className={error ? styles.error : ''}>{error || status}</span>
-            </div>
           </HorizontalGroup>
         </div>
       </div>
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
index 3e943ee6b88..69df9eae73a 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
@@ -149,6 +149,11 @@ describe('LokiQueryEditorSelector', () => {
     expect(screen.getByText('Rate')).toBeInTheDocument();
     expect(screen.getByText('$__interval')).toBeInTheDocument();
   });
+
+  it('renders the label browser button', async () => {
+    renderWithMode(QueryEditorMode.Code);
+    expect(await screen.findByTestId('label-browser-button')).toBeInTheDocument();
+  });
 });
 
 function renderWithMode(mode: QueryEditorMode) {
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index 5e65d770ebe..e33a4c27359 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -2,7 +2,7 @@ import React, { SyntheticEvent, useCallback, useEffect, useState } from 'react';
 
 import { CoreApp, LoadingState } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorHeader, EditorRows, FlexItem, Space } from '@grafana/experimental';
+import { EditorHeader, EditorRows, FlexItem, Space, Stack } from '@grafana/experimental';
 import { reportInteraction } from '@grafana/runtime';
 import { Button, ConfirmModal } from '@grafana/ui';
 import { QueryEditorModeToggle } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle';
@@ -10,6 +10,7 @@ import { QueryHeaderSwitch } from 'app/plugins/datasource/prometheus/querybuilde
 import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
 
 import { lokiQueryEditorExplainKey, useFlag } from '../../prometheus/querybuilder/shared/hooks/useFlag';
+import { LabelBrowserModal } from '../querybuilder/components/LabelBrowserModal';
 import { LokiQueryBuilderContainer } from '../querybuilder/components/LokiQueryBuilderContainer';
 import { LokiQueryBuilderOptions } from '../querybuilder/components/LokiQueryBuilderOptions';
 import { LokiQueryCodeEditor } from '../querybuilder/components/LokiQueryCodeEditor';
@@ -25,10 +26,12 @@ export const testIds = {
 };
 
 export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
-  const { onChange, onRunQuery, onAddQuery, data, app, queries } = props;
+  const { onChange, onRunQuery, onAddQuery, data, app, queries, datasource } = props;
   const [parseModalOpen, setParseModalOpen] = useState(false);
   const [queryPatternsModalOpen, setQueryPatternsModalOpen] = useState(false);
   const [dataIsStale, setDataIsStale] = useState(false);
+  const [labelBrowserVisible, setLabelBrowserVisible] = useState(false);
+  const [labelsLoaded, setLabelsLoaded] = useState(false);
   const { flag: explain, setFlag: setExplain } = useFlag(lokiQueryEditorExplainKey);
 
   const query = getQueryWithDefaults(props.query);
@@ -70,6 +73,30 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
     onChange(query);
   };
 
+  const onClickChooserButton = () => {
+    setLabelBrowserVisible((visible) => !visible);
+  };
+
+  const getChooserText = (logLabelsLoaded: boolean, hasLogLabels: boolean) => {
+    if (!logLabelsLoaded) {
+      return 'Loading labels...';
+    }
+    if (!hasLogLabels) {
+      return '(No labels found)';
+    }
+    return 'Label browser';
+  };
+
+  useEffect(() => {
+    datasource.languageProvider.start().then(() => {
+      setLabelsLoaded(true);
+    });
+  }, [datasource]);
+
+  const hasLogLabels = datasource.languageProvider.getLabelKeys().length > 0;
+  const labelBrowserText = getChooserText(labelsLoaded, hasLogLabels);
+  const buttonDisabled = !(labelsLoaded && hasLogLabels);
+
   return (
     <>
       <ConfirmModal
@@ -93,25 +120,45 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
         onAddQuery={onAddQuery}
       />
       <EditorHeader>
-        <Button
-          aria-label={selectors.components.QueryBuilder.queryPatterns}
-          variant="secondary"
-          size="sm"
-          onClick={() => {
-            setQueryPatternsModalOpen((prevValue) => !prevValue);
+        <LabelBrowserModal
+          isOpen={labelBrowserVisible}
+          languageProvider={datasource.languageProvider}
+          query={query}
+          app={app}
+          onClose={() => setLabelBrowserVisible(false)}
+          onChange={onChangeInternal}
+          onRunQuery={onRunQuery}
+        />
+        <Stack gap={1}>
+          <Button
+            aria-label={selectors.components.QueryBuilder.queryPatterns}
+            variant="secondary"
+            size="sm"
+            onClick={() => {
+              setQueryPatternsModalOpen((prevValue) => !prevValue);
 
-            const visualQuery = buildVisualQueryFromString(query.expr || '');
-            reportInteraction('grafana_loki_query_patterns_opened', {
-              version: 'v2',
-              app: app ?? '',
-              editorMode: query.editorMode,
-              preSelectedOperationsCount: visualQuery.query.operations.length,
-              preSelectedLabelsCount: visualQuery.query.labels.length,
-            });
-          }}
-        >
-          Kick start your query
-        </Button>
+              const visualQuery = buildVisualQueryFromString(query.expr || '');
+              reportInteraction('grafana_loki_query_patterns_opened', {
+                version: 'v2',
+                app: app ?? '',
+                editorMode: query.editorMode,
+                preSelectedOperationsCount: visualQuery.query.operations.length,
+                preSelectedLabelsCount: visualQuery.query.labels.length,
+              });
+            }}
+          >
+            Kick start your query
+          </Button>
+          <Button
+            variant="secondary"
+            size="sm"
+            onClick={onClickChooserButton}
+            disabled={buttonDisabled}
+            data-testid="label-browser-button"
+          >
+            {labelBrowserText}
+          </Button>
+        </Stack>
         <QueryHeaderSwitch label="Explain" value={explain} onChange={onExplainChange} />
         <FlexItem grow={1} />
         {app !== CoreApp.Explore && (
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
index b695b2d4c08..9ec7354f88d 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
@@ -13,7 +13,6 @@ import {
   TypeaheadInput,
   BracesPlugin,
   DOMUtil,
-  Icon,
 } from '@grafana/ui';
 import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
 
@@ -22,21 +21,10 @@ import { LokiDatasource } from '../datasource';
 import { escapeLabelValueInSelector, shouldRefreshLabels } from '../languageUtils';
 import { LokiQuery, LokiOptions } from '../types';
 
-import { LokiLabelBrowser } from './LokiLabelBrowser';
 import { MonacoQueryFieldWrapper } from './monaco-query-field/MonacoQueryFieldWrapper';
 
 const LAST_USED_LABELS_KEY = 'grafana.datasources.loki.browser.labels';
 
-function getChooserText(hasSyntax: boolean, hasLogLabels: boolean) {
-  if (!hasSyntax) {
-    return 'Loading labels...';
-  }
-  if (!hasLogLabels) {
-    return '(No labels found)';
-  }
-  return 'Label browser';
-}
-
 function willApplySuggestion(suggestion: string, { typeaheadContext, typeaheadText }: SuggestionsState): string {
   // Modify suggestion based on context
   switch (typeaheadContext) {
@@ -191,11 +179,6 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
       onBlur,
     } = this.props;
 
-    const { labelsLoaded, labelBrowserVisible } = this.state;
-    const hasLogLabels = datasource.languageProvider.getLabelKeys().length > 0;
-    const chooserText = getChooserText(labelsLoaded, hasLogLabels);
-    const buttonDisabled = !(labelsLoaded && hasLogLabels);
-
     return (
       <LocalStorageValueProvider<string[]> storageKey={LAST_USED_LABELS_KEY} defaultValue={[]}>
         {(lastUsedLabels, onLastUsedLabelsSave, onLastUsedLabelsDelete) => {
@@ -205,14 +188,6 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
                 className="gf-form-inline gf-form-inline--xs-view-flex-column flex-grow-1"
                 data-testid={this.props['data-testid']}
               >
-                <button
-                  className="gf-form-label query-keyword pointer"
-                  onClick={this.onClickChooserButton}
-                  disabled={buttonDisabled}
-                >
-                  {chooserText}
-                  <Icon name={labelBrowserVisible ? 'angle-down' : 'angle-right'} />
-                </button>
                 <div className="gf-form gf-form--grow flex-shrink-1 min-width-15">
                   {config.featureToggles.lokiMonacoEditor ? (
                     <MonacoQueryFieldWrapper
@@ -239,19 +214,6 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
                   )}
                 </div>
               </div>
-              {labelBrowserVisible && (
-                <div className="gf-form">
-                  <LokiLabelBrowser
-                    languageProvider={datasource.languageProvider}
-                    onChange={this.onChangeLabelBrowser}
-                    lastUsedLabels={lastUsedLabels || []}
-                    storeLastUsedLabels={onLastUsedLabelsSave}
-                    deleteLastUsedLabels={onLastUsedLabelsDelete}
-                    app={app}
-                  />
-                </div>
-              )}
-
               {ExtraFieldElement}
             </>
           );
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx
new file mode 100644
index 00000000000..3f95c0b1bc6
--- /dev/null
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx
@@ -0,0 +1,42 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { LokiDatasource } from '../../datasource';
+import { createLokiDatasource } from '../../mocks';
+import { LokiQuery } from '../../types';
+
+import { LabelBrowserModal, Props } from './LabelBrowserModal';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
+describe('LabelBrowserModal', () => {
+  let datasource: LokiDatasource, props: Props;
+
+  beforeEach(() => {
+    datasource = createLokiDatasource();
+
+    props = {
+      isOpen: true,
+      languageProvider: datasource.languageProvider,
+      query: {} as LokiQuery,
+      onClose: jest.fn(),
+      onChange: jest.fn(),
+      onRunQuery: jest.fn(),
+    };
+
+    jest.spyOn(datasource, 'metadataRequest').mockResolvedValue({});
+  });
+
+  it('renders the label browser modal when open', () => {
+    render(<LabelBrowserModal {...props} />);
+    expect(screen.getByRole('heading', { name: /label browser/i })).toBeInTheDocument();
+  });
+
+  it("doesn't render the label browser modal when closed", () => {
+    render(<LabelBrowserModal {...props} isOpen={false} />);
+    expect(screen.queryByRole('heading', { name: /label browser/i })).toBeNull();
+  });
+});
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx
new file mode 100644
index 00000000000..4a0b0ba6bdd
--- /dev/null
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+
+import { CoreApp } from '@grafana/data';
+import { Modal } from '@grafana/ui';
+import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
+
+import LanguageProvider from '../../LanguageProvider';
+import { LokiLabelBrowser } from '../../components/LokiLabelBrowser';
+import { LokiQuery } from '../../types';
+
+export interface Props {
+  isOpen: boolean;
+  languageProvider: LanguageProvider;
+  query: LokiQuery;
+  app?: CoreApp;
+  onClose: () => void;
+  onChange: (query: LokiQuery) => void;
+  onRunQuery: () => void;
+}
+
+export const LabelBrowserModal = (props: Props) => {
+  const { isOpen, onClose, languageProvider, app } = props;
+
+  const LAST_USED_LABELS_KEY = 'grafana.datasources.loki.browser.labels';
+
+  const changeQuery = (value: string) => {
+    const { query, onChange, onRunQuery } = props;
+
+    const nextQuery = { ...query, expr: value };
+    onChange(nextQuery);
+    onRunQuery();
+  };
+
+  const onChange = (selector: string) => {
+    changeQuery(selector);
+    onClose();
+  };
+
+  return (
+    <Modal isOpen={isOpen} title="Label browser" onDismiss={onClose}>
+      <LocalStorageValueProvider<string[]> storageKey={LAST_USED_LABELS_KEY} defaultValue={[]}>
+        {(lastUsedLabels, onLastUsedLabelsSave, onLastUsedLabelsDelete) => {
+          return (
+            <LokiLabelBrowser
+              languageProvider={languageProvider}
+              onChange={onChange}
+              lastUsedLabels={lastUsedLabels}
+              storeLastUsedLabels={onLastUsedLabelsSave}
+              deleteLastUsedLabels={onLastUsedLabelsDelete}
+              app={app}
+            />
+          );
+        }}
+      </LocalStorageValueProvider>
+    </Modal>
+  );
+};

From d33b4918cdbd21a1742090f451042a86c5b6d8fe Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 23 Nov 2022 16:54:57 +0000
Subject: [PATCH 126/153] Chore: more any/type assertion improvements (#59229)

more any/type assertion improvements
---
 .betterer.results                             | 130 ++----------------
 .../querybuilder/shared/OperationEditor.tsx   |   2 +-
 .../querybuilder/shared/OperationHeader.tsx   |   3 +-
 .../shared/OperationList.test.tsx             |   7 +-
 .../querybuilder/shared/parsingUtils.ts       |   6 +-
 .../prometheus/querybuilder/state.test.ts     |   6 +-
 .../prometheus/querybuilder/state.ts          |   2 +-
 .../prometheus/result_transformer.ts          |   4 +-
 .../tempo/QueryEditor/QueryField.tsx          |   2 +-
 .../plugins/datasource/tempo/datasource.ts    |   2 +-
 .../tempo/traceql/autocomplete.test.ts        |  49 +++++--
 .../datasource/tempo/traceql/autocomplete.ts  |  10 +-
 .../panel/barchart/TickSpacingEditor.tsx      |   2 +-
 .../app/plugins/panel/barchart/suggestions.ts |   6 +-
 .../app/plugins/panel/barchart/utils.test.ts  |  16 +--
 .../panel/bargauge/BarGaugeMigrations.test.ts |   2 +-
 .../plugins/panel/bargauge/BarGaugePanel.tsx  |   2 +-
 public/app/plugins/panel/canvas/utils.ts      |   5 +-
 .../components/FlameGraphHeader.tsx           |   6 +-
 .../panel/gauge/GaugeMigrations.test.ts       |   2 +-
 .../app/plugins/panel/geomap/GeomapPanel.tsx  |   4 +-
 .../geomap/editor/FrameSelectionEditor.tsx    |   9 +-
 .../panel/geomap/editor/StyleEditor.tsx       |   2 +-
 .../plugins/panel/geomap/style/utils.test.ts  |   2 +-
 .../plugins/panel/geomap/utils/tootltip.ts    |   6 +-
 public/app/plugins/panel/geomap/view.ts       |   6 +-
 .../panel/gettingstarted/GettingStarted.tsx   |   2 +-
 .../panel/gettingstarted/components/Step.tsx  |   4 +-
 public/app/plugins/panel/graph/utils.ts       |   6 +-
 public/app/plugins/panel/nodeGraph/Edge.tsx   |   2 +-
 .../plugins/panel/nodeGraph/Legend.test.tsx   |  14 +-
 public/app/plugins/panel/nodeGraph/Node.tsx   |   7 +-
 .../app/plugins/panel/nodeGraph/NodeGraph.tsx |   4 +-
 public/app/plugins/panel/nodeGraph/useZoom.ts |   2 +-
 34 files changed, 131 insertions(+), 203 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 21865cd8692..0c4594256b5 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -6644,16 +6644,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -6665,22 +6657,13 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "public/app/plugins/datasource/prometheus/querybuilder/state.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/datasource/prometheus/querybuilder/state.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/datasource/prometheus/result_transformer.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -6716,8 +6699,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "31"]
     ],
     "public/app/plugins/datasource/prometheus/result_transformer.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6727,8 +6709,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -6762,16 +6743,15 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
       [0, 0, 0, "Do not use any type assertions.", "10"],
       [0, 0, 0, "Do not use any type assertions.", "11"],
       [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
     ],
     "public/app/plugins/datasource/tempo/language_provider.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6805,33 +6785,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"]
-    ],
-    "public/app/plugins/datasource/tempo/traceql/autocomplete.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/testdata/ConfigEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6988,9 +6942,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/plugins/panel/barchart/TickSpacingEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/barchart/bars.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -7007,29 +6958,10 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/barchart/quadtree.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/barchart/suggestions.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/panel/barchart/utils.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
-    ],
     "public/app/plugins/panel/barchart/utils.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/plugins/panel/bargauge/BarGaugePanel.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/candlestick/CandlestickPanel.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -7099,8 +7031,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/plugins/panel/canvas/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/panel/dashlist/module.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -7117,12 +7048,6 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/debug/RenderInfoViewer.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/gauge/GaugeMigrations.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/gauge/GaugeMigrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -7140,16 +7065,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
     "public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/panel/geomap/editor/StyleEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
@@ -7160,8 +7081,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
       [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"]
+      [0, 0, 0, "Do not use any type assertions.", "11"]
     ],
     "public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -7187,9 +7107,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
-    "public/app/plugins/panel/geomap/style/utils.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/geomap/utils/layers.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
@@ -7201,14 +7118,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/plugins/panel/geomap/view.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
-    ],
-    "public/app/plugins/panel/gettingstarted/GettingStarted.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/gettingstarted/components/Step.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -7554,9 +7463,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "public/app/plugins/panel/graph/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/heatmap-old/axes_editor.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -7833,31 +7739,19 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/panel/nodeGraph/Edge.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/panel/nodeGraph/EdgeLabel.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/nodeGraph/Legend.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/plugins/panel/nodeGraph/Legend.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/nodeGraph/Node.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/panel/nodeGraph/NodeGraph.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
+      [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
     "public/app/plugins/panel/nodeGraph/ViewControls.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
index 4256a0e4bfc..188a7d71b4f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
@@ -166,7 +166,7 @@ export function OperationEditor({
 function useFlash(flash?: boolean) {
   const [keepFlash, setKeepFlash] = useState(true);
   useEffect(() => {
-    let t: any;
+    let t: ReturnType<typeof setTimeout>;
     if (flash) {
       t = setTimeout(() => {
         setKeepFlash(false);
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
index f6acf54caae..575f134f501 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
@@ -1,5 +1,6 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
+import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { FlexItem } from '@grafana/experimental';
@@ -13,7 +14,7 @@ export interface Props {
   def: QueryBuilderOperationDef;
   index: number;
   queryModeller: VisualQueryModeller;
-  dragHandleProps: any;
+  dragHandleProps?: DraggableProvidedDragHandleProps;
   onChange: (index: number, update: QueryBuilderOperation) => void;
   onRemove: (index: number) => void;
 }
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
index 3d2943dc058..3480d76b869 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
@@ -2,11 +2,12 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { DataSourceApi } from '@grafana/data';
+import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
 
 import { PrometheusDatasource } from '../../datasource';
 import PromQlLanguageProvider from '../../language_provider';
 import { EmptyLanguageProviderMock } from '../../language_provider.mock';
+import { PromOptions } from '../../types';
 import { promQueryModeller } from '../PromQueryModeller';
 import { PromVisualQuery } from '../types';
 
@@ -69,8 +70,8 @@ function setup(query: PromVisualQuery = defaultQuery) {
       {
         url: '',
         jsonData: {},
-        meta: {} as any,
-      } as any,
+        meta: {},
+      } as DataSourceInstanceSettings<PromOptions>,
       undefined,
       undefined,
       languageProvider
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts
index f8f7314bb89..d0306411e2f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts
@@ -1,6 +1,6 @@
 import { SyntaxNode, TreeCursor } from '@lezer/common';
 
-import { QueryBuilderOperation } from './types';
+import { QueryBuilderOperation, QueryBuilderOperationParamValue } from './types';
 
 // Although 0 isn't explicitly provided in the lezer-promql & @grafana/lezer-logql library as the error node ID, it does appear to be the ID of error nodes within lezer.
 export const ErrorId = 0;
@@ -97,7 +97,7 @@ export function makeBinOp(
   numberNode: SyntaxNode,
   hasBool: boolean
 ): QueryBuilderOperation {
-  const params: any[] = [parseFloat(getString(expr, numberNode))];
+  const params: QueryBuilderOperationParamValue[] = [parseFloat(getString(expr, numberNode))];
   if (opDef.comparison) {
     params.push(hasBool);
   }
@@ -184,7 +184,7 @@ function jsonToText(
   let text = newIndent + name;
 
   const children = node.children;
-  children.forEach((child: any, index: number) => {
+  children.forEach((child, index) => {
     const isLastChild = index === children.length - 1;
     text +=
       '\n' +
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/state.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/state.test.ts
index e8bdc3762e9..fb8ded74555 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/state.test.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/state.test.ts
@@ -17,7 +17,7 @@ describe('getQueryWithDefaults(', () => {
   });
 
   it('should set both range and instant to true when in Explore', () => {
-    expect(getQueryWithDefaults({ refId: 'A' } as any, CoreApp.Explore)).toEqual({
+    expect(getQueryWithDefaults({ refId: 'A' } as PromQuery, CoreApp.Explore)).toEqual({
       editorMode: 'builder',
       expr: '',
       legendFormat: '__auto',
@@ -45,6 +45,8 @@ describe('getQueryWithDefaults(', () => {
       expect(query.editorMode).toBe(QueryEditorMode.Code);
     });
 
-    expect(getQueryWithDefaults({ refId: 'A' } as any, CoreApp.Dashboard).editorMode).toEqual(QueryEditorMode.Code);
+    expect(getQueryWithDefaults({ refId: 'A' } as PromQuery, CoreApp.Dashboard).editorMode).toEqual(
+      QueryEditorMode.Code
+    );
   });
 });
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/state.ts b/public/app/plugins/datasource/prometheus/querybuilder/state.ts
index 0215bec27ea..748b8fb814f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/state.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/state.ts
@@ -22,7 +22,7 @@ function getDefaultEditorMode(expr: string) {
     return QueryEditorMode.Code;
   }
 
-  const value = store.get(queryEditorModeDefaultLocalStorageKey) as QueryEditorMode;
+  const value: QueryEditorMode = store.get(queryEditorModeDefaultLocalStorageKey);
   switch (value) {
     case QueryEditorMode.Builder:
     case QueryEditorMode.Code:
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 3b8025e7afc..875d65dc1f2 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -156,13 +156,13 @@ export function transformV2(
 
   // Everything else is processed as time_series result and graph preferredVisualisationType
   const otherFrames = framesWithoutTableHeatmapsAndExemplars.map((dataFrame) => {
-    const df = {
+    const df: DataFrame = {
       ...dataFrame,
       meta: {
         ...dataFrame.meta,
         preferredVisualisationType: 'graph',
       },
-    } as DataFrame;
+    };
     return df;
   });
 
diff --git a/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx b/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
index 171ac626ef5..9903838ee4c 100644
--- a/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
+++ b/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
@@ -214,7 +214,7 @@ function SearchSection({ logsDatasourceUid, onChange, onRunQuery, query }: Searc
           datasource={ds}
           onChange={onChange}
           onRunQuery={onRunQuery}
-          query={query.linkedQuery ?? ({ refId: 'linked' } as any)}
+          query={query.linkedQuery ?? ({ refId: 'linked' } as LokiQuery)}
           history={[]}
         />
       </>
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 2bac0022990..f480037d7e3 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -366,7 +366,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
       method: 'GET',
       url: `${this.instanceSettings.url}/api/echo`,
     };
-    const response = await lastValueFrom(getBackendSrv().fetch<any>(options));
+    const response = await lastValueFrom(getBackendSrv().fetch(options));
 
     if (response?.ok) {
       return { status: 'success', message: 'Data source is working' };
diff --git a/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts b/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
index 29885de84de..5433f699e7a 100644
--- a/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
+++ b/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
@@ -1,4 +1,4 @@
-import { DataSourceInstanceSettings, PluginType } from '@grafana/data/src';
+import { DataSourceInstanceSettings, PluginMetaInfo, PluginType } from '@grafana/data';
 import { monacoTypes } from '@grafana/ui';
 
 import { TempoDatasource } from '../datasource';
@@ -14,7 +14,10 @@ jest.mock('@grafana/runtime', () => ({
 describe('CompletionProvider', () => {
   it('suggests tags, intrinsics and scopes', async () => {
     const { provider, model } = setup('{}', 1, defaultTags);
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       ...CompletionProvider.scopes.map((s) => expect.objectContaining({ label: s, insertText: s })),
       ...CompletionProvider.intrinsics.map((s) => expect.objectContaining({ label: s, insertText: s })),
@@ -38,7 +41,10 @@ describe('CompletionProvider', () => {
         })
     );
 
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'foobar', insertText: '"foobar"' }),
     ]);
@@ -59,7 +65,10 @@ describe('CompletionProvider', () => {
         })
     );
 
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'foobar', insertText: 'foobar' }),
     ]);
@@ -67,13 +76,19 @@ describe('CompletionProvider', () => {
 
   it('suggests nothing without tags', async () => {
     const { provider, model } = setup('{foo="}', 7, []);
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([]);
   });
 
   it('suggests tags on empty input', async () => {
     const { provider, model } = setup('', 0, defaultTags);
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       ...CompletionProvider.scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
       ...CompletionProvider.intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
@@ -84,7 +99,10 @@ describe('CompletionProvider', () => {
 
   it('suggests operators after a space after the tag name', async () => {
     const { provider, model } = setup('{ foo }', 6, defaultTags);
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual(
       CompletionProvider.operators.map((s) => expect.objectContaining({ label: s, insertText: s }))
     );
@@ -92,7 +110,10 @@ describe('CompletionProvider', () => {
 
   it('suggests tags after a scope', async () => {
     const { provider, model } = setup('{ resource. }', 11, defaultTags);
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       ...CompletionProvider.intrinsics.map((s) => expect.objectContaining({ label: s, insertText: s })),
       ...defaultTags.map((s) => expect.objectContaining({ label: s, insertText: s })),
@@ -101,7 +122,10 @@ describe('CompletionProvider', () => {
 
   it('suggests logical operators and close bracket after the value', async () => {
     const { provider, model } = setup('{foo=300 }', 9, defaultTags);
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       ...CompletionProvider.logicalOps.map((s) => expect.objectContaining({ label: s, insertText: s })),
       expect.objectContaining({ label: '}', insertText: '}' }),
@@ -122,7 +146,10 @@ describe('CompletionProvider', () => {
           ]);
         })
     );
-    const result = await provider.provideCompletionItems(model as any, {} as any);
+    const result = await provider.provideCompletionItems(
+      model as unknown as monacoTypes.editor.ITextModel,
+      {} as monacoTypes.Position
+    );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'foobar', insertText: 'foobar' }),
     ]);
@@ -185,7 +212,7 @@ const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
     id: 'tempo',
     name: 'tempo',
     type: PluginType.datasource,
-    info: {} as any,
+    info: {} as PluginMetaInfo,
     module: '',
     baseUrl: '',
   },
diff --git a/public/app/plugins/datasource/tempo/traceql/autocomplete.ts b/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
index 1cb224d083d..aaa3851e974 100644
--- a/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
+++ b/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
@@ -124,7 +124,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
         return CompletionProvider.operators.map((key) => ({
           label: key,
           insertText: key,
-          type: 'OPERATOR' as CompletionType,
+          type: 'OPERATOR',
         }));
       case 'SPANSET_IN_VALUE':
         const tagName = this.overrideTagName(situation.tagName);
@@ -144,7 +144,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
         return CompletionProvider.logicalOps.concat('}').map((key) => ({
           label: key,
           insertText: key,
-          type: 'OPERATOR' as CompletionType,
+          type: 'OPERATOR',
         }));
       default:
         throw new Error(`Unexpected situation ${situation}`);
@@ -157,7 +157,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
       .map((key) => ({
         label: key,
         insertText: (prepend || '') + key,
-        type: 'TAG_NAME' as CompletionType,
+        type: 'TAG_NAME',
       }));
   }
 
@@ -165,7 +165,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
     return CompletionProvider.intrinsics.map((key) => ({
       label: key,
       insertText: (prepend || '') + key,
-      type: 'KEYWORD' as CompletionType,
+      type: 'KEYWORD',
     }));
   }
 
@@ -173,7 +173,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
     return CompletionProvider.scopes.map((key) => ({
       label: key,
       insertText: (prepend || '') + key,
-      type: 'SCOPE' as CompletionType,
+      type: 'SCOPE',
     }));
   }
 
diff --git a/public/app/plugins/panel/barchart/TickSpacingEditor.tsx b/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
index a4564cc78d0..2c6c397b186 100644
--- a/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
+++ b/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
@@ -26,7 +26,7 @@ const GAPS_OPTIONS: Array<SelectableValue<number>> = [
   },
 ];
 
-export const TickSpacingEditor: React.FC<StandardEditorProps<number, any>> = (props) => {
+export const TickSpacingEditor: React.FC<StandardEditorProps<number>> = (props) => {
   let value = props.value ?? 0;
   const isRTL = value < 0;
   if (isRTL) {
diff --git a/public/app/plugins/panel/barchart/suggestions.ts b/public/app/plugins/panel/barchart/suggestions.ts
index 2781a53589c..150696b60ad 100644
--- a/public/app/plugins/panel/barchart/suggestions.ts
+++ b/public/app/plugins/panel/barchart/suggestions.ts
@@ -1,5 +1,5 @@
 import { VisualizationSuggestionsBuilder, VizOrientation } from '@grafana/data';
-import { StackingMode, VisibilityMode } from '@grafana/schema';
+import { LegendDisplayMode, StackingMode, VisibilityMode } from '@grafana/schema';
 import { SuggestionName } from 'app/types/suggestions';
 
 import { PanelFieldConfig, PanelOptions } from './models.gen';
@@ -12,9 +12,11 @@ export class BarChartSuggestionsSupplier {
       options: {
         showValue: VisibilityMode.Never,
         legend: {
+          calcs: [],
+          displayMode: LegendDisplayMode.List,
           showLegend: true,
           placement: 'right',
-        } as any,
+        },
       },
       fieldConfig: {
         defaults: {
diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts
index 8590256f7f1..4b917ab6b7f 100644
--- a/public/app/plugins/panel/barchart/utils.test.ts
+++ b/public/app/plugins/panel/barchart/utils.test.ts
@@ -19,7 +19,7 @@ import {
   SortOrder,
 } from '@grafana/schema';
 
-import { PanelFieldConfig } from './models.gen';
+import { PanelFieldConfig, PanelOptions } from './models.gen';
 import { BarChartOptionsEX, prepareBarChartDisplayValues, preparePlotConfigBuilder } from './utils';
 
 function mockDataFrame() {
@@ -69,7 +69,7 @@ function mockDataFrame() {
     state: {},
   });
 
-  const info = prepareBarChartDisplayValues([df1], createTheme(), {} as any);
+  const info = prepareBarChartDisplayValues([df1], createTheme(), {} as PanelOptions);
 
   if (!('aligned' in info)) {
     throw new Error('Bar chart not prepared correctly');
@@ -158,7 +158,7 @@ describe('BarChart utils', () => {
 
   describe('prepareGraphableFrames', () => {
     it('will warn when there is no data in the response', () => {
-      const result = prepareBarChartDisplayValues([], createTheme(), { stacking: StackingMode.None } as any);
+      const result = prepareBarChartDisplayValues([], createTheme(), { stacking: StackingMode.None } as PanelOptions);
       const warning = assertIsDefined('warn' in result ? result : null);
 
       expect(warning.warn).toEqual('No data in response');
@@ -171,7 +171,7 @@ describe('BarChart utils', () => {
           { name: 'value', values: [1, 2, 3, 4, 5] },
         ],
       });
-      const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as any);
+      const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as PanelOptions);
       const warning = assertIsDefined('warn' in result ? result : null);
       expect(warning.warn).toEqual('Bar charts requires a string or time field');
       expect(warning).not.toHaveProperty('viz');
@@ -184,7 +184,7 @@ describe('BarChart utils', () => {
           { name: 'value', type: FieldType.boolean, values: [true, true, true, true, true] },
         ],
       });
-      const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as any);
+      const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as PanelOptions);
       const warning = assertIsDefined('warn' in result ? result : null);
       expect(warning.warn).toEqual('No numeric fields found');
       expect(warning).not.toHaveProperty('viz');
@@ -197,7 +197,7 @@ describe('BarChart utils', () => {
           { name: 'value', values: [-10, NaN, 10, -Infinity, +Infinity] },
         ],
       });
-      const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as any);
+      const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as PanelOptions);
       const displayValues = assertIsDefined('viz' in result ? result : null);
 
       const field = displayValues.viz[0].fields[1];
@@ -224,7 +224,7 @@ describe('BarChart utils', () => {
 
       const resultAsc = prepareBarChartDisplayValues([frame], createTheme(), {
         legend: { sortBy: 'Min', sortDesc: false },
-      } as any);
+      } as PanelOptions);
       const displayValuesAsc = assertIsDefined('viz' in resultAsc ? resultAsc : null).viz[0];
       expect(displayValuesAsc.fields[0].type).toBe(FieldType.string);
       expect(displayValuesAsc.fields[1].name).toBe('a');
@@ -233,7 +233,7 @@ describe('BarChart utils', () => {
 
       const resultDesc = prepareBarChartDisplayValues([frame], createTheme(), {
         legend: { sortBy: 'Min', sortDesc: true },
-      } as any);
+      } as PanelOptions);
       const displayValuesDesc = assertIsDefined('viz' in resultDesc ? resultDesc : null).viz[0];
       expect(displayValuesDesc.fields[0].type).toBe(FieldType.string);
       expect(displayValuesDesc.fields[1].name).toBe('b');
diff --git a/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts b/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts
index 94a034d9cda..14b08ad0b88 100644
--- a/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts
+++ b/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts
@@ -49,7 +49,7 @@ describe('BarGauge Panel Migrations', () => {
     const newOptions = barGaugePanelMigrationHandler(panel as PanelModel);
 
     // should mutate panel model and move field config out of panel.options
-    expect((panel as any).fieldConfig).toMatchInlineSnapshot(`
+    expect((panel as PanelModel).fieldConfig).toMatchInlineSnapshot(`
       Object {
         "defaults": Object {
           "color": Object {
diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
index 812db7b911a..496d9c41786 100644
--- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
+++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
@@ -111,7 +111,7 @@ export class BarGaugePanel extends PureComponent<BarGaugePanelProps> {
 }
 export type BarGaugePanelProps = PanelProps<PanelOptions>;
 
-export function clearNameForSingleSeries(count: number, field: FieldConfig<any>, display: DisplayValue): DisplayValue {
+export function clearNameForSingleSeries(count: number, field: FieldConfig, display: DisplayValue): DisplayValue {
   if (count === 1 && !field.displayName) {
     return {
       ...display,
diff --git a/public/app/plugins/panel/canvas/utils.ts b/public/app/plugins/panel/canvas/utils.ts
index 6ebe45a896a..89e80963a04 100644
--- a/public/app/plugins/panel/canvas/utils.ts
+++ b/public/app/plugins/panel/canvas/utils.ts
@@ -46,10 +46,7 @@ interface RegistrySelectInfo {
   current: Array<SelectableValue<string>>;
 }
 
-export function getElementTypesOptions(
-  items: Array<CanvasElementItem<any>>,
-  current: string | undefined
-): RegistrySelectInfo {
+export function getElementTypesOptions(items: CanvasElementItem[], current: string | undefined): RegistrySelectInfo {
   const selectables: RegistrySelectInfo = { options: [], current: [] };
   const alpha: Array<SelectableValue<string>> = [];
 
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx
index 2bf1f2f0ef6..00ee80cf5e6 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx
@@ -33,7 +33,7 @@ const FlameGraphHeader = ({
 }: Props) => {
   const styles = useStyles2((theme) => getStyles(theme, app));
 
-  let viewOptions: Array<{ value: string; label: string; description: string }> = [
+  let viewOptions: Array<{ value: SelectedView; label: string; description: string }> = [
     { value: SelectedView.TopTable, label: 'Top Table', description: 'Only show top table' },
     { value: SelectedView.FlameGraph, label: 'Flame Graph', description: 'Only show flame graph' },
   ];
@@ -74,11 +74,11 @@ const FlameGraphHeader = ({
       </div>
 
       <div className={styles.rightContainer}>
-        <RadioButtonGroup
+        <RadioButtonGroup<SelectedView>
           options={viewOptions}
           value={selectedView}
           onChange={(view) => {
-            setSelectedView(view as SelectedView);
+            setSelectedView(view);
           }}
         />
       </div>
diff --git a/public/app/plugins/panel/gauge/GaugeMigrations.test.ts b/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
index bc2868c2474..853359c4bfb 100644
--- a/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
+++ b/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
@@ -141,7 +141,7 @@ describe('Gauge Panel Migrations', () => {
   });
 
   it('change from angular singlestat to gauge', () => {
-    const old: any = {
+    const old = {
       angular: {
         format: 'ms',
         decimals: 7,
diff --git a/public/app/plugins/panel/geomap/GeomapPanel.tsx b/public/app/plugins/panel/geomap/GeomapPanel.tsx
index 99e63d498b2..06ac6b825a6 100644
--- a/public/app/plugins/panel/geomap/GeomapPanel.tsx
+++ b/public/app/plugins/panel/geomap/GeomapPanel.tsx
@@ -240,11 +240,11 @@ export class GeomapPanel extends Component<Props, State> {
     this.setState({ ttipOpen: false, ttip: undefined });
   };
 
-  pointerClickListener = (evt: MapBrowserEvent<UIEvent>) => {
+  pointerClickListener = (evt: MapBrowserEvent<MouseEvent>) => {
     pointerClickListener(evt, this);
   };
 
-  pointerMoveListener = (evt: MapBrowserEvent<UIEvent>) => {
+  pointerMoveListener = (evt: MapBrowserEvent<MouseEvent>) => {
     pointerMoveListener(evt, this);
   };
 
diff --git a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
index 1126a05860a..5b770e2c2a2 100644
--- a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
@@ -40,9 +40,12 @@ export const FrameSelectionEditor: FC<StandardEditorProps<MatcherConfig>> = ({ v
     }));
   }, [context.data]);
 
-  const [priorSelectionState, updatePriorSelectionState] = useState({
-    refIds: [] as SelectableValue[],
-    value: undefined as string | undefined,
+  const [priorSelectionState, updatePriorSelectionState] = useState<{
+    refIds: SelectableValue[];
+    value: string | undefined;
+  }>({
+    refIds: [],
+    value: undefined,
   });
 
   const currentValue = useMemo(() => {
diff --git a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
index e4663f4edff..dffb281c64e 100644
--- a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
@@ -42,7 +42,7 @@ export interface StyleEditorOptions {
   displayRotation?: boolean;
 }
 
-export const StyleEditor: FC<StandardEditorProps<StyleConfig, StyleEditorOptions, any>> = ({
+export const StyleEditor: FC<StandardEditorProps<StyleConfig, StyleEditorOptions>> = ({
   value,
   context,
   onChange,
diff --git a/public/app/plugins/panel/geomap/style/utils.test.ts b/public/app/plugins/panel/geomap/style/utils.test.ts
index ddb4cc4f0e8..8c79844a266 100644
--- a/public/app/plugins/panel/geomap/style/utils.test.ts
+++ b/public/app/plugins/panel/geomap/style/utils.test.ts
@@ -31,7 +31,7 @@ describe('style utils', () => {
     };
 
     const state = await getStyleConfigState(cfg);
-    state.config = null as any; // not interesting in the snapshot
+    state.config = null as unknown as StyleConfig; // not interesting in the snapshot
     expect(state.hasText).toBe(false);
     expect(state).toMatchInlineSnapshot(`
       Object {
diff --git a/public/app/plugins/panel/geomap/utils/tootltip.ts b/public/app/plugins/panel/geomap/utils/tootltip.ts
index c67643ba750..07c75dd0c5b 100644
--- a/public/app/plugins/panel/geomap/utils/tootltip.ts
+++ b/public/app/plugins/panel/geomap/utils/tootltip.ts
@@ -18,7 +18,7 @@ export const setTooltipListeners = (panel: GeomapPanel) => {
   });
 };
 
-export const pointerClickListener = (evt: MapBrowserEvent<UIEvent>, panel: GeomapPanel) => {
+export const pointerClickListener = (evt: MapBrowserEvent<MouseEvent>, panel: GeomapPanel) => {
   if (pointerMoveListener(evt, panel)) {
     evt.preventDefault();
     evt.stopPropagation();
@@ -27,7 +27,7 @@ export const pointerClickListener = (evt: MapBrowserEvent<UIEvent>, panel: Geoma
   }
 };
 
-export const pointerMoveListener = (evt: MapBrowserEvent<UIEvent>, panel: GeomapPanel) => {
+export const pointerMoveListener = (evt: MapBrowserEvent<MouseEvent>, panel: GeomapPanel) => {
   // If measure menu is open, bypass tooltip logic and display measuring mouse events
   if (panel.state.measureMenuActive) {
     return true;
@@ -35,7 +35,7 @@ export const pointerMoveListener = (evt: MapBrowserEvent<UIEvent>, panel: Geomap
   if (!panel.map || panel.state.ttipOpen) {
     return false;
   }
-  const mouse = evt.originalEvent as MouseEvent; // eslint-disable-line
+  const mouse = evt.originalEvent;
   const pixel = panel.map.getEventPixel(mouse);
   const hover = toLonLat(panel.map.getCoordinateFromPixel(pixel));
 
diff --git a/public/app/plugins/panel/geomap/view.ts b/public/app/plugins/panel/geomap/view.ts
index 94b9602480c..99f00c829e7 100644
--- a/public/app/plugins/panel/geomap/view.ts
+++ b/public/app/plugins/panel/geomap/view.ts
@@ -14,18 +14,18 @@ export enum MapCenterID {
 
 export const centerPointRegistry = new Registry<MapCenterItems>(() => [
   {
-    id: MapCenterID.Fit as string,
+    id: MapCenterID.Fit,
     name: 'Fit to data',
     zoom: 15, // max zoom
   },
   {
-    id: MapCenterID.Zero as string,
+    id: MapCenterID.Zero,
     name: '(0°, 0°)',
     lat: 0,
     lon: 0,
   },
   {
-    id: MapCenterID.Coordinates as string,
+    id: MapCenterID.Coordinates,
     name: 'Coordinates',
   },
   {
diff --git a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
index 4941d87f6c5..da99ceca45a 100644
--- a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
+++ b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
@@ -71,7 +71,7 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
 
     dashboard?.removePanel(panel!);
 
-    backendSrv.put('/api/user/helpflags/1', undefined, { showSuccessAlert: false }).then((res: any) => {
+    backendSrv.put('/api/user/helpflags/1', undefined, { showSuccessAlert: false }).then((res) => {
       contextSrv.user.helpFlags1 = res.helpFlags1;
     });
   };
diff --git a/public/app/plugins/panel/gettingstarted/components/Step.tsx b/public/app/plugins/panel/gettingstarted/components/Step.tsx
index 753ca00a486..bdfdd4d5be9 100644
--- a/public/app/plugins/panel/gettingstarted/components/Step.tsx
+++ b/public/app/plugins/panel/gettingstarted/components/Step.tsx
@@ -4,7 +4,7 @@ import React, { FC } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
-import { Card, SetupStep, TutorialCardType } from '../types';
+import { SetupStep, TutorialCardType } from '../types';
 
 import { DocsCard } from './DocsCard';
 import { TutorialCard } from './TutorialCard';
@@ -23,7 +23,7 @@ export const Step: FC<Props> = ({ step }) => {
         <p>{step.info}</p>
       </div>
       <div className={styles.cards}>
-        {step.cards.map((card: Card | TutorialCardType, index: number) => {
+        {step.cards.map((card, index) => {
           const key = `${card.title}-${index}`;
           if (card.type === 'tutorial') {
             return <TutorialCard key={key} card={card as TutorialCardType} />;
diff --git a/public/app/plugins/panel/graph/utils.ts b/public/app/plugins/panel/graph/utils.ts
index 12b17f6f85a..d637391a216 100644
--- a/public/app/plugins/panel/graph/utils.ts
+++ b/public/app/plugins/panel/graph/utils.ts
@@ -30,7 +30,7 @@ export function getDataTimeRange(frames: DataFrame[]): AbsoluteTimeRange | undef
   return found ? range : undefined;
 }
 
-// Check wether event is LegacyGraphHoverEvent
-export function isLegacyGraphHoverEvent(event: any): event is LegacyGraphHoverEventPayload {
-  return event.hasOwnProperty('pos');
+// Check whether event is LegacyGraphHoverEvent
+export function isLegacyGraphHoverEvent(event: unknown): event is LegacyGraphHoverEventPayload {
+  return Boolean(event && typeof event === 'object' && event.hasOwnProperty('pos'));
 }
diff --git a/public/app/plugins/panel/nodeGraph/Edge.tsx b/public/app/plugins/panel/nodeGraph/Edge.tsx
index e6b8ced56dc..263ea88ec33 100644
--- a/public/app/plugins/panel/nodeGraph/Edge.tsx
+++ b/public/app/plugins/panel/nodeGraph/Edge.tsx
@@ -30,7 +30,7 @@ export const Edge = memo(function Edge(props: Props) {
     <g
       onClick={(event) => onClick(event, edge)}
       style={{ cursor: 'pointer' }}
-      aria-label={`Edge from: ${(edge.source as NodeDatum).id} to: ${(edge.target as NodeDatum).id}`}
+      aria-label={`Edge from: ${source.id} to: ${target.id}`}
     >
       <line
         strokeWidth={hovering ? 2 : 1}
diff --git a/public/app/plugins/panel/nodeGraph/Legend.test.tsx b/public/app/plugins/panel/nodeGraph/Legend.test.tsx
index fb9ac756ee5..831983305a6 100644
--- a/public/app/plugins/panel/nodeGraph/Legend.test.tsx
+++ b/public/app/plugins/panel/nodeGraph/Legend.test.tsx
@@ -12,16 +12,14 @@ describe('Legend', () => {
   });
 
   it('renders ok with color fields', () => {
-    const nodes: NodeDatum[] = [
+    const nodes = [
       {
         id: 'nodeId',
-        mainStat: { config: { displayName: 'stat1' } } as any,
-        secondaryStat: { config: { displayName: 'stat2' } } as any,
-        arcSections: [
-          { config: { displayName: 'error', color: { mode: FieldColorModeId.Fixed, fixedColor: 'red' } } } as any,
-        ],
-      } as any,
-    ];
+        mainStat: { config: { displayName: 'stat1' } },
+        secondaryStat: { config: { displayName: 'stat2' } },
+        arcSections: [{ config: { displayName: 'error', color: { mode: FieldColorModeId.Fixed, fixedColor: 'red' } } }],
+      },
+    ] as NodeDatum[];
     render(<Legend nodes={nodes} onSort={(sort) => {}} sortable={false} />);
     const items = screen.getAllByLabelText(/VizLegend series/);
     expect(items.length).toBe(3);
diff --git a/public/app/plugins/panel/nodeGraph/Node.tsx b/public/app/plugins/panel/nodeGraph/Node.tsx
index f22b031fb1f..75b2b1f5f6d 100644
--- a/public/app/plugins/panel/nodeGraph/Node.tsx
+++ b/public/app/plugins/panel/nodeGraph/Node.tsx
@@ -155,7 +155,10 @@ function ColorCircle(props: { node: NodeDatum }) {
     );
   }
 
-  const { elements } = nonZero.reduce(
+  const { elements } = nonZero.reduce<{
+    elements: React.ReactNode[];
+    percent: number;
+  }>(
     (acc, section) => {
       const color = section.config.color?.fixedColor || '';
       const value = section.values.get(node.dataFrameRowIndex);
@@ -182,7 +185,7 @@ function ColorCircle(props: { node: NodeDatum }) {
       acc.percent = acc.percent + value;
       return acc;
     },
-    { elements: [] as React.ReactNode[], percent: 0 }
+    { elements: [], percent: 0 }
   );
 
   return <>{elements}</>;
diff --git a/public/app/plugins/panel/nodeGraph/NodeGraph.tsx b/public/app/plugins/panel/nodeGraph/NodeGraph.tsx
index 2df6a41ac5e..d4ea4365bf3 100644
--- a/public/app/plugins/panel/nodeGraph/NodeGraph.tsx
+++ b/public/app/plugins/panel/nodeGraph/NodeGraph.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import cx from 'classnames';
-import React, { memo, MouseEvent, MutableRefObject, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { memo, MouseEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import useMeasure from 'react-use/lib/useMeasure';
 
 import { DataFrame, GrafanaTheme2, LinkModel } from '@grafana/data';
@@ -184,7 +184,7 @@ export function NodeGraph({ getLinks, dataFrames, nodeLimit }: Props) {
   const topLevelRef = useCallback(
     (r: HTMLDivElement) => {
       measureRef(r);
-      (zoomRef as MutableRefObject<HTMLElement | null>).current = r;
+      zoomRef.current = r;
     },
     [measureRef, zoomRef]
   );
diff --git a/public/app/plugins/panel/nodeGraph/useZoom.ts b/public/app/plugins/panel/nodeGraph/useZoom.ts
index 9eb924fae58..19dbd5632c5 100644
--- a/public/app/plugins/panel/nodeGraph/useZoom.ts
+++ b/public/app/plugins/panel/nodeGraph/useZoom.ts
@@ -28,7 +28,7 @@ interface Options {
  * used to zoom in/out with mouse wheel.
  */
 export function useZoom({ stepUp, stepDown, min, max } = defaultOptions) {
-  const ref = useRef<HTMLElement>(null);
+  const ref = useRef<HTMLElement | null>(null);
   const [scale, setScale] = useState(1);
 
   const onStepUp = useCallback(() => {

From 9dc82606dbfc770c374f34ab5481bdcab58b8a74 Mon Sep 17 00:00:00 2001
From: Selene <selenepinillos@gmail.com>
Date: Wed, 23 Nov 2022 17:58:52 +0100
Subject: [PATCH 127/153] LoginService: Remove unused sqlstore (#58595)

Remove unused sqlstore
---
 pkg/services/login/loginservice/loginservice.go      | 6 +-----
 pkg/services/login/loginservice/loginservice_test.go | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkg/services/login/loginservice/loginservice.go b/pkg/services/login/loginservice/loginservice.go
index 1c28ac1423c..44323ead976 100644
--- a/pkg/services/login/loginservice/loginservice.go
+++ b/pkg/services/login/loginservice/loginservice.go
@@ -10,7 +10,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/quota"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
@@ -19,7 +18,6 @@ var (
 )
 
 func ProvideService(
-	sqlStore sqlstore.Store,
 	userService user.Service,
 	quotaService quota.Service,
 	authInfoService login.AuthInfoService,
@@ -27,7 +25,6 @@ func ProvideService(
 	orgService org.Service,
 ) *Implementation {
 	s := &Implementation{
-		SQLStore:        sqlStore,
 		userService:     userService,
 		QuotaService:    quotaService,
 		AuthInfoService: authInfoService,
@@ -38,7 +35,6 @@ func ProvideService(
 }
 
 type Implementation struct {
-	SQLStore        sqlstore.Store
 	userService     user.Service
 	AuthInfoService login.AuthInfoService
 	QuotaService    quota.Service
@@ -49,7 +45,7 @@ type Implementation struct {
 
 // CreateUser creates inserts a new one.
 func (ls *Implementation) CreateUser(cmd user.CreateUserCommand) (*user.User, error) {
-	return ls.SQLStore.CreateUser(context.Background(), cmd)
+	return ls.userService.Create(context.Background(), &cmd)
 }
 
 // UpsertUser updates an existing user, or if it doesn't exist, inserts a new one.
diff --git a/pkg/services/login/loginservice/loginservice_test.go b/pkg/services/login/loginservice/loginservice_test.go
index edd9bade8d6..7b79d7ccc94 100644
--- a/pkg/services/login/loginservice/loginservice_test.go
+++ b/pkg/services/login/loginservice/loginservice_test.go
@@ -28,7 +28,6 @@ func Test_syncOrgRoles_doesNotBreakWhenTryingToRemoveLastOrgAdmin(t *testing.T)
 	login := Implementation{
 		QuotaService:    quotatest.New(false, nil),
 		AuthInfoService: authInfoMock,
-		SQLStore:        nil,
 		userService:     usertest.NewUserServiceFake(),
 		orgService:      orgtest.NewOrgServiceFake(),
 	}
@@ -53,7 +52,6 @@ func Test_syncOrgRoles_whenTryingToRemoveLastOrgLogsError(t *testing.T) {
 	login := Implementation{
 		QuotaService:    quotatest.New(false, nil),
 		AuthInfoService: authInfoMock,
-		SQLStore:        nil,
 		userService:     usertest.NewUserServiceFake(),
 		orgService:      orgService,
 	}

From b981a93f9a10c70caa62fe27f0d73b6c7eb3ab86 Mon Sep 17 00:00:00 2001
From: Selene <selenepinillos@gmail.com>
Date: Wed, 23 Nov 2022 18:40:58 +0100
Subject: [PATCH 128/153] Chore: Add Quote function in DB (#58594)

Added Quote function
---
 pkg/infra/db/db.go            | 1 +
 pkg/infra/db/dbtest/dbtest.go | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/pkg/infra/db/db.go b/pkg/infra/db/db.go
index 82046d3eda0..d85b7db05e9 100644
--- a/pkg/infra/db/db.go
+++ b/pkg/infra/db/db.go
@@ -19,6 +19,7 @@ type DB interface {
 	GetDBType() core.DbType
 	GetSqlxSession() *session.SessionDB
 	InTransaction(ctx context.Context, fn func(ctx context.Context) error) error
+	Quote(value string) string
 }
 
 type Session = sqlstore.DBSession
diff --git a/pkg/infra/db/dbtest/dbtest.go b/pkg/infra/db/dbtest/dbtest.go
index cdd9b7393c6..142626189e2 100644
--- a/pkg/infra/db/dbtest/dbtest.go
+++ b/pkg/infra/db/dbtest/dbtest.go
@@ -47,6 +47,10 @@ func (f *FakeDB) GetSqlxSession() *session.SessionDB {
 	return nil
 }
 
+func (f *FakeDB) Quote(value string) string {
+	return ""
+}
+
 // TODO: service-specific methods not yet split out ; to be removed
 func (f *FakeDB) UpdateTempUserWithEmailSent(ctx context.Context, cmd *models.UpdateTempUserWithEmailSentCommand) error {
 	return f.ExpectedError

From 183b279274d6c1eea66ea5a545807d77bb4b6b9e Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Wed, 23 Nov 2022 17:49:32 +0000
Subject: [PATCH 129/153] Explore: Sub-tables support for Table component
 (#58682)

* First commit with working version of sub-tables using subData array

* Update TableContainer and query result to support a dataframe array for the table result

* Fix border issue by moving the subtable to above the cells in the DOM

* Allow header to be configurable using custom options.

* Update TablePanel to support sub-tables

* Fix main row links

* Added tests

* Fix TablePanel correctly splitting frames and sub-frames by using refId
---
 .betterer.results                             | 16 +---
 .../src/components/Table/RowExpander.tsx      | 41 ++++++++
 .../grafana-ui/src/components/Table/Table.mdx |  8 ++
 .../src/components/Table/Table.story.tsx      | 76 ++++++++++++++-
 .../src/components/Table/Table.test.tsx       | 50 ++++++++++
 .../grafana-ui/src/components/Table/Table.tsx | 96 ++++++++++++++++---
 .../grafana-ui/src/components/Table/styles.ts | 12 ++-
 .../Table/{utils.test.ts => utils.test.tsx}   | 40 +++++---
 .../components/Table/{utils.ts => utils.tsx}  | 32 ++++++-
 .../features/explore/TableContainer.test.tsx  | 14 +--
 .../app/features/explore/TableContainer.tsx   | 51 ++++++----
 public/app/features/explore/state/query.ts    |  2 +-
 .../features/explore/utils/decorators.test.ts | 42 ++++----
 .../app/features/explore/utils/decorators.ts  | 24 ++---
 public/app/plugins/panel/table/TablePanel.tsx | 20 ++--
 public/app/types/explore.ts                   |  4 +-
 16 files changed, 413 insertions(+), 115 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/Table/RowExpander.tsx
 rename packages/grafana-ui/src/components/Table/{utils.test.ts => utils.test.tsx} (92%)
 rename packages/grafana-ui/src/components/Table/{utils.ts => utils.tsx} (89%)

diff --git a/.betterer.results b/.betterer.results
index 0c4594256b5..fd61b3d78c2 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -1538,7 +1538,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "packages/grafana-ui/src/components/Table/utils.test.ts:5381": [
+    "packages/grafana-ui/src/components/Table/utils.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
@@ -1548,19 +1548,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
     ],
-    "packages/grafana-ui/src/components/Table/utils.ts:5381": [
+    "packages/grafana-ui/src/components/Table/utils.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
diff --git a/packages/grafana-ui/src/components/Table/RowExpander.tsx b/packages/grafana-ui/src/components/Table/RowExpander.tsx
new file mode 100644
index 00000000000..1e4f5a52cc0
--- /dev/null
+++ b/packages/grafana-ui/src/components/Table/RowExpander.tsx
@@ -0,0 +1,41 @@
+import React, { FC } from 'react';
+import { Row } from 'react-table';
+
+import { useStyles2 } from '../../themes';
+import { Icon } from '../Icon/Icon';
+
+import { getTableStyles } from './styles';
+
+export interface Props {
+  row: Row;
+  expandedIndexes: Set<number>;
+  setExpandedIndexes: (indexes: Set<number>) => void;
+}
+
+export const RowExpander: FC<Props> = ({ row, expandedIndexes, setExpandedIndexes }) => {
+  const tableStyles = useStyles2(getTableStyles);
+  const isExpanded = expandedIndexes.has(row.index);
+  // Use Cell to render an expander for each row.
+  // We can use the getToggleRowExpandedProps prop-getter
+  // to build the expander.
+  return (
+    <div
+      className={tableStyles.expanderCell}
+      onClick={() => {
+        const newExpandedIndexes = new Set(expandedIndexes);
+        if (isExpanded) {
+          newExpandedIndexes.delete(row.index);
+        } else {
+          newExpandedIndexes.add(row.index);
+        }
+        setExpandedIndexes(newExpandedIndexes);
+      }}
+    >
+      <Icon
+        aria-label={isExpanded ? 'Close trace' : 'Open trace'}
+        name={isExpanded ? 'angle-down' : 'angle-right'}
+        size="xl"
+      />
+    </div>
+  );
+};
diff --git a/packages/grafana-ui/src/components/Table/Table.mdx b/packages/grafana-ui/src/components/Table/Table.mdx
index 685ea7f424b..44ca807b86f 100644
--- a/packages/grafana-ui/src/components/Table/Table.mdx
+++ b/packages/grafana-ui/src/components/Table/Table.mdx
@@ -5,6 +5,14 @@ import { Table } from './Table';
 
 Used for displaying tabular data
 
+## Sub-tables
+
+Sub-tables are supported through the usage of the prop `subData` Dataframe array.
+The frames are linked to each row using the following custom properties under `dataframe.meta.custom`
+
+- **parentRowIndex**: number - The index of the parent row in the main dataframe (under the `data` prop of the Table component)
+- **noHeader**: boolean - Sets the noHeader of each sub-table
+
 ## Usage
 
 <Props of={Table} />
diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx
index 75a7cd65fd0..a300ecb99a2 100644
--- a/packages/grafana-ui/src/components/Table/Table.story.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.story.tsx
@@ -36,7 +36,7 @@ const meta: ComponentMeta<typeof Table> = {
   args: {
     width: 700,
     height: 500,
-    columnMinWidth: 150,
+    columnMinWidth: 130,
   },
 };
 
@@ -98,6 +98,61 @@ function buildData(theme: GrafanaTheme2, config: Record<string, FieldConfig>): D
   return prepDataForStorybook([data], theme)[0];
 }
 
+function buildSubTablesData(theme: GrafanaTheme2, config: Record<string, FieldConfig>): DataFrame[] {
+  const frames: DataFrame[] = [];
+
+  for (let i = 0; i < 1000; i++) {
+    const data = new MutableDataFrame({
+      meta: {
+        custom: {
+          parentRowIndex: i,
+        },
+      },
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [] }, // The time field
+        {
+          name: 'Quantity',
+          type: FieldType.number,
+          values: [],
+          config: {
+            decimals: 0,
+            custom: {
+              align: 'center',
+            },
+          },
+        },
+        { name: 'Quality', type: FieldType.string, values: [] }, // The time field
+        {
+          name: 'Progress',
+          type: FieldType.number,
+          values: [],
+          config: {
+            unit: 'percent',
+            min: 0,
+            max: 100,
+          },
+        },
+      ],
+    });
+
+    for (const field of data.fields) {
+      field.config = merge(field.config, config[field.name]);
+    }
+
+    for (let i = 0; i < Math.random() * 4 + 1; i++) {
+      data.appendRow([
+        new Date().getTime(),
+        Math.random() * 2,
+        Math.random() > 0.7 ? 'Good' : 'Bad',
+        Math.random() * 100,
+      ]);
+    }
+
+    frames.push(data);
+  }
+  return prepDataForStorybook(frames, theme);
+}
+
 function buildFooterData(data: DataFrame): FooterItem[] {
   const values = data.fields[3].values.toArray();
   const valueSum = values.reduce((prev, curr) => {
@@ -195,4 +250,23 @@ Pagination.args = {
   enablePagination: true,
 };
 
+export const SubTables: ComponentStory<typeof Table> = (args) => {
+  const theme = useTheme2();
+  const data = buildData(theme, {});
+  const subData = buildSubTablesData(theme, {
+    Progress: {
+      custom: {
+        displayMode: 'gradient-gauge',
+      },
+      thresholds: defaultThresholds,
+    },
+  });
+
+  return (
+    <div className="panel-container" style={{ width: 'auto', height: 'unset' }}>
+      <Table {...args} data={data} subData={subData} />
+    </div>
+  );
+};
+
 export default meta;
diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx
index bd11b19bde1..b6ce1f0d003 100644
--- a/packages/grafana-ui/src/components/Table/Table.test.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.test.tsx
@@ -398,4 +398,54 @@ describe('Table', () => {
       expect(() => screen.getByTestId('table-footer')).toThrow('Unable to find an element');
     });
   });
+
+  describe('when mounted with data and sub-data', () => {
+    it('then correct rows should be rendered and new table is rendered when expander is clicked', () => {
+      getTestContext({
+        subData: new Array(getDefaultDataFrame().length).fill(0).map((i) =>
+          toDataFrame({
+            name: 'A',
+            fields: [
+              {
+                name: 'number' + i,
+                type: FieldType.number,
+                values: [i, i, i],
+                config: {
+                  custom: {
+                    filterable: true,
+                  },
+                },
+              },
+            ],
+            meta: {
+              custom: {
+                parentRowIndex: i,
+              },
+            },
+          })
+        ),
+      });
+      expect(getTable()).toBeInTheDocument();
+      expect(screen.getAllByRole('columnheader')).toHaveLength(4);
+      expect(getColumnHeader(/time/)).toBeInTheDocument();
+      expect(getColumnHeader(/temperature/)).toBeInTheDocument();
+      expect(getColumnHeader(/img/)).toBeInTheDocument();
+
+      const rows = within(getTable()).getAllByRole('row');
+      expect(rows).toHaveLength(5);
+      expect(getRowsData(rows)).toEqual([
+        { time: '2021-01-01 00:00:00', temperature: '10', link: '10' },
+        { time: '2021-01-01 03:00:00', temperature: 'NaN', link: 'NaN' },
+        { time: '2021-01-01 01:00:00', temperature: '11', link: '11' },
+        { time: '2021-01-01 02:00:00', temperature: '12', link: '12' },
+      ]);
+
+      within(rows[1]).getByLabelText('Open trace').click();
+      const rowsAfterClick = within(getTable()).getAllByRole('row');
+      expect(within(rowsAfterClick[1]).getByRole('table')).toBeInTheDocument();
+      expect(within(rowsAfterClick[1]).getByText(/number0/)).toBeInTheDocument();
+
+      expect(within(rowsAfterClick[2]).queryByRole('table')).toBeNull();
+    });
+  });
 });
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index fe69cf86ba3..dc3103067ec 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -9,7 +9,8 @@ import {
   useSortBy,
   useTable,
 } from 'react-table';
-import { FixedSizeList } from 'react-window';
+import usePrevious from 'react-use/lib/usePrevious';
+import { VariableSizeList } from 'react-window';
 
 import { DataFrame, getFieldDisplayName, Field } from '@grafana/data';
 
@@ -30,7 +31,14 @@ import {
   TableFooterCalc,
   GrafanaTableColumn,
 } from './types';
-import { getColumns, sortCaseInsensitive, sortNumber, getFooterItems, createFooterCalculationValues } from './utils';
+import {
+  getColumns,
+  sortCaseInsensitive,
+  sortNumber,
+  getFooterItems,
+  createFooterCalculationValues,
+  EXPANDER_WIDTH,
+} from './utils';
 
 const COLUMN_MIN_WIDTH = 150;
 
@@ -51,6 +59,8 @@ export interface Props {
   footerOptions?: TableFooterCalc;
   footerValues?: FooterItem[];
   enablePagination?: boolean;
+  /** @alpha */
+  subData?: DataFrame[];
 }
 
 function useTableStateReducer({ onColumnResize, onSortByChange, data }: Props) {
@@ -121,6 +131,7 @@ export const Table = memo((props: Props) => {
   const {
     ariaLabel,
     data,
+    subData,
     height,
     onCellFilterAdded,
     width,
@@ -134,13 +145,15 @@ export const Table = memo((props: Props) => {
     enablePagination,
   } = props;
 
-  const listRef = useRef<FixedSizeList>(null);
+  const listRef = useRef<VariableSizeList>(null);
   const tableDivRef = useRef<HTMLDivElement>(null);
-  const fixedSizeListScrollbarRef = useRef<HTMLDivElement>(null);
+  const variableSizeListScrollbarRef = useRef<HTMLDivElement>(null);
   const tableStyles = useStyles2(getTableStyles);
   const theme = useTheme2();
   const headerHeight = noHeader ? 0 : tableStyles.cellHeight;
   const [footerItems, setFooterItems] = useState<FooterItem[] | undefined>(footerValues);
+  const [expandedIndexes, setExpandedIndexes] = useState<Set<number>>(new Set());
+  const prevExpandedIndexes = usePrevious(expandedIndexes);
 
   const footerHeight = useMemo(() => {
     const EXTENDED_ROW_HEIGHT = 33;
@@ -177,8 +190,8 @@ export const Table = memo((props: Props) => {
 
   // React-table column definitions
   const memoizedColumns = useMemo(
-    () => getColumns(data, width, columnMinWidth, footerItems),
-    [data, width, columnMinWidth, footerItems]
+    () => getColumns(data, width, columnMinWidth, expandedIndexes, setExpandedIndexes, !!subData?.length, footerItems),
+    [data, width, columnMinWidth, footerItems, subData, expandedIndexes]
   );
 
   // Internal react table state reducer
@@ -260,14 +273,23 @@ export const Table = memo((props: Props) => {
     setPageSize(pageSize);
   }, [pageSize, setPageSize]);
 
+  useEffect(() => {
+    // react-table caches the height of cells so we need to reset them when expanding/collapsing rows
+    // We need to take the minimum of the current expanded indexes and the previous expandedIndexes array to account
+    // for collapsed rows, since they disappear from expandedIndexes but still keep their expanded height
+    listRef.current?.resetAfterIndex(
+      Math.min(...Array.from(expandedIndexes), ...(prevExpandedIndexes ? Array.from(prevExpandedIndexes) : []))
+    );
+  }, [expandedIndexes, prevExpandedIndexes]);
+
   useEffect(() => {
     // To have the custom vertical scrollbar always visible (https://github.com/grafana/grafana/issues/52136),
-    // we need to bring the element from the FixedSizeList scope to the outer Table container scope,
-    // because the FixedSizeList scope has overflow. By moving scrollbar to container scope we will have
+    // we need to bring the element from the VariableSizeList scope to the outer Table container scope,
+    // because the VariableSizeList scope has overflow. By moving scrollbar to container scope we will have
     // it always visible since the entire width is in view.
 
-    // Select the scrollbar element from the FixedSizeList scope
-    const listVerticalScrollbarHTML = (fixedSizeListScrollbarRef.current as HTMLDivElement)?.querySelector(
+    // Select the scrollbar element from the VariableSizeList scope
+    const listVerticalScrollbarHTML = (variableSizeListScrollbarRef.current as HTMLDivElement)?.querySelector(
       '.track-vertical'
     );
 
@@ -283,6 +305,36 @@ export const Table = memo((props: Props) => {
     }
   });
 
+  const renderSubTable = React.useCallback(
+    (rowIndex: number) => {
+      if (expandedIndexes.has(rowIndex)) {
+        const rowSubData = subData?.find((frame) => frame.meta?.custom?.parentRowIndex === rowIndex);
+        if (rowSubData) {
+          const noHeader = !!rowSubData.meta?.custom?.noHeader;
+          const subTableStyle: CSSProperties = {
+            height: tableStyles.rowHeight * (rowSubData.length + (noHeader ? 0 : 1)), // account for the header with + 1
+            background: theme.colors.emphasize(theme.colors.background.primary, 0.015),
+            paddingLeft: EXPANDER_WIDTH,
+            position: 'absolute',
+            bottom: 0,
+          };
+          return (
+            <div style={subTableStyle}>
+              <Table
+                data={rowSubData}
+                width={width - EXPANDER_WIDTH}
+                height={tableStyles.rowHeight * (rowSubData.length + 1)}
+                noHeader={noHeader}
+              />
+            </div>
+          );
+        }
+      }
+      return null;
+    },
+    [expandedIndexes, subData, tableStyles.rowHeight, theme.colors, width]
+  );
+
   const RenderRow = React.useCallback(
     ({ index: rowIndex, style }: { index: number; style: CSSProperties }) => {
       let row = rows[rowIndex];
@@ -290,8 +342,11 @@ export const Table = memo((props: Props) => {
         row = page[rowIndex];
       }
       prepareRow(row);
+
       return (
         <div {...row.getRowProps({ style })} className={tableStyles.row}>
+          {/*add the subtable to the DOM first to prevent a 1px border CSS issue on the last cell of the row*/}
+          {renderSubTable(rowIndex)}
           {row.cells.map((cell: Cell, index: number) => (
             <TableCell
               key={index}
@@ -305,7 +360,7 @@ export const Table = memo((props: Props) => {
         </div>
       );
     },
-    [onCellFilterAdded, page, enablePagination, prepareRow, rows, tableStyles]
+    [onCellFilterAdded, page, enablePagination, prepareRow, rows, tableStyles, renderSubTable]
   );
 
   const onNavigate = useCallback(
@@ -344,6 +399,17 @@ export const Table = memo((props: Props) => {
     );
   }
 
+  const getItemSize = (index: number): number => {
+    if (expandedIndexes.has(index)) {
+      const rowSubData = subData?.find((frame) => frame.meta?.custom?.parentRowIndex === index);
+      if (rowSubData) {
+        const noHeader = !!rowSubData.meta?.custom?.noHeader;
+        return tableStyles.rowHeight * (rowSubData.length + 1 + (noHeader ? 0 : 1)); // account for the header and the row data with + 1 + 1
+      }
+    }
+    return tableStyles.rowHeight;
+  };
+
   const handleScroll: React.UIEventHandler = (event) => {
     const { scrollTop } = event.target as HTMLDivElement;
 
@@ -358,18 +424,18 @@ export const Table = memo((props: Props) => {
         <div className={tableStyles.tableContentWrapper(totalColumnsWidth)}>
           {!noHeader && <HeaderRow headerGroups={headerGroups} showTypeIcons={showTypeIcons} />}
           {itemCount > 0 ? (
-            <div ref={fixedSizeListScrollbarRef}>
+            <div ref={variableSizeListScrollbarRef}>
               <CustomScrollbar onScroll={handleScroll} hideHorizontalTrack={true}>
-                <FixedSizeList
+                <VariableSizeList
                   height={listHeight}
                   itemCount={itemCount}
-                  itemSize={tableStyles.rowHeight}
+                  itemSize={getItemSize}
                   width={'100%'}
                   ref={listRef}
                   style={{ overflow: undefined }}
                 >
                   {RenderRow}
-                </FixedSizeList>
+                </VariableSizeList>
               </CustomScrollbar>
             </div>
           ) : (
diff --git a/packages/grafana-ui/src/components/Table/styles.ts b/packages/grafana-ui/src/components/Table/styles.ts
index 5d08f95d6a6..0f769c4c933 100644
--- a/packages/grafana-ui/src/components/Table/styles.ts
+++ b/packages/grafana-ui/src/components/Table/styles.ts
@@ -11,6 +11,7 @@ export const getTableStyles = (theme: GrafanaTheme2) => {
   const lineHeight = theme.typography.body.lineHeight;
   const bodyFontSize = 14;
   const cellHeight = cellPadding * 2 + bodyFontSize * lineHeight;
+  const rowHeight = cellHeight + 2;
   const rowHoverBg = theme.colors.emphasize(theme.colors.background.primary, 0.03);
 
   const buildCellContainerStyle = (color?: string, background?: string, overflowOnHover?: boolean) => {
@@ -36,7 +37,7 @@ export const getTableStyles = (theme: GrafanaTheme2) => {
       label: ${overflowOnHover ? 'cellContainerOverflow' : 'cellContainerNoOverflow'};
       padding: ${cellPadding}px;
       width: 100%;
-      height: 100%;
+      height: ${rowHeight}px;
       display: flex;
       align-items: center;
       border-right: 1px solid ${borderColor};
@@ -95,7 +96,7 @@ export const getTableStyles = (theme: GrafanaTheme2) => {
     buildCellContainerStyle,
     cellPadding,
     cellHeightInner: bodyFontSize * lineHeight,
-    rowHeight: cellHeight + 2,
+    rowHeight,
     table: css`
       height: 100%;
       width: 100%;
@@ -253,6 +254,13 @@ export const getTableStyles = (theme: GrafanaTheme2) => {
       justify-content: center;
       width: 100%;
     `,
+    expanderCell: css`
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      height: ${rowHeight}px;
+      cursor: pointer;
+    `,
   };
 };
 
diff --git a/packages/grafana-ui/src/components/Table/utils.test.ts b/packages/grafana-ui/src/components/Table/utils.test.tsx
similarity index 92%
rename from packages/grafana-ui/src/components/Table/utils.test.ts
rename to packages/grafana-ui/src/components/Table/utils.test.tsx
index 1dad733f3ca..293c3511cfa 100644
--- a/packages/grafana-ui/src/components/Table/utils.test.ts
+++ b/packages/grafana-ui/src/components/Table/utils.test.tsx
@@ -1,3 +1,5 @@
+import { Row } from 'react-table';
+
 import { ArrayVector, Field, FieldType, MutableDataFrame, SelectableValue } from '@grafana/data';
 
 import {
@@ -44,21 +46,29 @@ function getData() {
 describe('Table utils', () => {
   describe('getColumns', () => {
     it('Should build columns from DataFrame', () => {
-      const columns = getColumns(getData(), 1000, 120);
+      const columns = getColumns(getData(), 1000, 120, new Set(), () => null, false);
 
       expect(columns[0].Header).toBe('Time');
       expect(columns[1].Header).toBe('Value');
     });
 
     it('Should distribute width and use field config width', () => {
-      const columns = getColumns(getData(), 1000, 120);
+      const columns = getColumns(getData(), 1000, 120, new Set(), () => null, false);
 
       expect(columns[0].width).toBe(450);
       expect(columns[1].width).toBe(100);
     });
 
+    it('Should distribute width and use field config width with expander enabled', () => {
+      const columns = getColumns(getData(), 1000, 120, new Set(), () => null, true);
+
+      expect(columns[0].width).toBe(50); // expander column
+      expect(columns[1].width).toBe(425);
+      expect(columns[2].width).toBe(100);
+    });
+
     it('Should set field on columns', () => {
-      const columns = getColumns(getData(), 1000, 120);
+      const columns = getColumns(getData(), 1000, 120, new Set(), () => null, false);
 
       expect(columns[0].field.name).toBe('Time');
       expect(columns[1].field.name).toBe('Value');
@@ -82,8 +92,8 @@ describe('Table utils', () => {
 
   describe('filterByValue', () => {
     describe('happy path', () => {
-      const field: any = { values: new ArrayVector(['a', 'aa', 'ab', 'b', 'ba', 'bb', 'c']) };
-      const rows: any = [
+      const field = { values: new ArrayVector(['a', 'aa', 'ab', 'b', 'ba', 'bb', 'c']) } as unknown as Field;
+      const rows = [
         { index: 0, values: { 0: 'a' } },
         { index: 1, values: { 0: 'aa' } },
         { index: 2, values: { 0: 'ab' } },
@@ -91,7 +101,7 @@ describe('Table utils', () => {
         { index: 4, values: { 0: 'ba' } },
         { index: 5, values: { 0: 'bb' } },
         { index: 6, values: { 0: 'c' } },
-      ];
+      ] as unknown as Row[];
       const filterValues = [{ value: 'a' }, { value: 'b' }, { value: 'c' }];
 
       const result = filterByValue(field)(rows, '0', filterValues);
@@ -106,8 +116,8 @@ describe('Table utils', () => {
     describe('fast exit cases', () => {
       describe('no rows', () => {
         it('should return empty array', () => {
-          const field: any = { values: new ArrayVector(['a']) };
-          const rows: any = [];
+          const field = { values: new ArrayVector(['a']) } as unknown as Field;
+          const rows: Row[] = [];
           const filterValues = [{ value: 'a' }];
 
           const result = filterByValue(field)(rows, '', filterValues);
@@ -118,8 +128,8 @@ describe('Table utils', () => {
 
       describe('no filterValues', () => {
         it('should return rows', () => {
-          const field: any = { values: new ArrayVector(['a']) };
-          const rows: any = [{}];
+          const field = { values: new ArrayVector(['a']) } as unknown as Field;
+          const rows = [{}] as Row[];
           const filterValues = undefined;
 
           const result = filterByValue(field)(rows, '', filterValues);
@@ -131,7 +141,7 @@ describe('Table utils', () => {
       describe('no field', () => {
         it('should return rows', () => {
           const field = undefined;
-          const rows: any = [{}];
+          const rows = [{}] as Row[];
           const filterValues = [{ value: 'a' }];
 
           const result = filterByValue(field)(rows, '', filterValues);
@@ -142,12 +152,12 @@ describe('Table utils', () => {
 
       describe('missing id in values', () => {
         it('should return rows', () => {
-          const field: any = { values: new ArrayVector(['a', 'b', 'c']) };
-          const rows: any = [
+          const field = { values: new ArrayVector(['a', 'b', 'c']) } as unknown as Field;
+          const rows = [
             { index: 0, values: { 0: 'a' } },
             { index: 1, values: { 0: 'b' } },
             { index: 2, values: { 0: 'c' } },
-          ];
+          ] as unknown as Row[];
           const filterValues = [{ value: 'a' }, { value: 'b' }, { value: 'c' }];
 
           const result = filterByValue(field)(rows, '1', filterValues);
@@ -188,7 +198,7 @@ describe('Table utils', () => {
             text: '1.0',
           }),
         };
-        const rows: any[] = [];
+        const rows = [] as Row[];
 
         const result = calculateUniqueFieldValues(rows, field);
 
diff --git a/packages/grafana-ui/src/components/Table/utils.ts b/packages/grafana-ui/src/components/Table/utils.tsx
similarity index 89%
rename from packages/grafana-ui/src/components/Table/utils.ts
rename to packages/grafana-ui/src/components/Table/utils.tsx
index ce988462f05..fdce74d6853 100644
--- a/packages/grafana-ui/src/components/Table/utils.ts
+++ b/packages/grafana-ui/src/components/Table/utils.tsx
@@ -1,6 +1,7 @@
 import { Property } from 'csstype';
 import { clone } from 'lodash';
 import memoizeOne from 'memoize-one';
+import React from 'react';
 import { Row } from 'react-table';
 
 import {
@@ -23,6 +24,7 @@ import { getFooterValue } from './FooterRow';
 import { GeoCell } from './GeoCell';
 import { ImageCell } from './ImageCell';
 import { JSONViewCell } from './JSONViewCell';
+import { RowExpander } from './RowExpander';
 import {
   CellComponent,
   TableCellDisplayMode,
@@ -32,6 +34,8 @@ import {
   TableFooterCalc,
 } from './types';
 
+export const EXPANDER_WIDTH = 50;
+
 export function getTextAlign(field?: Field): Property.JustifyContent {
   if (!field) {
     return 'flex-start';
@@ -61,11 +65,37 @@ export function getColumns(
   data: DataFrame,
   availableWidth: number,
   columnMinWidth: number,
+  expandedIndexes: Set<number>,
+  setExpandedIndexes: (indexes: Set<number>) => void,
+  expander: boolean,
   footerValues?: FooterItem[]
 ): GrafanaTableColumn[] {
-  const columns: GrafanaTableColumn[] = [];
+  const columns: GrafanaTableColumn[] = expander
+    ? [
+        {
+          // Make an expander cell
+          Header: () => null, // No header
+          id: 'expander', // It needs an ID
+          Cell: ({ row }) => {
+            return <RowExpander row={row} expandedIndexes={expandedIndexes} setExpandedIndexes={setExpandedIndexes} />;
+          },
+          width: EXPANDER_WIDTH,
+          minWidth: EXPANDER_WIDTH,
+          filter: (rows: Row[], id: string, filterValues?: SelectableValue[]) => {
+            return [];
+          },
+          justifyContent: 'left',
+          field: data.fields[0],
+          sortType: 'basic',
+        },
+      ]
+    : [];
   let fieldCountWithoutWidth = 0;
 
+  if (expander) {
+    availableWidth -= EXPANDER_WIDTH;
+  }
+
   for (const [fieldIndex, field] of data.fields.entries()) {
     const fieldTableOptions = (field.config.custom || {}) as TableFieldOptions;
 
diff --git a/public/app/features/explore/TableContainer.test.tsx b/public/app/features/explore/TableContainer.test.tsx
index ad4bce55640..c35304a5587 100644
--- a/public/app/features/explore/TableContainer.test.tsx
+++ b/public/app/features/explore/TableContainer.test.tsx
@@ -52,7 +52,7 @@ const defaultProps = {
   loading: false,
   width: 800,
   onCellFilterAdded: jest.fn(),
-  tableResult: dataFrame,
+  tableResult: [dataFrame],
   splitOpenFn: (() => {}) as any,
   range: {} as any,
   timeZone: InternalTimeZones.utc,
@@ -73,11 +73,13 @@ describe('TableContainer', () => {
   });
 
   it('should render 0 series returned on no items', () => {
-    const emptyFrames = {
-      name: 'TableResultName',
-      fields: [],
-      length: 0,
-    } as DataFrame;
+    const emptyFrames = [
+      {
+        name: 'TableResultName',
+        fields: [],
+        length: 0,
+      },
+    ] as DataFrame[];
     render(<TableContainer {...defaultProps} tableResult={emptyFrames} />);
     expect(screen.getByText('0 series returned')).toBeInTheDocument();
   });
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index 40c986fea62..a999d82afd7 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { ValueLinkConfig, applyFieldOverrides, TimeZone, SplitOpen } from '@grafana/data';
+import { ValueLinkConfig, applyFieldOverrides, TimeZone, SplitOpen, DataFrame } from '@grafana/data';
 import { Collapse, Table } from '@grafana/ui';
 import { FilterItem } from '@grafana/ui/src/components/Table/types';
 import { config } from 'app/core/config';
@@ -35,15 +35,20 @@ const connector = connect(mapStateToProps, {});
 type Props = TableContainerProps & ConnectedProps<typeof connector>;
 
 export class TableContainer extends PureComponent<Props> {
+  getMainFrame(frames: DataFrame[] | null) {
+    return frames?.find((df) => df.meta?.custom?.parentRowIndex === undefined) || frames?.[0];
+  }
+
   getTableHeight() {
     const { tableResult } = this.props;
+    const mainFrame = this.getMainFrame(tableResult);
 
-    if (!tableResult || tableResult.length === 0) {
+    if (!mainFrame || mainFrame.length === 0) {
       return 200;
     }
 
     // tries to estimate table height
-    return Math.max(Math.min(600, tableResult.length * 35) + 35);
+    return Math.max(Math.min(600, mainFrame.length * 35) + 35);
   }
 
   render() {
@@ -51,11 +56,11 @@ export class TableContainer extends PureComponent<Props> {
     const height = this.getTableHeight();
     const tableWidth = width - config.theme.panelPadding * 2 - PANEL_BORDER;
 
-    let dataFrame = tableResult;
+    let dataFrames = tableResult;
 
-    if (dataFrame?.length) {
-      dataFrame = applyFieldOverrides({
-        data: [dataFrame],
+    if (dataFrames?.length) {
+      dataFrames = applyFieldOverrides({
+        data: dataFrames,
         timeZone,
         theme: config.theme2,
         replaceVariables: (v: string) => v,
@@ -63,29 +68,35 @@ export class TableContainer extends PureComponent<Props> {
           defaults: {},
           overrides: [],
         },
-      })[0];
+      });
       // Bit of code smell here. We need to add links here to the frame modifying the frame on every render.
       // Should work fine in essence but still not the ideal way to pass props. In logs container we do this
       // differently and sidestep this getLinks API on a dataframe
-      for (const field of dataFrame.fields) {
-        field.getLinks = (config: ValueLinkConfig) => {
-          return getFieldLinksForExplore({
-            field,
-            rowIndex: config.valueRowIndex!,
-            splitOpenFn,
-            range,
-            dataFrame: dataFrame!,
-          });
-        };
+      for (const frame of dataFrames) {
+        for (const field of frame.fields) {
+          field.getLinks = (config: ValueLinkConfig) => {
+            return getFieldLinksForExplore({
+              field,
+              rowIndex: config.valueRowIndex!,
+              splitOpenFn,
+              range,
+              dataFrame: frame!,
+            });
+          };
+        }
       }
     }
 
+    const mainFrame = this.getMainFrame(dataFrames);
+    const subFrames = dataFrames?.filter((df) => df.meta?.custom?.parentRowIndex !== undefined);
+
     return (
       <Collapse label="Table" loading={loading} isOpen>
-        {dataFrame?.length ? (
+        {mainFrame?.length ? (
           <Table
             ariaLabel={ariaLabel}
-            data={dataFrame}
+            data={mainFrame}
+            subData={subFrames}
             width={tableWidth}
             height={height}
             onCellFilterAdded={onCellFilterAdded}
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 2865b1d2191..1ce8de80f06 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -965,7 +965,7 @@ export const processQueryResponse = (
     loading: loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming,
     showLogs: !!logsResult,
     showMetrics: !!graphResult,
-    showTable: !!tableResult,
+    showTable: !!tableResult?.length,
     showTrace: !!traceFrames.length,
     showNodeGraph: !!nodeGraphFrames.length,
     showFlameGraph: !!flameGraphFrames.length,
diff --git a/public/app/features/explore/utils/decorators.test.ts b/public/app/features/explore/utils/decorators.test.ts
index 5b2467105ad..d7e959e06eb 100644
--- a/public/app/features/explore/utils/decorators.test.ts
+++ b/public/app/features/explore/utils/decorators.test.ts
@@ -208,17 +208,18 @@ describe('decorateWithTableResult', () => {
     const panelResult = await lastValueFrom(decorateWithTableResult(panelData));
 
     let theResult = panelResult.tableResult;
+    let theResultTable = theResult?.[0];
 
-    expect(theResult?.fields[0].name).toEqual('value');
-    expect(theResult?.fields[1].name).toEqual('time');
-    expect(theResult?.fields[2].name).toEqual('tsNs');
-    expect(theResult?.fields[3].name).toEqual('message');
-    expect(theResult?.fields[1].display).not.toBeNull();
-    expect(theResult?.length).toBe(3);
+    expect(theResultTable?.fields[0].name).toEqual('value');
+    expect(theResultTable?.fields[1].name).toEqual('time');
+    expect(theResultTable?.fields[2].name).toEqual('tsNs');
+    expect(theResultTable?.fields[3].name).toEqual('message');
+    expect(theResultTable?.fields[1].display).not.toBeNull();
+    expect(theResultTable?.length).toBe(3);
 
     // I don't understand the purpose of the code below, feels like this belongs in toDataFrame tests?
     // Same data though a DataFrame
-    theResult = toDataFrame(
+    theResultTable = toDataFrame(
       new TableModel({
         columns: [
           { text: 'value', type: 'number' },
@@ -234,12 +235,12 @@ describe('decorateWithTableResult', () => {
         type: 'table',
       })
     );
-    expect(theResult.fields[0].name).toEqual('value');
-    expect(theResult.fields[1].name).toEqual('time');
-    expect(theResult.fields[2].name).toEqual('tsNs');
-    expect(theResult.fields[3].name).toEqual('message');
-    expect(theResult.fields[1].display).not.toBeNull();
-    expect(theResult.length).toBe(3);
+    expect(theResultTable.fields[0].name).toEqual('value');
+    expect(theResultTable.fields[1].name).toEqual('time');
+    expect(theResultTable.fields[2].name).toEqual('tsNs');
+    expect(theResultTable.fields[3].name).toEqual('message');
+    expect(theResultTable.fields[1].display).not.toBeNull();
+    expect(theResultTable.length).toBe(3);
   });
 
   it('should do join transform if all series are timeseries', async () => {
@@ -264,13 +265,14 @@ describe('decorateWithTableResult', () => {
     const panelData = createExplorePanelData({ tableFrames });
     const panelResult = await lastValueFrom(decorateWithTableResult(panelData));
     const result = panelResult.tableResult;
+    const tableResult = result?.[0];
 
-    expect(result?.fields[0].name).toBe('Time');
-    expect(result?.fields[1].name).toBe('A-series');
-    expect(result?.fields[2].name).toBe('B-series');
-    expect(result?.fields[0].values.toArray()).toEqual([100, 200, 300]);
-    expect(result?.fields[1].values.toArray()).toEqual([4, 5, 6]);
-    expect(result?.fields[2].values.toArray()).toEqual([4, 5, 6]);
+    expect(tableResult?.fields[0].name).toBe('Time');
+    expect(tableResult?.fields[1].name).toBe('A-series');
+    expect(tableResult?.fields[2].name).toBe('B-series');
+    expect(tableResult?.fields[0].values.toArray()).toEqual([100, 200, 300]);
+    expect(tableResult?.fields[1].values.toArray()).toEqual([4, 5, 6]);
+    expect(tableResult?.fields[2].values.toArray()).toEqual([4, 5, 6]);
   });
 
   it('should not override fields display property when filled', async () => {
@@ -286,7 +288,7 @@ describe('decorateWithTableResult', () => {
 
     const panelData = createExplorePanelData({ tableFrames });
     const panelResult = await lastValueFrom(decorateWithTableResult(panelData));
-    expect(panelResult.tableResult?.fields[0].display).toBe(displayFunctionMock);
+    expect(panelResult.tableResult?.[0]?.fields[0].display).toBe(displayFunctionMock);
   });
 
   it('should return null when passed empty array', async () => {
diff --git a/public/app/features/explore/utils/decorators.ts b/public/app/features/explore/utils/decorators.ts
index 970e001b4c0..9ab44c8270b 100644
--- a/public/app/features/explore/utils/decorators.ts
+++ b/public/app/features/explore/utils/decorators.ts
@@ -137,20 +137,20 @@ export const decorateWithTableResult = (data: ExplorePanelData): Observable<Expl
 
   return transformer.pipe(
     map((frames) => {
-      const frame = frames[0];
-
-      // set display processor
-      for (const field of frame.fields) {
-        field.display =
-          field.display ??
-          getDisplayProcessor({
-            field,
-            theme: config.theme2,
-            timeZone: data.request?.timezone ?? 'browser',
-          });
+      for (const frame of frames) {
+        // set display processor
+        for (const field of frame.fields) {
+          field.display =
+            field.display ??
+            getDisplayProcessor({
+              field,
+              theme: config.theme2,
+              timeZone: data.request?.timezone ?? 'browser',
+            });
+        }
       }
 
-      return { ...data, tableResult: frame };
+      return { ...data, tableResult: frames };
     })
   );
 };
diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx
index c7f105259c8..6ec1ddbf42f 100644
--- a/public/app/plugins/panel/table/TablePanel.tsx
+++ b/public/app/plugins/panel/table/TablePanel.tsx
@@ -94,7 +94,7 @@ export class TablePanel extends Component<Props> {
     dispatch(applyFilterFromTable({ datasource: datasourceRef, key, operator, value }));
   };
 
-  renderTable(frame: DataFrame, width: number, height: number) {
+  renderTable(frame: DataFrame, width: number, height: number, subData?: DataFrame[]) {
     const { options } = this.props;
 
     return (
@@ -111,6 +111,7 @@ export class TablePanel extends Component<Props> {
         onCellFilterAdded={this.onCellFilterAdded}
         footerOptions={options.footer}
         enablePagination={options.footer?.enablePagination}
+        subData={subData}
       />
     );
   }
@@ -123,8 +124,10 @@ export class TablePanel extends Component<Props> {
     const { data, height, width, options, fieldConfig, id } = this.props;
 
     const frames = data.series;
-    const count = frames?.length;
-    const hasFields = frames[0]?.fields.length;
+    const mainFrames = frames.filter((f) => f.meta?.custom?.parentRowIndex === undefined);
+    const subFrames = frames.filter((f) => f.meta?.custom?.parentRowIndex !== undefined);
+    const count = mainFrames?.length;
+    const hasFields = mainFrames[0]?.fields.length;
 
     if (!count || !hasFields) {
       return <PanelDataErrorView panelId={id} fieldConfig={fieldConfig} data={data} />;
@@ -133,17 +136,19 @@ export class TablePanel extends Component<Props> {
     if (count > 1) {
       const inputHeight = config.theme2.spacing.gridSize * config.theme2.components.height.md;
       const padding = 8 * 2;
-      const currentIndex = this.getCurrentFrameIndex(frames, options);
-      const names = frames.map((frame, index) => {
+      const currentIndex = this.getCurrentFrameIndex(mainFrames, options);
+      const names = mainFrames.map((frame, index) => {
         return {
           label: getFrameDisplayName(frame),
           value: index,
         };
       });
 
+      const main = mainFrames[currentIndex];
+      const subData = subFrames.filter((f) => f.refId === main.refId);
       return (
         <div className={tableStyles.wrapper}>
-          {this.renderTable(data.series[currentIndex], width, height - inputHeight - padding)}
+          {this.renderTable(main, width, height - inputHeight - padding, subData)}
           <div className={tableStyles.selectWrapper}>
             <Select options={names} value={names[currentIndex]} onChange={this.onChangeTableSelection} />
           </div>
@@ -151,7 +156,8 @@ export class TablePanel extends Component<Props> {
       );
     }
 
-    return this.renderTable(data.series[0], width, height);
+    const subData = frames.filter((f) => f.meta?.custom?.parentRowIndex !== undefined);
+    return this.renderTable(data.series[0], width, height, subData);
   }
 }
 
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index c0936606eb6..efc9852c4e8 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -148,7 +148,7 @@ export interface ExploreItemState {
   /**
    * Table model that combines all query table results into a single table.
    */
-  tableResult: DataFrame | null;
+  tableResult: DataFrame[] | null;
 
   /**
    * React keys for rendering of QueryRows
@@ -249,6 +249,6 @@ export interface ExplorePanelData extends PanelData {
   nodeGraphFrames: DataFrame[];
   flameGraphFrames: DataFrame[];
   graphResult: DataFrame[] | null;
-  tableResult: DataFrame | null;
+  tableResult: DataFrame[] | null;
   logsResult: LogsModel | null;
 }

From 0a7a5b13fe07318a115d1399434bffd5f37caa5d Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 23 Nov 2022 10:46:21 -0800
Subject: [PATCH 130/153] Heatmap: Remove legacy angular based implementation
 (#59249)

remove angular heatmap
---
 .betterer.results                             | 182 ----
 .../src/types/featureToggles.gen.ts           |   1 -
 .../manager/manager_integration_test.go       |   1 -
 pkg/plugins/plugindef/plugindef.cue           |   2 +-
 pkg/services/featuremgmt/registry.go          |   5 -
 pkg/services/featuremgmt/toggles_gen.go       |   4 -
 .../api/plugins/data/expectedListResp.json    |  45 -
 .../app/features/plugins/built_in_plugins.ts  |  16 +-
 public/app/plugins/gen.go                     |   1 -
 .../app/plugins/panel/heatmap-old/README.md   |   7 -
 .../plugins/panel/heatmap-old/axes_editor.ts  |  50 -
 .../plugins/panel/heatmap-old/color_legend.ts | 347 -------
 .../plugins/panel/heatmap-old/color_scale.ts  |  27 -
 .../panel/heatmap-old/display_editor.ts       |  22 -
 .../plugins/panel/heatmap-old/heatmap_ctrl.ts | 385 --------
 .../heatmap-old/heatmap_data_converter.ts     | 491 ----------
 .../panel/heatmap-old/heatmap_tooltip.ts      | 277 ------
 .../heatmap-old/img/icn-heatmap-panel.svg     |   1 -
 .../app/plugins/panel/heatmap-old/module.html |  14 -
 .../app/plugins/panel/heatmap-old/module.ts   |   4 -
 .../app/plugins/panel/heatmap-old/plugin.json |  22 -
 .../plugins/panel/heatmap-old/rendering.ts    | 865 ------------------
 .../heatmap-old/specs/heatmap_ctrl.test.ts    |  93 --
 .../specs/heatmap_data_converter.test.ts      | 397 --------
 public/app/plugins/panel/heatmap-old/types.ts |  42 -
 25 files changed, 2 insertions(+), 3299 deletions(-)
 delete mode 100644 public/app/plugins/panel/heatmap-old/README.md
 delete mode 100644 public/app/plugins/panel/heatmap-old/axes_editor.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/color_legend.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/color_scale.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/display_editor.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/heatmap_ctrl.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/heatmap_data_converter.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/heatmap_tooltip.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/img/icn-heatmap-panel.svg
 delete mode 100644 public/app/plugins/panel/heatmap-old/module.html
 delete mode 100644 public/app/plugins/panel/heatmap-old/module.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/plugin.json
 delete mode 100644 public/app/plugins/panel/heatmap-old/rendering.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/specs/heatmap_ctrl.test.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/specs/heatmap_data_converter.test.ts
 delete mode 100644 public/app/plugins/panel/heatmap-old/types.ts

diff --git a/.betterer.results b/.betterer.results
index fd61b3d78c2..fd31bfb5837 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -7453,188 +7453,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "public/app/plugins/panel/heatmap-old/axes_editor.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
-    ],
-    "public/app/plugins/panel/heatmap-old/color_legend.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Do not use any type assertions.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Do not use any type assertions.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"]
-    ],
-    "public/app/plugins/panel/heatmap-old/color_scale.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
-    ],
-    "public/app/plugins/panel/heatmap-old/display_editor.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
-    "public/app/plugins/panel/heatmap-old/heatmap_ctrl.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"]
-    ],
-    "public/app/plugins/panel/heatmap-old/heatmap_data_converter.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"]
-    ],
-    "public/app/plugins/panel/heatmap-old/heatmap_tooltip.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"]
-    ],
-    "public/app/plugins/panel/heatmap-old/rendering.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "33"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "34"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "35"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "36"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "37"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "38"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "39"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "40"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "41"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "42"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "43"],
-      [0, 0, 0, "Do not use any type assertions.", "44"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "45"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "46"]
-    ],
-    "public/app/plugins/panel/heatmap-old/specs/heatmap_ctrl.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
-    "public/app/plugins/panel/heatmap-old/specs/heatmap_data_converter.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
-    "public/app/plugins/panel/heatmap-old/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
-    ],
     "public/app/plugins/panel/heatmap/HeatmapHoverView.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index c4b9823408c..5d9debb1609 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -59,7 +59,6 @@ export interface FeatureToggles {
   prometheusWideSeries?: boolean;
   canvasPanelNesting?: boolean;
   scenes?: boolean;
-  useLegacyHeatmapPanel?: boolean;
   disableSecretsCompatibility?: boolean;
   logRequestsInstrumentedAsUnknown?: boolean;
   dataConnectionsConsole?: boolean;
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index ec2cc099864..8bda9300e45 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -164,7 +164,6 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *store.Serv
 		"gettingstarted": {},
 		"graph":          {},
 		"heatmap":        {},
-		"heatmap-old":    {},
 		"histogram":      {},
 		"icon":           {},
 		"live":           {},
diff --git a/pkg/plugins/plugindef/plugindef.cue b/pkg/plugins/plugindef/plugindef.cue
index b2b3df50e3e..a3a5b9e5ac6 100644
--- a/pkg/plugins/plugindef/plugindef.cue
+++ b/pkg/plugins/plugindef/plugindef.cue
@@ -16,7 +16,7 @@ seqs: [
 				// grafana.com, then the plugin id has to follow the naming
 				// conventions.
 				id: string & strings.MinRunes(1)
-				id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|gauge|geomap|gettingstarted|graph|heatmap|heatmap-old|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$"
+				id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$"
 
 				// The set of all plugin types. This hidden field exists solely
 				// so that the set can be string-interpolated into other fields.
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 542f9b4a53c..b08a0bc4a34 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -248,11 +248,6 @@ var (
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
 		},
-		{
-			Name:        "useLegacyHeatmapPanel",
-			Description: "Continue to use the angular/flot based heatmap panel",
-			State:       FeatureStateStable,
-		},
 		{
 			Name:            "disableSecretsCompatibility",
 			Description:     "Disable duplicated secret storage in legacy tables",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 2af681298cf..1c503d4867f 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -179,10 +179,6 @@ const (
 	// Experimental framework to build interactive dashboards
 	FlagScenes = "scenes"
 
-	// FlagUseLegacyHeatmapPanel
-	// Continue to use the angular/flot based heatmap panel
-	FlagUseLegacyHeatmapPanel = "useLegacyHeatmapPanel"
-
 	// FlagDisableSecretsCompatibility
 	// Disable duplicated secret storage in legacy tables
 	FlagDisableSecretsCompatibility = "disableSecretsCompatibility"
diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index f3d82c3614e..9950b4672a8 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -724,51 +724,6 @@
     "signatureType": "",
     "signatureOrg": ""
   },
-  {
-    "name": "Heatmap (legacy)",
-    "type": "panel",
-    "id": "heatmap-old",
-    "enabled": true,
-    "pinned": false,
-    "info": {
-      "author": {
-        "name": "Grafana Labs",
-        "url": "https://grafana.com"
-      },
-      "description": "Legacy heatmap panel based on angular, d3, and flot",
-      "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-old/img/icn-heatmap-panel.svg",
-        "large": "public/app/plugins/panel/heatmap-old/img/icn-heatmap-panel.svg"
-      },
-      "build": {},
-      "screenshots": null,
-      "version": "",
-      "updated": ""
-    },
-    "dependencies": {
-      "grafanaDependency": "",
-      "grafanaVersion": "*",
-      "plugins": []
-    },
-    "latestVersion": "",
-    "hasUpdate": false,
-    "defaultNavUrl": "/plugins/heatmap-old/",
-    "category": "",
-    "state": "deprecated",
-    "signature": "internal",
-    "signatureType": "",
-    "signatureOrg": ""
-  },
   {
     "name": "Histogram",
     "type": "panel",
diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts
index a449338bea7..6b05af7bea9 100644
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -44,7 +44,6 @@ const phlarePlugin = async () =>
 const parcaPlugin = async () =>
   await import(/* webpackChunkName: "parcaPlugin" */ 'app/plugins/datasource/parca/module');
 
-import { config } from '@grafana/runtime';
 import * as alertGroupsPanel from 'app/plugins/panel/alertGroups/module';
 import * as alertListPanel from 'app/plugins/panel/alertlist/module';
 import * as annoListPanel from 'app/plugins/panel/annolist/module';
@@ -79,23 +78,10 @@ const iconPanel = async () => await import(/* webpackChunkName: "iconPanel" */ '
 const graphPanel = async () => await import(/* webpackChunkName: "graphPlugin" */ 'app/plugins/panel/graph/module');
 const heatmapPanel = async () =>
   await import(/* webpackChunkName: "heatmapPanel" */ 'app/plugins/panel/heatmap/module');
-const heatmapPanelOLD = async () =>
-  await import(/* webpackChunkName: "heatmapPanelOLD" */ 'app/plugins/panel/heatmap-old/module');
 
 const tableOldPanel = async () =>
   await import(/* webpackChunkName: "tableOldPlugin" */ 'app/plugins/panel/table-old/module');
 
-// Automatically migrate heatmap panel.
-if (config.featureToggles.useLegacyHeatmapPanel) {
-  const heatmap = config.panels['heatmap'];
-  const legacy = config.panels['heatmap-old'];
-  legacy.id = heatmap.id;
-  legacy.module = heatmap.module;
-  legacy.state = heatmap.state;
-  config.panels['heatmap'] = legacy;
-}
-delete config.panels['heatmap-old'];
-
 const builtInPlugins: any = {
   'app/plugins/datasource/graphite/module': graphitePlugin,
   'app/plugins/datasource/cloudwatch/module': cloudwatchPlugin,
@@ -133,7 +119,7 @@ const builtInPlugins: any = {
   'app/plugins/panel/dashlist/module': dashListPanel,
   'app/plugins/panel/alertlist/module': alertListPanel,
   'app/plugins/panel/annolist/module': annoListPanel,
-  'app/plugins/panel/heatmap/module': config.featureToggles.useLegacyHeatmapPanel ? heatmapPanelOLD : heatmapPanel,
+  'app/plugins/panel/heatmap/module': heatmapPanel,
   'app/plugins/panel/table/module': tablePanel,
   'app/plugins/panel/table-old/module': tableOldPanel,
   'app/plugins/panel/news/module': newsPanel,
diff --git a/public/app/plugins/gen.go b/public/app/plugins/gen.go
index ab9946669d6..16a9d633592 100644
--- a/public/app/plugins/gen.go
+++ b/public/app/plugins/gen.go
@@ -19,7 +19,6 @@ import (
 var skipPlugins = map[string]bool{
 	"canvas":         true,
 	"heatmap":        true,
-	"heatmap-old":    true,
 	"candlestick":    true,
 	"state-timeline": true,
 	"status-history": true,
diff --git a/public/app/plugins/panel/heatmap-old/README.md b/public/app/plugins/panel/heatmap-old/README.md
deleted file mode 100644
index 17a080b9cc7..00000000000
--- a/public/app/plugins/panel/heatmap-old/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Heatmap Panel - Native Plugin
-
-The Heatmap panel allows you to view histograms over time and is **included** with Grafana.
-
-Read more about it here:
-
-[http://docs.grafana.org/features/panels/heatmap/](http://docs.grafana.org/features/panels/heatmap/)
diff --git a/public/app/plugins/panel/heatmap-old/axes_editor.ts b/public/app/plugins/panel/heatmap-old/axes_editor.ts
deleted file mode 100644
index 761a0680184..00000000000
--- a/public/app/plugins/panel/heatmap-old/axes_editor.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-export class AxesEditorCtrl {
-  panel: any;
-  panelCtrl: any;
-  logScales: any;
-  dataFormats: any;
-  yBucketBoundModes: any;
-
-  /** @ngInject */
-  constructor($scope: any, uiSegmentSrv: any) {
-    $scope.editor = this;
-    this.panelCtrl = $scope.ctrl;
-    this.panel = this.panelCtrl.panel;
-
-    this.logScales = {
-      linear: 1,
-      'log (base 2)': 2,
-      'log (base 10)': 10,
-      'log (base 32)': 32,
-      'log (base 1024)': 1024,
-    };
-
-    this.dataFormats = {
-      'Time series': 'timeseries',
-      'Time series buckets': 'tsbuckets',
-    };
-
-    this.yBucketBoundModes = {
-      Auto: 'auto',
-      Upper: 'upper',
-      Lower: 'lower',
-      Middle: 'middle',
-    };
-  }
-
-  setUnitFormat = (unit: string) => {
-    this.panel.yAxis.format = unit;
-    this.panelCtrl.render();
-  };
-}
-
-/** @ngInject */
-export function axesEditor() {
-  'use strict';
-  return {
-    restrict: 'E',
-    scope: true,
-    templateUrl: 'public/app/plugins/panel/heatmap/partials/axes_editor.html',
-    controller: AxesEditorCtrl,
-  };
-}
diff --git a/public/app/plugins/panel/heatmap-old/color_legend.ts b/public/app/plugins/panel/heatmap-old/color_legend.ts
deleted file mode 100644
index d369868e74b..00000000000
--- a/public/app/plugins/panel/heatmap-old/color_legend.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import * as d3 from 'd3';
-import $ from 'jquery';
-import { find, isEmpty, isNil, sortBy, uniq } from 'lodash';
-
-import { PanelEvents } from '@grafana/data';
-import coreModule from 'app/angular/core_module';
-import { config } from 'app/core/config';
-import { contextSrv } from 'app/core/core';
-import { tickStep } from 'app/core/utils/ticks';
-
-import { getColorScale, getOpacityScale } from './color_scale';
-
-const LEGEND_HEIGHT_PX = 6;
-const LEGEND_WIDTH_PX = 100;
-const LEGEND_TICK_SIZE = 0;
-const LEGEND_VALUE_MARGIN = 0;
-const LEGEND_PADDING_LEFT = 10;
-const LEGEND_SEGMENT_WIDTH = 10;
-
-/**
- * Color legend for heatmap editor.
- */
-coreModule.directive('colorLegend', () => {
-  return {
-    restrict: 'E',
-    template: '<div class="heatmap-color-legend"><svg width="16.5rem" height="24px"></svg></div>',
-    link: (scope: any, elem, attrs) => {
-      const ctrl = scope.ctrl;
-      const panel = scope.ctrl.panel;
-
-      render();
-
-      ctrl.events.on(PanelEvents.render, () => {
-        render();
-      });
-
-      function render() {
-        const legendElem = $(elem).find('svg');
-        const legendWidth = Math.floor(legendElem.outerWidth() ?? 10);
-
-        if (panel.color.mode === 'spectrum') {
-          const colorScheme: any = find(ctrl.colorSchemes, {
-            value: panel.color.colorScheme,
-          });
-          const colorScale = getColorScale(colorScheme, contextSrv.user.lightTheme, legendWidth);
-          drawSimpleColorLegend(elem, colorScale);
-        } else if (panel.color.mode === 'opacity') {
-          const colorOptions = panel.color;
-          drawSimpleOpacityLegend(elem, colorOptions);
-        }
-      }
-    },
-  };
-});
-
-/**
- * Heatmap legend with scale values.
- */
-coreModule.directive('heatmapLegend', () => {
-  return {
-    restrict: 'E',
-    template: `<div class="heatmap-color-legend"><svg width="${LEGEND_WIDTH_PX}px" height="${LEGEND_HEIGHT_PX}px"></svg></div>`,
-    link: (scope: any, elem, attrs) => {
-      const ctrl = scope.ctrl;
-      const panel = scope.ctrl.panel;
-
-      render();
-      ctrl.events.on(PanelEvents.render, () => {
-        render();
-      });
-
-      function render() {
-        clearLegend(elem);
-        if (!isEmpty(ctrl.data) && !isEmpty(ctrl.data.cards)) {
-          const cardStats = ctrl.data.cardStats;
-          const rangeFrom = isNil(panel.color.min) ? Math.max(cardStats.min, 0) : panel.color.min;
-          const rangeTo = isNil(panel.color.max) ? cardStats.max : panel.color.max;
-          const maxValue = cardStats.max;
-          const minValue = cardStats.min;
-
-          if (panel.color.mode === 'spectrum') {
-            const colorScheme: any = find(ctrl.colorSchemes, {
-              value: panel.color.colorScheme,
-            });
-            drawColorLegend(elem, colorScheme, rangeFrom, rangeTo, maxValue, minValue);
-          } else if (panel.color.mode === 'opacity') {
-            const colorOptions = panel.color;
-            drawOpacityLegend(elem, colorOptions, rangeFrom, rangeTo, maxValue, minValue);
-          }
-        }
-      }
-    },
-  };
-});
-
-function drawColorLegend(
-  elem: JQuery,
-  colorScheme: any,
-  rangeFrom: number,
-  rangeTo: number,
-  maxValue: number,
-  minValue: number
-) {
-  const legendElem = $(elem).find('svg');
-  const legendDomElement = legendElem.get(0);
-  if (legendDomElement) {
-    const legend = d3.select(legendDomElement);
-    clearLegend(elem);
-
-    const legendWidth = Math.floor(legendElem.outerWidth() ?? 10) - 30;
-    const legendHeight = legendElem.attr('height') as any;
-
-    const rangeStep = ((rangeTo - rangeFrom) / legendWidth) * LEGEND_SEGMENT_WIDTH;
-    const widthFactor = legendWidth / (rangeTo - rangeFrom);
-    const valuesRange = d3.range(rangeFrom, rangeTo, rangeStep);
-
-    const colorScale = getColorScale(colorScheme, contextSrv.user.lightTheme, rangeTo, rangeFrom);
-    legend
-      .append('g')
-      .attr('class', 'legend-color-bar')
-      .attr('transform', 'translate(' + LEGEND_PADDING_LEFT + ',0)')
-      .selectAll('.heatmap-color-legend-rect')
-      .data(valuesRange)
-      .enter()
-      .append('rect')
-      .attr('x', (d) => Math.round((d - rangeFrom) * widthFactor))
-      .attr('y', 0)
-      .attr('width', Math.round(rangeStep * widthFactor + 1)) // Overlap rectangles to prevent gaps
-      .attr('height', legendHeight)
-      .attr('stroke-width', 0)
-      .attr('fill', (d) => colorScale(d));
-
-    drawLegendValues(elem, rangeFrom, rangeTo, maxValue, minValue, legendWidth, valuesRange);
-  }
-}
-
-function drawOpacityLegend(
-  elem: JQuery,
-  options: { cardColor: null },
-  rangeFrom: number,
-  rangeTo: number,
-  maxValue: any,
-  minValue: number
-) {
-  const legendElem = $(elem).find('svg');
-  const legendDomElement = legendElem.get(0);
-  if (legendDomElement) {
-    const legend = d3.select(legendDomElement);
-    clearLegend(elem);
-
-    const legendWidth = Math.floor(legendElem.outerWidth() ?? 30) - 30;
-    const legendHeight = legendElem.attr('height') as any;
-
-    const rangeStep = ((rangeTo - rangeFrom) / legendWidth) * LEGEND_SEGMENT_WIDTH;
-    const widthFactor = legendWidth / (rangeTo - rangeFrom);
-    const valuesRange = d3.range(rangeFrom, rangeTo, rangeStep);
-
-    const opacityScale = getOpacityScale(options, rangeTo, rangeFrom);
-    legend
-      .append('g')
-      .attr('class', 'legend-color-bar')
-      .attr('transform', 'translate(' + LEGEND_PADDING_LEFT + ',0)')
-      .selectAll('.heatmap-opacity-legend-rect')
-      .data(valuesRange)
-      .enter()
-      .append('rect')
-      .attr('x', (d) => Math.round((d - rangeFrom) * widthFactor))
-      .attr('y', 0)
-      .attr('width', Math.round(rangeStep * widthFactor))
-      .attr('height', legendHeight)
-      .attr('stroke-width', 0)
-      .attr('fill', options.cardColor)
-      .style('opacity', (d) => opacityScale(d));
-
-    drawLegendValues(elem, rangeFrom, rangeTo, maxValue, minValue, legendWidth, valuesRange);
-  }
-}
-
-function drawLegendValues(
-  elem: JQuery,
-  rangeFrom: number,
-  rangeTo: number,
-  maxValue: any,
-  minValue: any,
-  legendWidth: number,
-  valuesRange: number[]
-) {
-  const legendElem = $(elem).find('svg');
-  const legendDomElement = legendElem.get(0);
-  if (legendDomElement) {
-    const legend = d3.select(legendDomElement);
-
-    if (legendWidth <= 0 || legendDomElement.childNodes.length === 0) {
-      return;
-    }
-
-    const legendValueScale = d3.scaleLinear().domain([rangeFrom, rangeTo]).range([0, legendWidth]);
-
-    const ticks = buildLegendTicks(rangeFrom, rangeTo, maxValue, minValue);
-    const xAxis = d3.axisBottom(legendValueScale).tickValues(ticks).tickSize(LEGEND_TICK_SIZE);
-
-    const colorRect = legendElem.find(':first-child');
-    const posY = getSvgElemHeight(legendElem) + LEGEND_VALUE_MARGIN;
-    const posX = getSvgElemX(colorRect) + LEGEND_PADDING_LEFT;
-
-    d3.select(legendDomElement)
-      .append('g')
-      .attr('class', 'axis')
-      .attr('transform', 'translate(' + posX + ',' + posY + ')')
-      .call(xAxis);
-
-    legend.select('.axis').select('.domain').remove();
-  }
-}
-
-function drawSimpleColorLegend(elem: JQuery, colorScale: any) {
-  const legendElem = $(elem).find('svg');
-  clearLegend(elem);
-
-  const legendWidth = Math.floor(legendElem.outerWidth() ?? 30);
-  const legendHeight = legendElem.attr('height') as any;
-
-  if (legendWidth) {
-    const valuesNumber = Math.floor(legendWidth / 2);
-    const rangeStep = Math.floor(legendWidth / valuesNumber);
-    const valuesRange = d3.range(0, legendWidth, rangeStep);
-
-    const legendDomElement = legendElem.get(0);
-    if (legendDomElement) {
-      const legend = d3.select(legendDomElement);
-      const legendRects = legend.selectAll('.heatmap-color-legend-rect').data(valuesRange);
-
-      legendRects
-        .enter()
-        .append('rect')
-        .attr('x', (d) => d)
-        .attr('y', 0)
-        .attr('width', rangeStep + 1) // Overlap rectangles to prevent gaps
-        .attr('height', legendHeight)
-        .attr('stroke-width', 0)
-        .attr('fill', (d) => colorScale(d));
-    }
-  }
-}
-
-function drawSimpleOpacityLegend(elem: JQuery, options: { colorScale: string; exponent: number; cardColor: string }) {
-  const legendElem = $(elem).find('svg');
-  const legendDomElement = legendElem.get(0);
-  if (legendDomElement) {
-    clearLegend(elem);
-
-    const legend = d3.select(legendDomElement);
-    const legendWidth = Math.floor(legendElem.outerWidth() ?? 30);
-    const legendHeight = legendElem.attr('height') as any;
-
-    if (legendWidth) {
-      let legendOpacityScale: any;
-      if (options.colorScale === 'linear') {
-        legendOpacityScale = d3.scaleLinear().domain([0, legendWidth]).range([0, 1]);
-      } else if (options.colorScale === 'sqrt') {
-        legendOpacityScale = d3.scalePow().exponent(options.exponent).domain([0, legendWidth]).range([0, 1]);
-      }
-
-      const rangeStep = 10;
-      const valuesRange = d3.range(0, legendWidth, rangeStep);
-      const legendRects = legend.selectAll('.heatmap-opacity-legend-rect').data(valuesRange);
-
-      legendRects
-        .enter()
-        .append('rect')
-        .attr('x', (d) => d)
-        .attr('y', 0)
-        .attr('width', rangeStep)
-        .attr('height', legendHeight)
-        .attr('stroke-width', 0)
-        .attr('fill', config.theme2.visualization.getColorByName(options.cardColor))
-        .style('opacity', (d) => legendOpacityScale(d));
-    }
-  }
-}
-
-function clearLegend(elem: JQuery) {
-  const legendElem = $(elem).find('svg');
-  legendElem.empty();
-}
-
-function getSvgElemX(elem: JQuery) {
-  const svgElem: any = elem.get(0) as any;
-  if (svgElem && svgElem.x && svgElem.x.baseVal) {
-    return svgElem.x.baseVal.value;
-  } else {
-    return 0;
-  }
-}
-
-function getSvgElemHeight(elem: JQuery<any>) {
-  const svgElem: any = elem.get(0);
-  if (svgElem && svgElem.height && svgElem.height.baseVal) {
-    return svgElem.height.baseVal.value;
-  } else {
-    return 0;
-  }
-}
-
-function buildLegendTicks(rangeFrom: number, rangeTo: number, maxValue: number, minValue: number) {
-  const range = rangeTo - rangeFrom;
-  const tickStepSize = tickStep(rangeFrom, rangeTo, 3);
-  const ticksNum = Math.ceil(range / tickStepSize);
-  const firstTick = getFirstCloseTick(rangeFrom, tickStepSize);
-  let ticks = [];
-
-  for (let i = 0; i < ticksNum; i++) {
-    const current = firstTick + tickStepSize * i;
-    // Add user-defined min and max if it had been set
-    if (isValueCloseTo(minValue, current, tickStepSize)) {
-      ticks.push(minValue);
-      continue;
-    } else if (minValue < current) {
-      ticks.push(minValue);
-    }
-    if (isValueCloseTo(maxValue, current, tickStepSize)) {
-      ticks.push(maxValue);
-      continue;
-    } else if (maxValue < current) {
-      ticks.push(maxValue);
-    }
-    ticks.push(current);
-  }
-  if (!isValueCloseTo(maxValue, rangeTo, tickStepSize)) {
-    ticks.push(maxValue);
-  }
-  ticks.push(rangeTo);
-  ticks = sortBy(uniq(ticks));
-  return ticks;
-}
-
-function isValueCloseTo(val: number, valueTo: number, step: number) {
-  const diff = Math.abs(val - valueTo);
-  return diff < step * 0.3;
-}
-
-function getFirstCloseTick(minValue: number, step: number) {
-  if (minValue < 0) {
-    return Math.floor(minValue / step) * step;
-  }
-  return 0;
-}
diff --git a/public/app/plugins/panel/heatmap-old/color_scale.ts b/public/app/plugins/panel/heatmap-old/color_scale.ts
deleted file mode 100644
index fe87c5fc650..00000000000
--- a/public/app/plugins/panel/heatmap-old/color_scale.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as d3 from 'd3';
-import * as d3ScaleChromatic from 'd3-scale-chromatic';
-
-export function getColorScale(colorScheme: any, lightTheme: boolean, maxValue: number, minValue = 0): (d: any) => any {
-  //@ts-ignore
-  const colorInterpolator = d3ScaleChromatic[colorScheme.value];
-  const colorScaleInverted = colorScheme.invert === 'always' || colorScheme.invert === (lightTheme ? 'light' : 'dark');
-
-  const start = colorScaleInverted ? maxValue : minValue;
-  const end = colorScaleInverted ? minValue : maxValue;
-
-  return d3.scaleSequential(colorInterpolator).domain([start, end]);
-}
-
-export function getOpacityScale(
-  options: { cardColor?: null; colorScale?: any; exponent?: any },
-  maxValue: number,
-  minValue = 0
-): any {
-  let legendOpacityScale;
-  if (options.colorScale === 'linear') {
-    legendOpacityScale = d3.scaleLinear().domain([minValue, maxValue]).range([0, 1]);
-  } else if (options.colorScale === 'sqrt') {
-    legendOpacityScale = d3.scalePow().exponent(options.exponent).domain([minValue, maxValue]).range([0, 1]);
-  }
-  return legendOpacityScale;
-}
diff --git a/public/app/plugins/panel/heatmap-old/display_editor.ts b/public/app/plugins/panel/heatmap-old/display_editor.ts
deleted file mode 100644
index 6ed7f7e8af5..00000000000
--- a/public/app/plugins/panel/heatmap-old/display_editor.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export class HeatmapDisplayEditorCtrl {
-  panel: any;
-  panelCtrl: any;
-
-  /** @ngInject */
-  constructor($scope: any) {
-    $scope.editor = this;
-    this.panelCtrl = $scope.ctrl;
-    this.panel = this.panelCtrl.panel;
-  }
-}
-
-/** @ngInject */
-export function heatmapDisplayEditor() {
-  'use strict';
-  return {
-    restrict: 'E',
-    scope: true,
-    templateUrl: 'public/app/plugins/panel/heatmap/partials/display_editor.html',
-    controller: HeatmapDisplayEditorCtrl,
-  };
-}
diff --git a/public/app/plugins/panel/heatmap-old/heatmap_ctrl.ts b/public/app/plugins/panel/heatmap-old/heatmap_ctrl.ts
deleted file mode 100644
index 74a112b5f16..00000000000
--- a/public/app/plugins/panel/heatmap-old/heatmap_ctrl.ts
+++ /dev/null
@@ -1,385 +0,0 @@
-import { auto } from 'angular';
-import { defaultsDeep, includes, keys, map, reduce, min as _min, max as _max } from 'lodash';
-
-import { LegacyResponseData, PanelEvents, DataFrame, rangeUtil } from '@grafana/data';
-import appEvents from 'app/core/app_events';
-import TimeSeries from 'app/core/time_series2';
-import kbn from 'app/core/utils/kbn';
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { getProcessedDataFrames } from 'app/features/query/state/runRequest';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { MetricsPanelCtrl } from 'app/plugins/sdk';
-import { ZoomOutEvent } from 'app/types/events';
-
-import { DataProcessor } from '../graph/data_processor';
-
-import { axesEditor } from './axes_editor';
-import { heatmapDisplayEditor } from './display_editor';
-import {
-  convertToHeatMap,
-  convertToCards,
-  histogramToHeatmap,
-  calculateBucketSize,
-  sortSeriesByLabel,
-} from './heatmap_data_converter';
-import rendering from './rendering';
-
-const X_BUCKET_NUMBER_DEFAULT = 30;
-const Y_BUCKET_NUMBER_DEFAULT = 10;
-
-const panelDefaults: any = {
-  heatmap: {},
-  cards: {
-    cardPadding: null,
-    cardRound: null,
-  },
-  color: {
-    mode: 'spectrum',
-    cardColor: '#b4ff00',
-    colorScale: 'sqrt',
-    exponent: 0.5,
-    colorScheme: 'interpolateOranges',
-  },
-  legend: {
-    show: false,
-  },
-  dataFormat: 'timeseries',
-  yBucketBound: 'auto',
-  reverseYBuckets: false,
-  xAxis: {
-    show: true,
-  },
-  yAxis: {
-    show: true,
-    format: 'short',
-    decimals: null,
-    logBase: 1,
-    splitFactor: null,
-    min: null,
-    max: null,
-  },
-  xBucketSize: null,
-  xBucketNumber: null,
-  yBucketSize: null,
-  yBucketNumber: null,
-  tooltip: {
-    show: true,
-    showHistogram: false,
-  },
-  highlightCards: true,
-  hideZeroBuckets: false,
-};
-
-const colorModes = ['opacity', 'spectrum'];
-const opacityScales = ['linear', 'sqrt'];
-
-// Schemes from d3-scale-chromatic
-// https://github.com/d3/d3-scale-chromatic
-const colorSchemes = [
-  // Diverging
-  { name: 'Spectral', value: 'interpolateSpectral', invert: 'always' },
-  { name: 'RdYlGn', value: 'interpolateRdYlGn', invert: 'always' },
-
-  // Sequential (Single Hue)
-  { name: 'Blues', value: 'interpolateBlues', invert: 'dark' },
-  { name: 'Greens', value: 'interpolateGreens', invert: 'dark' },
-  { name: 'Greys', value: 'interpolateGreys', invert: 'dark' },
-  { name: 'Oranges', value: 'interpolateOranges', invert: 'dark' },
-  { name: 'Purples', value: 'interpolatePurples', invert: 'dark' },
-  { name: 'Reds', value: 'interpolateReds', invert: 'dark' },
-
-  // Sequential (Multi-Hue)
-  { name: 'Turbo', value: 'interpolateTurbo', invert: 'light' },
-  { name: 'Cividis', value: 'interpolateCividis', invert: 'light' },
-  { name: 'Viridis', value: 'interpolateViridis', invert: 'light' },
-  { name: 'Magma', value: 'interpolateMagma', invert: 'light' },
-  { name: 'Inferno', value: 'interpolateInferno', invert: 'light' },
-  { name: 'Plasma', value: 'interpolatePlasma', invert: 'light' },
-  { name: 'Warm', value: 'interpolateWarm', invert: 'light' },
-  { name: 'Cool', value: 'interpolateCool', invert: 'light' },
-  { name: 'Cubehelix', value: 'interpolateCubehelixDefault', invert: 'light' },
-  { name: 'BuGn', value: 'interpolateBuGn', invert: 'dark' },
-  { name: 'BuPu', value: 'interpolateBuPu', invert: 'dark' },
-  { name: 'GnBu', value: 'interpolateGnBu', invert: 'dark' },
-  { name: 'OrRd', value: 'interpolateOrRd', invert: 'dark' },
-  { name: 'PuBuGn', value: 'interpolatePuBuGn', invert: 'dark' },
-  { name: 'PuBu', value: 'interpolatePuBu', invert: 'dark' },
-  { name: 'PuRd', value: 'interpolatePuRd', invert: 'dark' },
-  { name: 'RdPu', value: 'interpolateRdPu', invert: 'dark' },
-  { name: 'YlGnBu', value: 'interpolateYlGnBu', invert: 'dark' },
-  { name: 'YlGn', value: 'interpolateYlGn', invert: 'dark' },
-  { name: 'YlOrBr', value: 'interpolateYlOrBr', invert: 'dark' },
-  { name: 'YlOrRd', value: 'interpolateYlOrRd', invert: 'dark' },
-];
-
-const dsSupportHistogramSort = ['elasticsearch'];
-
-export class HeatmapCtrl extends MetricsPanelCtrl {
-  static templateUrl = 'module.html';
-
-  opacityScales: any = [];
-  colorModes: any = [];
-  colorSchemes: any = [];
-  selectionActivated: boolean;
-  unitFormats: any;
-  data: any;
-  series: TimeSeries[] = [];
-  dataWarning: any;
-  decimals = 0;
-  scaledDecimals = 0;
-
-  processor: DataProcessor; // Shared with graph panel
-
-  /** @ngInject */
-  constructor($scope: any, $injector: auto.IInjectorService, templateSrv: TemplateSrv, timeSrv: TimeSrv) {
-    super($scope, $injector);
-
-    this.selectionActivated = false;
-
-    defaultsDeep(this.panel, panelDefaults);
-    this.opacityScales = opacityScales;
-    this.colorModes = colorModes;
-    this.colorSchemes = colorSchemes;
-
-    // Use DataFrames
-    this.useDataFrames = true;
-    this.processor = new DataProcessor({
-      xaxis: { mode: 'custom' }, // NOT: 'histogram' :)
-      aliasColors: {}, // avoids null reference
-    });
-
-    // Bind grafana panel events
-    this.events.on(PanelEvents.render, this.onRender.bind(this));
-    this.events.on(PanelEvents.dataFramesReceived, this.onDataFramesReceived.bind(this));
-    this.events.on(PanelEvents.dataSnapshotLoad, this.onSnapshotLoad.bind(this));
-    this.events.on(PanelEvents.editModeInitialized, this.onInitEditMode.bind(this));
-
-    this.onCardColorChange = this.onCardColorChange.bind(this);
-
-    // Make sure we do not save the version so migration to react version is kicked off
-    delete this.panel.pluginVersion;
-  }
-
-  onInitEditMode() {
-    this.addEditorTab('Axes', axesEditor, 2);
-    this.addEditorTab('Display', heatmapDisplayEditor, 3);
-    this.unitFormats = kbn.getUnitFormats();
-  }
-
-  zoomOut(evt: any) {
-    appEvents.publish(new ZoomOutEvent({ scale: 2 }));
-  }
-
-  onRender() {
-    if (this.panel.dataFormat === 'tsbuckets') {
-      this.convertHistogramToHeatmapData();
-    } else {
-      this.convertTimeSeriesToHeatmapData();
-    }
-  }
-
-  convertTimeSeriesToHeatmapData() {
-    if (!this.range || !this.series) {
-      return;
-    }
-
-    let xBucketSize, yBucketSize, bucketsData, heatmapStats;
-    const logBase = this.panel.yAxis.logBase;
-
-    const xBucketNumber = this.panel.xBucketNumber || X_BUCKET_NUMBER_DEFAULT;
-    const xBucketSizeByNumber = Math.floor((this.range.to.valueOf() - this.range.from.valueOf()) / xBucketNumber);
-
-    // Parse X bucket size (number or interval)
-    const isIntervalString = kbn.intervalRegex.test(this.panel.xBucketSize);
-    if (isIntervalString) {
-      xBucketSize = rangeUtil.intervalToMs(this.panel.xBucketSize);
-    } else if (
-      isNaN(Number(this.panel.xBucketSize)) ||
-      this.panel.xBucketSize === '' ||
-      this.panel.xBucketSize === null
-    ) {
-      xBucketSize = xBucketSizeByNumber;
-    } else {
-      xBucketSize = Number(this.panel.xBucketSize);
-    }
-
-    // Calculate Y bucket size
-    heatmapStats = this.parseSeries(this.series);
-    const yBucketNumber = this.panel.yBucketNumber || Y_BUCKET_NUMBER_DEFAULT;
-    if (logBase !== 1) {
-      yBucketSize = this.panel.yAxis.splitFactor;
-    } else {
-      if (heatmapStats.max === heatmapStats.min) {
-        if (heatmapStats.max) {
-          yBucketSize = heatmapStats.max / Y_BUCKET_NUMBER_DEFAULT;
-        } else {
-          yBucketSize = 1;
-        }
-      } else {
-        yBucketSize = (heatmapStats.max - heatmapStats.min) / yBucketNumber;
-      }
-      yBucketSize = this.panel.yBucketSize || yBucketSize;
-    }
-
-    bucketsData = convertToHeatMap(this.series, yBucketSize, xBucketSize, logBase);
-
-    // Set default Y range if no data
-    if (!heatmapStats.min && !heatmapStats.max) {
-      heatmapStats = { min: -1, max: 1, minLog: 1 };
-      yBucketSize = 1;
-    }
-
-    const { cards, cardStats } = convertToCards(bucketsData, this.panel.hideZeroBuckets);
-
-    this.data = {
-      buckets: bucketsData,
-      heatmapStats: heatmapStats,
-      xBucketSize: xBucketSize,
-      yBucketSize: yBucketSize,
-      cards: cards,
-      cardStats: cardStats,
-    };
-  }
-
-  convertHistogramToHeatmapData() {
-    if (!this.range || !this.series) {
-      return;
-    }
-
-    const panelDatasource = this.getPanelDataSourceType();
-    let xBucketSize, yBucketSize, bucketsData, tsBuckets;
-
-    // Try to sort series by bucket bound, if datasource doesn't do it.
-    if (!includes(dsSupportHistogramSort, panelDatasource)) {
-      this.series.sort(sortSeriesByLabel);
-    }
-
-    if (this.panel.reverseYBuckets) {
-      this.series.reverse();
-    }
-
-    // Convert histogram to heatmap. Each histogram bucket represented by the series which name is
-    // a top (or bottom, depends of datasource) bucket bound. Further, these values will be used as Y axis labels.
-    bucketsData = histogramToHeatmap(this.series);
-
-    tsBuckets = map(this.series, 'label');
-    const yBucketBound = this.panel.yBucketBound;
-    if (
-      (panelDatasource === 'prometheus' && yBucketBound !== 'lower' && yBucketBound !== 'middle') ||
-      yBucketBound === 'upper'
-    ) {
-      // Prometheus labels are upper inclusive bounds, so add empty bottom bucket label.
-      tsBuckets = [''].concat(tsBuckets);
-    } else {
-      // Elasticsearch uses labels as lower bucket bounds, so add empty top bucket label.
-      // Use this as a default mode as well.
-      tsBuckets.push('');
-    }
-
-    // Calculate bucket size based on heatmap data
-    const xBucketBoundSet = map(keys(bucketsData), (key) => Number(key));
-    xBucketSize = calculateBucketSize(xBucketBoundSet);
-    // Always let yBucketSize=1 in 'tsbuckets' mode
-    yBucketSize = 1;
-
-    const { cards, cardStats } = convertToCards(bucketsData, this.panel.hideZeroBuckets);
-
-    this.data = {
-      buckets: bucketsData,
-      xBucketSize: xBucketSize,
-      yBucketSize: yBucketSize,
-      tsBuckets: tsBuckets,
-      cards: cards,
-      cardStats: cardStats,
-    };
-  }
-
-  getPanelDataSourceType() {
-    if (this.datasource && this.datasource.meta && this.datasource.meta.id) {
-      return this.datasource.meta.id;
-    } else {
-      return 'unknown';
-    }
-  }
-
-  // This should only be called from the snapshot callback
-  onSnapshotLoad(dataList: LegacyResponseData[]) {
-    this.onDataFramesReceived(getProcessedDataFrames(dataList));
-  }
-
-  // Directly support DataFrame
-  onDataFramesReceived(data: DataFrame[]) {
-    this.series = this.processor.getSeriesList({ dataList: data, range: this.range }).map((ts) => {
-      ts.color = undefined; // remove whatever the processor set
-      ts.flotpairs = ts.getFlotPairs(this.panel.nullPointMode);
-      return ts;
-    });
-
-    this.dataWarning = null;
-    const datapointsCount = reduce(
-      this.series,
-      (sum, series) => {
-        return sum + series.datapoints.length;
-      },
-      0
-    );
-
-    if (datapointsCount === 0) {
-      this.dataWarning = {
-        title: 'No data points',
-        tip: 'No datapoints returned from data query',
-      };
-    } else {
-      for (const series of this.series) {
-        if (series.isOutsideRange) {
-          this.dataWarning = {
-            title: 'Data points outside time range',
-            tip: 'Can be caused by timezone mismatch or missing time filter in query',
-          };
-          break;
-        }
-      }
-    }
-
-    this.render();
-  }
-
-  onDataError() {
-    this.series = [];
-    this.render();
-  }
-
-  onCardColorChange(newColor: any) {
-    this.panel.color.cardColor = newColor;
-    this.render();
-  }
-
-  parseSeries(series: TimeSeries[]) {
-    const min = _min(map(series, (s) => s.stats.min));
-    const minLog = _min(map(series, (s) => s.stats.logmin));
-    const max = _max(map(series, (s) => s.stats.max));
-
-    return {
-      max,
-      min,
-      minLog,
-    };
-  }
-
-  parseHistogramSeries(series: TimeSeries[]) {
-    const bounds = map(series, (s) => Number(s.alias));
-    const min = _min(bounds);
-    const minLog = _min(bounds);
-    const max = _max(bounds);
-
-    return {
-      max: max,
-      min: min,
-      minLog: minLog,
-    };
-  }
-
-  link(scope: any, elem: any, attrs: any, ctrl: any) {
-    rendering(scope, elem, attrs, ctrl);
-  }
-}
diff --git a/public/app/plugins/panel/heatmap-old/heatmap_data_converter.ts b/public/app/plugins/panel/heatmap-old/heatmap_data_converter.ts
deleted file mode 100644
index d979e204d1f..00000000000
--- a/public/app/plugins/panel/heatmap-old/heatmap_data_converter.ts
+++ /dev/null
@@ -1,491 +0,0 @@
-import { concat, forEach, isEmpty, isEqual, isNumber, sortBy } from 'lodash';
-
-import { TimeSeries } from 'app/core/core';
-
-import { Bucket, HeatmapCard, HeatmapCardStats, YBucket, XBucket } from './types';
-
-const VALUE_INDEX = 0;
-const TIME_INDEX = 1;
-
-/**
- * Convert histogram represented by the list of series to heatmap object.
- * @param seriesList List of time series
- */
-function histogramToHeatmap(seriesList: TimeSeries[]) {
-  const heatmap: any = {};
-
-  for (let i = 0; i < seriesList.length; i++) {
-    const series = seriesList[i];
-    const bound = i;
-    if (isNaN(bound)) {
-      return heatmap;
-    }
-
-    for (const point of series.datapoints) {
-      const count = point[VALUE_INDEX];
-      const time = point[TIME_INDEX];
-
-      if (!isNumber(count)) {
-        continue;
-      }
-
-      let bucket = heatmap[time];
-      if (!bucket) {
-        bucket = heatmap[time] = { x: time, buckets: {} };
-      }
-
-      bucket.buckets[bound] = {
-        y: bound,
-        count: count,
-        bounds: {
-          top: null,
-          bottom: bound,
-        },
-        values: [],
-        points: [],
-      };
-    }
-  }
-
-  return heatmap;
-}
-
-/**
- * Sort series representing histogram by label value.
- */
-function sortSeriesByLabel(s1: { label: string }, s2: { label: string }) {
-  let label1, label2;
-
-  try {
-    // fail if not integer. might happen with bad queries
-    label1 = parseHistogramLabel(s1.label);
-    label2 = parseHistogramLabel(s2.label);
-  } catch (err) {
-    console.error(err instanceof Error ? err.message : err);
-    return 0;
-  }
-
-  if (label1 > label2) {
-    return 1;
-  }
-
-  if (label1 < label2) {
-    return -1;
-  }
-
-  return 0;
-}
-
-function parseHistogramLabel(label: string): number {
-  if (label === '+Inf' || label === 'inf') {
-    return +Infinity;
-  }
-  const value = Number(label);
-  if (isNaN(value)) {
-    throw new Error(`Error parsing histogram label: ${label} is not a number`);
-  }
-  return value;
-}
-
-/**
- * Convert buckets into linear array of "cards" - objects, represented heatmap elements.
- * @param  {Object} buckets
- * @returns {Object}          Array of "card" objects and stats
- */
-function convertToCards(buckets: any, hideZero = false): { cards: HeatmapCard[]; cardStats: HeatmapCardStats } {
-  let min = 0,
-    max = 0;
-  const cards: HeatmapCard[] = [];
-  forEach(buckets, (xBucket) => {
-    forEach(xBucket.buckets, (yBucket) => {
-      const card: HeatmapCard = {
-        x: xBucket.x,
-        y: yBucket.y,
-        yBounds: yBucket.bounds,
-        values: yBucket.values,
-        count: yBucket.count,
-      };
-      if (!hideZero || card.count !== 0) {
-        cards.push(card);
-      }
-
-      if (cards.length === 1) {
-        min = yBucket.count;
-        max = yBucket.count;
-      }
-
-      min = yBucket.count < min ? yBucket.count : min;
-      max = yBucket.count > max ? yBucket.count : max;
-    });
-  });
-
-  const cardStats = { min, max };
-  return { cards, cardStats };
-}
-
-/**
- * Special method for log scales. When series converted into buckets with log scale,
- * for simplification, 0 values are converted into 0, not into -Infinity. On the other hand, we mean
- * that all values less than series minimum, is 0 values, and we create special "minimum" bucket for
- * that values (actually, there're no values less than minimum, so this bucket is empty).
- *  8-16|    | ** |    |  * |  **|
- *   4-8|  * |*  *|*   |** *| *  |
- *   2-4| * *|    | ***|    |*   |
- *   1-2|*   |    |    |    |    | This bucket contains minimum series value
- * 0.5-1|____|____|____|____|____| This bucket should be displayed as 0 on graph
- *     0|____|____|____|____|____| This bucket is for 0 values (should actually be -Infinity)
- * So we should merge two bottom buckets into one (0-value bucket).
- *
- * @param  {Object} buckets  Heatmap buckets
- * @param  {Number} minValue Minimum series value
- * @returns {Object}          Transformed buckets
- */
-function mergeZeroBuckets(buckets: any, minValue: number) {
-  forEach(buckets, (xBucket) => {
-    const yBuckets = xBucket.buckets;
-
-    const emptyBucket: any = {
-      bounds: { bottom: 0, top: 0 },
-      values: [],
-      points: [],
-      count: 0,
-    };
-
-    const nullBucket = yBuckets[0] || emptyBucket;
-    const minBucket = yBuckets[minValue] || emptyBucket;
-
-    const newBucket: any = {
-      y: 0,
-      bounds: { bottom: minValue, top: minBucket.bounds.top || minValue },
-      values: [],
-      points: [],
-      count: 0,
-    };
-
-    newBucket.points = nullBucket.points.concat(minBucket.points);
-    newBucket.values = nullBucket.values.concat(minBucket.values);
-    newBucket.count = newBucket.values.length;
-
-    if (newBucket.count === 0) {
-      return;
-    }
-
-    delete yBuckets[minValue];
-    yBuckets[0] = newBucket;
-  });
-
-  return buckets;
-}
-
-/**
- * Convert set of time series into heatmap buckets
- * @returns {Object}    Heatmap object:
- * {
- *   xBucketBound_1: {
- *     x: xBucketBound_1,
- *     buckets: {
- *       yBucketBound_1: {
- *         y: yBucketBound_1,
- *         bounds: {bottom, top}
- *         values: [val_1, val_2, ..., val_K],
- *         points: [[val_Y, val_X, series_name], ..., [...]],
- *         seriesStat: {seriesName_1: val_1, seriesName_2: val_2}
- *       },
- *       ...
- *       yBucketBound_M: {}
- *     },
- *     values: [val_1, val_2, ..., val_K],
- *     points: [
- *       [val_Y, val_X, series_name], (point_1)
- *       ...
- *       [...] (point_K)
- *     ]
- *   },
- *   xBucketBound_2: {},
- *   ...
- *   xBucketBound_N: {}
- * }
- */
-function convertToHeatMap(seriesList: TimeSeries[], yBucketSize: number, xBucketSize: number, logBase = 1) {
-  const heatmap = {};
-
-  for (const series of seriesList) {
-    const datapoints = series.datapoints;
-    const seriesName = series.label;
-
-    // Slice series into X axis buckets
-    // |    | ** |    |  * |  **|
-    // |  * |*  *|*   |** *| *  |
-    // |** *|    | ***|    |*   |
-    // |____|____|____|____|____|_
-    //
-    forEach(datapoints, (point) => {
-      const bucketBound = getBucketBound(point[TIME_INDEX], xBucketSize);
-      pushToXBuckets(heatmap, point, bucketBound, seriesName);
-    });
-  }
-
-  // Slice X axis buckets into Y (value) buckets
-  // |  **|     |2|,
-  // | *  | --\ |1|,
-  // |*   | --/ |1|,
-  // |____|     |0|
-  //
-  forEach(heatmap, (xBucket: any) => {
-    if (logBase !== 1) {
-      xBucket.buckets = convertToLogScaleValueBuckets(xBucket, yBucketSize, logBase);
-    } else {
-      xBucket.buckets = convertToValueBuckets(xBucket, yBucketSize);
-    }
-  });
-
-  return heatmap;
-}
-
-function pushToXBuckets(buckets: any, point: any[], bucketNum: number, seriesName: string) {
-  const value = point[VALUE_INDEX];
-  if (value === null || value === undefined || isNaN(value)) {
-    return;
-  }
-
-  // Add series name to point for future identification
-  const pointExt = concat(point, seriesName);
-
-  if (buckets[bucketNum] && buckets[bucketNum].values) {
-    buckets[bucketNum].values.push(value);
-    buckets[bucketNum].points.push(pointExt);
-  } else {
-    buckets[bucketNum] = {
-      x: bucketNum,
-      values: [value],
-      points: [pointExt],
-    };
-  }
-}
-
-function pushToYBuckets(
-  buckets: Bucket,
-  bucketNum: number,
-  value: any,
-  point: string[],
-  bounds: { bottom: number; top: number }
-) {
-  let count = 1;
-  // Use the 3rd argument as scale/count
-  if (point.length > 3) {
-    count = parseInt(point[2], 10);
-  }
-  if (buckets[bucketNum]) {
-    buckets[bucketNum].values.push(value);
-    buckets[bucketNum].points?.push(point);
-    buckets[bucketNum].count += count;
-  } else {
-    buckets[bucketNum] = {
-      y: bucketNum,
-      bounds: bounds,
-      values: [value],
-      points: [point],
-      count: count,
-    };
-  }
-}
-
-function getValueBucketBound(value: any, yBucketSize: number, logBase: number) {
-  if (logBase === 1) {
-    return getBucketBound(value, yBucketSize);
-  } else {
-    return getLogScaleBucketBound(value, yBucketSize, logBase);
-  }
-}
-
-/**
- * Find bucket for given value (for linear scale)
- */
-function getBucketBounds(value: number, bucketSize: number) {
-  let bottom, top;
-  bottom = Math.floor(value / bucketSize) * bucketSize;
-  top = (Math.floor(value / bucketSize) + 1) * bucketSize;
-
-  return { bottom, top };
-}
-
-function getBucketBound(value: number, bucketSize: number) {
-  const bounds = getBucketBounds(value, bucketSize);
-  return bounds.bottom;
-}
-
-function convertToValueBuckets(xBucket: { values: any; points: any }, bucketSize: number) {
-  const values = xBucket.values;
-  const points = xBucket.points;
-  const buckets = {};
-
-  forEach(values, (val, index) => {
-    const bounds = getBucketBounds(val, bucketSize);
-    const bucketNum = bounds.bottom;
-    pushToYBuckets(buckets, bucketNum, val, points[index], bounds);
-  });
-
-  return buckets;
-}
-
-/**
- * Find bucket for given value (for log scales)
- */
-function getLogScaleBucketBounds(value: number, yBucketSplitFactor: number, logBase: number) {
-  let top, bottom;
-  if (value === 0) {
-    return { bottom: 0, top: 0 };
-  }
-
-  const valueLog = logp(value, logBase);
-  let pow, powTop;
-  if (yBucketSplitFactor === 1 || !yBucketSplitFactor) {
-    pow = Math.floor(valueLog);
-    powTop = pow + 1;
-  } else {
-    const additionalBucketSize = 1 / yBucketSplitFactor;
-    let additionalLog = valueLog - Math.floor(valueLog);
-    additionalLog = Math.floor(additionalLog / additionalBucketSize) * additionalBucketSize;
-    pow = Math.floor(valueLog) + additionalLog;
-    powTop = pow + additionalBucketSize;
-  }
-  bottom = Math.pow(logBase, pow);
-  top = Math.pow(logBase, powTop);
-
-  return { bottom, top };
-}
-
-function getLogScaleBucketBound(value: number, yBucketSplitFactor: number, logBase: number) {
-  const bounds = getLogScaleBucketBounds(value, yBucketSplitFactor, logBase);
-  return bounds.bottom;
-}
-
-function convertToLogScaleValueBuckets(
-  xBucket: { values: any; points: any },
-  yBucketSplitFactor: number,
-  logBase: number
-) {
-  const values = xBucket.values;
-  const points = xBucket.points;
-
-  const buckets = {};
-  forEach(values, (val, index) => {
-    const bounds = getLogScaleBucketBounds(val, yBucketSplitFactor, logBase);
-    const bucketNum = bounds.bottom;
-    pushToYBuckets(buckets, bucketNum, val, points[index], bounds);
-  });
-
-  return buckets;
-}
-
-/**
- * Logarithm for custom base
- * @param value
- * @param base logarithm base
- */
-function logp(value: number, base: number) {
-  return Math.log(value) / Math.log(base);
-}
-
-/**
- * Calculate size of Y bucket from given buckets bounds.
- * @param bounds Array of Y buckets bounds
- * @param logBase Logarithm base
- */
-function calculateBucketSize(bounds: number[], logBase = 1): number {
-  let bucketSize = Infinity;
-
-  if (bounds.length === 0) {
-    return 0;
-  } else if (bounds.length === 1) {
-    return bounds[0];
-  } else {
-    bounds = sortBy(bounds);
-    for (let i = 1; i < bounds.length; i++) {
-      const distance = getDistance(bounds[i], bounds[i - 1], logBase);
-      bucketSize = distance < bucketSize ? distance : bucketSize;
-    }
-  }
-
-  return bucketSize;
-}
-
-/**
- * Calculate distance between two numbers in given scale (linear or logarithmic).
- * @param a
- * @param b
- * @param logBase
- */
-function getDistance(a: number, b: number, logBase = 1): number {
-  if (logBase === 1) {
-    // Linear distance
-    return Math.abs(b - a);
-  } else {
-    // logarithmic distance
-    const ratio = Math.max(a, b) / Math.min(a, b);
-    return logp(ratio, logBase);
-  }
-}
-
-/**
- * Compare two heatmap data objects
- * @param objA
- * @param objB
- */
-function isHeatmapDataEqual(objA: any, objB: any): boolean {
-  let isEql = !emptyXOR(objA, objB);
-
-  forEach(objA, (xBucket: XBucket, x) => {
-    if (objB[x]) {
-      if (emptyXOR(xBucket.buckets, objB[x].buckets)) {
-        isEql = false;
-        return false;
-      }
-
-      forEach(xBucket.buckets, (yBucket: YBucket, y) => {
-        if (objB[x].buckets && objB[x].buckets[y]) {
-          if (objB[x].buckets[y].values) {
-            isEql = isEqual(sortBy(yBucket.values), sortBy(objB[x].buckets[y].values));
-            if (!isEql) {
-              return false;
-            } else {
-              return true;
-            }
-          } else {
-            isEql = false;
-            return false;
-          }
-        } else {
-          isEql = false;
-          return false;
-        }
-      });
-
-      if (!isEql) {
-        return false;
-      } else {
-        return true;
-      }
-    } else {
-      isEql = false;
-      return false;
-    }
-  });
-
-  return isEql;
-}
-
-function emptyXOR(foo: any, bar: any): boolean {
-  return (isEmpty(foo) || isEmpty(bar)) && !(isEmpty(foo) && isEmpty(bar));
-}
-
-export {
-  convertToHeatMap,
-  histogramToHeatmap,
-  convertToCards,
-  mergeZeroBuckets,
-  getValueBucketBound,
-  isHeatmapDataEqual,
-  calculateBucketSize,
-  sortSeriesByLabel,
-};
diff --git a/public/app/plugins/panel/heatmap-old/heatmap_tooltip.ts b/public/app/plugins/panel/heatmap-old/heatmap_tooltip.ts
deleted file mode 100644
index e7400ee04e4..00000000000
--- a/public/app/plugins/panel/heatmap-old/heatmap_tooltip.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-import * as d3 from 'd3';
-import $ from 'jquery';
-import { filter, find, isNumber, map, reduce } from 'lodash';
-
-import { getValueFormat, formattedValueToString } from '@grafana/data';
-
-import { getValueBucketBound } from './heatmap_data_converter';
-
-const TOOLTIP_PADDING_X = 30;
-const TOOLTIP_PADDING_Y = 5;
-const HISTOGRAM_WIDTH = 160;
-const HISTOGRAM_HEIGHT = 40;
-
-export class HeatmapTooltip {
-  tooltip: any;
-  scope: any;
-  dashboard: any;
-  panelCtrl: any;
-  panel: any;
-  heatmapPanel: any;
-  mouseOverBucket: boolean;
-  originalFillColor: any;
-
-  constructor(elem: JQuery, scope: any) {
-    this.scope = scope;
-    this.dashboard = scope.ctrl.dashboard;
-    this.panelCtrl = scope.ctrl;
-    this.panel = scope.ctrl.panel;
-    this.heatmapPanel = elem;
-    this.mouseOverBucket = false;
-    this.originalFillColor = null;
-
-    elem.on('mouseleave', this.onMouseLeave.bind(this));
-  }
-
-  onMouseLeave() {
-    this.destroy();
-  }
-
-  onMouseMove(e: any) {
-    if (!this.panel.tooltip.show) {
-      return;
-    }
-
-    this.move(e);
-  }
-
-  add() {
-    this.tooltip = d3.select('body').append('div').attr('class', 'heatmap-tooltip graph-tooltip grafana-tooltip');
-  }
-
-  destroy() {
-    if (this.tooltip) {
-      this.tooltip.remove();
-    }
-
-    this.tooltip = null;
-  }
-
-  show(pos: { panelRelY: any }, data: any) {
-    if (!this.panel.tooltip.show || !data) {
-      return;
-    }
-    // shared tooltip mode
-    if (pos.panelRelY) {
-      return;
-    }
-
-    const { xBucketIndex, yBucketIndex } = this.getBucketIndexes(pos, data);
-
-    if (!data.buckets[xBucketIndex]) {
-      this.destroy();
-      return;
-    }
-
-    if (!this.tooltip) {
-      this.add();
-    }
-
-    let boundBottom, boundTop, valuesNumber;
-    const xData = data.buckets[xBucketIndex];
-    // Search in special 'zero' bucket also
-    const yData: any = find(xData.buckets, (bucket, bucketIndex) => {
-      return bucket.bounds.bottom === yBucketIndex || bucketIndex === yBucketIndex.toString();
-    });
-
-    const tooltipTimeFormat = 'YYYY-MM-DD HH:mm:ss';
-    const time = this.dashboard.formatDate(xData.x, tooltipTimeFormat);
-
-    // Decimals override. Code from panel/graph/graph.ts
-    let countValueFormatter, bucketBoundFormatter;
-    if (isNumber(this.panel.tooltipDecimals)) {
-      countValueFormatter = this.countValueFormatter(this.panel.tooltipDecimals, null);
-      bucketBoundFormatter = this.panelCtrl.tickValueFormatter(this.panelCtrl.decimals, null);
-    } else {
-      // auto decimals
-      // legend and tooltip gets one more decimal precision
-      // than graph legend ticks
-      const decimals = (this.panelCtrl.decimals || -1) + 1;
-      countValueFormatter = this.countValueFormatter(decimals, this.panelCtrl.scaledDecimals + 2);
-      bucketBoundFormatter = this.panelCtrl.tickValueFormatter(decimals, this.panelCtrl.scaledDecimals + 2);
-    }
-
-    let tooltipHtml = `<div class="graph-tooltip-time">${time}</div>
-      <div class="heatmap-histogram"></div>`;
-
-    if (yData) {
-      if (yData.bounds) {
-        if (data.tsBuckets) {
-          // Use Y-axis labels
-          const tickFormatter = (valIndex: string | number) => {
-            return data.tsBucketsFormatted ? data.tsBucketsFormatted[valIndex] : data.tsBuckets[valIndex];
-          };
-
-          boundBottom = tickFormatter(yBucketIndex);
-          if (this.panel.yBucketBound !== 'middle') {
-            boundTop = yBucketIndex < data.tsBuckets.length - 1 ? tickFormatter(yBucketIndex + 1) : '';
-          }
-        } else {
-          // Display 0 if bucket is a special 'zero' bucket
-          const bottom = yData.y ? yData.bounds.bottom : 0;
-          boundBottom = bucketBoundFormatter(bottom);
-          boundTop = bucketBoundFormatter(yData.bounds.top);
-        }
-        valuesNumber = countValueFormatter(yData.count);
-        const boundStr = boundTop && boundBottom ? `${boundBottom} - ${boundTop}` : boundBottom || boundTop;
-        tooltipHtml += `<div>
-          bucket: <b>${boundStr}</b> <br>
-          count: <b>${valuesNumber}</b> <br>
-        </div>`;
-      } else {
-        // currently no bounds for pre bucketed data
-        tooltipHtml += `<div>count: <b>${yData.count}</b><br></div>`;
-      }
-    } else {
-      if (!this.panel.tooltip.showHistogram) {
-        this.destroy();
-        return;
-      }
-      boundBottom = yBucketIndex;
-      boundTop = '';
-      valuesNumber = 0;
-    }
-
-    this.tooltip.html(tooltipHtml);
-
-    if (this.panel.tooltip.showHistogram) {
-      this.addHistogram(xData);
-    }
-
-    this.move(pos);
-  }
-
-  getBucketIndexes(pos: { panelRelY?: any; x?: any; y?: any }, data: any) {
-    const xBucketIndex = this.getXBucketIndex(pos.x, data);
-    const yBucketIndex = this.getYBucketIndex(pos.y, data);
-    return { xBucketIndex, yBucketIndex };
-  }
-
-  getXBucketIndex(x: number, data: { buckets: any; xBucketSize: number }) {
-    // First try to find X bucket by checking x pos is in the
-    // [bucket.x, bucket.x + xBucketSize] interval
-    const xBucket: any = find(data.buckets, (bucket) => {
-      return x > bucket.x && x - bucket.x <= data.xBucketSize;
-    });
-    return xBucket ? xBucket.x : getValueBucketBound(x, data.xBucketSize, 1);
-  }
-
-  getYBucketIndex(y: number, data: { tsBuckets: any; yBucketSize: number }) {
-    if (data.tsBuckets) {
-      return Math.floor(y);
-    }
-    const yBucketIndex = getValueBucketBound(y, data.yBucketSize, this.panel.yAxis.logBase);
-    return yBucketIndex;
-  }
-
-  getSharedTooltipPos(pos: { pageX: any; x: any; pageY: any; panelRelY: number }) {
-    // get pageX from position on x axis and pageY from relative position in original panel
-    pos.pageX = this.heatmapPanel.offset().left + this.scope.xScale(pos.x);
-    pos.pageY = this.heatmapPanel.offset().top + this.scope.chartHeight * pos.panelRelY;
-    return pos;
-  }
-
-  addHistogram(data: { x: string | number }) {
-    const xBucket = this.scope.ctrl.data.buckets[data.x];
-    const yBucketSize = this.scope.ctrl.data.yBucketSize;
-    let min: number, max: number, ticks: number;
-    if (this.scope.ctrl.data.tsBuckets) {
-      min = 0;
-      max = this.scope.ctrl.data.tsBuckets.length - 1;
-      ticks = this.scope.ctrl.data.tsBuckets.length;
-    } else {
-      min = this.scope.ctrl.data.yAxis.min;
-      max = this.scope.ctrl.data.yAxis.max;
-      ticks = this.scope.ctrl.data.yAxis.ticks;
-    }
-    let histogramData = map(xBucket.buckets, (bucket) => {
-      const count = bucket.count !== undefined ? bucket.count : bucket.values.length;
-      return [bucket.bounds.bottom, count];
-    });
-    histogramData = filter(histogramData, (d) => {
-      return d[0] >= min && d[0] <= max;
-    });
-
-    const scale = this.scope.yScale.copy();
-    const histXScale = scale.domain([min, max]).range([0, HISTOGRAM_WIDTH]);
-
-    let barWidth: number;
-    if (this.panel.yAxis.logBase === 1) {
-      barWidth = Math.floor((HISTOGRAM_WIDTH / (max - min)) * yBucketSize * 0.9);
-    } else {
-      const barNumberFactor = yBucketSize ? yBucketSize : 1;
-      barWidth = Math.floor((HISTOGRAM_WIDTH / ticks / barNumberFactor) * 0.9);
-    }
-    barWidth = Math.max(barWidth, 1);
-
-    // Normalize histogram Y axis
-    const histogramDomain = reduce(
-      map(histogramData, (d) => d[1]),
-      (sum, val) => sum + val,
-      0
-    );
-    const histYScale = d3.scaleLinear().domain([0, histogramDomain]).range([0, HISTOGRAM_HEIGHT]);
-
-    const histogram = this.tooltip
-      .select('.heatmap-histogram')
-      .append('svg')
-      .attr('width', HISTOGRAM_WIDTH)
-      .attr('height', HISTOGRAM_HEIGHT);
-
-    histogram
-      .selectAll('.bar')
-      .data(histogramData)
-      .enter()
-      .append('rect')
-      .attr('x', (d: any[]) => {
-        return histXScale(d[0]);
-      })
-      .attr('width', barWidth)
-      .attr('y', (d: any[]) => {
-        return HISTOGRAM_HEIGHT - histYScale(d[1]);
-      })
-      .attr('height', (d: any[]) => {
-        return histYScale(d[1]);
-      });
-  }
-
-  move(pos: { panelRelY?: any; pageX?: any; pageY?: any }) {
-    if (!this.tooltip) {
-      return;
-    }
-
-    const elem = $(this.tooltip.node())[0];
-    const tooltipWidth = elem.clientWidth;
-    const tooltipHeight = elem.clientHeight;
-
-    let left = pos.pageX + TOOLTIP_PADDING_X;
-    let top = pos.pageY + TOOLTIP_PADDING_Y;
-
-    if (pos.pageX + tooltipWidth + 40 > window.innerWidth) {
-      left = pos.pageX - tooltipWidth - TOOLTIP_PADDING_X;
-    }
-
-    if (pos.pageY - window.pageYOffset + tooltipHeight + 20 > window.innerHeight) {
-      top = pos.pageY - tooltipHeight - TOOLTIP_PADDING_Y;
-    }
-
-    return this.tooltip.style('left', left + 'px').style('top', top + 'px');
-  }
-
-  countValueFormatter(decimals: number, scaledDecimals: any = null) {
-    const fmt = getValueFormat('short');
-    return (value: number) => {
-      return formattedValueToString(fmt(value, decimals, scaledDecimals));
-    };
-  }
-}
diff --git a/public/app/plugins/panel/heatmap-old/img/icn-heatmap-panel.svg b/public/app/plugins/panel/heatmap-old/img/icn-heatmap-panel.svg
deleted file mode 100644
index 25d98a0d5fd..00000000000
--- a/public/app/plugins/panel/heatmap-old/img/icn-heatmap-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 80.09 80.09"><defs><style>.cls-1{fill:#3865ab;}.cls-2{fill:#84aff1;}.cls-3{fill:url(#linear-gradient);}.cls-4{fill:url(#linear-gradient-2);}</style><linearGradient id="linear-gradient" y1="19.02" x2="66.08" y2="19.02" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2cc0c"/><stop offset="1" stop-color="#ff9830"/></linearGradient><linearGradient id="linear-gradient-2" y1="54.06" x2="66.08" y2="54.06" xlink:href="#linear-gradient"/></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="28.03" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="42.05" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="56.06" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="70.08" y="14.02" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="28.03" y="28.03" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="42.05" y="28.03" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="56.06" y="28.03" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="70.08" y="28.03" width="10.02" height="10.02" rx="1"/><rect class="cls-1" y="42.05" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="42.05" y="42.05" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="56.06" y="42.05" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="70.08" y="42.05" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="14.02" y="56.06" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="14.02" y="70.08" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="28.03" y="70.08" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="42.05" y="70.08" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="14.02" width="10.02" height="10.02" rx="1"/><rect class="cls-2" y="28.03" width="10.02" height="10.02" rx="1" transform="translate(38.05 28.03) rotate(90)"/><rect class="cls-1" x="70.08" y="56.06" width="10.02" height="10.02" rx="1" transform="translate(136.16 -14.02) rotate(90)"/><rect class="cls-1" x="70.08" width="10.02" height="10.02" rx="1" transform="translate(80.09 -70.08) rotate(90)"/><path class="cls-3" d="M9,24H1a1,1,0,0,1-1-1V15a1,1,0,0,1,1-1H9a1,1,0,0,1,1,1v8A1,1,0,0,1,9,24Zm15-1V15a1,1,0,0,0-1-1H15a1,1,0,0,0-1,1v8a1,1,0,0,0,1,1h8A1,1,0,0,0,24,23Zm14,0V15a1,1,0,0,0-1-1H29a1,1,0,0,0-1,1v8a1,1,0,0,0,1,1h8A1,1,0,0,0,38.05,23Zm28,0V15a1,1,0,0,0-1-1h-8a1,1,0,0,0-1,1v8a1,1,0,0,0,1,1h8A1,1,0,0,0,66.08,23Zm-15,1h-8a1,1,0,0,1-1-1V15a1,1,0,0,1,1-1h8a1,1,0,0,1,1,1v8A1,1,0,0,1,51.06,24Z"/><rect class="cls-1" x="14.02" y="28.03" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="28.03" y="56.06" width="10.02" height="10.02" rx="1"/><path class="cls-4" d="M37.05,52.06H29a1,1,0,0,1-1-1v-8a1,1,0,0,1,1-1h8a1,1,0,0,1,1,1v8A1,1,0,0,1,37.05,52.06Zm-14,0H15a1,1,0,0,1-1-1v-8a1,1,0,0,1,1-1h8a1,1,0,0,1,1,1v8A1,1,0,0,1,23,52.06Zm-13,13v-8a1,1,0,0,0-1-1H1a1,1,0,0,0-1,1v8a1,1,0,0,0,1,1H9A1,1,0,0,0,10,65.08Zm42,0v-8a1,1,0,0,0-1-1h-8a1,1,0,0,0-1,1v8a1,1,0,0,0,1,1h8A1,1,0,0,0,52.06,65.08Zm14,0v-8a1,1,0,0,0-1-1h-8a1,1,0,0,0-1,1v8a1,1,0,0,0,1,1h8A1,1,0,0,0,66.08,65.08Z"/><rect class="cls-1" y="70.08" width="10.02" height="10.02" rx="1"/><rect class="cls-1" x="56.06" y="70.08" width="10.02" height="10.02" rx="1"/><rect class="cls-2" x="70.08" y="70.08" width="10.02" height="10.02" rx="1"/></g></g></svg>
\ No newline at end of file
diff --git a/public/app/plugins/panel/heatmap-old/module.html b/public/app/plugins/panel/heatmap-old/module.html
deleted file mode 100644
index 5b5c5296ca1..00000000000
--- a/public/app/plugins/panel/heatmap-old/module.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="heatmap-wrapper">
-	<div class="heatmap-canvas-wrapper">
-
-		<div class="datapoints-warning" ng-if="ctrl.dataWarning">
-			<span class="small" bs-tooltip="ctrl.dataWarning.tip">{{ctrl.dataWarning.title}}</span>
-		</div>
-
-		<div class="heatmap-panel" ng-dblclick="ctrl.zoomOut()"></div>
-	</div>
-	<div class="heatmap-legend-wrapper" ng-if="ctrl.panel.legend.show">
-		<heatmap-legend></heatmap-legend>
-	</div>
-</div>
-<div class="clearfix"></div>
diff --git a/public/app/plugins/panel/heatmap-old/module.ts b/public/app/plugins/panel/heatmap-old/module.ts
deleted file mode 100644
index 03fda580012..00000000000
--- a/public/app/plugins/panel/heatmap-old/module.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import './color_legend';
-import { HeatmapCtrl } from './heatmap_ctrl';
-
-export { HeatmapCtrl as PanelCtrl };
diff --git a/public/app/plugins/panel/heatmap-old/plugin.json b/public/app/plugins/panel/heatmap-old/plugin.json
deleted file mode 100644
index 5a00015d78f..00000000000
--- a/public/app/plugins/panel/heatmap-old/plugin.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "type": "panel",
-  "name": "Heatmap (legacy)",
-  "id": "heatmap-old",
-  "state": "deprecated",
-
-  "info": {
-    "description": "Legacy heatmap panel based on angular, d3, and flot",
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
-    },
-    "logos": {
-      "small": "img/icn-heatmap-panel.svg",
-      "large": "img/icn-heatmap-panel.svg"
-    },
-    "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" }
-    ]
-  }
-}
diff --git a/public/app/plugins/panel/heatmap-old/rendering.ts b/public/app/plugins/panel/heatmap-old/rendering.ts
deleted file mode 100644
index a7adc91c7bb..00000000000
--- a/public/app/plugins/panel/heatmap-old/rendering.ts
+++ /dev/null
@@ -1,865 +0,0 @@
-import * as d3 from 'd3';
-import $ from 'jquery';
-import { find, isEmpty, isNaN, isNil, isString, map, max, min, toNumber } from 'lodash';
-
-import {
-  dateTimeFormat,
-  formattedValueToString,
-  getValueFormat,
-  LegacyGraphHoverClearEvent,
-  LegacyGraphHoverEvent,
-  PanelEvents,
-  toUtc,
-} from '@grafana/data';
-import { graphTimeFormat } from '@grafana/ui';
-import { config } from 'app/core/config';
-import { contextSrv } from 'app/core/core';
-import * as ticksUtils from 'app/core/utils/ticks';
-
-import { getColorScale, getOpacityScale } from './color_scale';
-import { mergeZeroBuckets } from './heatmap_data_converter';
-import { HeatmapTooltip } from './heatmap_tooltip';
-
-const MIN_CARD_SIZE = 1,
-  CARD_PADDING = 1,
-  CARD_ROUND = 0,
-  DATA_RANGE_WIDING_FACTOR = 1.2,
-  DEFAULT_X_TICK_SIZE_PX = 100,
-  DEFAULT_Y_TICK_SIZE_PX = 22.5,
-  X_AXIS_TICK_PADDING = 10,
-  Y_AXIS_TICK_PADDING = 5,
-  MIN_SELECTION_WIDTH = 2;
-
-export default function rendering(scope: any, elem: any, attrs: any, ctrl: any) {
-  return new HeatmapRenderer(scope, elem, attrs, ctrl);
-}
-export class HeatmapRenderer {
-  width = 200;
-  height = 200;
-  yScale: any;
-  xScale: any;
-  chartWidth = 0;
-  chartHeight = 0;
-  chartTop = 0;
-  chartBottom = 0;
-  yAxisWidth = 0;
-  xAxisHeight = 0;
-  cardPadding = 0;
-  cardRound = 0;
-  cardWidth = 0;
-  cardHeight = 0;
-  colorScale: any;
-  opacityScale: any;
-  mouseUpHandler: any;
-  data: any;
-  panel: any;
-  $heatmap: any;
-  tooltip: HeatmapTooltip;
-  heatmap: any;
-  timeRange: any;
-
-  selection: any;
-  padding: any;
-  margin: any;
-  dataRangeWidingFactor: number;
-
-  hoverEvent: LegacyGraphHoverEvent;
-
-  constructor(private scope: any, private elem: any, attrs: any, private ctrl: any) {
-    // $heatmap is JQuery object, but heatmap is D3
-    this.$heatmap = this.elem.find('.heatmap-panel');
-    this.tooltip = new HeatmapTooltip(this.$heatmap, this.scope);
-
-    this.selection = {
-      active: false,
-      x1: -1,
-      x2: -1,
-    };
-
-    this.padding = { left: 0, right: 0, top: 0, bottom: 0 };
-    this.margin = { left: 25, right: 15, top: 10, bottom: 20 };
-    this.dataRangeWidingFactor = DATA_RANGE_WIDING_FACTOR;
-    this.ctrl.events.on(PanelEvents.render, this.onRender.bind(this));
-    this.ctrl.tickValueFormatter = this.tickValueFormatter.bind(this);
-
-    /////////////////////////////
-    // Selection and crosshair //
-    /////////////////////////////
-
-    // Shared crosshair and tooltip
-    this.ctrl.dashboard.events.on(LegacyGraphHoverEvent.type, this.onGraphHover.bind(this), this.scope);
-    this.ctrl.dashboard.events.on(LegacyGraphHoverClearEvent.type, this.onGraphHoverClear.bind(this), this.scope);
-
-    // Register selection listeners
-    this.$heatmap.on('mousedown', this.onMouseDown.bind(this));
-    this.$heatmap.on('mousemove', this.onMouseMove.bind(this));
-    this.$heatmap.on('mouseleave', this.onMouseLeave.bind(this));
-
-    this.hoverEvent = new LegacyGraphHoverEvent({ pos: {}, point: {}, panel: this.panel });
-  }
-
-  onGraphHoverClear() {
-    this.clearCrosshair();
-  }
-
-  onGraphHover(event: { pos: any }) {
-    this.drawSharedCrosshair(event.pos);
-  }
-
-  onRender() {
-    this.render();
-    this.ctrl.renderingCompleted();
-  }
-
-  setElementHeight() {
-    try {
-      let height = this.ctrl.height || this.panel.height || this.ctrl.row.height;
-      if (isString(height)) {
-        height = parseInt(height.replace('px', ''), 10);
-      }
-
-      height -= this.panel.legend.show ? 28 : 11; // bottom padding and space for legend
-
-      this.$heatmap.css('height', height + 'px');
-
-      return true;
-    } catch (e) {
-      // IE throws errors sometimes
-      return false;
-    }
-  }
-
-  getYAxisWidth(elem: any) {
-    const panelYAxisWidth = this.getPanelYAxisWidth();
-    if (panelYAxisWidth !== null) {
-      return panelYAxisWidth + Y_AXIS_TICK_PADDING;
-    }
-
-    const axisText = elem.selectAll('.axis-y text').nodes();
-    const maxTextWidth = max(
-      map(axisText, (text) => {
-        // Use SVG getBBox method
-        return text.getBBox().width;
-      })
-    );
-
-    return maxTextWidth;
-  }
-
-  getXAxisHeight(elem: any) {
-    const axisLine = elem.select('.axis-x line');
-    if (!axisLine.empty()) {
-      const axisLinePosition = parseFloat(elem.select('.axis-x line').attr('y2'));
-      const canvasWidth = parseFloat(elem.attr('height'));
-      return canvasWidth - axisLinePosition;
-    } else {
-      // Default height
-      return 30;
-    }
-  }
-
-  addXAxis() {
-    this.scope.xScale = this.xScale = d3
-      .scaleTime()
-      .domain([this.timeRange.from, this.timeRange.to])
-      .range([0, this.chartWidth]);
-
-    const ticks = this.chartWidth / DEFAULT_X_TICK_SIZE_PX;
-    const format = graphTimeFormat(ticks, this.timeRange.from.valueOf(), this.timeRange.to.valueOf());
-    const timeZone = this.ctrl.dashboard.getTimezone();
-    const formatter = (date: d3.AxisDomain) =>
-      dateTimeFormat(date.valueOf(), {
-        format: format,
-        timeZone: timeZone,
-      });
-
-    const xAxis = d3
-      .axisBottom(this.xScale)
-      .ticks(ticks)
-      .tickFormat(formatter)
-      .tickPadding(X_AXIS_TICK_PADDING)
-      .tickSize(this.chartHeight);
-
-    const posY = this.margin.top;
-    const posX = this.yAxisWidth;
-    this.heatmap
-      .append('g')
-      .attr('class', 'axis axis-x')
-      .attr('transform', 'translate(' + posX + ',' + posY + ')')
-      .call(xAxis);
-
-    // Remove horizontal line in the top of axis labels (called domain in d3)
-    this.heatmap.select('.axis-x').select('.domain').remove();
-  }
-
-  addYAxis() {
-    let ticks = Math.ceil(this.chartHeight / DEFAULT_Y_TICK_SIZE_PX);
-    let tickInterval = ticksUtils.tickStep(this.data.heatmapStats.min, this.data.heatmapStats.max, ticks);
-    let { yMin, yMax } = this.wideYAxisRange(this.data.heatmapStats.min, this.data.heatmapStats.max, tickInterval);
-
-    // Rewrite min and max if it have been set explicitly
-    yMin = this.panel.yAxis.min !== null ? this.panel.yAxis.min : yMin;
-    yMax = this.panel.yAxis.max !== null ? this.panel.yAxis.max : yMax;
-
-    // Adjust ticks after Y range widening
-    tickInterval = ticksUtils.tickStep(yMin, yMax, ticks);
-    ticks = Math.ceil((yMax - yMin) / tickInterval);
-
-    const decimalsAuto = ticksUtils.getPrecision(tickInterval);
-    let decimals = this.panel.yAxis.decimals === null ? decimalsAuto : this.panel.yAxis.decimals;
-    // Calculate scaledDecimals for log scales using tick size (as in jquery.flot.js)
-    const flotTickSize = ticksUtils.getFlotTickSize(yMin, yMax, ticks, decimalsAuto);
-    const scaledDecimals = ticksUtils.getScaledDecimals(decimals, flotTickSize);
-    this.ctrl.decimals = decimals;
-    this.ctrl.scaledDecimals = scaledDecimals;
-
-    // Set default Y min and max if no data
-    if (isEmpty(this.data.buckets)) {
-      yMax = 1;
-      yMin = -1;
-      ticks = 3;
-      decimals = 1;
-    }
-
-    this.data.yAxis = {
-      min: yMin,
-      max: yMax,
-      ticks: ticks,
-    };
-
-    this.scope.yScale = this.yScale = d3.scaleLinear().domain([yMin, yMax]).range([this.chartHeight, 0]);
-
-    const yAxis = d3
-      .axisLeft(this.yScale)
-      .ticks(ticks)
-      .tickFormat(this.tickValueFormatter(decimals, scaledDecimals))
-      .tickSizeInner(0 - this.width)
-      .tickSizeOuter(0)
-      .tickPadding(Y_AXIS_TICK_PADDING);
-
-    this.heatmap.append('g').attr('class', 'axis axis-y').call(yAxis);
-
-    // Calculate Y axis width first, then move axis into visible area
-    const posY = this.margin.top;
-    const posX = this.getYAxisWidth(this.heatmap) + Y_AXIS_TICK_PADDING;
-    this.heatmap.select('.axis-y').attr('transform', 'translate(' + posX + ',' + posY + ')');
-
-    // Remove vertical line in the right of axis labels (called domain in d3)
-    this.heatmap.select('.axis-y').select('.domain').remove();
-  }
-
-  // Wide Y values range and anjust to bucket size
-  wideYAxisRange(min: number, max: number, tickInterval: number) {
-    const yWiding = (max * (this.dataRangeWidingFactor - 1) - min * (this.dataRangeWidingFactor - 1)) / 2;
-    let yMin, yMax;
-
-    if (tickInterval === 0) {
-      yMax = max * this.dataRangeWidingFactor;
-      yMin = min - min * (this.dataRangeWidingFactor - 1);
-    } else {
-      yMax = Math.ceil((max + yWiding) / tickInterval) * tickInterval;
-      yMin = Math.floor((min - yWiding) / tickInterval) * tickInterval;
-    }
-
-    // Don't wide axis below 0 if all values are positive
-    if (min >= 0 && yMin < 0) {
-      yMin = 0;
-    }
-
-    return { yMin, yMax };
-  }
-
-  addLogYAxis() {
-    const logBase = this.panel.yAxis.logBase;
-    let { yMin, yMax } = this.adjustLogRange(this.data.heatmapStats.minLog, this.data.heatmapStats.max, logBase);
-
-    yMin =
-      this.panel.yAxis.min && this.panel.yAxis.min !== '0' ? this.adjustLogMin(this.panel.yAxis.min, logBase) : yMin;
-    yMax = this.panel.yAxis.max !== null ? this.adjustLogMax(this.panel.yAxis.max, logBase) : yMax;
-
-    // Set default Y min and max if no data
-    if (isEmpty(this.data.buckets)) {
-      yMax = Math.pow(logBase, 2);
-      yMin = 1;
-    }
-
-    this.scope.yScale = this.yScale = d3
-      .scaleLog()
-      .base(this.panel.yAxis.logBase)
-      .domain([yMin, yMax])
-      .range([this.chartHeight, 0]);
-
-    const domain = this.yScale.domain();
-    const tickValues = this.logScaleTickValues(domain, logBase);
-
-    const decimalsAuto = ticksUtils.getPrecision(yMin);
-    const decimals = this.panel.yAxis.decimals || decimalsAuto;
-
-    // Calculate scaledDecimals for log scales using tick size (as in jquery.flot.js)
-    const flotTickSize = ticksUtils.getFlotTickSize(yMin, yMax, tickValues.length, decimalsAuto);
-    const scaledDecimals = ticksUtils.getScaledDecimals(decimals, flotTickSize);
-    this.ctrl.decimals = decimals;
-    this.ctrl.scaledDecimals = scaledDecimals;
-
-    this.data.yAxis = {
-      min: yMin,
-      max: yMax,
-      ticks: tickValues.length,
-    };
-
-    const yAxis = d3
-      .axisLeft(this.yScale)
-      .tickValues(tickValues)
-      .tickFormat(this.tickValueFormatter(decimals, scaledDecimals))
-      .tickSizeInner(0 - this.width)
-      .tickSizeOuter(0)
-      .tickPadding(Y_AXIS_TICK_PADDING);
-
-    this.heatmap.append('g').attr('class', 'axis axis-y').call(yAxis);
-
-    // Calculate Y axis width first, then move axis into visible area
-    const posY = this.margin.top;
-    const posX = this.getYAxisWidth(this.heatmap) + Y_AXIS_TICK_PADDING;
-    this.heatmap.select('.axis-y').attr('transform', 'translate(' + posX + ',' + posY + ')');
-
-    // Set first tick as pseudo 0
-    if (yMin < 1) {
-      this.heatmap.select('.axis-y').select('.tick text').text('0');
-    }
-
-    // Remove vertical line in the right of axis labels (called domain in d3)
-    this.heatmap.select('.axis-y').select('.domain').remove();
-  }
-
-  addYAxisFromBuckets() {
-    const tsBuckets = this.data.tsBuckets;
-    let ticks = Math.ceil(this.chartHeight / DEFAULT_Y_TICK_SIZE_PX);
-
-    this.scope.yScale = this.yScale = d3
-      .scaleLinear()
-      .domain([0, tsBuckets.length - 1])
-      .range([this.chartHeight, 0]);
-
-    const tickValues = map(tsBuckets, (b, i) => i);
-    const decimalsAuto = max(map(tsBuckets, ticksUtils.getStringPrecision));
-    const decimals = this.panel.yAxis.decimals === null ? decimalsAuto : this.panel.yAxis.decimals;
-    this.ctrl.decimals = decimals;
-
-    const tickValueFormatter = this.tickValueFormatter.bind(this);
-    function tickFormatter(yAxisWidth: number | null) {
-      return function (valIndex: d3.AxisDomain) {
-        let valueFormatted = tsBuckets[valIndex.valueOf()];
-        if (!isNaN(toNumber(valueFormatted)) && valueFormatted !== '') {
-          // Try to format numeric tick labels
-          valueFormatted = tickValueFormatter(decimals)(toNumber(valueFormatted));
-        } else if (valueFormatted && typeof valueFormatted === 'string' && valueFormatted !== '') {
-          if (yAxisWidth) {
-            const scale = 0.15; // how to have a better calculation for this
-            const trimmed = valueFormatted.substring(0, Math.floor(yAxisWidth * scale));
-            const postfix = trimmed.length < valueFormatted.length ? '...' : '';
-            valueFormatted = `${trimmed}${postfix}`;
-          }
-        }
-        return valueFormatted;
-      };
-    }
-    const tsBucketsFormatted = map(tsBuckets, (v, i) => tickFormatter(null)(i));
-    this.data.tsBucketsFormatted = tsBucketsFormatted;
-
-    const yAxis = d3
-      .axisLeft(this.yScale)
-      .tickFormat(tickFormatter(this.getPanelYAxisWidth()))
-      .tickSizeInner(0 - this.width)
-      .tickSizeOuter(0)
-      .tickPadding(Y_AXIS_TICK_PADDING);
-    if (tickValues && tickValues.length <= ticks) {
-      yAxis.tickValues(tickValues);
-    } else {
-      yAxis.ticks(ticks);
-    }
-
-    this.heatmap.append('g').attr('class', 'axis axis-y').call(yAxis);
-
-    // Calculate Y axis width first, then move axis into visible area
-    const posY = this.margin.top;
-    const posX = this.getYAxisWidth(this.heatmap) + Y_AXIS_TICK_PADDING;
-    this.heatmap.select('.axis-y').attr('transform', 'translate(' + posX + ',' + posY + ')');
-
-    if (this.panel.yBucketBound === 'middle' && tickValues && tickValues.length) {
-      // Shift Y axis labels to the middle of bucket
-      const tickShift = 0 - this.chartHeight / (tickValues.length - 1) / 2;
-      this.heatmap.selectAll('.axis-y text').attr('transform', 'translate(' + 0 + ',' + tickShift + ')');
-    }
-
-    // Remove vertical line in the right of axis labels (called domain in d3)
-    this.heatmap.select('.axis-y').select('.domain').remove();
-  }
-
-  // Adjust data range to log base
-  adjustLogRange(min: number, max: number, logBase: number) {
-    let yMin = this.data.heatmapStats.minLog;
-    if (this.data.heatmapStats.minLog > 1 || !this.data.heatmapStats.minLog) {
-      yMin = 1;
-    } else {
-      yMin = this.adjustLogMin(this.data.heatmapStats.minLog, logBase);
-    }
-
-    // Adjust max Y value to log base
-    const yMax = this.adjustLogMax(this.data.heatmapStats.max, logBase);
-
-    return { yMin, yMax };
-  }
-
-  adjustLogMax(max: number, base: number) {
-    return Math.pow(base, Math.ceil(ticksUtils.logp(max, base)));
-  }
-
-  adjustLogMin(min: number, base: number) {
-    return Math.pow(base, Math.floor(ticksUtils.logp(min, base)));
-  }
-
-  logScaleTickValues(domain: any[], base: number) {
-    const domainMin = domain[0];
-    const domainMax = domain[1];
-    const tickValues = [];
-
-    if (domainMin < 1) {
-      const underOneTicks = Math.floor(ticksUtils.logp(domainMin, base));
-      for (let i = underOneTicks; i < 0; i++) {
-        const tickValue = Math.pow(base, i);
-        tickValues.push(tickValue);
-      }
-    }
-
-    const ticks = Math.ceil(ticksUtils.logp(domainMax, base));
-    for (let i = 0; i <= ticks; i++) {
-      const tickValue = Math.pow(base, i);
-      tickValues.push(tickValue);
-    }
-
-    return tickValues;
-  }
-
-  tickValueFormatter(decimals: number, scaledDecimals: any = null) {
-    const format = this.panel.yAxis.format;
-    return (value: any) => {
-      try {
-        if (format !== 'none') {
-          const v = getValueFormat(format)(value, decimals, scaledDecimals);
-          return formattedValueToString(v);
-        }
-      } catch (err) {
-        console.error(err instanceof Error ? err.message : err);
-      }
-      return value;
-    };
-  }
-
-  fixYAxisTickSize() {
-    this.heatmap.select('.axis-y').selectAll('.tick line').attr('x2', this.chartWidth);
-  }
-
-  addAxes() {
-    this.chartHeight = this.height - this.margin.top - this.margin.bottom;
-    this.chartTop = this.margin.top;
-    this.chartBottom = this.chartTop + this.chartHeight;
-    if (this.panel.dataFormat === 'tsbuckets') {
-      this.addYAxisFromBuckets();
-    } else {
-      if (this.panel.yAxis.logBase === 1) {
-        this.addYAxis();
-      } else {
-        this.addLogYAxis();
-      }
-    }
-
-    this.yAxisWidth = this.getYAxisWidth(this.heatmap) + Y_AXIS_TICK_PADDING;
-    this.chartWidth = this.width - this.yAxisWidth - this.margin.right;
-    this.fixYAxisTickSize();
-
-    this.addXAxis();
-    this.xAxisHeight = this.getXAxisHeight(this.heatmap);
-
-    if (!this.panel.yAxis.show) {
-      this.heatmap.select('.axis-y').selectAll('line').style('opacity', 0);
-    }
-
-    if (!this.panel.xAxis.show) {
-      this.heatmap.select('.axis-x').selectAll('line').style('opacity', 0);
-    }
-  }
-
-  addHeatmapCanvas() {
-    const heatmapElem = this.$heatmap[0];
-
-    this.width = Math.floor(this.$heatmap.width()) - this.padding.right;
-    this.height = Math.floor(this.$heatmap.height()) - this.padding.bottom;
-
-    this.cardPadding = this.panel.cards.cardPadding !== null ? this.panel.cards.cardPadding : CARD_PADDING;
-    this.cardRound = this.panel.cards.cardRound !== null ? this.panel.cards.cardRound : CARD_ROUND;
-
-    if (this.heatmap) {
-      this.heatmap.remove();
-    }
-
-    this.heatmap = d3.select(heatmapElem).append('svg').attr('width', this.width).attr('height', this.height);
-  }
-
-  addHeatmap() {
-    this.addHeatmapCanvas();
-    this.addAxes();
-
-    if (this.panel.yAxis.logBase !== 1 && this.panel.dataFormat !== 'tsbuckets') {
-      const logBase = this.panel.yAxis.logBase;
-      const domain = this.yScale.domain();
-      const tickValues = this.logScaleTickValues(domain, logBase);
-      this.data.buckets = mergeZeroBuckets(this.data.buckets, min(tickValues)!);
-    }
-
-    const cardsData = this.data.cards;
-    const cardStats = this.data.cardStats;
-    const maxValueAuto = cardStats.max;
-    const minValueAuto = Math.max(cardStats.min, 0);
-    const maxValue = isNil(this.panel.color.max) ? maxValueAuto : this.panel.color.max;
-    const minValue = isNil(this.panel.color.min) ? minValueAuto : this.panel.color.min;
-    const colorScheme: any = find(this.ctrl.colorSchemes, {
-      value: this.panel.color.colorScheme,
-    });
-    this.colorScale = getColorScale(colorScheme, contextSrv.user.lightTheme, maxValue, minValue);
-    this.opacityScale = getOpacityScale(this.panel.color, maxValue, minValue);
-    this.setCardSize();
-
-    let cards = this.heatmap.selectAll('.heatmap-card').data(cardsData);
-    cards.append('title');
-    cards = cards
-      .enter()
-      .append('rect')
-      .attr('x', this.getCardX.bind(this))
-      .attr('width', this.getCardWidth.bind(this))
-      .attr('y', this.getCardY.bind(this))
-      .attr('height', this.getCardHeight.bind(this))
-      .attr('rx', this.cardRound)
-      .attr('ry', this.cardRound)
-      .attr('class', 'bordered heatmap-card')
-      .style('fill', this.getCardColor.bind(this))
-      .style('stroke', this.getCardColor.bind(this))
-      .style('stroke-width', 0)
-      .style('opacity', this.getCardOpacity.bind(this));
-
-    const $cards = this.$heatmap.find('.heatmap-card');
-    $cards
-      .on('mouseenter', (event: any) => {
-        this.tooltip.mouseOverBucket = true;
-        this.highlightCard(event);
-      })
-      .on('mouseleave', (event: any) => {
-        this.tooltip.mouseOverBucket = false;
-        this.resetCardHighLight(event);
-      });
-  }
-
-  highlightCard(event: any) {
-    const color = d3.select(event.target).style('fill');
-    const highlightColor = d3.color(color)!.darker(2);
-    const strokeColor = d3.color(color)!.brighter(4);
-    const currentCard = d3.select(event.target);
-    this.tooltip.originalFillColor = color;
-    currentCard
-      .style('fill', highlightColor.toString())
-      .style('stroke', strokeColor.toString())
-      .style('stroke-width', 1);
-  }
-
-  resetCardHighLight(event: any) {
-    d3.select(event.target)
-      .style('fill', this.tooltip.originalFillColor)
-      .style('stroke', this.tooltip.originalFillColor)
-      .style('stroke-width', 0);
-  }
-
-  setCardSize() {
-    const xGridSize = Math.floor(this.xScale(this.data.xBucketSize) - this.xScale(0));
-    let yGridSize = Math.floor(this.yScale(this.yScale.invert(0) - this.data.yBucketSize));
-
-    if (this.panel.yAxis.logBase !== 1) {
-      const base = this.panel.yAxis.logBase;
-      const splitFactor = this.data.yBucketSize || 1;
-      yGridSize = Math.floor((this.yScale(1) - this.yScale(base)) / splitFactor);
-    }
-
-    const cardWidth = xGridSize - this.cardPadding * 2;
-    this.cardWidth = Math.max(cardWidth, MIN_CARD_SIZE);
-    this.cardHeight = yGridSize ? yGridSize - this.cardPadding * 2 : 0;
-  }
-
-  getCardX(d: { x: any }) {
-    let x;
-    if (this.xScale(d.x) < 0) {
-      // Cut card left to prevent overlay
-      x = this.yAxisWidth + this.cardPadding;
-    } else {
-      x = this.xScale(d.x) + this.yAxisWidth + this.cardPadding;
-    }
-
-    return x;
-  }
-
-  getCardWidth(d: { x: any }) {
-    let w = this.cardWidth;
-    if (this.xScale(d.x) < 0) {
-      // Cut card left to prevent overlay
-      w = this.xScale(d.x) + this.cardWidth;
-    } else if (this.xScale(d.x) + this.cardWidth > this.chartWidth) {
-      // Cut card right to prevent overlay
-      w = this.chartWidth - this.xScale(d.x) - this.cardPadding;
-    }
-
-    // Card width should be MIN_CARD_SIZE at least, but cut cards shouldn't be displayed
-    w = w > 0 ? Math.max(w, MIN_CARD_SIZE) : 0;
-    return w;
-  }
-
-  getCardY(d: { y: number }) {
-    let y = this.yScale(d.y) + this.chartTop - this.cardHeight - this.cardPadding;
-    if (this.panel.yAxis.logBase !== 1 && d.y === 0) {
-      y = this.chartBottom - this.cardHeight - this.cardPadding;
-    } else {
-      if (y < this.chartTop) {
-        y = this.chartTop;
-      }
-    }
-
-    return y;
-  }
-
-  getCardHeight(d: { y: number }) {
-    const y = this.yScale(d.y) + this.chartTop - this.cardHeight - this.cardPadding;
-    let h = this.cardHeight;
-
-    if (this.panel.yAxis.logBase !== 1 && d.y === 0) {
-      return this.cardHeight;
-    }
-
-    // Cut card height to prevent overlay
-    if (y < this.chartTop) {
-      h = this.yScale(d.y) - this.cardPadding;
-    } else if (this.yScale(d.y) > this.chartBottom) {
-      h = this.chartBottom - y;
-    } else if (y + this.cardHeight > this.chartBottom) {
-      h = this.chartBottom - y;
-    }
-
-    // Height can't be more than chart height
-    h = Math.min(h, this.chartHeight);
-    // Card height should be MIN_CARD_SIZE at least
-    h = Math.max(h, MIN_CARD_SIZE);
-
-    return h;
-  }
-
-  getCardColor(d: { count: any }) {
-    if (this.panel.color.mode === 'opacity') {
-      return config.theme2.visualization.getColorByName(this.panel.color.cardColor);
-    } else {
-      return this.colorScale(d.count);
-    }
-  }
-
-  getCardOpacity(d: { count: any }) {
-    if (this.panel.color.mode === 'opacity') {
-      return this.opacityScale(d.count);
-    } else {
-      return 1;
-    }
-  }
-
-  getEventOffset(event: any) {
-    const elemOffset = this.$heatmap.offset();
-    const x = Math.floor(event.clientX - elemOffset.left);
-    const y = Math.floor(event.clientY - elemOffset.top);
-    return { x, y };
-  }
-
-  onMouseDown(event: any) {
-    const offset = this.getEventOffset(event);
-    this.selection.active = true;
-    this.selection.x1 = offset.x;
-
-    this.mouseUpHandler = () => {
-      this.onMouseUp();
-    };
-
-    $(document).one('mouseup', this.mouseUpHandler.bind(this));
-  }
-
-  onMouseUp() {
-    $(document).unbind('mouseup', this.mouseUpHandler.bind(this));
-    this.mouseUpHandler = null;
-    this.selection.active = false;
-
-    const selectionRange = Math.abs(this.selection.x2 - this.selection.x1);
-    if (this.selection.x2 >= 0 && selectionRange > MIN_SELECTION_WIDTH) {
-      const timeFrom = this.xScale.invert(Math.min(this.selection.x1, this.selection.x2) - this.yAxisWidth);
-      const timeTo = this.xScale.invert(Math.max(this.selection.x1, this.selection.x2) - this.yAxisWidth);
-
-      this.ctrl.timeSrv.setTime({
-        from: toUtc(timeFrom),
-        to: toUtc(timeTo),
-      });
-    }
-
-    this.clearSelection();
-  }
-
-  onMouseLeave() {
-    this.ctrl.dashboard.events.publish(new LegacyGraphHoverClearEvent());
-    this.clearCrosshair();
-  }
-
-  onMouseMove(event: any) {
-    if (!this.heatmap) {
-      return;
-    }
-
-    const offset = this.getEventOffset(event);
-    if (this.selection.active) {
-      // Clear crosshair and tooltip
-      this.clearCrosshair();
-      this.tooltip.destroy();
-
-      this.selection.x2 = this.limitSelection(offset.x);
-      this.drawSelection(this.selection.x1, this.selection.x2);
-    } else {
-      const pos = this.getEventPos(event, offset);
-      this.drawCrosshair(offset.x);
-      this.tooltip.show(pos, this.data);
-      this.emitGraphHoverEvent(pos);
-    }
-  }
-
-  getEventPos(event: { pageX: any; pageY: any }, offset: { x: any; y: any }) {
-    const x = this.xScale.invert(offset.x - this.yAxisWidth).valueOf();
-    const y = this.yScale.invert(offset.y - this.chartTop);
-    const pos: any = {
-      pageX: event.pageX,
-      pageY: event.pageY,
-      x: x,
-      x1: x,
-      y: y,
-      y1: y,
-      panelRelY: null,
-      offset,
-    };
-
-    return pos;
-  }
-
-  emitGraphHoverEvent(pos: { panelRelY: number; offset: { y: number } }) {
-    // Set minimum offset to prevent showing legend from another panel
-    pos.panelRelY = Math.max(pos.offset.y / this.height, 0.001);
-    // broadcast to other graph panels that we are hovering
-    this.hoverEvent.payload.pos = pos;
-    this.hoverEvent.payload.panel = this.panel;
-    this.hoverEvent.payload.point['time'] = (pos as any).x;
-    this.ctrl.dashboard.events.publish(this.hoverEvent);
-  }
-
-  limitSelection(x2: number) {
-    x2 = Math.max(x2, this.yAxisWidth);
-    x2 = Math.min(x2, this.chartWidth + this.yAxisWidth);
-    return x2;
-  }
-
-  drawSelection(posX1: number, posX2: number) {
-    if (this.heatmap) {
-      this.heatmap.selectAll('.heatmap-selection').remove();
-      const selectionX = Math.min(posX1, posX2);
-      const selectionWidth = Math.abs(posX1 - posX2);
-
-      if (selectionWidth > MIN_SELECTION_WIDTH) {
-        this.heatmap
-          .append('rect')
-          .attr('class', 'heatmap-selection')
-          .attr('x', selectionX)
-          .attr('width', selectionWidth)
-          .attr('y', this.chartTop)
-          .attr('height', this.chartHeight);
-      }
-    }
-  }
-
-  clearSelection() {
-    this.selection.x1 = -1;
-    this.selection.x2 = -1;
-
-    if (this.heatmap) {
-      this.heatmap.selectAll('.heatmap-selection').remove();
-    }
-  }
-
-  drawCrosshair(position: number) {
-    if (this.heatmap) {
-      this.heatmap.selectAll('.heatmap-crosshair').remove();
-
-      let posX = position;
-      posX = Math.max(posX, this.yAxisWidth);
-      posX = Math.min(posX, this.chartWidth + this.yAxisWidth);
-
-      this.heatmap
-        .append('g')
-        .attr('class', 'heatmap-crosshair')
-        .attr('transform', 'translate(' + posX + ',0)')
-        .append('line')
-        .attr('x1', 1)
-        .attr('y1', this.chartTop)
-        .attr('x2', 1)
-        .attr('y2', this.chartBottom)
-        .attr('stroke-width', 1);
-    }
-  }
-
-  drawSharedCrosshair(pos: { x: any }) {
-    if (this.heatmap && this.ctrl.dashboard.graphTooltip !== 0) {
-      const posX = this.xScale(pos.x) + this.yAxisWidth;
-      this.drawCrosshair(posX);
-    }
-  }
-
-  clearCrosshair() {
-    if (this.heatmap) {
-      this.heatmap.selectAll('.heatmap-crosshair').remove();
-    }
-  }
-
-  render() {
-    this.data = this.ctrl.data;
-    this.panel = this.ctrl.panel;
-    this.timeRange = this.ctrl.range;
-
-    if (!this.setElementHeight() || !this.data) {
-      return;
-    }
-
-    // Draw default axes and return if no data
-    if (isEmpty(this.data.buckets)) {
-      this.addHeatmapCanvas();
-      this.addAxes();
-      return;
-    }
-
-    this.addHeatmap();
-    this.scope.yAxisWidth = this.yAxisWidth;
-    this.scope.xAxisHeight = this.xAxisHeight;
-    this.scope.chartHeight = this.chartHeight;
-    this.scope.chartWidth = this.chartWidth;
-    this.scope.chartTop = this.chartTop;
-  }
-
-  private getPanelYAxisWidth(): number | null {
-    if (!this.panel.yAxis.width) {
-      return null;
-    }
-
-    return isNaN(this.panel.yAxis.width) ? null : parseInt(this.panel.yAxis.width, 10);
-  }
-}
diff --git a/public/app/plugins/panel/heatmap-old/specs/heatmap_ctrl.test.ts b/public/app/plugins/panel/heatmap-old/specs/heatmap_ctrl.test.ts
deleted file mode 100644
index 8f30bf4c14a..00000000000
--- a/public/app/plugins/panel/heatmap-old/specs/heatmap_ctrl.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { dateTime } from '@grafana/data';
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-
-import { HeatmapCtrl } from '../heatmap_ctrl';
-
-describe('HeatmapCtrl', () => {
-  const ctx = {} as any;
-
-  const $injector = {
-    get: () => {},
-  };
-
-  HeatmapCtrl.prototype.panel = {
-    events: {
-      on: () => {},
-      emit: () => {},
-    },
-  };
-
-  const $scope = {
-    $on: () => {},
-    $parent: {
-      panel: HeatmapCtrl.prototype.panel,
-      dashboard: {},
-    },
-  };
-
-  beforeEach(() => {
-    //@ts-ignore
-    ctx.ctrl = new HeatmapCtrl($scope, $injector, {} as TimeSrv);
-  });
-
-  describe('when time series are outside range', () => {
-    beforeEach(() => {
-      const data: any = [
-        {
-          target: 'test.cpu1',
-          datapoints: [
-            [45, 1234567890],
-            [60, 1234567899],
-          ],
-        },
-      ];
-
-      ctx.ctrl.range = { from: dateTime().valueOf(), to: dateTime().valueOf() };
-      ctx.ctrl.onSnapshotLoad(data);
-    });
-
-    it('should set datapointsOutside', () => {
-      expect(ctx.ctrl.dataWarning.title).toBe('Data points outside time range');
-    });
-  });
-
-  describe('when time series are inside range', () => {
-    beforeEach(() => {
-      const range = {
-        from: dateTime().subtract(1, 'days').valueOf(),
-        to: dateTime().valueOf(),
-      };
-
-      const data: any = [
-        {
-          target: 'test.cpu1',
-          datapoints: [
-            [45, range.from + 1000],
-            [60, range.from + 10000],
-          ],
-        },
-      ];
-
-      ctx.ctrl.range = range;
-      ctx.ctrl.onSnapshotLoad(data);
-    });
-
-    it('should set datapointsOutside', () => {
-      expect(ctx.ctrl.dataWarning).toBe(null);
-    });
-  });
-
-  describe('datapointsCount given 2 series', () => {
-    beforeEach(() => {
-      const data: any = [
-        { target: 'test.cpu1', datapoints: [] },
-        { target: 'test.cpu2', datapoints: [] },
-      ];
-      ctx.ctrl.onSnapshotLoad(data);
-    });
-
-    it('should set datapointsCount warning', () => {
-      expect(ctx.ctrl.dataWarning.title).toBe('No data points');
-    });
-  });
-});
diff --git a/public/app/plugins/panel/heatmap-old/specs/heatmap_data_converter.test.ts b/public/app/plugins/panel/heatmap-old/specs/heatmap_data_converter.test.ts
deleted file mode 100644
index 816a679d2b0..00000000000
--- a/public/app/plugins/panel/heatmap-old/specs/heatmap_data_converter.test.ts
+++ /dev/null
@@ -1,397 +0,0 @@
-import { cloneDeep, each, map } from 'lodash';
-
-import TimeSeries from 'app/core/time_series2';
-
-import {
-  convertToHeatMap,
-  convertToCards,
-  histogramToHeatmap,
-  calculateBucketSize,
-  isHeatmapDataEqual,
-} from '../heatmap_data_converter';
-import { HeatmapData } from '../types';
-
-describe('isHeatmapDataEqual', () => {
-  const ctx: any = {};
-
-  beforeEach(() => {
-    ctx.heatmapA = {
-      '1422774000000': {
-        x: 1422774000000,
-        buckets: {
-          '1': { y: 1, values: [1, 1.5] },
-          '2': { y: 2, values: [1] },
-        },
-      },
-    };
-
-    ctx.heatmapB = {
-      '1422774000000': {
-        x: 1422774000000,
-        buckets: {
-          '1': { y: 1, values: [1.5, 1] },
-          '2': { y: 2, values: [1] },
-        },
-      },
-    };
-  });
-
-  it('should proper compare objects', () => {
-    const heatmapC = cloneDeep(ctx.heatmapA);
-    heatmapC['1422774000000'].buckets['1'].values = [1, 1.5];
-
-    const heatmapD = cloneDeep(ctx.heatmapA);
-    heatmapD['1422774000000'].buckets['1'].values = [1.5, 1, 1.6];
-
-    const heatmapE = cloneDeep(ctx.heatmapA);
-    heatmapE['1422774000000'].buckets['1'].values = [1, 1.6];
-
-    const empty = {};
-    const emptyValues = cloneDeep(ctx.heatmapA);
-    emptyValues['1422774000000'].buckets['1'].values = [];
-
-    expect(isHeatmapDataEqual(ctx.heatmapA, ctx.heatmapB)).toBe(true);
-    expect(isHeatmapDataEqual(ctx.heatmapB, ctx.heatmapA)).toBe(true);
-
-    expect(isHeatmapDataEqual(ctx.heatmapA, heatmapC)).toBe(true);
-    expect(isHeatmapDataEqual(heatmapC, ctx.heatmapA)).toBe(true);
-
-    expect(isHeatmapDataEqual(ctx.heatmapA, heatmapD)).toBe(false);
-    expect(isHeatmapDataEqual(heatmapD, ctx.heatmapA)).toBe(false);
-
-    expect(isHeatmapDataEqual(ctx.heatmapA, heatmapE)).toBe(false);
-    expect(isHeatmapDataEqual(heatmapE, ctx.heatmapA)).toBe(false);
-
-    expect(isHeatmapDataEqual(empty, ctx.heatmapA)).toBe(false);
-    expect(isHeatmapDataEqual(ctx.heatmapA, empty)).toBe(false);
-
-    expect(isHeatmapDataEqual(emptyValues, ctx.heatmapA)).toBe(false);
-    expect(isHeatmapDataEqual(ctx.heatmapA, emptyValues)).toBe(false);
-  });
-});
-
-describe('calculateBucketSize', () => {
-  const ctx: any = {};
-
-  describe('when logBase is 1 (linear scale)', () => {
-    beforeEach(() => {
-      ctx.logBase = 1;
-      ctx.bounds_set = [
-        { bounds: [], size: 0 },
-        { bounds: [0], size: 0 },
-        { bounds: [4], size: 4 },
-        { bounds: [0, 1, 2, 3, 4], size: 1 },
-        { bounds: [0, 1, 3, 5, 7], size: 1 },
-        { bounds: [0, 3, 7, 9, 15], size: 2 },
-        { bounds: [0, 7, 3, 15, 9], size: 2 },
-        { bounds: [0, 5, 10, 15, 50], size: 5 },
-      ];
-    });
-
-    it('should properly calculate bucket size', () => {
-      each(ctx.bounds_set, (b) => {
-        const bucketSize = calculateBucketSize(b.bounds, ctx.logBase);
-        expect(bucketSize).toBe(b.size);
-      });
-    });
-  });
-
-  describe('when logBase is 2', () => {
-    beforeEach(() => {
-      ctx.logBase = 2;
-      ctx.bounds_set = [
-        { bounds: [], size: 0 },
-        { bounds: [0], size: 0 },
-        { bounds: [4], size: 4 },
-        { bounds: [1, 2, 4, 8], size: 1 },
-        { bounds: [1, Math.SQRT2, 2, 8, 16], size: 0.5 },
-      ];
-    });
-
-    it('should properly calculate bucket size', () => {
-      each(ctx.bounds_set, (b) => {
-        const bucketSize = calculateBucketSize(b.bounds, ctx.logBase);
-        expect(isEqual(bucketSize, b.size)).toBe(true);
-      });
-    });
-  });
-});
-
-describe('HeatmapDataConverter', () => {
-  const ctx: any = {};
-
-  beforeEach(() => {
-    ctx.series = [];
-    ctx.series.push(
-      new TimeSeries({
-        datapoints: [
-          [1, 1422774000000],
-          [1, 1422774000010],
-          [2, 1422774060000],
-        ],
-        alias: 'series1',
-      })
-    );
-    ctx.series.push(
-      new TimeSeries({
-        datapoints: [
-          [2, 1422774000000],
-          [2, 1422774000010],
-          [3, 1422774060000],
-        ],
-        alias: 'series2',
-      })
-    );
-    ctx.series.push(
-      new TimeSeries({
-        datapoints: [
-          [5, 1422774000000],
-          [3, 1422774000010],
-          [4, 1422774060000],
-        ],
-        alias: 'series3',
-      })
-    );
-
-    ctx.xBucketSize = 60000; // 60s
-    ctx.yBucketSize = 2;
-    ctx.logBase = 1;
-  });
-
-  describe('when logBase is 1 (linear scale)', () => {
-    beforeEach(() => {
-      ctx.logBase = 1;
-    });
-
-    it('should build proper heatmap data', () => {
-      const expectedHeatmap = {
-        '1422774000000': {
-          x: 1422774000000,
-          buckets: {
-            '0': {
-              y: 0,
-              values: [1, 1],
-              count: 2,
-              bounds: { bottom: 0, top: 2 },
-            },
-            '2': {
-              y: 2,
-              values: [2, 2, 3],
-              count: 3,
-              bounds: { bottom: 2, top: 4 },
-            },
-            '4': { y: 4, values: [5], count: 1, bounds: { bottom: 4, top: 6 } },
-          },
-        },
-        '1422774060000': {
-          x: 1422774060000,
-          buckets: {
-            '2': {
-              y: 2,
-              values: [2, 3],
-              count: 3,
-              bounds: { bottom: 2, top: 4 },
-            },
-            '4': { y: 4, values: [4], count: 1, bounds: { bottom: 4, top: 6 } },
-          },
-        },
-      };
-
-      const heatmap = convertToHeatMap(ctx.series, ctx.yBucketSize, ctx.xBucketSize, ctx.logBase);
-      expect(isHeatmapDataEqual(heatmap, expectedHeatmap)).toBe(true);
-    });
-  });
-
-  describe.skip('when logBase is 2', () => {
-    beforeEach(() => {
-      ctx.logBase = 2;
-    });
-
-    it('should build proper heatmap data', () => {
-      const expectedHeatmap = {
-        '1422774000000': {
-          x: 1422774000000,
-          buckets: {
-            '1': { y: 1, values: [1] },
-            '2': { y: 2, values: [2] },
-          },
-        },
-        '1422774060000': {
-          x: 1422774060000,
-          buckets: {
-            '2': { y: 2, values: [2, 3] },
-          },
-        },
-      };
-
-      const heatmap = convertToHeatMap(ctx.series, ctx.yBucketSize, ctx.xBucketSize, ctx.logBase);
-      expect(isHeatmapDataEqual(heatmap, expectedHeatmap)).toBe(true);
-    });
-  });
-});
-
-describe('Histogram converter', () => {
-  const ctx: any = {};
-
-  beforeEach(() => {
-    ctx.series = [];
-    ctx.series.push(
-      new TimeSeries({
-        datapoints: [
-          [1, 1422774000000],
-          [0, 1422774060000],
-        ],
-        alias: '1',
-        label: '1',
-      })
-    );
-    ctx.series.push(
-      new TimeSeries({
-        datapoints: [
-          [5, 1422774000000],
-          [3, 1422774060000],
-        ],
-        alias: '2',
-        label: '2',
-      })
-    );
-    ctx.series.push(
-      new TimeSeries({
-        datapoints: [
-          [0, 1422774000000],
-          [1, 1422774060000],
-        ],
-        alias: '3',
-        label: '3',
-      })
-    );
-  });
-
-  describe('when converting histogram', () => {
-    beforeEach(() => {});
-
-    it('should build proper heatmap data', () => {
-      const expectedHeatmap: HeatmapData = {
-        '1422774000000': {
-          x: 1422774000000,
-          buckets: {
-            '0': {
-              y: 0,
-              count: 1,
-              bounds: { bottom: 0, top: null },
-              values: [],
-              points: [],
-            },
-            '1': {
-              y: 1,
-              count: 5,
-              bounds: { bottom: 1, top: null },
-              values: [],
-              points: [],
-            },
-            '2': {
-              y: 2,
-              count: 0,
-              bounds: { bottom: 2, top: null },
-              values: [],
-              points: [],
-            },
-          },
-        },
-        '1422774060000': {
-          x: 1422774060000,
-          buckets: {
-            '0': {
-              y: 0,
-              count: 0,
-              bounds: { bottom: 0, top: null },
-              values: [],
-              points: [],
-            },
-            '1': {
-              y: 1,
-              count: 3,
-              bounds: { bottom: 1, top: null },
-              values: [],
-              points: [],
-            },
-            '2': {
-              y: 2,
-              count: 1,
-              bounds: { bottom: 2, top: null },
-              values: [],
-              points: [],
-            },
-          },
-        },
-      };
-
-      const heatmap = histogramToHeatmap(ctx.series);
-      expect(heatmap).toEqual(expectedHeatmap);
-    });
-
-    it('should use bucket index as a bound', () => {
-      const heatmap = histogramToHeatmap(ctx.series);
-      const bucketLabels = map(heatmap['1422774000000'].buckets, (b, label) => label);
-      const bucketYs = map(heatmap['1422774000000'].buckets, 'y');
-      const bucketBottoms = map(heatmap['1422774000000'].buckets, (b) => b.bounds.bottom);
-      const expectedBounds = [0, 1, 2];
-
-      expect(bucketLabels).toEqual(map(expectedBounds, (b) => b.toString()));
-      expect(bucketYs).toEqual(expectedBounds);
-      expect(bucketBottoms).toEqual(expectedBounds);
-    });
-  });
-});
-
-describe('convertToCards', () => {
-  let buckets: HeatmapData = {};
-
-  beforeEach(() => {
-    buckets = {
-      '1422774000000': {
-        x: 1422774000000,
-        buckets: {
-          '1': { y: 1, values: [1], count: 1, bounds: {} },
-          '2': { y: 2, values: [2], count: 1, bounds: {} },
-        },
-      },
-      '1422774060000': {
-        x: 1422774060000,
-        buckets: {
-          '2': { y: 2, values: [2, 3], count: 2, bounds: {} },
-        },
-      },
-    };
-  });
-
-  it('should build proper cards data', () => {
-    const expectedCards = [
-      { x: 1422774000000, y: 1, count: 1, values: [1], yBounds: {} },
-      { x: 1422774000000, y: 2, count: 1, values: [2], yBounds: {} },
-      { x: 1422774060000, y: 2, count: 2, values: [2, 3], yBounds: {} },
-    ];
-    const res = convertToCards(buckets);
-    expect(res.cards).toMatchObject(expectedCards);
-  });
-
-  it('should build proper cards stats', () => {
-    const expectedStats = { min: 1, max: 2 };
-    const res = convertToCards(buckets);
-    expect(res.cardStats).toMatchObject(expectedStats);
-  });
-});
-
-/**
- * Compare two numbers with given precision. Suitable for compare float numbers after conversions with precision loss.
- * @param a
- * @param b
- * @param precision
- */
-function isEqual(a: number, b: number, precision = 0.000001): boolean {
-  if (a === b) {
-    return true;
-  } else {
-    return Math.abs(1 - a / b) <= precision;
-  }
-}
diff --git a/public/app/plugins/panel/heatmap-old/types.ts b/public/app/plugins/panel/heatmap-old/types.ts
deleted file mode 100644
index 4842b135355..00000000000
--- a/public/app/plugins/panel/heatmap-old/types.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export interface Bucket {
-  [x: string]: {
-    y: any;
-    bounds: any;
-    values: any[];
-    points?: any[];
-    count: number;
-  };
-}
-
-export interface XBucket {
-  x: number;
-  buckets: any;
-}
-
-export interface YBucket {
-  y: number;
-  values: number[];
-}
-
-export interface HeatmapCard {
-  x: number;
-  y: number;
-  yBounds: {
-    top: number | null;
-    bottom: number | null;
-  };
-  values: number[];
-  count: number;
-}
-
-export interface HeatmapCardStats {
-  min: number;
-  max: number;
-}
-
-export interface HeatmapData {
-  [key: string]: {
-    x: number;
-    buckets: Bucket;
-  };
-}

From 27bd50da52ab2c4b8483f77a9ad5002eba020bcb Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 23 Nov 2022 20:51:09 +0200
Subject: [PATCH 131/153] Docs: Update `merge-pull-request.md` regarding
 backport policies (#59239)

* Update merge-pull-request.md

* yarn run prettier:write
---
 contribute/merge-pull-request.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md
index 365f77d3661..69e2781fd4b 100644
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -135,6 +135,14 @@ Some examples when backport is not required:
 
 - The change is supposed to be released in the next major/minor release, e.g. v8.0.0, but the release branch, e.g. v8.0.x, has not yet been created.
 
+#### Required labels
+
+To ensure that we don't backport pull requests that don't need to be backported, i.e. implement new features, and only backport pull requests that address bugs, have a product approval, or refer to docs changes, backport labels need to be followed by either:
+
+- `type/bug` label: Pull requests which address bugs,
+- `product-approved` label: Urgent fixes which need product approval, in order to get merged,
+- `type/docs` label: Docs changes`.
+
 > **Note:** You can still backport a pull request after it's been merged.
 
 ## Doing the actual merge

From 4d8e681b9620f753b513a1f4f7fc6178d0f31ecb Mon Sep 17 00:00:00 2001
From: owensmallwood <owen.smallwood@grafana.com>
Date: Wed, 23 Nov 2022 13:44:46 -0600
Subject: [PATCH 132/153] Chore: update latest.json to 9.2.6 (#59246)

---
 latest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/latest.json b/latest.json
index 17efb856b65..5d0d253a775 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
 {
-  "stable": "9.2.5",
+  "stable": "9.2.6",
   "testing": "9.3.0-beta1"
 }

From 38b74d8bd6cfd11bc41729238854a470dfec859a Mon Sep 17 00:00:00 2001
From: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
Date: Wed, 23 Nov 2022 11:46:04 -0800
Subject: [PATCH 133/153] Geomap: Update documentation for 9.3 (#59164)

* Geomap: Update documentation for 9.3

* Update docs/sources/panels-visualizations/visualizations/geomap/index.md

Co-authored-by: Nathan Marrs  <nathanielmarrs@gmail.com>
---
 .../visualizations/geomap/index.md            | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/docs/sources/panels-visualizations/visualizations/geomap/index.md b/docs/sources/panels-visualizations/visualizations/geomap/index.md
index 891311df08f..5118f1425e4 100644
--- a/docs/sources/panels-visualizations/visualizations/geomap/index.md
+++ b/docs/sources/panels-visualizations/visualizations/geomap/index.md
@@ -81,12 +81,13 @@ There are three map layer types to choose from in the Geomap visualization.
 - [Heatmap]({{< relref "#heatmap-layer" >}}) visualizes a heatmap of the data.
 - [GeoJSON]({{< relref "#geojson-layer" >}}) renders static data from a GeoJSON file.
 
-There are also four alpha layer types.
+There are also five alpha layer types.
 
 - [Night / Day (alpha)]({{< relref "#night--day-layer-alpha" >}}) renders a night / day region.
 - **Icon at last point (alpha)** renders an icon at the last data point.
 - **Dynamic GeoJSON (alpha)** styles a GeoJSON file based on query results.
 - **Route (alpha)** render data points as a route.
+- [Photos layer (Alpha)]({{< relref "#photos-layer-alpha" >}}) renders a photo at each data point.
 
 > **Note:** [Basemap layer types]({{< relref "#types-1" >}}) can also be added as layers. You can specify an opacity.
 
@@ -351,6 +352,34 @@ The Night / Day layer displays night and day regions based on the current time r
 
 - [**Extensions for OpenLayers - DayNight**](https://viglino.github.io/ol-ext/examples/layer/map.daynight.html)
 
+## Photos layer (Alpha)
+
+The Photos layer renders a photo at each data point.
+
+{{< figure src="/static/img/docs/geomap-panel/geomap-photos-9-3-0.png" max-width="1200px" caption="Geomap panel Photos" >}}
+
+### Options
+
+- **Image Source Field** select a string field containing image data in either of the following formats
+  - **Image URLs**
+  - **Base64 encoded** image binary ("data:image/png;base64,...")
+- **Kind** select the frame style around the images
+  - **Square**
+  - **Circle**
+  - **Anchored**
+  - **Folio**
+- **Crop** toggle if the images are cropped to fit
+- **Shadow** toggle a box shadow behind the images
+- **Border** set the border size around images
+- **Border color** set the border color around images
+- **Radius** set the overall size of images in pixels
+
+{{< figure src="/static/img/docs/geomap-panel/geomap-photos-options-9-3-0.png" max-width="1200px" caption="Geomap panel Photos options" >}}
+
+### More information
+
+- [**Extensions for OpenLayers - Image Photo Style**](http://viglino.github.io/ol-ext/examples/style/map.style.photo.html)
+
 ## Map Controls
 
 The map controls section contains various options for map information and tool overlays.

From 5fe35e4860dbf2c3e5484f1280dba67f03a3e115 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Wed, 23 Nov 2022 12:58:21 -0700
Subject: [PATCH 134/153] Canvas: Update docs for 9.3.0 (#59168)

---
 .../panels-visualizations/visualizations/canvas/index.md  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/canvas/index.md b/docs/sources/panels-visualizations/visualizations/canvas/index.md
index 7c8e34ac2f8..627586663f4 100644
--- a/docs/sources/panels-visualizations/visualizations/canvas/index.md
+++ b/docs/sources/panels-visualizations/visualizations/canvas/index.md
@@ -55,9 +55,13 @@ Canvas introduces a new editing experience. You can now edit your canvas panel i
 
 Related to a fresh look at panel editing, the context menu enables you to perform common tasks quickly and efficiently. Supported functionality includes opening / closing the inline editor, duplicating an element, deleting an element, and more.
 
-The context menu is triggered by a right click action over the panel / over a given canvas element
+The context menu is triggered by a right click action over the panel / over a given canvas element. When right clicking the panel, you are able to set a background image and easily add elements to the canvas.
 
-{{< figure src="/static/img/docs/canvas-panel/canvas-context-menu-9-2-0.png" max-width="750px" caption="Canvas context menu" >}}
+{{< figure src="/static/img/docs/canvas-panel/canvas-panel-context-menu-9-3-0.png" max-width="750px" caption="Canvas panel context menu" >}}
+
+When right clicking an element, you are able to edit, delete, duplicate, and modify the element's layer positioning.
+
+{{< figure src="/static/img/docs/canvas-panel/canvas-context-menu-9-2-0.png" max-width="750px" caption="Canvas element context menu" >}}
 
 ## Canvas Options
 

From 5888f53aab4375ad0d3ea807e55698136bf35326 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 23 Nov 2022 13:32:52 -0800
Subject: [PATCH 135/153] Angular: auto-migrate graph panel when angular is
 disabled (#59247)

---
 .../DashExportModal/DashboardExporter.test.ts         |  1 +
 public/app/features/dashboard/state/PanelModel.ts     | 10 ++++++++--
 public/test/jest-setup.ts                             | 11 +++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
index 1452dd272c5..11621cb2f4b 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
@@ -37,6 +37,7 @@ jest.mock('@grafana/runtime', () => ({
     featureToggles: {
       newVariables: false,
     },
+    angularSupportEnabled: true,
   },
 }));
 
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index 59294a57330..ebf120deb6b 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -237,11 +237,17 @@ export class PanelModel implements DataConfigSource, IPanelModel {
 
     switch (this.type) {
       case 'graph':
-        if (config?.featureToggles?.autoMigrateGraphPanels) {
+        if (config.featureToggles?.autoMigrateGraphPanels || !config.angularSupportEnabled) {
           this.autoMigrateFrom = this.type;
           this.type = 'timeseries';
         }
         break;
+      case 'table-old':
+        if (!config.angularSupportEnabled) {
+          this.autoMigrateFrom = this.type;
+          this.type = 'table';
+        }
+        break;
       case 'heatmap-new':
         this.autoMigrateFrom = this.type;
         this.type = 'heatmap';
@@ -416,7 +422,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
     const version = getPluginVersion(plugin);
 
     if (this.autoMigrateFrom) {
-      const wasAngular = this.autoMigrateFrom === 'graph';
+      const wasAngular = this.autoMigrateFrom === 'graph' || this.autoMigrateFrom === 'table-old';
       this.callPanelTypeChangeHandler(
         plugin,
         this.autoMigrateFrom,
diff --git a/public/test/jest-setup.ts b/public/test/jest-setup.ts
index ecfce62c267..cf9b5f735ab 100644
--- a/public/test/jest-setup.ts
+++ b/public/test/jest-setup.ts
@@ -7,6 +7,7 @@ import angular from 'angular';
 import { configure } from 'enzyme';
 
 import { EventBusSrv } from '@grafana/data';
+import { GrafanaBootConfig } from '@grafana/runtime';
 import 'blob-polyfill';
 import 'mutationobserver-shim';
 import './mocks/workers';
@@ -18,6 +19,16 @@ const testAppEvents = new EventBusSrv();
 const global = window as any;
 global.$ = global.jQuery = $;
 
+// mock the default window.grafanaBootData settings
+const settings: Partial<GrafanaBootConfig> = {
+  angularSupportEnabled: true,
+};
+global.grafanaBootData = {
+  settings,
+  user: {},
+  navTree: [],
+};
+
 // https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
 Object.defineProperty(global, 'matchMedia', {
   writable: true,

From f4574f098d347926c5e631cc67b059fd08f3e77e Mon Sep 17 00:00:00 2001
From: matt abrams <37156449+zuchka@users.noreply.github.com>
Date: Wed, 23 Nov 2022 16:59:37 -1000
Subject: [PATCH 136/153] DataLinks: Improve Data-Links AutoComplete Logic
 (#58934)

* refactor dollar-sign logic to consider cursor position

* refactor logic

* add inline comment for obscure collapse() function
---
 .../components/DataLinks/DataLinkInput.tsx    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
index b2e3d907610..6ed1b123202 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
@@ -121,6 +121,7 @@ export const DataLinkInput: React.FC<DataLinkInputProps> = memo(
         default:
           return next();
       }
+      // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -137,11 +138,12 @@ export const DataLinkInput: React.FC<DataLinkInputProps> = memo(
     }, []);
 
     const onVariableSelect = (item: VariableSuggestion, editor = editorRef.current!) => {
-      const includeDollarSign = Plain.serialize(editor.value).slice(-1) !== '$';
+      const precedingChar: string = getCharactersAroundCaret();
+      const precedingDollar = precedingChar === '$';
       if (item.origin !== VariableOrigin.Template || item.value === DataLinkBuiltInVars.includeVars) {
-        editor.insertText(`${includeDollarSign ? '$' : ''}\{${item.value}}`);
+        editor.insertText(`${precedingDollar ? '' : '$'}\{${item.value}}`);
       } else {
-        editor.insertText(`${includeDollarSign ? '$' : ''}\{${item.value}:queryparam}`);
+        editor.insertText(`${precedingDollar ? '' : '$'}\{${item.value}:queryparam}`);
       }
 
       setLinkUrl(editor.value);
@@ -151,10 +153,28 @@ export const DataLinkInput: React.FC<DataLinkInputProps> = memo(
       stateRef.current.onChange(Plain.serialize(editor.value));
     };
 
+    const getCharactersAroundCaret = () => {
+      const input: HTMLSpanElement | null = document.getElementById('data-link-input')!;
+      let precedingChar = '',
+        sel: Selection | null,
+        range: Range;
+      if (window.getSelection) {
+        sel = window.getSelection();
+        if (sel && sel.rangeCount > 0) {
+          range = sel.getRangeAt(0).cloneRange();
+          // Collapse to the start of the range
+          range.collapse(true);
+          range.setStart(input, 0);
+          precedingChar = range.toString().slice(-1);
+        }
+      }
+      return precedingChar;
+    };
+
     return (
       <div className={styles.wrapperOverrides}>
         <div className="slate-query-field__wrapper">
-          <div className="slate-query-field">
+          <div id="data-link-input" className="slate-query-field">
             {showingSuggestions && (
               <Portal>
                 <ReactPopper

From 6f00bc5674d994cb85716610807e4b4f3e232fbf Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Wed, 23 Nov 2022 21:55:30 -0600
Subject: [PATCH 137/153] Heatmap: Fix blurry text & rendering (#59260)

---
 packages/grafana-ui/src/components/uPlot/Plot.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/uPlot/Plot.tsx b/packages/grafana-ui/src/components/uPlot/Plot.tsx
index 28cc4c7e728..d27276ef2d6 100644
--- a/packages/grafana-ui/src/components/uPlot/Plot.tsx
+++ b/packages/grafana-ui/src/components/uPlot/Plot.tsx
@@ -65,8 +65,8 @@ export class UPlotChart extends Component<PlotProps, UPlotChartState> {
     });
 
     const config: Options = {
-      width: this.props.width,
-      height: this.props.height,
+      width: Math.floor(this.props.width),
+      height: Math.floor(this.props.height),
       ...this.props.config.getConfig(),
     };
 
@@ -93,8 +93,8 @@ export class UPlotChart extends Component<PlotProps, UPlotChartState> {
 
     if (!sameDims(prevProps, this.props)) {
       plot?.setSize({
-        width: this.props.width,
-        height: this.props.height,
+        width: Math.floor(this.props.width),
+        height: Math.floor(this.props.height),
       });
     } else if (!sameConfig(prevProps, this.props)) {
       this.reinitPlot();

From 24ce1a8a0bf04315a365cd020c3008cc116e58d5 Mon Sep 17 00:00:00 2001
From: Timur Olzhabayev <timur.olzhabayev@grafana.com>
Date: Thu, 24 Nov 2022 10:15:21 +0100
Subject: [PATCH 138/153] Feat: Adding an optional browser config option to e2e
 test runner (#59076)

Adding an optional browser config option to e2e test runner
---
 packages/grafana-e2e/cli.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-e2e/cli.js b/packages/grafana-e2e/cli.js
index c2d42b204e4..af51c9b31b1 100644
--- a/packages/grafana-e2e/cli.js
+++ b/packages/grafana-e2e/cli.js
@@ -3,7 +3,7 @@ const execa = require('execa');
 const { resolve, sep } = require('path');
 const resolveBin = require('resolve-as-bin');
 
-const cypress = (commandName, { updateScreenshots }) => {
+const cypress = (commandName, { updateScreenshots, browser }) => {
   // Support running an unpublished dev build
   const dirname = __dirname.split(sep).pop();
   const projectPath = resolve(`${__dirname}${dirname === 'dist' ? '/..' : ''}`);
@@ -16,6 +16,10 @@ const cypress = (commandName, { updateScreenshots }) => {
 
   const cypressOptions = [commandName, '--env', `${CWD},${UPDATE_SCREENSHOTS}`, `--project=${projectPath}`];
 
+  if (browser) {
+    cypressOptions.push('--browser', browser);
+  }
+
   const execaOptions = {
     cwd: __dirname,
     stdio: 'inherit',
@@ -32,17 +36,21 @@ const cypress = (commandName, { updateScreenshots }) => {
 module.exports = () => {
   const updateOption = '-u, --update-screenshots';
   const updateDescription = 'update expected screenshots';
+  const browserOption = '-b, --browser <browser>';
+  const browserDescription = 'specify which browser to use';
 
   program
     .command('open')
     .description('runs tests within the interactive GUI')
     .option(updateOption, updateDescription)
+    .option(browserOption, browserDescription)
     .action((options) => cypress('open', options));
 
   program
     .command('run')
     .description('runs tests from the CLI without the GUI')
     .option(updateOption, updateDescription)
+    .option(browserOption, browserDescription)
     .action((options) => cypress('run', options));
 
   program.parse(process.argv);

From 2105e521389752a28440b3428a05430ede89d570 Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Thu, 24 Nov 2022 09:56:09 +0000
Subject: [PATCH 139/153] Chore: Refactor the
 packages/jaeger-ui-components/src/model folder to TS (#59233)

---
 .../{PathElem.test.js => PathElem.test.ts}    | 13 ++++---
 ...lem.test.js.snap => PathElem.test.ts.snap} |  0
 ...rces.js => sample-paths.test.resources.ts} | 12 ++----
 ...e-name.test.js => find-trace-name.test.ts} | 12 +++---
 ...patterns.test.js => link-patterns.test.ts} | 38 +++++++++++++------
 .../src/model/link-patterns.tsx               | 12 +++---
 ...a.test.js => transform-trace-data.test.ts} | 11 +++---
 7 files changed, 56 insertions(+), 42 deletions(-)
 rename packages/jaeger-ui-components/src/model/ddg/{PathElem.test.js => PathElem.test.ts} (96%)
 rename packages/jaeger-ui-components/src/model/ddg/__snapshots__/{PathElem.test.js.snap => PathElem.test.ts.snap} (100%)
 rename packages/jaeger-ui-components/src/model/ddg/{sample-paths.test.resources.js => sample-paths.test.resources.ts} (93%)
 rename packages/jaeger-ui-components/src/model/{find-trace-name.test.js => find-trace-name.test.ts} (93%)
 rename packages/jaeger-ui-components/src/model/{link-patterns.test.js => link-patterns.test.ts} (93%)
 rename packages/jaeger-ui-components/src/model/{transform-trace-data.test.js => transform-trace-data.test.ts} (91%)

diff --git a/packages/jaeger-ui-components/src/model/ddg/PathElem.test.js b/packages/jaeger-ui-components/src/model/ddg/PathElem.test.ts
similarity index 96%
rename from packages/jaeger-ui-components/src/model/ddg/PathElem.test.js
rename to packages/jaeger-ui-components/src/model/ddg/PathElem.test.ts
index e7eba0d49e3..2e835d09bc7 100644
--- a/packages/jaeger-ui-components/src/model/ddg/PathElem.test.js
+++ b/packages/jaeger-ui-components/src/model/ddg/PathElem.test.ts
@@ -14,12 +14,13 @@
 
 import PathElem from './PathElem';
 import { simplePath } from './sample-paths.test.resources';
+import { TDdgOperation, TDdgPath, TDdgService } from './types';
 
 describe('PathElem', () => {
   const getPath = () => {
     const path = {
       focalIdx: 2,
-    };
+    } as TDdgPath;
     const members = simplePath.map(
       ({ operation, service }, i) =>
         new PathElem({
@@ -28,8 +29,8 @@ describe('PathElem', () => {
             name: operation,
             service: {
               name: service,
-            },
-          },
+            } as TDdgService,
+          } as TDdgOperation,
           path,
         })
     );
@@ -42,13 +43,13 @@ describe('PathElem', () => {
     return path;
   };
   const testMemberIdx = 3;
-  const testOperation = {};
+  const testOperation = {} as TDdgOperation;
   const testPath = {
     focalIdx: 4,
     members: ['member0', 'member1', 'member2', 'member3', 'member4', 'member5'],
-  };
+  } as unknown as TDdgPath;
   const testVisibilityIdx = 105;
-  let pathElem;
+  let pathElem: PathElem;
 
   beforeEach(() => {
     pathElem = new PathElem({ path: testPath, operation: testOperation, memberIdx: testMemberIdx });
diff --git a/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.js.snap b/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap
similarity index 100%
rename from packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.js.snap
rename to packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap
diff --git a/packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.js b/packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.ts
similarity index 93%
rename from packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.js
rename to packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.ts
index b9dadfcaf1b..7bcd7a0f040 100644
--- a/packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.js
+++ b/packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-export const simplePayloadElemMaker = (label) => ({
+export const simplePayloadElemMaker = (label: string) => ({
   operation: `${label}Operation`,
   service: `${label}Service`,
 });
@@ -24,9 +24,9 @@ const sameFocalServicePayloadElem = {
   service: focalPayloadElem.service,
 };
 
-const pathLengthener = (path) => {
-  const prequels = [];
-  const sequels = [];
+const pathLengthener = (path: Array<{ operation: string; service: string }>) => {
+  const prequels: Array<{ operation: string; service: string }> = [];
+  const sequels: Array<{ operation: string; service: string }> = [];
   path.forEach(({ operation, service }) => {
     if (operation !== focalPayloadElem.operation && service !== focalPayloadElem.service) {
       prequels.push({
@@ -115,7 +115,3 @@ export const generationPaths = [
   ],
   [generationPayloadElems.target, generationPayloadElems.beforeFocalMid, focalPayloadElem],
 ];
-
-export const wrap = (paths) => ({
-  dependencies: paths.map((path) => ({ path, attributes: [] })),
-});
diff --git a/packages/jaeger-ui-components/src/model/find-trace-name.test.js b/packages/jaeger-ui-components/src/model/find-trace-name.test.ts
similarity index 93%
rename from packages/jaeger-ui-components/src/model/find-trace-name.test.js
rename to packages/jaeger-ui-components/src/model/find-trace-name.test.ts
index 39c9653a528..bec8fefd8c3 100644
--- a/packages/jaeger-ui-components/src/model/find-trace-name.test.js
+++ b/packages/jaeger-ui-components/src/model/find-trace-name.test.ts
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { TraceSpan } from '../types/trace';
+
 import { _getTraceNameImpl as getTraceName } from './trace-viewer';
 
 describe('getTraceName', () => {
@@ -223,22 +225,22 @@ describe('getTraceName', () => {
   const fullTraceName = `${serviceName}: ${operationName}`;
 
   it('returns an empty string if given spans with no root among them', () => {
-    expect(getTraceName(spansWithNoRoots)).toEqual('');
+    expect(getTraceName(spansWithNoRoots as TraceSpan[])).toEqual('');
   });
 
   it('returns an id of root span with the earliest startTime', () => {
-    expect(getTraceName(spansWithMultipleRootsDifferentByStartTime)).toEqual(fullTraceName);
+    expect(getTraceName(spansWithMultipleRootsDifferentByStartTime as TraceSpan[])).toEqual(fullTraceName);
   });
 
   it('returns an id of root span without any refs', () => {
-    expect(getTraceName(spansWithMultipleRootsWithOneWithoutRefs)).toEqual(fullTraceName);
+    expect(getTraceName(spansWithMultipleRootsWithOneWithoutRefs as unknown as TraceSpan[])).toEqual(fullTraceName);
   });
 
   it('returns an id of root span with remote ref', () => {
-    expect(getTraceName(spansWithOneRootWithRemoteRef)).toEqual(fullTraceName);
+    expect(getTraceName(spansWithOneRootWithRemoteRef as TraceSpan[])).toEqual(fullTraceName);
   });
 
   it('returns an id of root span with no refs', () => {
-    expect(getTraceName(spansWithOneRootWithNoRefs)).toEqual(fullTraceName);
+    expect(getTraceName(spansWithOneRootWithNoRefs as unknown as TraceSpan[])).toEqual(fullTraceName);
   });
 });
diff --git a/packages/jaeger-ui-components/src/model/link-patterns.test.js b/packages/jaeger-ui-components/src/model/link-patterns.test.ts
similarity index 93%
rename from packages/jaeger-ui-components/src/model/link-patterns.test.js
rename to packages/jaeger-ui-components/src/model/link-patterns.test.ts
index 22f5c13a047..0a6768febd9 100644
--- a/packages/jaeger-ui-components/src/model/link-patterns.test.js
+++ b/packages/jaeger-ui-components/src/model/link-patterns.test.ts
@@ -12,12 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Trace, TraceLink, TraceSpan } from '../types/trace';
+
 import {
   processTemplate,
   createTestFunction,
   getParameterInArray,
   getParameterInAncestor,
   processLinkPattern,
+  ProcessedLinkPattern,
   computeLinks,
   createGetLinks,
   computeTraceLink,
@@ -64,7 +67,8 @@ describe('processTemplate()', () => {
     expect(() =>
       processTemplate(
         {
-          template: (data) => `a${data.b}c`,
+          /* eslint-disable @typescript-eslint/no-explicit-any */
+          template: (data: { [key: string]: any }) => `a${data.b}c`,
         },
         (a) => a
       )
@@ -243,21 +247,28 @@ describe('getParameterInAncestor()', () => {
       },
       tags: [{ key: 'a', value: 'a0' }],
     },
-  ];
+  ] as TraceSpan[];
+
   spans[1].references = [
     {
+      spanID: 's1',
+      traceID: 't2',
       refType: 'CHILD_OF',
       span: spans[0],
     },
   ];
   spans[2].references = [
     {
+      spanID: 's1',
+      traceID: 't2',
       refType: 'CHILD_OF',
       span: spans[0],
     },
   ];
   spans[3].references = [
     {
+      spanID: 's1',
+      traceID: 't2',
       refType: 'CHILD_OF',
       span: spans[2],
     },
@@ -311,7 +322,7 @@ describe('getParameterInAncestor()', () => {
         depth: 0,
         process: {},
       },
-    ];
+    ] as TraceSpan[];
     expect(getParameterInAncestor('a', spansWithUndefinedTags[0])).toBeUndefined();
   });
 });
@@ -328,7 +339,7 @@ describe('computeTraceLink()', () => {
       url: 'http://example.com/?myKey=#{traceID}&myKey=#{myKey}',
       text: 'second link (#{myKey})',
     },
-  ].map(processLinkPattern);
+  ].map(processLinkPattern) as ProcessedLinkPattern[];
 
   const trace = {
     processes: [],
@@ -338,7 +349,7 @@ describe('computeTraceLink()', () => {
     endTime: 2000,
     duration: 1000,
     services: [],
-  };
+  } as unknown as Trace;
 
   it('correctly computes links', () => {
     expect(computeTraceLink(linkPatterns, trace)).toEqual([
@@ -363,14 +374,16 @@ describe('computeLinks()', () => {
       url: 'http://example.com/?myKey=#{myOtherKey}&myKey=#{myKey}',
       text: 'second link (#{myOtherKey})',
     },
-  ].map(processLinkPattern);
+  ].map(processLinkPattern) as ProcessedLinkPattern[];
 
   const spans = [
     { depth: 0, process: {}, tags: [{ key: 'myKey', value: 'valueOfMyKey' }] },
     { depth: 1, process: {}, logs: [{ fields: [{ key: 'myOtherKey', value: 'valueOfMy+Other+Key' }] }] },
-  ];
+  ] as unknown as TraceSpan[];
   spans[1].references = [
     {
+      spanID: 's1',
+      traceID: 't2',
       refType: 'CHILD_OF',
       span: spans[0],
     },
@@ -399,12 +412,13 @@ describe('getLinks()', () => {
       url: 'http://example.com/?mySpecialKey=#{mySpecialKey}',
       text: 'special key link (#{mySpecialKey})',
     },
-  ].map(processLinkPattern);
-  const template = jest.spyOn(linkPatterns[0].url, 'template');
+  ].map(processLinkPattern) as ProcessedLinkPattern[];
+  const template = jest.spyOn(linkPatterns[0]!.url, 'template');
 
-  const span = { depth: 0, process: {}, tags: [{ key: 'mySpecialKey', value: 'valueOfMyKey' }] };
+  const span = { depth: 0, process: {}, tags: [{ key: 'mySpecialKey', value: 'valueOfMyKey' }] } as TraceSpan;
 
-  let cache;
+  /* eslint-disable @typescript-eslint/no-explicit-any */
+  let cache: WeakMap<object, any>;
 
   beforeEach(() => {
     cache = new WeakMap();
@@ -419,7 +433,7 @@ describe('getLinks()', () => {
   });
 
   it('returns the result from the cache', () => {
-    const result = [];
+    const result: TraceLink[] = [];
     cache.set(span.tags[0], result);
     const getLinks = createGetLinks(linkPatterns, cache);
     expect(getLinks(span, span.tags, 0)).toBe(result);
diff --git a/packages/jaeger-ui-components/src/model/link-patterns.tsx b/packages/jaeger-ui-components/src/model/link-patterns.tsx
index d0d47a676a1..9f74ccb532f 100644
--- a/packages/jaeger-ui-components/src/model/link-patterns.tsx
+++ b/packages/jaeger-ui-components/src/model/link-patterns.tsx
@@ -28,7 +28,7 @@ type ProcessedTemplate = {
   template: (template: { [key: string]: any }) => string;
 };
 
-type ProcessedLinkPattern = {
+export type ProcessedLinkPattern = {
   object: any;
   type: (link: string) => boolean;
   key: (link: string) => boolean;
@@ -74,7 +74,7 @@ export function processTemplate(template: unknown, encodeFn: (unencoded: any) =>
   };
 }
 
-export function createTestFunction(entry: any) {
+export function createTestFunction(entry?: any) {
   if (typeof entry === 'string') {
     return (arg: unknown) => arg === entry;
   }
@@ -100,7 +100,7 @@ export function createTestFunction(entry: any) {
 
 const identity = (a: any): typeof a => a;
 
-export function processLinkPattern(pattern: any): ProcessedLinkPattern | TNil {
+export function processLinkPattern(pattern: any): ProcessedLinkPattern | null {
   try {
     const url = processTemplate(pattern.url, encodeURIComponent);
     const text = processTemplate(pattern.text, identity);
@@ -120,7 +120,7 @@ export function processLinkPattern(pattern: any): ProcessedLinkPattern | TNil {
   }
 }
 
-export function getParameterInArray(name: string, array: TraceKeyValuePair[]) {
+export function getParameterInArray(name: string, array?: TraceKeyValuePair[] | TNil) {
   if (array) {
     return array.find((entry) => entry.key === name);
   }
@@ -150,10 +150,10 @@ export function computeTraceLink(linkPatterns: ProcessedLinkPattern[], trace: Tr
   );
 
   linkPatterns
-    .filter((pattern) => pattern.type('traces'))
+    ?.filter((pattern) => pattern?.type('traces'))
     .forEach((pattern) => {
       const parameterValues: Record<string, any> = {};
-      const allParameters = pattern.parameters.every((parameter) => {
+      const allParameters = pattern?.parameters.every((parameter) => {
         const key = parameter as keyof Trace;
         if (validKeys.includes(key)) {
           // At this point is safe to access to trace object using parameter variable because
diff --git a/packages/jaeger-ui-components/src/model/transform-trace-data.test.js b/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts
similarity index 91%
rename from packages/jaeger-ui-components/src/model/transform-trace-data.test.js
rename to packages/jaeger-ui-components/src/model/transform-trace-data.test.ts
index 8dfa857fdcf..0a73c00d943 100644
--- a/packages/jaeger-ui-components/src/model/transform-trace-data.test.js
+++ b/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts
@@ -11,6 +11,7 @@
 // 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.
+import { TraceResponse } from '../types/trace';
 
 import transformTraceData, { orderTags, deduplicateTags } from './transform-trace-data';
 
@@ -136,7 +137,7 @@ describe('transformTraceData()', () => {
       traceID: undefined,
       processes,
       spans,
-    };
+    } as unknown as TraceResponse;
 
     expect(transformTraceData(traceData)).toEqual(null);
   });
@@ -146,9 +147,9 @@ describe('transformTraceData()', () => {
       traceID,
       processes,
       spans: [...spans, rootSpanWithMissingRef],
-    };
+    } as unknown as TraceResponse;
 
-    expect(transformTraceData(traceData).traceName).toEqual(`${serviceName}: ${rootOperationName}`);
+    expect(transformTraceData(traceData)!.traceName).toEqual(`${serviceName}: ${rootOperationName}`);
   });
 
   it('should return trace data with correct traceName based on root span without any refs', () => {
@@ -156,8 +157,8 @@ describe('transformTraceData()', () => {
       traceID,
       processes,
       spans: [...spans, rootSpanWithoutRefs],
-    };
+    } as unknown as TraceResponse;
 
-    expect(transformTraceData(traceData).traceName).toEqual(`${serviceName}: ${rootOperationName}`);
+    expect(transformTraceData(traceData)!.traceName).toEqual(`${serviceName}: ${rootOperationName}`);
   });
 });

From 624e6037cf88e28eff934c3be86e4922ee317c0d Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Thu, 24 Nov 2022 10:16:00 +0000
Subject: [PATCH 140/153] Chore: Refactor transform-trace-data.test.js to TS
 (#59214)

---
 .../jaeger-ui-components/src/model/transform-trace-data.test.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts b/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts
index 0a73c00d943..980b0bfabb9 100644
--- a/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts
+++ b/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts
@@ -11,6 +11,7 @@
 // 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.
+
 import { TraceResponse } from '../types/trace';
 
 import transformTraceData, { orderTags, deduplicateTags } from './transform-trace-data';

From cff36ea7d88d993bb82a171c7d770fa1460b49e2 Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Thu, 24 Nov 2022 11:21:06 +0100
Subject: [PATCH 141/153] Chore: Remove unused method from sqlstore (#59156)

remove unused method
---
 pkg/services/sqlstore/org.go | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go
index dfad3bcd4ae..fdf4b1bae97 100644
--- a/pkg/services/sqlstore/org.go
+++ b/pkg/services/sqlstore/org.go
@@ -81,33 +81,6 @@ func (ss *SQLStore) CreateOrg(ctx context.Context, cmd *models.CreateOrgCommand)
 	return nil
 }
 
-func (ss *SQLStore) UpdateOrgAddress(ctx context.Context, cmd *models.UpdateOrgAddressCommand) error {
-	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
-		org := models.Org{
-			Address1: cmd.Address1,
-			Address2: cmd.Address2,
-			City:     cmd.City,
-			ZipCode:  cmd.ZipCode,
-			State:    cmd.State,
-			Country:  cmd.Country,
-
-			Updated: time.Now(),
-		}
-
-		if _, err := sess.ID(cmd.OrgId).Update(&org); err != nil {
-			return err
-		}
-
-		sess.publishAfterCommit(&events.OrgUpdated{
-			Timestamp: org.Updated,
-			Id:        org.Id,
-			Name:      org.Name,
-		})
-
-		return nil
-	})
-}
-
 func verifyExistingOrg(sess *DBSession, orgId int64) error {
 	var org models.Org
 	has, err := sess.Where("id=?", orgId).Get(&org)

From 276b54fe9d41d7c435eb255f75cc1a54bf415db3 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Thu, 24 Nov 2022 11:25:40 +0100
Subject: [PATCH 142/153] Azure Monitor: Fix empty/errored responses for Logs
 variables (#59240)

---
 .../azure-log-analytics-datasource.go         | 16 +++++++---
 .../azure-response-table-frame.go             |  7 +---
 .../azure-response-table-frame_test.go        |  7 +---
 .../variables.test.ts                         | 32 +++++++++++++++++++
 .../variables.ts                              |  1 +
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index b05254bf52f..83ba706cbbf 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -190,7 +190,10 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 	if err != nil {
 		return dataResponseErrorWithExecuted(err)
 	}
-	appendErrorNotice(frame, logResponse.Error)
+	frame = appendErrorNotice(frame, logResponse.Error)
+	if frame == nil {
+		return dataResponse
+	}
 
 	model, err := simplejson.NewJson(query.JSON)
 	if err != nil {
@@ -222,10 +225,15 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 	return dataResponse
 }
 
-func appendErrorNotice(frame *data.Frame, err *AzureLogAnalyticsAPIError) {
-	if err != nil {
-		frame.AppendNotices(apiErrorToNotice(err))
+func appendErrorNotice(frame *data.Frame, err *AzureLogAnalyticsAPIError) *data.Frame {
+	if err == nil {
+		return frame
 	}
+	if frame == nil {
+		frame = &data.Frame{}
+	}
+	frame.AppendNotices(apiErrorToNotice(err))
+	return frame
 }
 
 func (e *AzureLogAnalyticsDatasource) createRequest(ctx context.Context, logger log.Logger, url string) (*http.Request, error) {
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go
index f274d9e2cf4..ad28b2a0e08 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go
@@ -45,12 +45,7 @@ func apiErrorToNotice(err *AzureLogAnalyticsAPIError) data.Notice {
 // ResponseTableToFrame converts an AzureResponseTable to a data.Frame.
 func ResponseTableToFrame(table *types.AzureResponseTable, refID string, executedQuery string) (*data.Frame, error) {
 	if len(table.Rows) == 0 {
-		return &data.Frame{
-			RefID: refID,
-			Meta: &data.FrameMeta{
-				ExecutedQueryString: executedQuery,
-			},
-		}, nil
+		return nil, nil
 	}
 
 	converterFrame, err := converterFrameForTable(table)
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go
index ba3ae060e79..afda6263816 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go
@@ -173,12 +173,7 @@ func TestLogTableToFrame(t *testing.T) {
 			name:     "empty data response",
 			testFile: "loganalytics/11-log-analytics-response-empty.json",
 			expectedFrame: func() *data.Frame {
-				return &data.Frame{
-					RefID: "A",
-					Meta: &data.FrameMeta{
-						ExecutedQueryString: "query",
-					},
-				}
+				return nil
 			},
 		},
 	}
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
index cf42c890f0f..957fbfa654f 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
@@ -489,6 +489,38 @@ describe('VariableSupport', () => {
     });
   });
 
+  it('passes on the query error for a log query', (done) => {
+    const variableSupport = new VariableSupport(
+      createMockDatasource({
+        query: () =>
+          from(
+            Promise.resolve({
+              data: [],
+              error: {
+                message: 'boom',
+              },
+            })
+          ),
+      })
+    );
+    const mockRequest = {
+      targets: [
+        {
+          queryType: AzureQueryType.LogAnalytics,
+          azureLogAnalytics: {
+            query: 'some log thing',
+          },
+        } as AzureMonitorQuery,
+      ],
+    } as DataQueryRequest<AzureMonitorQuery>;
+    const observables = variableSupport.query(mockRequest);
+    observables.subscribe((result: DataQueryResponseData) => {
+      expect(result.data).toEqual([]);
+      expect(result.error.message).toEqual('boom');
+      done();
+    });
+  });
+
   it('should handle http error', (done) => {
     const error = invalidSubscriptionError();
     const variableSupport = new VariableSupport(
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
index 2a57156d2d2..3d8be733ca3 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
@@ -94,6 +94,7 @@ export class VariableSupport extends CustomVariableSupport<DataSource, AzureMoni
             const queryResp = await lastValueFrom(this.datasource.query(request));
             return {
               data: queryResp.data,
+              error: queryResp.error ? new Error(messageFromError(queryResp.error)) : undefined,
             };
         }
       } catch (err) {

From a2f1d2e102b37106bc4b91e0b32be1c41de1373f Mon Sep 17 00:00:00 2001
From: zdg-github <52441803+zdg-github@users.noreply.github.com>
Date: Thu, 24 Nov 2022 18:49:55 +0800
Subject: [PATCH 143/153] TraceView: Fix broken rendering when scrolling in
 Dashboard panel in Firefox (#56642)

---
 .../src/TraceTimelineViewer/ListView/index.tsx       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.tsx
index 57bd8f51c92..e7587f0a563 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.tsx
@@ -215,10 +215,20 @@ export default class ListView extends React.Component<TListViewProps> {
     }
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps: TListViewProps) {
     if (this._itemHolderElm) {
       this._scanItemHeights();
     }
+    // When windowScroller is set to false, we can continue to handle scrollElement
+    if (this.props.windowScroller) {
+      return;
+    }
+    // check if the scrollElement changes and update its scroll listener
+    if (prevProps.scrollElement !== this.props.scrollElement) {
+      prevProps.scrollElement?.removeEventListener('scroll', this._onScroll);
+      this._wrapperElm = this.props.scrollElement;
+      this._wrapperElm?.addEventListener('scroll', this._onScroll);
+    }
   }
 
   componentWillUnmount() {

From f3da48bd5040ebbc830b81d53f94707ea95e7cdf Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:12:50 +0200
Subject: [PATCH 144/153] SQLStore: Refactor query retries to use exponential
 backoff (#58559)

---
 pkg/services/sqlstore/session.go      | 31 ++++++++++++++++++------
 pkg/services/sqlstore/session_test.go | 35 +++++++++++++++------------
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/pkg/services/sqlstore/session.go b/pkg/services/sqlstore/session.go
index 973e6c63e67..8f9e2a63d37 100644
--- a/pkg/services/sqlstore/session.go
+++ b/pkg/services/sqlstore/session.go
@@ -9,10 +9,13 @@ import (
 	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/util/errutil"
+	"github.com/grafana/grafana/pkg/util/retryer"
 	"github.com/mattn/go-sqlite3"
 )
 
 var sessionLogger = log.New("sqlstore.session")
+var ErrMaximumRetriesReached = errutil.NewBase(errutil.StatusInternal, "sqlstore.max-retries-reached")
 
 type DBSession struct {
 	*xorm.Session
@@ -68,23 +71,34 @@ func (ss *SQLStore) WithDbSession(ctx context.Context, callback DBTransactionFun
 func (ss *SQLStore) WithNewDbSession(ctx context.Context, callback DBTransactionFunc) error {
 	sess := &DBSession{Session: ss.engine.NewSession(), transactionOpen: false}
 	defer sess.Close()
-	return ss.withRetry(ctx, callback, 0)(sess)
+	retry := 0
+	return retryer.Retry(ss.retryOnLocks(ctx, callback, sess, retry), ss.dbCfg.QueryRetries, time.Millisecond*time.Duration(10), time.Second)
 }
 
-func (ss *SQLStore) withRetry(ctx context.Context, callback DBTransactionFunc, retry int) DBTransactionFunc {
-	return func(sess *DBSession) error {
+func (ss *SQLStore) retryOnLocks(ctx context.Context, callback DBTransactionFunc, sess *DBSession, retry int) func() (retryer.RetrySignal, error) {
+	return func() (retryer.RetrySignal, error) {
+		retry++
+
 		err := callback(sess)
 
 		ctxLogger := tsclogger.FromContext(ctx)
 
 		var sqlError sqlite3.Error
-		if errors.As(err, &sqlError) && retry < ss.dbCfg.QueryRetries && (sqlError.Code == sqlite3.ErrLocked || sqlError.Code == sqlite3.ErrBusy) {
-			time.Sleep(time.Millisecond * time.Duration(10))
+		if errors.As(err, &sqlError) && (sqlError.Code == sqlite3.ErrLocked || sqlError.Code == sqlite3.ErrBusy) {
 			ctxLogger.Info("Database locked, sleeping then retrying", "error", err, "retry", retry, "code", sqlError.Code)
-			return ss.withRetry(ctx, callback, retry+1)(sess)
+			// retryer immediately returns the error (if there is one) without checking the response
+			// therefore we only have to send it if we have reached the maximum retries
+			if retry == ss.dbCfg.QueryRetries {
+				return retryer.FuncError, ErrMaximumRetriesReached.Errorf("retry %d: %w", retry, err)
+			}
+			return retryer.FuncFailure, nil
 		}
 
-		return err
+		if err != nil {
+			return retryer.FuncError, err
+		}
+
+		return retryer.FuncComplete, nil
 	}
 }
 
@@ -96,7 +110,8 @@ func (ss *SQLStore) withDbSession(ctx context.Context, engine *xorm.Engine, call
 	if isNew {
 		defer sess.Close()
 	}
-	return ss.withRetry(ctx, callback, 0)(sess)
+	retry := 0
+	return retryer.Retry(ss.retryOnLocks(ctx, callback, sess, retry), ss.dbCfg.QueryRetries, time.Millisecond*time.Duration(10), time.Second)
 }
 
 func (sess *DBSession) InsertId(bean interface{}) (int64, error) {
diff --git a/pkg/services/sqlstore/session_test.go b/pkg/services/sqlstore/session_test.go
index 6d22c735e5f..160bc280216 100644
--- a/pkg/services/sqlstore/session_test.go
+++ b/pkg/services/sqlstore/session_test.go
@@ -15,48 +15,51 @@ func TestRetryingOnFailures(t *testing.T) {
 	store.dbCfg.QueryRetries = 5
 
 	funcToTest := map[string]func(ctx context.Context, callback DBTransactionFunc) error{
-		"WithDbSession()":    store.WithDbSession,
-		"WithNewDbSession()": store.WithNewDbSession,
+		"WithDbSession":    store.WithDbSession,
+		"WithNewDbSession": store.WithNewDbSession,
 	}
 
 	for name, f := range funcToTest {
-		i := 0
 		t.Run(fmt.Sprintf("%s should return the error immediately if it's other than sqlite3.ErrLocked or sqlite3.ErrBusy", name), func(t *testing.T) {
-			err := f(context.Background(), func(sess *DBSession) error {
+			i := 0
+			callback := func(sess *DBSession) error {
 				i++
 				return errors.New("some error")
-			})
+			}
+			err := f(context.Background(), callback)
 			require.Error(t, err)
-			require.Equal(t, i, 1)
+			require.Equal(t, 1, i)
 		})
 
-		i = 0
 		t.Run(fmt.Sprintf("%s should return the sqlite3.Error if all retries have failed", name), func(t *testing.T) {
-			err := f(context.Background(), func(sess *DBSession) error {
+			i := 0
+			callback := func(sess *DBSession) error {
 				i++
 				return sqlite3.Error{Code: sqlite3.ErrBusy}
-			})
+			}
+			err := f(context.Background(), callback)
 			require.Error(t, err)
 			var driverErr sqlite3.Error
 			require.ErrorAs(t, err, &driverErr)
-			require.Equal(t, i, store.dbCfg.QueryRetries+1)
+			require.Equal(t, store.dbCfg.QueryRetries, i)
 		})
 
-		i = 0
 		t.Run(fmt.Sprintf("%s should not return the error if successive retries succeed", name), func(t *testing.T) {
-			err := f(context.Background(), func(sess *DBSession) error {
+			i := 0
+			callback := func(sess *DBSession) error {
+				i++
 				var err error
 				switch {
-				case i >= store.dbCfg.QueryRetries:
+				case store.dbCfg.QueryRetries == i:
 					err = nil
 				default:
 					err = sqlite3.Error{Code: sqlite3.ErrBusy}
 				}
-				i++
 				return err
-			})
+			}
+			err := f(context.Background(), callback)
 			require.NoError(t, err)
-			require.Equal(t, i, store.dbCfg.QueryRetries+1)
+			require.Equal(t, store.dbCfg.QueryRetries, i)
 		})
 	}
 

From 314c22bc5b01fa265eb228fe0e50b04fe753f354 Mon Sep 17 00:00:00 2001
From: Polina Boneva <13227501+polibb@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:21:18 +0200
Subject: [PATCH 145/153] PanelChrome: Implementing the new layout on
 PanelChrome @ grafana/ui (#57203)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use newPanelChromeUI feature flag in DashboardPanel panel rendering

* just render the PanelChromeUI instead of the PanelChrome

* add new props to PanelChrome; have ChromePanel from grafana/ui in DashboardPanel for testing (will remove before finished);

* put icons next to the title of PanelChrome header space

* arrange PanelChrome's title icons into view/edit/status sections

* icons next to title in PanelChrome are surrounded by square focusable space

* items to be render in Header in PanelChrome come in as props

* PanelChrome accepts items next to title from the outside; currently them being ordered in the left side is okay, right side not so much

* revert local changes to DashboardPanel

* cleanup unused imports

* simple PanelChrome render without any header props

* CSS function

* add test PanelChrome prop padding

* add icons next to title if they are passed to PanelChrome

* fixed PanelChrome header: hoverHeader, having a menu prop;

* only show icons with correct icon names; show menu icon only on hover over panel container; minor other fixes

* attempt to resolve hovering in an RTL test for the menu icon to work as expected

* menu opens in a Dropdown if provided as prop

* fixing tooltips and aria-labels

* Fixed issue with light theme in storybook

* comment out props and tests that are not yet used

* Fixed issue where content was overflowing the boundaries

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .../grafana-ui/src/components/Menu/Menu.tsx   |  22 +-
 .../components/PanelChrome/ErrorIndicator.tsx |  12 +-
 .../PanelChrome/LoadingIndicator.tsx          |   6 +-
 .../PanelChrome/PanelChrome.story.tsx         | 165 ++++++++++-----
 .../PanelChrome/PanelChrome.test.tsx          | 107 ++++++++++
 .../components/PanelChrome/PanelChrome.tsx    | 199 +++++++++++++-----
 6 files changed, 391 insertions(+), 120 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/PanelChrome/PanelChrome.test.tsx

diff --git a/packages/grafana-ui/src/components/Menu/Menu.tsx b/packages/grafana-ui/src/components/Menu/Menu.tsx
index 114f7221a29..b2b159b4d1d 100644
--- a/packages/grafana-ui/src/components/Menu/Menu.tsx
+++ b/packages/grafana-ui/src/components/Menu/Menu.tsx
@@ -57,16 +57,16 @@ export const Menu = Object.assign(MenuComp, {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    header: css`
-      padding: ${theme.spacing(0.5, 0.5, 1, 0.5)};
-      border-bottom: 1px solid ${theme.colors.border.weak};
-    `,
-    wrapper: css`
-      background: ${theme.colors.background.primary};
-      box-shadow: ${theme.shadows.z3};
-      display: inline-block;
-      border-radius: ${theme.shape.borderRadius()};
-      padding: ${theme.spacing(0.5, 0)};
-    `,
+    header: css({
+      padding: `${theme.spacing(0.5, 0.5, 1, 0.5)}`,
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+    }),
+    wrapper: css({
+      background: `${theme.colors.background.primary}`,
+      boxShadow: `${theme.shadows.z3}`,
+      display: `inline-block`,
+      borderRadius: `${theme.shape.borderRadius()}`,
+      padding: `${theme.spacing(0.5, 0)}`,
+    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/PanelChrome/ErrorIndicator.tsx b/packages/grafana-ui/src/components/PanelChrome/ErrorIndicator.tsx
index bdf721f621f..d18e460b6e8 100644
--- a/packages/grafana-ui/src/components/PanelChrome/ErrorIndicator.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/ErrorIndicator.tsx
@@ -38,11 +38,11 @@ export const ErrorIndicator: React.FC<ErrorIndicatorProps> = ({ error, onClick }
 
 const getStyles = () => {
   return {
-    clickable: css`
-      cursor: pointer;
-    `,
-    icon: css`
-      color: ${commonColorsPalette.red88};
-    `,
+    clickable: css({
+      cursor: 'pointer',
+    }),
+    icon: css({
+      color: `${commonColorsPalette.red88}`,
+    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx b/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx
index a47b08a4a9a..610e0382fc8 100644
--- a/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx
@@ -40,8 +40,8 @@ export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({ onCancel, lo
 
 const getStyles = () => {
   return {
-    clickable: css`
-      cursor: pointer;
-    `,
+    clickable: css({
+      cursor: 'pointer',
+    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
index 6d98df8311b..7e5247cb66d 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
@@ -4,11 +4,14 @@ import { merge } from 'lodash';
 import React, { CSSProperties, useState, ReactNode } from 'react';
 import { useInterval } from 'react-use';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { PanelChrome, useTheme2, PanelChromeProps } from '@grafana/ui';
+import { PanelChrome, PanelChromeProps } from '@grafana/ui';
 
+import { DashboardStoryCanvas } from '../../utils/storybook/DashboardStoryCanvas';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { HorizontalGroup, VerticalGroup } from '../Layout/Layout';
+import { Menu } from '../Menu/Menu';
+
+import { PanelChromeInfoState } from './PanelChrome';
 
 const meta: ComponentMeta<typeof PanelChrome> = {
   title: 'Visualizations/PanelChrome',
@@ -22,17 +25,16 @@ const meta: ComponentMeta<typeof PanelChrome> = {
   },
 };
 
-function getContentStyle(theme: GrafanaTheme2): CSSProperties {
+function getContentStyle(): CSSProperties {
   return {
-    background: theme.colors.background.secondary,
-    color: theme.colors.text.primary,
+    background: 'rgba(230,0,0,0.05)',
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'center',
   };
 }
 
-function renderPanel(name: string, overrides: Partial<PanelChromeProps>, theme: GrafanaTheme2) {
+function renderPanel(name: string, overrides: Partial<PanelChromeProps>) {
   const props: PanelChromeProps = {
     width: 400,
     height: 130,
@@ -42,7 +44,7 @@ function renderPanel(name: string, overrides: Partial<PanelChromeProps>, theme:
 
   merge(props, overrides);
 
-  const contentStyle = getContentStyle(theme);
+  const contentStyle = getContentStyle();
 
   return (
     <PanelChrome {...props}>
@@ -54,69 +56,75 @@ function renderPanel(name: string, overrides: Partial<PanelChromeProps>, theme:
 }
 
 export const Examples = () => {
-  const theme = useTheme2();
   const [loading, setLoading] = useState(true);
 
   useInterval(() => setLoading(true), 5000);
 
   return (
-    <div style={{ background: theme.colors.background.canvas, padding: 100 }}>
-      <HorizontalGroup spacing="md">
+    <DashboardStoryCanvas>
+      <HorizontalGroup spacing="md" align="flex-start">
         <VerticalGroup spacing="md">
-          {renderPanel('Default panel', {}, theme)}
-          {renderPanel('No padding', { padding: 'none' }, theme)}
+          {renderPanel('Default panel with error state indicator', {
+            title: 'Default title',
+            leftItems: [
+              <PanelChrome.ErrorIndicator
+                key="errorIndicator"
+                error="Error text"
+                onClick={action('ErrorIndicator: onClick fired')}
+              />,
+            ],
+          })}
+          {renderPanel('No padding with error state indicator', {
+            padding: 'none',
+            title: 'Default title',
+            leftItems: [
+              <PanelChrome.ErrorIndicator
+                key="errorIndicator"
+                error="Error text"
+                onClick={action('ErrorIndicator: onClick fired')}
+              />,
+            ],
+          })}
         </VerticalGroup>
         <VerticalGroup spacing="md">
-          {renderPanel('No title', { title: '' }, theme)}
-          {renderPanel(
-            'Very long title',
-            { title: 'Very long title that should get ellipsis when there is no more space' },
-            theme
-          )}
+          {renderPanel('No title', { title: '' })}
+          {renderPanel('Very long title', {
+            title: 'Very long title that should get ellipsis when there is no more space',
+          })}
         </VerticalGroup>
       </HorizontalGroup>
-      <div style={{ marginTop: theme.spacing(2) }} />
       <HorizontalGroup spacing="md">
         <VerticalGroup spacing="md">
-          {renderPanel(
-            'No title and loading indicator',
-            {
-              title: '',
-              leftItems: [
-                <PanelChrome.LoadingIndicator
-                  loading={loading}
-                  onCancel={() => setLoading(false)}
-                  key="loading-indicator"
-                />,
-              ],
-            },
-            theme
-          )}
+          {renderPanel('No title and loading indicator', {
+            title: '',
+            leftItems: [
+              <PanelChrome.LoadingIndicator
+                loading={loading}
+                onCancel={() => setLoading(false)}
+                key="loading-indicator"
+              />,
+            ],
+          })}
         </VerticalGroup>
         <VerticalGroup spacing="md">
-          {renderPanel(
-            'Very long title',
-            {
-              title: 'Very long title that should get ellipsis when there is no more space',
-              leftItems: [
-                <PanelChrome.LoadingIndicator
-                  loading={loading}
-                  onCancel={() => setLoading(false)}
-                  key="loading-indicator"
-                />,
-              ],
-            },
-            theme
-          )}
+          {renderPanel('Very long title', {
+            title: 'Very long title that should get ellipsis when there is no more space',
+            leftItems: [
+              <PanelChrome.LoadingIndicator
+                loading={loading}
+                onCancel={() => setLoading(false)}
+                key="loading-indicator"
+              />,
+            ],
+          })}
         </VerticalGroup>
       </HorizontalGroup>
-    </div>
+    </DashboardStoryCanvas>
   );
 };
 
 export const Basic: ComponentStory<typeof PanelChrome> = (args: PanelChromeProps) => {
-  const theme = useTheme2();
-  const contentStyle = getContentStyle(theme);
+  const contentStyle = getContentStyle();
 
   return (
     <PanelChrome {...args}>
@@ -139,6 +147,59 @@ const ErrorIcon = [
 
 const leftItems = { LoadingIcon, ErrorIcon, Default };
 
+const titleItems: PanelChromeInfoState[] = [
+  {
+    icon: 'info',
+    tooltip:
+      'Description text with very long descriptive words that describe what is going on in the panel and not beyond. Or maybe beyond, not up to us.',
+  },
+  {
+    icon: 'external-link-alt',
+    tooltip: 'wearegoingonanadventure.openanewtab.maybe',
+    onClick: () => {},
+  },
+  {
+    icon: 'clock-nine',
+    tooltip: 'Time range: 2021-09-01 00:00:00 to 2021-09-01 00:00:00',
+    onClick: () => {},
+  },
+  {
+    icon: 'heart',
+    tooltip: 'Health of the panel',
+  },
+];
+
+const menu = (
+  <Menu>
+    <Menu.Item label="View" icon="eye" />
+    <Menu.Item label="Edit" icon="edit" />
+    <Menu.Item label="Share" icon="share-alt" />
+    <Menu.Item label="Explore" icon="compass" />
+    <Menu.Item
+      label="Inspect"
+      icon="info-circle"
+      childItems={[
+        <Menu.Item key="subitem1" label="Data" />,
+        <Menu.Item key="subitem2" label="Query" />,
+        <Menu.Item key="subitem3" label="Panel JSON" />,
+      ]}
+    />
+    <Menu.Item
+      label="More"
+      icon="cube"
+      childItems={[
+        <Menu.Item key="subitem1" label="Duplicate" />,
+        <Menu.Item key="subitem2" label="Copy" />,
+        <Menu.Item key="subitem3" label="Create library panel" />,
+        <Menu.Item key="subitem4" label="Hide legend" />,
+        <Menu.Item key="subitem5" label="Get help" />,
+      ]}
+    />
+    <Menu.Divider />
+    <Menu.Item label="Remove" icon="trash-alt" />
+  </Menu>
+);
+
 Basic.argTypes = {
   leftItems: {
     options: Object.keys(leftItems),
@@ -157,7 +218,9 @@ Basic.argTypes = {
 Basic.args = {
   width: 400,
   height: 200,
-  title: 'Title text',
+  title: 'Very long title that should get ellipsis when there is no more space',
+  titleItems,
+  menu,
 };
 
 export default meta;
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.test.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.test.tsx
new file mode 100644
index 00000000000..35508f8e3c7
--- /dev/null
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.test.tsx
@@ -0,0 +1,107 @@
+import { screen, render } from '@testing-library/react';
+import React from 'react';
+
+import { PanelChrome, PanelChromeProps } from './PanelChrome';
+
+const setup = (propOverrides?: Partial<PanelChromeProps>) => {
+  const props: PanelChromeProps = {
+    width: 100,
+    height: 100,
+    children: (innerWidth, innerHeight) => {
+      return <div style={{ width: innerWidth, height: innerHeight, color: 'pink' }}>Panel&apos;s Content</div>;
+    },
+  };
+
+  Object.assign(props, propOverrides);
+  return render(<PanelChrome {...props} />);
+};
+
+it('renders an empty panel with required props only', () => {
+  setup();
+
+  expect(screen.getByText("Panel's Content")).toBeInTheDocument();
+});
+
+it('renders an empty panel without padding', () => {
+  setup({ padding: 'none' });
+
+  expect(screen.getByText("Panel's Content").parentElement).toHaveStyle({ padding: '0px' });
+});
+
+it('renders an empty panel with padding', () => {
+  setup({ padding: 'md' });
+
+  expect(screen.getByText("Panel's Content").style.getPropertyValue('height')).not.toBe('100px');
+  expect(screen.getByText("Panel's Content").parentElement).not.toHaveStyle({ padding: '0px' });
+});
+
+it('renders an empty panel without a header if no title or titleItems', () => {
+  setup();
+
+  expect(screen.queryByTestId('header-container')).not.toBeInTheDocument();
+});
+
+it('renders panel with a header if prop title', () => {
+  setup({ title: 'Test Panel Header' });
+
+  expect(screen.getByTestId('header-container')).toBeInTheDocument();
+});
+
+it('renders panel with a header with title in place if prop title', () => {
+  setup({ title: 'Test Panel Header' });
+
+  expect(screen.getByText('Test Panel Header')).toBeInTheDocument();
+});
+
+it('renders panel with a header if prop titleItems', () => {
+  setup({
+    titleItems: [
+      {
+        icon: 'info-circle',
+        tooltip: 'This is the panel description',
+        onClick: () => {},
+      },
+    ],
+  });
+
+  expect(screen.getByTestId('header-container')).toBeInTheDocument();
+});
+
+it('renders panel with a header with icons in place if prop titleItems', () => {
+  setup({
+    titleItems: [
+      {
+        icon: 'info-circle',
+        tooltip: 'This is the panel description',
+        onClick: () => {},
+      },
+    ],
+  });
+
+  expect(screen.getByTestId('title-items-container')).toBeInTheDocument();
+});
+
+it('renders panel with a fixed header if prop hoverHeader is false', () => {
+  setup({ title: 'Test Panel Header', hoverHeader: false });
+
+  expect(screen.getByTestId('header-container')).toBeInTheDocument();
+});
+
+it('renders panel with a header if prop menu', () => {
+  setup({ menu: <div> Menu </div> });
+
+  expect(screen.getByTestId('header-container')).toBeInTheDocument();
+});
+
+it('renders panel with a show-on-hover menu icon if prop menu', () => {
+  setup({ menu: <div> Menu </div> });
+
+  expect(screen.getByTestId('menu-icon')).toBeInTheDocument();
+  expect(screen.getByTestId('menu-icon')).not.toBeVisible();
+});
+
+it.skip('renders states in the panel header if any given', () => {});
+
+it.skip('renders leftItems in the panel header if any given when no states prop is given', () => {});
+
+it.skip('renders states in the panel header if both leftItems and states are given', () => {});
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index 02875a6c2ea..685261d1870 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -1,9 +1,25 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React, { CSSProperties, ReactNode } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, isIconName } from '@grafana/data';
 
 import { useStyles2, useTheme2 } from '../../themes';
+import { IconName } from '../../types/icon';
+import { Dropdown } from '../Dropdown/Dropdown';
+import { Icon } from '../Icon/Icon';
+import { IconButton, IconButtonVariant } from '../IconButton/IconButton';
+import { PopoverContent, Tooltip } from '../Tooltip';
+
+/**
+ * @internal
+ */
+export interface PanelChromeInfoState {
+  icon: IconName;
+  label?: string | ReactNode;
+  tooltip?: PopoverContent;
+  variant?: IconButtonVariant;
+  onClick?: () => void;
+}
 
 /**
  * @internal
@@ -11,10 +27,22 @@ import { useStyles2, useTheme2 } from '../../themes';
 export interface PanelChromeProps {
   width: number;
   height: number;
-  title?: string;
+  children: (innerWidth: number, innerHeight: number) => ReactNode;
   padding?: PanelPadding;
-  leftItems?: React.ReactNode[]; // rightItems will be added later (actions links etc.)
-  children: (innerWidth: number, innerHeight: number) => React.ReactNode;
+  title?: string;
+  titleItems?: PanelChromeInfoState[];
+  menu?: React.ReactElement;
+  /** dragClass, hoverHeader, loadingState, and states not yet implemented */
+  // dragClass?: string;
+  hoverHeader?: boolean;
+  // loadingState?: LoadingState;
+  // states?: ReactNode[];
+  /** @deprecated in favor of prop states
+   * which will serve the same purpose
+   * of showing the panel state in the top right corner
+   * of itself or its header
+   * */
+  leftItems?: ReactNode[];
 }
 
 /**
@@ -26,33 +54,86 @@ export type PanelPadding = 'none' | 'md';
  * @internal
  */
 export const PanelChrome: React.FC<PanelChromeProps> = ({
-  title = '',
-  children,
   width,
   height,
+  children,
   padding = 'md',
+  title = '',
+  titleItems = [],
+  menu,
+  // dragClass,
+  hoverHeader = false,
+  // loadingState,
+  // states = [],
   leftItems = [],
 }) => {
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
 
-  const headerHeight = getHeaderHeight(theme, title, leftItems);
+  const headerHeight = !hoverHeader ? getHeaderHeight(theme, title, leftItems) : 0;
   const { contentStyle, innerWidth, innerHeight } = getContentStyle(padding, theme, width, headerHeight, height);
 
   const headerStyles: CSSProperties = {
     height: headerHeight,
   };
-
+  const itemStyles: CSSProperties = {
+    minHeight: headerHeight,
+    minWidth: headerHeight,
+  };
   const containerStyles: CSSProperties = { width, height };
 
+  const handleMenuOpen = () => {};
+
+  const hasHeader = title || titleItems.length > 0 || menu;
+
   return (
     <div className={styles.container} style={containerStyles}>
-      <div className={styles.header} style={headerStyles}>
-        <div className={styles.headerTitle}>{title}</div>
-        {itemsRenderer(leftItems, (items) => {
-          return <div className={styles.leftItems}>{items}</div>;
-        })}
-      </div>
+      {hasHeader && !hoverHeader && (
+        <div className={styles.headerContainer} style={headerStyles} data-testid="header-container">
+          {title && (
+            <div title={title} className={styles.title}>
+              {title}
+            </div>
+          )}
+
+          {titleItems.length > 0 && (
+            <div className={styles.items} data-testid="title-items-container">
+              {titleItems
+                .filter((item) => isIconName(item.icon))
+                .map((item, i) => (
+                  <div key={`${item.icon}-${i}`} className={styles.item} style={itemStyles}>
+                    {item.onClick ? (
+                      <IconButton tooltip={item.tooltip} name={item.icon} size="sm" onClick={item.onClick} />
+                    ) : (
+                      <Tooltip content={item.tooltip ?? ''}>
+                        <Icon name={item.icon} size="sm" />
+                      </Tooltip>
+                    )}
+                  </div>
+                ))}
+            </div>
+          )}
+
+          {menu && (
+            <Dropdown overlay={menu} placement="bottom">
+              <div className={cx(styles.item, styles.menuItem, 'menu-icon')} data-testid="menu-icon" style={itemStyles}>
+                <IconButton
+                  ariaLabel={`Menu for panel with ${title ? `title ${title}` : 'no title'}`}
+                  tooltip="Menu"
+                  name="ellipsis-v"
+                  size="sm"
+                  onClick={handleMenuOpen}
+                />
+              </div>
+            </Dropdown>
+          )}
+
+          {leftItems.length > 0 && (
+            <div className={cx(styles.rightAligned, styles.items)}>{itemsRenderer(leftItems, (item) => item)}</div>
+          )}
+        </div>
+      )}
+
       <div className={styles.content} style={contentStyle}>
         {children(innerWidth, innerHeight)}
       </div>
@@ -95,39 +176,59 @@ const getStyles = (theme: GrafanaTheme2) => {
   const { padding, background, borderColor } = theme.components.panel;
 
   return {
-    container: css`
-      label: panel-container;
-      background-color: ${background};
-      border: 1px solid ${borderColor};
-      position: relative;
-      border-radius: 3px;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      flex: 0 0 0;
-    `,
-    content: css`
-      label: panel-content;
-      width: 100%;
-      flex-grow: 1;
-    `,
-    header: css`
-      label: panel-header;
-      display: flex;
-      align-items: center;
-    `,
-    headerTitle: css`
-      label: panel-header;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-      padding-left: ${theme.spacing(padding)};
-      flex-grow: 1;
-      font-weight: ${theme.typography.fontWeightMedium};
-    `,
-    leftItems: css`
-      display: flex;
-      padding-right: ${theme.spacing(padding)};
-    `,
+    container: css({
+      label: 'panel-container',
+      backgroundColor: background,
+      border: `1px solid ${borderColor}`,
+      position: 'relative',
+      borderRadius: '3px',
+      height: '100%',
+      display: 'flex',
+      flexDirection: 'column',
+      flex: '0 0 0',
+
+      '&:focus-visible, &:hover': {
+        // only show menu icon on hover or focused panel
+        '.menu-icon': {
+          visibility: 'visible',
+        },
+      },
+
+      '&:focus-visible': {
+        outline: `1px solid ${theme.colors.action.focus}`,
+      },
+    }),
+    content: css({
+      label: 'panel-content',
+      width: '100%',
+      contain: 'strict',
+      flexGrow: 1,
+    }),
+    headerContainer: css({
+      label: 'panel-header',
+      display: 'flex',
+      alignItems: 'center',
+      padding: `0 ${theme.spacing(padding)}`,
+    }),
+    title: css({
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+      whiteSpace: 'nowrap',
+      fontWeight: theme.typography.fontWeightMedium,
+    }),
+    items: css({
+      display: 'flex',
+    }),
+    item: css({
+      display: 'flex',
+      justifyContent: 'space-around',
+      alignItems: 'center',
+    }),
+    menuItem: css({
+      visibility: 'hidden',
+    }),
+    rightAligned: css({
+      marginLeft: 'auto',
+    }),
   };
 };

From be73418d0011c6303c2f638c49002445cd63ccf9 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Thu, 24 Nov 2022 11:52:10 +0000
Subject: [PATCH 146/153] PostgreSQL: Fix missing CA field from configuration
 (#59280)

* PostgreSQL: Fix missing CA field from configuration
---
 .../postgres/configuration/ConfigurationEditor.tsx   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
index 590d4871389..9a8184abb02 100644
--- a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
@@ -153,10 +153,16 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
         ) : null}
       </FieldSet>
 
-      {options.jsonData.sslmode !== 'disable' ? (
+      {jsonData.sslmode !== PostgresTLSModes.disable ? (
         <FieldSet label="TLS/SSL Auth Details">
-          {options.jsonData.tlsConfigurationMethod === PostgresTLSMethods.fileContent ? (
-            <TLSSecretsConfig editorProps={props} labelWidth={labelWidthSSLDetails}></TLSSecretsConfig>
+          {jsonData.tlsConfigurationMethod === PostgresTLSMethods.fileContent ? (
+            <TLSSecretsConfig
+              showCACert={
+                jsonData.sslmode === PostgresTLSModes.verifyCA || jsonData.sslmode === PostgresTLSModes.verifyFull
+              }
+              editorProps={props}
+              labelWidth={labelWidthSSLDetails}
+            ></TLSSecretsConfig>
           ) : (
             <>
               <InlineField

From 2d7fcea8fa553a2811316d117e8a40c4a08c0dc2 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Thu, 24 Nov 2022 14:12:07 +0200
Subject: [PATCH 147/153] CI: Remove `npm` steps from enterprise pipelines
 (#59108)

Remove npm steps from enterprise pipelines
---
 .drone.yml                        | 13 +------------
 scripts/drone/events/release.star |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5fb3cee20a8..afa440e9753 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2868,17 +2868,6 @@ steps:
       from_secret: prerelease_bucket
   image: grafana/grafana-ci-deploy:1.3.3
   name: upload-cdn-assets-enterprise2
-- commands:
-  - ./bin/grabpl artifacts npm store --tag ${DRONE_TAG}
-  depends_on:
-  - build-frontend-packages
-  environment:
-    GCP_KEY:
-      from_secret: gcp_key
-    PRERELEASE_BUCKET:
-      from_secret: prerelease_bucket
-  image: grafana/build-container:1.6.4
-  name: store-npm-packages
 - commands:
   - ./bin/build upload-packages --edition enterprise2
   depends_on:
@@ -6317,6 +6306,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 1eca02a75c7e67666e8be67a9f121b9a70f5c280ee4d231a647be9d696e267dc
+hmac: e7746a4b35fba9e1a7cb3096b947a874786b082f41e4252448ac6acde7ee3ccf
 
 ...
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index a0049840a0d..702e59dd7b6 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -300,11 +300,8 @@ def enterprise_pipelines(ver_mode=ver_mode, trigger=release_trigger):
         ])
     if should_publish:
         publish_step = store_storybook_step(edition=edition, ver_mode=ver_mode)
-        store_npm_step = store_npm_packages_step()
         if publish_step:
             publish_steps.append(publish_step)
-        if store_npm_step:
-            publish_steps.append(store_npm_step)
     windows_package_steps = get_windows_steps(edition=edition, ver_mode=ver_mode)
 
     if should_upload:

From 400ada1ad07d7d987ee12aee4ea80c3b0d6063de Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 24 Nov 2022 13:21:55 +0100
Subject: [PATCH 148/153] Logs: Fix misalignment of LogRows (#59279)

* add default display flex

* changed to `text-align: left`
---
 public/app/features/logs/components/LogRowMessage.tsx  | 2 +-
 public/app/features/logs/components/getLogRowStyles.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/logs/components/LogRowMessage.tsx b/public/app/features/logs/components/LogRowMessage.tsx
index 8a2efcc694c..ee34273bdfd 100644
--- a/public/app/features/logs/components/LogRowMessage.tsx
+++ b/public/app/features/logs/components/LogRowMessage.tsx
@@ -47,7 +47,7 @@ const getStyles = (theme: GrafanaTheme2, showContextButton: boolean, isInDashboa
       display: inherit;
     `,
     horizontalScroll: css`
-      label: verticalScroll;
+      label: horizontalScroll;
       white-space: pre;
     `,
     contextNewline: css`
diff --git a/public/app/features/logs/components/getLogRowStyles.ts b/public/app/features/logs/components/getLogRowStyles.ts
index 14f8b6017d4..8b53e186afc 100644
--- a/public/app/features/logs/components/getLogRowStyles.ts
+++ b/public/app/features/logs/components/getLogRowStyles.ts
@@ -124,6 +124,7 @@ export const getLogRowStyles = (theme: GrafanaTheme2, logLevel?: LogLevel) => {
       white-space: pre-wrap;
       word-break: break-all;
       width: 100%;
+      text-align: left;
     `,
     //Log details specific CSS
     logDetailsContainer: css`

From 1ee52e14d247968c984783fb878d281cc2a47523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uladzimir=20Dzmitra=C4=8Dko=C5=AD?=
 <3773351+going-confetti@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:39:42 +0100
Subject: [PATCH 149/153] GrafanaUI: Add disabled option for menu items
 (#58980)

---
 .../src/components/Menu/Menu.story.tsx        | 25 ++++++++++++
 .../src/components/Menu/MenuItem.test.tsx     | 14 +++++++
 .../src/components/Menu/MenuItem.tsx          | 38 +++++++++++++++++--
 .../src/components/Menu/hooks.test.tsx        | 24 +++++++++++-
 .../grafana-ui/src/components/Menu/hooks.ts   |  6 +--
 5 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/packages/grafana-ui/src/components/Menu/Menu.story.tsx b/packages/grafana-ui/src/components/Menu/Menu.story.tsx
index 80499f0e3b5..2c72671a348 100644
--- a/packages/grafana-ui/src/components/Menu/Menu.story.tsx
+++ b/packages/grafana-ui/src/components/Menu/Menu.story.tsx
@@ -49,6 +49,31 @@ export function Examples() {
           <Menu.Item label="With destructive prop set" icon="trash-alt" destructive />
         </Menu>
       </StoryExample>
+      <StoryExample name="With disabled items">
+        <Menu>
+          <Menu.Item label="Google" icon="search-plus" />
+          <Menu.Item label="Disabled action" icon="history" disabled />
+          <Menu.Item label="Disabled link" icon="external-link-alt" url="http://google.com" target="_blank" disabled />
+          <Menu.Item
+            label="Submenu"
+            icon="apps"
+            childItems={[
+              <Menu.Item key="subitem1" label="subitem1" icon="history" disabled />,
+              <Menu.Item key="subitem2" label="subitem2" icon="apps" />,
+            ]}
+          />
+          <Menu.Item
+            label="Disabled submenu"
+            icon="apps"
+            disabled
+            childItems={[
+              <Menu.Item key="subitem1" label="subitem1" icon="history" />,
+              <Menu.Item key="subitem2" label="subitem2" icon="apps" />,
+            ]}
+          />
+          <Menu.Item label="Disabled destructive action" icon="trash-alt" destructive disabled />
+        </Menu>
+      </StoryExample>
       <StoryExample name="With header & groups">
         <Menu
           header={
diff --git a/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx b/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
index 39f5719361b..5371d1c7674 100644
--- a/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
@@ -51,6 +51,20 @@ describe('MenuItem', () => {
     expect(subMenuContainer.firstChild?.childNodes.length).toBe(2);
   });
 
+  it('renders disabled subMenu correctly', async () => {
+    const childItems = [
+      <MenuItem key="subitem1" label="subitem1" icon="history" />,
+      <MenuItem key="subitem2" label="subitem2" icon="apps" />,
+    ];
+
+    render(getMenuItem({ childItems, disabled: true }));
+
+    fireEvent.mouseOver(screen.getByLabelText(selectors.components.Menu.MenuItem('Test')));
+
+    const subMenuContainer = screen.queryByLabelText(selectors.components.Menu.SubMenu.container);
+    expect(subMenuContainer).toBe(null);
+  });
+
   it('opens subMenu on ArrowRight', async () => {
     const childItems = [
       <MenuItem key="subitem1" label="subitem1" icon="history" />,
diff --git a/packages/grafana-ui/src/components/Menu/MenuItem.tsx b/packages/grafana-ui/src/components/Menu/MenuItem.tsx
index 84b8c3f0520..47c9940a6b8 100644
--- a/packages/grafana-ui/src/components/Menu/MenuItem.tsx
+++ b/packages/grafana-ui/src/components/Menu/MenuItem.tsx
@@ -35,6 +35,8 @@ export interface MenuItemProps<T = any> {
   className?: string;
   /** Active */
   active?: boolean;
+  /** Disabled */
+  disabled?: boolean;
   /** Show in destructive style (error color) */
   destructive?: boolean;
   tabIndex?: number;
@@ -57,6 +59,7 @@ export const MenuItem = React.memo(
       onClick,
       className,
       active,
+      disabled,
       destructive,
       childItems,
       role = 'menuitem',
@@ -68,13 +71,21 @@ export const MenuItem = React.memo(
     const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);
     const [openedWithArrow, setOpenedWithArrow] = useState(false);
     const onMouseEnter = useCallback(() => {
+      if (disabled) {
+        return;
+      }
+
       setIsSubMenuOpen(true);
       setIsActive(true);
-    }, []);
+    }, [disabled]);
     const onMouseLeave = useCallback(() => {
+      if (disabled) {
+        return;
+      }
+
       setIsSubMenuOpen(false);
       setIsActive(false);
-    }, []);
+    }, [disabled]);
 
     const hasSubMenu = childItems && childItems.length > 0;
     const ItemElement = hasSubMenu ? 'div' : url === undefined ? 'button' : 'a';
@@ -82,10 +93,19 @@ export const MenuItem = React.memo(
       {
         [styles.item]: true,
         [styles.active]: isActive,
-        [styles.destructive]: destructive,
+        [styles.disabled]: disabled,
+        [styles.destructive]: destructive && !disabled,
       },
       className
     );
+    const disabledProps = {
+      [ItemElement === 'button' ? 'disabled' : 'aria-disabled']: disabled,
+      ...(ItemElement === 'a' && disabled && { href: undefined, onClick: undefined }),
+      ...(disabled && {
+        tabIndex: -1,
+        ['data-disabled']: disabled, // used to identify disabled items in Menu.tsx
+      }),
+    };
 
     const localRef = useRef<MenuItemElement>(null);
     useImperativeHandle(ref, () => localRef.current!);
@@ -128,6 +148,7 @@ export const MenuItem = React.memo(
         aria-label={ariaLabel}
         aria-checked={ariaChecked}
         tabIndex={tabIndex}
+        {...disabledProps}
       >
         <>
           {icon && <Icon name={icon} className={styles.icon} aria-hidden />}
@@ -200,6 +221,17 @@ const getStyles = (theme: GrafanaTheme2) => {
         }
       }
     `,
+    disabled: css`
+      color: ${theme.colors.action.disabledText};
+
+      &:hover,
+      &:focus,
+      &:focus-visible {
+        cursor: not-allowed;
+        background: none;
+        color: ${theme.colors.action.disabledText};
+      }
+    `,
     icon: css`
       opacity: 0.7;
       margin-right: 10px;
diff --git a/packages/grafana-ui/src/components/Menu/hooks.test.tsx b/packages/grafana-ui/src/components/Menu/hooks.test.tsx
index a35406e6a35..2c8bfabf886 100644
--- a/packages/grafana-ui/src/components/Menu/hooks.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/hooks.test.tsx
@@ -18,7 +18,10 @@ describe('useMenuFocus', () => {
         Item 1
       </span>
       <span data-role="menuitem">Item 2</span>
-      <span data-role="menuitem">Item 3</span>
+      <span data-role="menuitem" data-disabled>
+        Item 3
+      </span>
+      <span data-role="menuitem">Item 4</span>
     </div>
   );
 
@@ -31,6 +34,7 @@ describe('useMenuFocus', () => {
     expect(screen.getByText('Item 1').tabIndex).toBe(-1);
     expect(screen.getByText('Item 2').tabIndex).toBe(-1);
     expect(screen.getByText('Item 3').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 4').tabIndex).toBe(-1);
 
     act(() => {
       fireEvent.keyDown(screen.getByTestId(testid), { key: 'ArrowDown' });
@@ -42,6 +46,7 @@ describe('useMenuFocus', () => {
     expect(screen.getByText('Item 1').tabIndex).toBe(0);
     expect(screen.getByText('Item 2').tabIndex).toBe(-1);
     expect(screen.getByText('Item 3').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 4').tabIndex).toBe(-1);
 
     act(() => {
       fireEvent.keyDown(screen.getByTestId(testid), { key: 'ArrowDown' });
@@ -53,6 +58,7 @@ describe('useMenuFocus', () => {
     expect(screen.getByText('Item 1').tabIndex).toBe(-1);
     expect(screen.getByText('Item 2').tabIndex).toBe(0);
     expect(screen.getByText('Item 3').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 4').tabIndex).toBe(-1);
 
     act(() => {
       fireEvent.keyDown(screen.getByTestId(testid), { key: 'ArrowUp' });
@@ -64,6 +70,7 @@ describe('useMenuFocus', () => {
     expect(screen.getByText('Item 1').tabIndex).toBe(0);
     expect(screen.getByText('Item 2').tabIndex).toBe(-1);
     expect(screen.getByText('Item 3').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 4').tabIndex).toBe(-1);
 
     act(() => {
       fireEvent.keyDown(screen.getByTestId(testid), { key: 'ArrowUp' });
@@ -74,7 +81,20 @@ describe('useMenuFocus', () => {
 
     expect(screen.getByText('Item 1').tabIndex).toBe(-1);
     expect(screen.getByText('Item 2').tabIndex).toBe(-1);
-    expect(screen.getByText('Item 3').tabIndex).toBe(0);
+    expect(screen.getByText('Item 3').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 4').tabIndex).toBe(0);
+
+    act(() => {
+      fireEvent.keyDown(screen.getByTestId(testid), { key: 'ArrowUp' });
+    });
+
+    const [handleKeys6] = result.current;
+    rerender(getMenuElement(ref, handleKeys6));
+
+    expect(screen.getByText('Item 1').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 2').tabIndex).toBe(0);
+    expect(screen.getByText('Item 3').tabIndex).toBe(-1);
+    expect(screen.getByText('Item 4').tabIndex).toBe(-1);
   });
 
   it('calls close on ArrowLeft and unfocuses all items', () => {
diff --git a/packages/grafana-ui/src/components/Menu/hooks.ts b/packages/grafana-ui/src/components/Menu/hooks.ts
index f021986fafc..3ca3d2baf5b 100644
--- a/packages/grafana-ui/src/components/Menu/hooks.ts
+++ b/packages/grafana-ui/src/components/Menu/hooks.ts
@@ -41,7 +41,7 @@ export const useMenuFocus = ({
 
   useEffect(() => {
     const menuItems = localRef?.current?.querySelectorAll<HTMLElement | HTMLButtonElement | HTMLAnchorElement>(
-      `[data-role="menuitem"]`
+      '[data-role="menuitem"]:not([data-disabled])'
     );
     menuItems?.[focusedItem]?.focus();
     menuItems?.forEach((menuItem, i) => {
@@ -51,7 +51,7 @@ export const useMenuFocus = ({
 
   useEffectOnce(() => {
     const firstMenuItem = localRef?.current?.querySelector<HTMLElement | HTMLButtonElement | HTMLAnchorElement>(
-      `[data-role="menuitem"]`
+      '[data-role="menuitem"]:not([data-disabled])'
     );
     if (firstMenuItem) {
       firstMenuItem.tabIndex = 0;
@@ -61,7 +61,7 @@ export const useMenuFocus = ({
 
   const handleKeys = (event: React.KeyboardEvent) => {
     const menuItems = localRef?.current?.querySelectorAll<HTMLElement | HTMLButtonElement | HTMLAnchorElement>(
-      `[data-role="menuitem"]`
+      '[data-role="menuitem"]:not([data-disabled])'
     );
     const menuItemsCount = menuItems?.length ?? 0;
 

From 0da77201bf0958b60fcc44b2bf62f5be2a47eeff Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Thu, 24 Nov 2022 14:44:32 +0200
Subject: [PATCH 150/153] TimeseriesPanel: Preserve string fields for data link
 interpolation (#58424)

* TimeseriesPanel: Preserve string fields for data link interpolation

* clean code

* Modify tests so that string fields are allowed only when a valid time/number dataframe exists

* performance mods

* fix wrong length

* remove console.log

* Check if aligned dataframe has links
---
 .../grafana-data/src/vector/SortedVector.ts   |  4 ++
 .../panel/timeseries/TimeSeriesPanel.tsx      | 18 +++----
 .../plugins/panel/timeseries/utils.test.ts    |  2 +-
 public/app/plugins/panel/timeseries/utils.ts  | 54 +++++++++++++++++++
 4 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/packages/grafana-data/src/vector/SortedVector.ts b/packages/grafana-data/src/vector/SortedVector.ts
index 0d66dff6ded..e2a318e95d4 100644
--- a/packages/grafana-data/src/vector/SortedVector.ts
+++ b/packages/grafana-data/src/vector/SortedVector.ts
@@ -23,4 +23,8 @@ export class SortedVector<T = any> implements Vector<T> {
   toJSON(): T[] {
     return vectorToArray(this);
   }
+
+  getOrderArray(): number[] {
+    return this.order;
+  }
 }
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index 9b422fb5ad8..78203d51ba0 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { Field, PanelProps, getLinksSupplier } from '@grafana/data';
+import { Field, PanelProps } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
 import { TooltipDisplayMode } from '@grafana/schema';
 import { usePanelContext, TimeSeries, TooltipPlugin, ZoomPlugin, KeyboardPlugin } from '@grafana/ui';
@@ -14,7 +14,7 @@ import { ExemplarsPlugin } from './plugins/ExemplarsPlugin';
 import { OutsideRangePlugin } from './plugins/OutsideRangePlugin';
 import { ThresholdControlsPlugin } from './plugins/ThresholdControlsPlugin';
 import { TimeSeriesOptions } from './types';
-import { getTimezones, prepareGraphableFields } from './utils';
+import { getTimezones, prepareGraphableFields, regenerateLinksSupplier } from './utils';
 
 interface TimeSeriesPanelProps extends PanelProps<TimeSeriesOptions> {}
 
@@ -65,15 +65,11 @@ export const TimeSeriesPanel: React.FC<TimeSeriesPanelProps> = ({
       options={options}
     >
       {(config, alignedDataFrame) => {
-        alignedDataFrame.fields.forEach((field) => {
-          field.getLinks = getLinksSupplier(
-            alignedDataFrame,
-            field,
-            field.state!.scopedVars!,
-            replaceVariables,
-            timeZone
-          );
-        });
+        if (
+          alignedDataFrame.fields.filter((f) => f.config.links !== undefined && f.config.links.length > 0).length > 0
+        ) {
+          alignedDataFrame = regenerateLinksSupplier(alignedDataFrame, frames, replaceVariables, timeZone);
+        }
 
         return (
           <>
diff --git a/public/app/plugins/panel/timeseries/utils.test.ts b/public/app/plugins/panel/timeseries/utils.test.ts
index 2eb3ca95674..9be6bde5c11 100644
--- a/public/app/plugins/panel/timeseries/utils.test.ts
+++ b/public/app/plugins/panel/timeseries/utils.test.ts
@@ -43,7 +43,7 @@ describe('prepare timeseries graph', () => {
     const frames = prepareGraphableFields(input, createTheme());
     const out = frames![0];
 
-    expect(out.fields.map((f) => f.name)).toEqual(['a', 'c', 'd']);
+    expect(out.fields.map((f) => f.name)).toEqual(['a', 'b', 'c', 'd']);
 
     const field = out.fields.find((f) => f.name === 'c');
     expect(field?.display).toBeDefined();
diff --git a/public/app/plugins/panel/timeseries/utils.ts b/public/app/plugins/panel/timeseries/utils.ts
index 241e775b1ff..f8008bb0c27 100644
--- a/public/app/plugins/panel/timeseries/utils.ts
+++ b/public/app/plugins/panel/timeseries/utils.ts
@@ -4,8 +4,11 @@ import {
   Field,
   FieldType,
   getDisplayProcessor,
+  getLinksSupplier,
   GrafanaTheme2,
+  InterpolateFunction,
   isBooleanUnit,
+  SortedVector,
   TimeRange,
 } from '@grafana/data';
 import { GraphFieldConfig, LineInterpolation } from '@grafana/schema';
@@ -60,6 +63,14 @@ export function prepareGraphableFields(
             ),
           };
 
+          fields.push(copy);
+          break; // ok
+        case FieldType.string:
+          copy = {
+            ...field,
+            values: new ArrayVector(field.values.toArray()),
+          };
+
           fields.push(copy);
           break; // ok
         case FieldType.boolean:
@@ -123,3 +134,46 @@ export function getTimezones(timezones: string[] | undefined, defaultTimezone: s
   }
   return timezones.map((v) => (v?.length ? v : defaultTimezone));
 }
+
+export function regenerateLinksSupplier(
+  alignedDataFrame: DataFrame,
+  frames: DataFrame[],
+  replaceVariables: InterpolateFunction,
+  timeZone: string
+): DataFrame {
+  alignedDataFrame.fields.forEach((field) => {
+    const frameIndex = field.state?.origin?.frameIndex;
+
+    if (frameIndex === undefined) {
+      return;
+    }
+
+    const frame = frames[frameIndex];
+    const tempFields: Field[] = [];
+
+    /* check if field has sortedVector values
+      if it does, sort all string fields in the original frame by the order array already used for the field
+      otherwise just attach the fields to the temporary frame used to get the links
+    */
+    for (const frameField of frame.fields) {
+      if (frameField.type === FieldType.string) {
+        if (field.values instanceof SortedVector) {
+          const copiedField = { ...frameField };
+          copiedField.values = new SortedVector(frameField.values, field.values.getOrderArray());
+          tempFields.push(copiedField);
+        } else {
+          tempFields.push(frameField);
+        }
+      }
+    }
+
+    const tempFrame: DataFrame = {
+      fields: [...alignedDataFrame.fields, ...tempFields],
+      length: alignedDataFrame.fields.length + tempFields.length,
+    };
+
+    field.getLinks = getLinksSupplier(tempFrame, field, field.state!.scopedVars!, replaceVariables, timeZone);
+  });
+
+  return alignedDataFrame;
+}

From 1a6b46e98df494a9e5fb07f87c06704252ce3ff4 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Thu, 24 Nov 2022 13:53:31 +0100
Subject: [PATCH 151/153] Scenes: Add support for Datasource variables (#59147)

---
 public/app/features/scenes/core/sceneGraph.ts |  13 +-
 .../features/scenes/scenes/variablesDemo.tsx  |  26 +-
 .../interpolation/sceneInterpolator.ts        |   2 +-
 .../variables/variants/CustomVariable.test.ts |  21 +-
 .../variants/DataSourceVariable.test.ts       | 227 ++++++++++++++++++
 .../variables/variants/DataSourceVariable.tsx | 107 +++++++++
 6 files changed, 369 insertions(+), 27 deletions(-)
 create mode 100644 public/app/features/scenes/variables/variants/DataSourceVariable.test.ts
 create mode 100644 public/app/features/scenes/variables/variants/DataSourceVariable.tsx

diff --git a/public/app/features/scenes/core/sceneGraph.ts b/public/app/features/scenes/core/sceneGraph.ts
index 0cee433477e..2522e2e5264 100644
--- a/public/app/features/scenes/core/sceneGraph.ts
+++ b/public/app/features/scenes/core/sceneGraph.ts
@@ -1,6 +1,6 @@
-import { getDefaultTimeRange, LoadingState } from '@grafana/data';
+import { getDefaultTimeRange, LoadingState, ScopedVars } from '@grafana/data';
 
-import { sceneInterpolator } from '../variables/interpolation/sceneInterpolator';
+import { CustomFormatterFn, sceneInterpolator } from '../variables/interpolation/sceneInterpolator';
 import { SceneVariableSet } from '../variables/sets/SceneVariableSet';
 import { SceneVariables } from '../variables/types';
 
@@ -89,13 +89,18 @@ export function getLayout(scene: SceneObject): SceneObject<SceneLayoutState> {
 /**
  * Interpolates the given string using the current scene object as context.   *
  */
-export function interpolate(sceneObject: SceneObject, value: string | undefined | null): string {
+export function interpolate(
+  sceneObject: SceneObject,
+  value: string | undefined | null,
+  scopedVars?: ScopedVars,
+  format?: string | CustomFormatterFn
+): string {
   // Skip interpolation if there are no variable dependencies
   if (!value || !sceneObject.variableDependency || sceneObject.variableDependency.getNames().size === 0) {
     return value ?? '';
   }
 
-  return sceneInterpolator(sceneObject, value);
+  return sceneInterpolator(sceneObject, value, scopedVars, format);
 }
 
 export const EmptyVariableSet = new SceneVariableSet({ variables: [] });
diff --git a/public/app/features/scenes/scenes/variablesDemo.tsx b/public/app/features/scenes/scenes/variablesDemo.tsx
index 16cf91a60fb..aae519e72b7 100644
--- a/public/app/features/scenes/scenes/variablesDemo.tsx
+++ b/public/app/features/scenes/scenes/variablesDemo.tsx
@@ -7,7 +7,9 @@ import { SceneFlexLayout } from '../components/layout/SceneFlexLayout';
 import { SceneTimeRange } from '../core/SceneTimeRange';
 import { VariableValueSelectors } from '../variables/components/VariableValueSelectors';
 import { SceneVariableSet } from '../variables/sets/SceneVariableSet';
+import { ConstantVariable } from '../variables/variants/ConstantVariable';
 import { CustomVariable } from '../variables/variants/CustomVariable';
+import { DataSourceVariable } from '../variables/variants/DataSourceVariable';
 import { TestVariable } from '../variables/variants/TestVariable';
 
 import { getQueryRunnerWithRandomWalkQuery } from './queries';
@@ -43,16 +45,36 @@ export function getVariablesDemo(): Scene {
           text: '',
           options: [],
         }),
+        new ConstantVariable({
+          name: 'constant',
+          value: 'slow',
+        }),
         new CustomVariable({
           name: 'Single Custom',
           query: 'A : 10,B : 20',
-          options: [],
         }),
         new CustomVariable({
           name: 'Multi Custom',
           query: 'A : 10,B : 20',
           isMulti: true,
-          options: [],
+        }),
+        new DataSourceVariable({
+          name: 'DataSource',
+          query: 'testdata',
+        }),
+        new DataSourceVariable({
+          name: 'DataSource',
+          query: 'prometheus',
+        }),
+        new DataSourceVariable({
+          name: 'DataSource multi',
+          query: 'prometheus',
+          isMulti: true,
+        }),
+        new DataSourceVariable({
+          name: 'Datasource w/ regex and using $constant',
+          query: 'prometheus',
+          regex: '.*$constant.*',
         }),
       ],
     }),
diff --git a/public/app/features/scenes/variables/interpolation/sceneInterpolator.ts b/public/app/features/scenes/variables/interpolation/sceneInterpolator.ts
index 06466d7d892..8b72af1ef95 100644
--- a/public/app/features/scenes/variables/interpolation/sceneInterpolator.ts
+++ b/public/app/features/scenes/variables/interpolation/sceneInterpolator.ts
@@ -9,7 +9,7 @@ import { VariableValue } from '../types';
 import { getSceneVariableForScopedVar } from './ScopedVarsVariable';
 import { formatRegistry, FormatRegistryID, FormatVariable } from './formatRegistry';
 
-type CustomFormatterFn = (
+export type CustomFormatterFn = (
   value: unknown,
   legacyVariableModel: VariableModel,
   legacyDefaultFormatter: CustomFormatterFn
diff --git a/public/app/features/scenes/variables/variants/CustomVariable.test.ts b/public/app/features/scenes/variables/variants/CustomVariable.test.ts
index f974a281b93..21e39a652b0 100644
--- a/public/app/features/scenes/variables/variants/CustomVariable.test.ts
+++ b/public/app/features/scenes/variables/variants/CustomVariable.test.ts
@@ -21,26 +21,7 @@ describe('CustomVariable', () => {
     });
   });
 
-  describe('When invalid query is provided', () => {
-    it('Should default to empty options', async () => {
-      const variable = new CustomVariable({
-        name: 'test',
-        options: [],
-        value: '',
-        text: '',
-        query: 'A - B',
-      });
-
-      // TODO: Be able to triggger the state update to get the options
-      await lastValueFrom(variable.getValueOptions({}));
-
-      expect(variable.state.value).toEqual('');
-      expect(variable.state.text).toEqual('');
-      expect(variable.state.options).toEqual([]);
-    });
-  });
-
-  describe('When valid query is provided', () => {
+  describe('When query is provided', () => {
     it('Should generate correctly the options for only value queries', async () => {
       const variable = new CustomVariable({
         name: 'test',
diff --git a/public/app/features/scenes/variables/variants/DataSourceVariable.test.ts b/public/app/features/scenes/variables/variants/DataSourceVariable.test.ts
new file mode 100644
index 00000000000..94f6fb6881d
--- /dev/null
+++ b/public/app/features/scenes/variables/variants/DataSourceVariable.test.ts
@@ -0,0 +1,227 @@
+import { lastValueFrom } from 'rxjs';
+
+import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
+import { getMockPlugin } from 'app/features/plugins/__mocks__/pluginMocks';
+
+import { SceneObject } from '../../core/types';
+import { CustomFormatterFn } from '../interpolation/sceneInterpolator';
+
+import { DataSourceVariable } from './DataSourceVariable';
+
+function getDataSource(name: string, type: string, isDefault = false): DataSourceInstanceSettings {
+  return {
+    id: 1,
+    uid: 'c8eceabb-0275-4108-8f03-8f74faf4bf6d',
+    type,
+    name,
+    meta: getMockPlugin({ name, id: type }),
+    jsonData: {},
+    access: 'proxy',
+    readOnly: false,
+    isDefault,
+  };
+}
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => ({
+    getList: () => [
+      getDataSource('prometheus-mocked', 'prometheus'),
+      getDataSource('slow-prometheus-mocked', 'prometheus', true),
+      getDataSource('elastic-mocked', 'elastic'),
+    ],
+  }),
+}));
+
+jest.mock('../../core/sceneGraph', () => {
+  return {
+    ...jest.requireActual('../../core/sceneGraph'),
+    sceneGraph: {
+      interpolate: (
+        sceneObject: SceneObject,
+        value: string | undefined | null,
+        scopedVars?: ScopedVars,
+        format?: string | CustomFormatterFn
+      ) => {
+        return value?.replace('$variable-1', 'slow');
+      },
+    },
+  };
+});
+
+describe('DataSourceVariable', () => {
+  describe('When empty query is provided', () => {
+    it('Should default to empty options and empty value', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: '',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('');
+      expect(variable.state.text).toEqual('');
+      expect(variable.state.options).toEqual([]);
+    });
+  });
+
+  describe('When query is provided', () => {
+    it('Should default to non datasources found options for invalid query', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'non-existant-datasource',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('');
+      expect(variable.state.text).toEqual('');
+      expect(variable.state.options).toEqual([
+        {
+          label: 'No data sources found',
+          value: '',
+        },
+      ]);
+    });
+
+    it('Should default to first item datasource when options available', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'prometheus',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('prometheus-mocked');
+      expect(variable.state.text).toEqual('prometheus-mocked');
+      expect(variable.state.options).toEqual([
+        {
+          label: 'prometheus-mocked',
+          value: 'prometheus-mocked',
+        },
+        {
+          label: 'slow-prometheus-mocked',
+          value: 'slow-prometheus-mocked',
+        },
+        {
+          label: 'default',
+          value: 'default',
+        },
+      ]);
+    });
+
+    it('Should generate correctly the options including only datasources with the queried type', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'prometheus',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('prometheus-mocked');
+      expect(variable.state.text).toEqual('prometheus-mocked');
+      expect(variable.state.options).toEqual([
+        { label: 'prometheus-mocked', value: 'prometheus-mocked' },
+        { label: 'slow-prometheus-mocked', value: 'slow-prometheus-mocked' },
+        { label: 'default', value: 'default' },
+      ]);
+    });
+  });
+
+  describe('When regex is provided', () => {
+    it('Should generate correctly the options including only datasources with matching', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'prometheus',
+        regex: 'slow.*',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('slow-prometheus-mocked');
+      expect(variable.state.text).toEqual('slow-prometheus-mocked');
+      expect(variable.state.options).toEqual([{ label: 'slow-prometheus-mocked', value: 'slow-prometheus-mocked' }]);
+    });
+
+    it('Should generate correctly the options after interpolating variables', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        value: '',
+        text: '',
+        query: 'prometheus',
+        regex: '$variable-1.*',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual('slow-prometheus-mocked');
+      expect(variable.state.text).toEqual('slow-prometheus-mocked');
+      expect(variable.state.options).toEqual([{ label: 'slow-prometheus-mocked', value: 'slow-prometheus-mocked' }]);
+    });
+  });
+
+  describe('When value is provided', () => {
+    it('Should keep current value if current value is valid', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        query: 'prometheus',
+        value: 'slow-prometheus-mocked',
+        text: 'slow-prometheus-mocked',
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toBe('slow-prometheus-mocked');
+      expect(variable.state.text).toBe('slow-prometheus-mocked');
+    });
+
+    it('Should maintain the valid values when multiple selected', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        isMulti: true,
+        query: 'prometheus',
+        value: ['prometheus-mocked', 'slow-prometheus-mocked', 'elastic-mocked'],
+        text: ['prometheus-mocked', 'slow-prometheus-mocked', 'elastic-mocked'],
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual(['prometheus-mocked', 'slow-prometheus-mocked']);
+      expect(variable.state.text).toEqual(['prometheus-mocked', 'slow-prometheus-mocked']);
+    });
+
+    it('Should pick first option if none of the current values are valid', async () => {
+      const variable = new DataSourceVariable({
+        name: 'test',
+        options: [],
+        isMulti: true,
+        query: 'elastic',
+        value: ['prometheus-mocked', 'slow-prometheus-mocked'],
+        text: ['prometheus-mocked', 'slow-prometheus-mocked'],
+      });
+
+      await lastValueFrom(variable.validateAndUpdate());
+
+      expect(variable.state.value).toEqual(['elastic-mocked']);
+      expect(variable.state.text).toEqual(['elastic-mocked']);
+    });
+  });
+});
diff --git a/public/app/features/scenes/variables/variants/DataSourceVariable.tsx b/public/app/features/scenes/variables/variants/DataSourceVariable.tsx
new file mode 100644
index 00000000000..18712274f0c
--- /dev/null
+++ b/public/app/features/scenes/variables/variants/DataSourceVariable.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+import { Observable, of } from 'rxjs';
+
+import { stringToJsRegex, DataSourceInstanceSettings } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+
+import { sceneGraph } from '../../core/sceneGraph';
+import { SceneComponentProps } from '../../core/types';
+import { VariableDependencyConfig } from '../VariableDependencyConfig';
+import { VariableValueSelect } from '../components/VariableValueSelect';
+import { VariableValueOption } from '../types';
+
+import { MultiValueVariable, MultiValueVariableState, VariableGetOptionsArgs } from './MultiValueVariable';
+
+export interface DataSourceVariableState extends MultiValueVariableState {
+  query: string;
+  regex: string;
+}
+
+export class DataSourceVariable extends MultiValueVariable<DataSourceVariableState> {
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    statePaths: ['regex'],
+  });
+
+  public constructor(initialState: Partial<DataSourceVariableState>) {
+    super({
+      value: '',
+      text: '',
+      options: [],
+      name: '',
+      regex: '',
+      query: '',
+      ...initialState,
+    });
+  }
+
+  public getValueOptions(args: VariableGetOptionsArgs): Observable<VariableValueOption[]> {
+    if (!this.state.query) {
+      return of([]);
+    }
+
+    const dataSourceTypes = this.getDataSourceTypes();
+
+    let regex;
+    if (this.state.regex) {
+      const interpolated = sceneGraph.interpolate(this, this.state.regex, undefined, 'regex');
+      regex = stringToJsRegex(interpolated);
+    }
+
+    const options: VariableValueOption[] = [];
+
+    for (let i = 0; i < dataSourceTypes.length; i++) {
+      const source = dataSourceTypes[i];
+      // must match on type
+      if (source.meta.id !== this.state.query) {
+        continue;
+      }
+
+      if (isValid(source, regex)) {
+        options.push({ label: source.name, value: source.name });
+      }
+
+      if (isDefault(source, regex)) {
+        options.push({ label: 'default', value: 'default' });
+      }
+    }
+
+    if (options.length === 0) {
+      options.push({ label: 'No data sources found', value: '' });
+    }
+
+    // TODO: Add support for include All
+    // if (instanceState.includeAll) {
+    //  options.unshift({ label: ALL_VARIABLE_TEXT, value: ALL_VARIABLE_VALUE });
+    //}
+
+    return of(options);
+  }
+
+  private getDataSourceTypes(): DataSourceInstanceSettings[] {
+    return getDataSourceSrv().getList({ metrics: true, variables: false });
+  }
+
+  public static Component = ({ model }: SceneComponentProps<MultiValueVariable>) => {
+    return <VariableValueSelect model={model} />;
+  };
+}
+
+function isValid(source: DataSourceInstanceSettings, regex?: RegExp) {
+  if (!regex) {
+    return true;
+  }
+
+  return regex.exec(source.name);
+}
+
+function isDefault(source: DataSourceInstanceSettings, regex?: RegExp) {
+  if (!source.isDefault) {
+    return false;
+  }
+
+  if (!regex) {
+    return true;
+  }
+
+  return regex.exec('default');
+}

From 8e6d34398171726b6438c5c3eecc78fd05cc8127 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Thu, 24 Nov 2022 15:59:47 +0200
Subject: [PATCH 152/153] Nested Folders: Some API fixes (#59298)

* Nested Folders: Fix API responses

* Fix panic during deletions

* Add test
---
 pkg/api/dtos/folder.go                        |  4 +--
 pkg/api/folder.go                             |  1 +
 pkg/services/folder/folderimpl/folder.go      | 34 ++++++++++++-------
 pkg/services/folder/folderimpl/folder_test.go | 12 +++++--
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/pkg/api/dtos/folder.go b/pkg/api/dtos/folder.go
index 569255951cb..4a5536ac0dd 100644
--- a/pkg/api/dtos/folder.go
+++ b/pkg/api/dtos/folder.go
@@ -20,10 +20,10 @@ type Folder struct {
 	Created       time.Time              `json:"created"`
 	UpdatedBy     string                 `json:"updatedBy"`
 	Updated       time.Time              `json:"updated"`
-	Version       int                    `json:"version"`
+	Version       int                    `json:"version,omitempty"`
 	AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
 	// only used if nested folders are enabled
-	ParentUID string `json:"parentUid"`
+	ParentUID string `json:"parentUid,omitempty"`
 }
 
 type FolderSearchHit struct {
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 6c2c1174366..0c7432da976 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -251,6 +251,7 @@ func (hs *HTTPServer) newToFolderDto(c *models.ReqContext, g guardian.DashboardG
 		Updated:       folder.Updated,
 		Version:       folder.Version,
 		AccessControl: hs.getAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folder.UID),
+		ParentUID:     folder.ParentUID,
 	}
 }
 
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 491e6940cc6..f16aaa1abbc 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -97,15 +97,21 @@ func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.
 	}
 
 	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		if ok, err := s.accessControl.Evaluate(ctx, cmd.SignedInUser, accesscontrol.EvalPermission(
-			dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(*cmd.UID),
-		)); !ok {
+		f, err := s.store.Get(ctx, *cmd)
+
+		if err != nil {
+			return nil, err
+		}
+
+		g := guardian.New(ctx, f.ID, f.OrgID, cmd.SignedInUser)
+		if canView, err := g.CanView(); err != nil || !canView {
 			if err != nil {
 				return nil, toFolderError(err)
 			}
 			return nil, dashboards.ErrFolderAccessDenied
 		}
-		return s.store.Get(ctx, *cmd)
+
+		return f, err
 	}
 
 	switch {
@@ -274,6 +280,7 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 		logger.Error("Could not make user admin", "folder", createdFolder.Title, "user", userID, "error", permissionErr)
 	}
 
+	var nestedFolder *folder.Folder
 	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
 		cmd := &folder.CreateFolderCommand{
 			// TODO: Today, if a UID isn't specified, the dashboard store
@@ -285,7 +292,8 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 			Description: cmd.Description,
 			ParentUID:   cmd.ParentUID,
 		}
-		if err := s.nestedFolderCreate(ctx, cmd); err != nil {
+		nestedFolder, err = s.nestedFolderCreate(ctx, cmd)
+		if err != nil {
 			// We'll log the error and also roll back the previously-created
 			// (legacy) folder.
 			logger.Error("error saving folder to nested folder store", "error", err)
@@ -296,10 +304,13 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 			}
 			return folder.FromDashboard(dash), err
 		}
-		// The folder UID is specified (or generated) during creation, so we'll
-		// stop here and return the created model.Folder.
 	}
-	return folder.FromDashboard(dash), nil
+
+	f := folder.FromDashboard(dash)
+	if nestedFolder != nil && nestedFolder.ParentUID != "" {
+		f.ParentUID = nestedFolder.ParentUID
+	}
+	return f, nil
 }
 
 func (s *Service) Update(ctx context.Context, user *user.SignedInUser, orgID int64, existingUid string, cmd *models.UpdateFolderCommand) (*folder.Folder, error) {
@@ -494,14 +505,13 @@ func (s *Service) MakeUserAdmin(ctx context.Context, orgID int64, userID, folder
 	return s.dashboardService.MakeUserAdmin(ctx, orgID, userID, folderID, setViewAndEditPermissions)
 }
 
-func (s *Service) nestedFolderCreate(ctx context.Context, cmd *folder.CreateFolderCommand) error {
+func (s *Service) nestedFolderCreate(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
 	if cmd.ParentUID != "" {
 		if err := s.validateParent(ctx, cmd.OrgID, cmd.ParentUID); err != nil {
-			return err
+			return nil, err
 		}
 	}
-	_, err := s.store.Create(ctx, *cmd)
-	return err
+	return s.store.Create(ctx, *cmd)
 }
 
 func (s *Service) validateParent(ctx context.Context, orgID int64, parentUID string) error {
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index fc2785e8847..bfe18a5f2d0 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -333,10 +333,11 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 		log:              log.New("test-folder-service"),
 	}
 	t.Run("create folder", func(t *testing.T) {
-		folderStore.ExpectedFolder = &folder.Folder{}
+		folderStore.ExpectedFolder = &folder.Folder{ParentUID: util.GenerateShortUID()}
 		res, err := folderService.Create(context.Background(), &folder.CreateFolderCommand{SignedInUser: usr})
 		require.NoError(t, err)
 		require.NotNil(t, res.UID)
+		require.NotEmpty(t, res.ParentUID)
 	})
 
 	t.Run("get parents folder", func(t *testing.T) {
@@ -497,6 +498,13 @@ func TestNestedFolderService(t *testing.T) {
 		})
 
 		t.Run("move, no error", func(t *testing.T) {
+			// This test creates and deletes the dashboard, so needs some extra setup.
+			g := guardian.New
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
+			t.Cleanup(func() {
+				guardian.New = g
+			})
+
 			store.ExpectedError = nil
 			store.ExpectedFolder = &folder.Folder{UID: "myFolder", ParentUID: "newFolder"}
 			f, err := foldersvc.Move(context.Background(), &folder.MoveFolderCommand{UID: "myFolder", NewParentUID: "newFolder", OrgID: orgID, SignedInUser: usr})
@@ -512,7 +520,7 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore.On("GetFolderByUID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).Return(&models.Folder{}, nil)
 
 			g := guardian.New
-			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
 
 			err := foldersvc.DeleteFolder(context.Background(), &folder.DeleteFolderCommand{UID: "myFolder", OrgID: orgID, SignedInUser: usr})
 			require.NoError(t, err)

From e84a01e8701920cbe68857f6378a35f876188b80 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 24 Nov 2022 14:00:41 +0000
Subject: [PATCH 153/153] Update jest monorepo to v29 (#58261)

* Update jest monorepo to v29

* update snapshots + wrap test in act

* fix linting errors: jest.mocked now defaults to deep mocking

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 jest.config.js                                |     3 +-
 package.json                                  |    12 +-
 packages/grafana-data/package.json            |     2 +-
 .../src/dataframe/ArrayDataFrame.test.ts      |    28 +-
 .../src/dataframe/DataFrameJSON.test.ts       |    56 +-
 .../src/dataframe/processDataFrame.test.ts    |    10 +-
 .../src/field/fieldOverrides.test.ts          |    44 +-
 .../transformers/calculateField.test.ts       |    12 +-
 .../transformers/concat.test.ts               |    54 +-
 .../transformers/ensureColumns.test.ts        |    56 +-
 .../transformers/groupingToMatrix.test.ts     |    22 +-
 .../transformers/histogram.test.ts            |    52 +-
 .../transformers/joinByField.test.ts          |  1344 +-
 .../transformers/joinDataFrames.test.ts       |   108 +-
 .../transformers/labelsToFields.test.ts       |   108 +-
 .../transformers/reduce.test.ts               |    30 +-
 .../transformers/renameByRegex.test.ts        |    72 +-
 .../transformers/sortBy.test.ts               |     8 +-
 .../src/utils/__snapshots__/csv.test.ts.snap  |    72 +-
 packages/grafana-data/src/utils/csv.test.ts   |     6 +-
 packages/grafana-runtime/package.json         |     2 +-
 .../src/utils/DataSourceWithBackend.test.ts   |    32 +-
 .../src/utils/queryResponse.test.ts           |    88 +-
 packages/grafana-ui/package.json              |     2 +-
 .../CustomScrollbar.test.tsx.snap             |    12 +-
 .../GraphNG/__snapshots__/utils.test.ts.snap  |    82 +-
 .../src/components/GraphNG/utils.test.ts      |    86 +-
 .../SingleStatBaseOptions.test.ts             |    34 +-
 .../uPlot/config/UPlotConfigBuilder.test.ts   |   256 +-
 .../src/components/uPlot/utils.test.ts        |   234 +-
 packages/jaeger-ui-components/package.json    |     2 +-
 .../ListView/__snapshots__/index.test.js.snap |    16 +-
 .../ddg/__snapshots__/PathElem.test.ts.snap   |    16 +-
 public/app/core/utils/timeRegions.test.ts     |    10 +-
 .../PanelAlertTabContent.test.tsx.snap        |    68 +-
 .../__snapshots__/reducer.test.tsx.snap       |   222 +-
 .../__snapshots__/StateHistory.test.tsx.snap  |    28 +-
 .../__snapshots__/rule-form.test.ts.snap      |    26 +-
 .../HelpWizard/SupportSnapshotService.test.ts |    28 +-
 .../PanelEditor/state/selectors.test.ts       |     6 +-
 .../dashboard/state/DashboardMigrator.test.ts |    58 +-
 .../dashboard/state/DashboardModel.test.ts    |     2 +-
 .../state/getPanelOptionsWithDefaults.test.ts |    64 +-
 .../dashboard/utils/getPanelMenu.test.ts      |    52 +-
 .../dashboard/utils/panelMerge.test.ts        |    24 +-
 public/app/features/dimensions/scale.test.ts  |     4 +-
 .../app/features/geo/format/geojson.test.ts   |    34 +-
 .../features/geo/gazetteer/gazetteer.test.ts  |     6 +-
 .../features/geo/gazetteer/worldmap.test.ts   |     2 +-
 .../app/features/geo/utils/location.test.ts   |    34 +-
 .../live/data/StreamingDataFrame.test.ts      |   190 +-
 .../components/SnapshotListTable.test.tsx     |     6 +-
 .../panel/panellinks/linkSuppliers.test.ts    |    18 +-
 .../plugins/tests/datasource_srv.test.ts      |    34 +-
 .../features/query/state/runRequest.test.ts   |     6 +-
 .../query/state/updateQueries.test.ts         |    20 +-
 .../features/search/service/frontend.test.ts  |     6 +-
 .../calculateHeatmap/heatmap.test.ts          |    40 +-
 .../configFromQuery/configFromQuery.test.ts   |    12 +-
 .../extractFields/extractFields.test.ts       |     2 +-
 .../extractFields/fieldExtractor.test.ts      |    18 +-
 .../joinByLabels/joinByLabels.test.ts         |    32 +-
 .../lookupGazetteer/fieldLookup.test.ts       |    40 +-
 .../prepareTimeSeries.test.ts                 |    34 +-
 .../rowsToFields/rowsToFields.test.ts         |    20 +-
 .../__mocks__/cloudMonitoringDatasource.ts    |     2 +-
 .../dashboard/runSharedRequest.test.ts        |     8 +-
 .../__mocks__/datasource.ts                   |     2 +-
 .../__mocks__/panelData.ts                    |     2 +-
 .../azure_monitor_datasource.test.ts          |     8 +-
 .../plugins/datasource/graphite/meta.test.ts  |    10 +-
 .../LokiQueryBuilderContainer.test.tsx        |     6 +-
 .../barchart/__snapshots__/utils.test.ts.snap |   448 +-
 .../app/plugins/panel/barchart/utils.test.ts  |    16 +-
 .../panel/bargauge/BarGaugeMigrations.test.ts |    26 +-
 .../plugins/panel/candlestick/fields.test.ts  |     8 +-
 .../__snapshots__/FlameGraph.test.tsx.snap    | 16694 ++++++++--------
 .../panel/gauge/GaugeMigrations.test.ts       |    24 +-
 .../GaugeMigrations.test.ts.snap              |     6 +-
 .../plugins/panel/geomap/migrations.test.ts   |    54 +-
 .../plugins/panel/geomap/style/utils.test.ts  |     6 +-
 .../panel/geomap/utils/getFeatures.test.ts    |     6 +-
 .../__snapshots__/data_processor.test.ts.snap |   118 +-
 .../plugins/panel/heatmap/migrations.test.ts  |    34 +-
 .../__snapshots__/migrations.test.ts.snap     |    44 +-
 .../panel/state-timeline/utils.test.ts        |     2 +-
 .../__snapshots__/migrations.test.ts.snap     |   154 +-
 .../__snapshots__/migrations.test.ts.snap     |   378 +-
 .../panel/timeseries/migrations.test.ts       |    22 +-
 .../plugins/panel/timeseries/utils.test.ts    |     8 +-
 yarn.lock                                     |  1058 +-
 91 files changed, 11654 insertions(+), 11597 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 9d0047b98e3..f9e545b4886 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -7,7 +7,7 @@ module.exports = {
   verbose: false,
   testEnvironment: 'jsdom',
   transform: {
-    '^.+\\.(ts|tsx|js|jsx)$': require.resolve('ts-jest'),
+    '^.+\\.(ts|tsx|js|jsx)$': [require.resolve('ts-jest'), { isolatedModules: true }],
   },
   transformIgnorePatterns: [
     'node_modules/(?!(ol)/)', // <- exclude the open layers library
@@ -22,7 +22,6 @@ module.exports = {
   setupFilesAfterEnv: ['./public/test/setupTests.ts'],
   snapshotSerializers: ['enzyme-to-json/serializer'],
   globals: {
-    'ts-jest': { isolatedModules: true },
     __webpack_public_path__: '', // empty string
   },
   moduleNameMapper: {
diff --git a/package.json b/package.json
index fb0faba2452..98fbcb97bea 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "@types/gtag.js": "^0.0.12",
     "@types/history": "4.7.11",
     "@types/hoist-non-react-statics": "3.3.1",
-    "@types/jest": "28.1.6",
+    "@types/jest": "29.2.3",
     "@types/jquery": "3.5.14",
     "@types/js-yaml": "^4.0.5",
     "@types/jsurl": "^1.2.28",
@@ -165,7 +165,7 @@
     "@typescript-eslint/parser": "5.42.0",
     "@wojtekmaj/enzyme-adapter-react-17": "0.7.0",
     "autoprefixer": "10.4.13",
-    "babel-jest": "28.1.3",
+    "babel-jest": "29.3.1",
     "babel-loader": "9.1.0",
     "babel-plugin-angularjs-annotate": "0.10.0",
     "babel-plugin-macros": "3.1.0",
@@ -195,13 +195,13 @@
     "http-server": "14.1.1",
     "husky": "8.0.1",
     "i18next-parser": "6.6.0",
-    "jest": "28.1.3",
+    "jest": "29.3.1",
     "jest-canvas-mock": "2.4.0",
     "jest-date-mock": "1.0.8",
-    "jest-environment-jsdom": "28.1.3",
+    "jest-environment-jsdom": "29.3.1",
     "jest-fail-on-console": "3.0.2",
     "jest-junit": "14.0.1",
-    "jest-matcher-utils": "28.1.3",
+    "jest-matcher-utils": "29.3.1",
     "lerna": "5.5.4",
     "lint-staged": "13.0.3",
     "mini-css-extract-plugin": "2.6.1",
@@ -230,7 +230,7 @@
     "stylelint-config-sass-guidelines": "9.0.1",
     "terser-webpack-plugin": "5.3.6",
     "testing-library-selector": "0.2.1",
-    "ts-jest": "28.0.7",
+    "ts-jest": "29.0.3",
     "ts-loader": "9.3.1",
     "ts-node": "10.9.1",
     "typescript": "4.8.4",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 863a05c0335..537beb5f0af 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -66,7 +66,7 @@
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
     "@types/history": "4.7.11",
-    "@types/jest": "28.1.6",
+    "@types/jest": "29.2.3",
     "@types/jquery": "3.5.14",
     "@types/lodash": "4.14.187",
     "@types/marked": "4.0.7",
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
index 20001cb4913..c0980c39481 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
@@ -40,14 +40,14 @@ describe('Array DataFrame', () => {
 
   test('Should convert an array of objects to a dataframe', () => {
     expect(toDataFrameDTO(frame)).toMatchInlineSnapshot(`
-      Object {
-        "fields": Array [
-          Object {
-            "config": Object {},
+      {
+        "fields": [
+          {
+            "config": {},
             "labels": undefined,
             "name": "name",
             "type": "string",
-            "values": Array [
+            "values": [
               "first",
               "second",
               "third",
@@ -55,14 +55,14 @@ describe('Array DataFrame', () => {
               "5th (Null)",
             ],
           },
-          Object {
-            "config": Object {
+          {
+            "config": {
               "unit": "kwh",
             },
             "labels": undefined,
             "name": "value",
             "type": "number",
-            "values": Array [
+            "values": [
               1,
               2,
               3,
@@ -70,12 +70,12 @@ describe('Array DataFrame', () => {
               null,
             ],
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "labels": undefined,
             "name": "time",
             "type": "time",
-            "values": Array [
+            "values": [
               123,
               456,
               789,
@@ -83,12 +83,12 @@ describe('Array DataFrame', () => {
               1100,
             ],
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "labels": undefined,
             "name": "phantom",
             "type": "string",
-            "values": Array [
+            "values": [
               "🦥",
               "🦥",
               "🦥",
diff --git a/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts b/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
index 8a32d377c4e..6cd11677ba0 100644
--- a/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
@@ -29,50 +29,50 @@ describe('DataFrame JSON', () => {
 
       const frame = dataFrameFromJSON(json);
       expect(frame).toMatchInlineSnapshot(`
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
-              "entities": Object {},
+        {
+          "fields": [
+            {
+              "config": {},
+              "entities": {},
               "name": "time",
               "type": "time",
-              "values": Array [
+              "values": [
                 100,
                 200,
                 300,
               ],
             },
-            Object {
-              "config": Object {},
-              "entities": Object {
-                "Inf": Array [
+            {
+              "config": {},
+              "entities": {
+                "Inf": [
                   1,
                 ],
-                "NaN": Array [
+                "NaN": [
                   0,
                 ],
-                "Undef": Array [
+                "Undef": [
                   2,
                 ],
               },
               "name": "name",
               "type": "string",
-              "values": Array [
+              "values": [
                 NaN,
                 Infinity,
                 undefined,
               ],
             },
-            Object {
-              "config": Object {},
-              "entities": Object {
-                "NegInf": Array [
+            {
+              "config": {},
+              "entities": {
+                "NegInf": [
                   2,
                 ],
               },
               "name": "value",
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 2,
                 -Infinity,
@@ -106,26 +106,26 @@ describe('DataFrame JSON', () => {
 
       const frame = dataFrameFromJSON(json);
       expect(frame).toMatchInlineSnapshot(`
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
-              "entities": Object {},
+        {
+          "fields": [
+            {
+              "config": {},
+              "entities": {},
               "name": "time",
               "type": "time",
-              "values": Array [
+              "values": [
                 100,
                 200,
                 300,
                 400,
               ],
             },
-            Object {
-              "config": Object {},
-              "entities": Object {},
+            {
+              "config": {},
+              "entities": {},
               "name": "value",
               "type": "string",
-              "values": Array [
+              "values": [
                 "bar",
                 "foo",
                 "baz",
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
index 0683697263e..ad08566a507 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
@@ -199,16 +199,16 @@ describe('toDataFrame', () => {
     };
     const dataFrame = toDataFrame(msg);
     expect(dataFrame.fields.map((f) => ({ [f.name]: f.values.toArray() }))).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "First": Array [
+      [
+        {
+          "First": [
             "2019-02-15",
             "2019-03-15",
             "2019-04-15",
           ],
         },
-        Object {
-          "Second": Array [
+        {
+          "Second": [
             3,
             9,
             16,
diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index 7b5d8ee5cd7..07a69a8bd58 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -186,29 +186,29 @@ describe('applyFieldOverrides', () => {
       });
 
       expect(withOverrides[0].fields[0].state!.scopedVars).toMatchInlineSnapshot(`
-                                                                                 Object {
-                                                                                   "__field": Object {
-                                                                                     "text": "Field",
-                                                                                     "value": Object {},
-                                                                                   },
-                                                                                   "__series": Object {
-                                                                                     "text": "Series",
-                                                                                     "value": Object {
-                                                                                       "name": "A",
-                                                                                     },
-                                                                                   },
-                                                                                 }
-                                                                                 `);
+        {
+          "__field": {
+            "text": "Field",
+            "value": {},
+          },
+          "__series": {
+            "text": "Series",
+            "value": {
+              "name": "A",
+            },
+          },
+        }
+      `);
 
       expect(withOverrides[1].fields[0].state!.scopedVars).toMatchInlineSnapshot(`
-        Object {
-          "__field": Object {
+        {
+          "__field": {
             "text": "Field",
-            "value": Object {},
+            "value": {},
           },
-          "__series": Object {
+          "__series": {
             "text": "Series",
-            "value": Object {
+            "value": {
               "name": "B",
             },
           },
@@ -384,8 +384,8 @@ describe('setFieldConfigDefaults', () => {
     setFieldConfigDefaults(dsFieldConfig, panelFieldConfig, context);
 
     expect(dsFieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "custom": Object {},
+      {
+        "custom": {},
         "decimals": 2,
         "max": 100,
         "min": 0,
@@ -419,8 +419,8 @@ describe('setFieldConfigDefaults', () => {
     setFieldConfigDefaults(dsFieldConfig, panelFieldConfig, context);
 
     expect(dsFieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "custom": Object {
+      {
+        "custom": {
           "property1": 10,
           "property2": 10,
         },
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts b/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
index 0ebf4030b33..aba72a8585d 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
@@ -208,12 +208,12 @@ describe('calculateField transformer w/ timeseries', () => {
       const filtered = data[0];
       const rows = new DataFrameView(filtered).toArray();
       expect(rows).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "E * 1": 1,
             "TheTime": 1000,
           },
-          Object {
+          {
             "E * 1": 0,
             "TheTime": 2000,
           },
@@ -267,12 +267,12 @@ describe('calculateField transformer w/ timeseries', () => {
       const filtered = data[0];
       const rows = new DataFrameView(filtered).toArray();
       expect(rows).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "Test": 6,
             "TheTime": 1000,
           },
-          Object {
+          {
             "Test": 105,
             "TheTime": 2000,
           },
diff --git a/packages/grafana-data/src/transformations/transformers/concat.test.ts b/packages/grafana-data/src/transformations/transformers/concat.test.ts
index 20d5b9ebaa9..20a79781929 100644
--- a/packages/grafana-data/src/transformations/transformers/concat.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/concat.test.ts
@@ -25,28 +25,28 @@ describe('Concat Transformer', () => {
     const frame = concatenateFields([simpleABC, simpleXYZ], { frameNameMode: ConcatenateFrameNameMode.Drop });
     expect(frame.length).toBe(3);
     expect(frame.fields.map((f) => ({ name: f.name, labels: f.labels }))).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "labels": undefined,
           "name": "A",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "B",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "C",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "X",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "Y",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "Z",
         },
@@ -58,28 +58,28 @@ describe('Concat Transformer', () => {
     const frame = concatenateFields([simpleABC, simpleXYZ], { frameNameMode: ConcatenateFrameNameMode.FieldName });
     expect(frame.length).toBe(3);
     expect(frame.fields.map((f) => ({ name: f.name, labels: f.labels }))).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "labels": undefined,
           "name": "ABC · A",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "ABC · B",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "ABC · C",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "XYZ · X",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "XYZ · Y",
         },
-        Object {
+        {
           "labels": undefined,
           "name": "XYZ · Z",
         },
@@ -94,39 +94,39 @@ describe('Concat Transformer', () => {
     });
     expect(frame.length).toBe(3);
     expect(frame.fields.map((f) => ({ name: f.name, labels: f.labels }))).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "labels": Object {
+      [
+        {
+          "labels": {
             "sensor": "ABC",
           },
           "name": "A",
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "ABC",
           },
           "name": "B",
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "ABC",
           },
           "name": "C",
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "XYZ",
           },
           "name": "X",
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "XYZ",
           },
           "name": "Y",
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "XYZ",
           },
           "name": "Z",
diff --git a/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts b/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts
index b67bb998870..ae2b231b680 100644
--- a/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts
@@ -51,66 +51,66 @@ describe('ensureColumns transformer', () => {
       const frame = filtered[0];
       expect(frame.fields.length).toEqual(5);
       expect(filtered[0]).toMatchInlineSnapshot(`
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
+        {
+          "fields": [
+            {
+              "config": {},
               "name": "TheTime",
-              "state": Object {},
+              "state": {},
               "type": "time",
-              "values": Array [
+              "values": [
                 1000,
                 2000,
               ],
             },
-            Object {
-              "config": Object {},
-              "labels": Object {},
+            {
+              "config": {},
+              "labels": {},
               "name": "A",
-              "state": Object {},
+              "state": {},
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 100,
               ],
             },
-            Object {
-              "config": Object {},
-              "labels": Object {},
+            {
+              "config": {},
+              "labels": {},
               "name": "B",
-              "state": Object {},
+              "state": {},
               "type": "number",
-              "values": Array [
+              "values": [
                 2,
                 200,
               ],
             },
-            Object {
-              "config": Object {},
-              "labels": Object {},
+            {
+              "config": {},
+              "labels": {},
               "name": "C",
-              "state": Object {},
+              "state": {},
               "type": "number",
-              "values": Array [
+              "values": [
                 3,
                 300,
               ],
             },
-            Object {
-              "config": Object {},
-              "labels": Object {},
+            {
+              "config": {},
+              "labels": {},
               "name": "D",
-              "state": Object {},
+              "state": {},
               "type": "string",
-              "values": Array [
+              "values": [
                 "first",
                 "second",
               ],
             },
           ],
           "length": 2,
-          "meta": Object {
-            "transformations": Array [
+          "meta": {
+            "transformations": [
               "ensureColumns",
             ],
           },
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts
index d8c458840ce..b8b10dae669 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts
@@ -128,34 +128,34 @@ describe('Grouping to Matrix', () => {
       const processed = received[0];
 
       expect(processed[0].fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "Row\\\\Column",
+        [
+          {
+            "config": {},
+            "name": "Row\\Column",
             "type": "string",
-            "values": Array [
+            "values": [
               "R1",
               "R2",
             ],
           },
-          Object {
-            "config": Object {
+          {
+            "config": {
               "units": "celsius",
             },
             "name": "C1",
             "type": "number",
-            "values": Array [
+            "values": [
               1,
               4,
             ],
           },
-          Object {
-            "config": Object {
+          {
+            "config": {
               "units": "celsius",
             },
             "name": "C2",
             "type": "number",
-            "values": Array [
+            "values": [
               5,
               "",
             ],
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.test.ts b/packages/grafana-data/src/transformations/transformers/histogram.test.ts
index a2f0b1952a2..98e127ee2f1 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.test.ts
@@ -30,13 +30,13 @@ describe('histogram frames frames', () => {
         config: f.config,
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "config": Object {
+      [
+        {
+          "config": {
             "unit": "mph",
           },
           "name": "BucketMin",
-          "values": Array [
+          "values": [
             1,
             2,
             3,
@@ -48,12 +48,12 @@ describe('histogram frames frames', () => {
             9,
           ],
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": "mph",
           },
           "name": "BucketMax",
-          "values": Array [
+          "values": [
             2,
             3,
             4,
@@ -65,12 +65,12 @@ describe('histogram frames frames', () => {
             10,
           ],
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": undefined,
           },
           "name": "A",
-          "values": Array [
+          "values": [
             1,
             1,
             1,
@@ -82,12 +82,12 @@ describe('histogram frames frames', () => {
             0,
           ],
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": undefined,
           },
           "name": "B",
-          "values": Array [
+          "values": [
             0,
             0,
             1,
@@ -99,12 +99,12 @@ describe('histogram frames frames', () => {
             0,
           ],
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": undefined,
           },
           "name": "C",
-          "values": Array [
+          "values": [
             0,
             0,
             0,
@@ -116,12 +116,12 @@ describe('histogram frames frames', () => {
             1,
           ],
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": undefined,
           },
           "name": "C",
-          "values": Array [
+          "values": [
             0,
             0,
             0,
@@ -143,10 +143,10 @@ describe('histogram frames frames', () => {
         values: f.values.toArray(),
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "name": "BucketMin",
-          "values": Array [
+          "values": [
             1,
             2,
             3,
@@ -158,9 +158,9 @@ describe('histogram frames frames', () => {
             9,
           ],
         },
-        Object {
+        {
           "name": "BucketMax",
-          "values": Array [
+          "values": [
             2,
             3,
             4,
@@ -172,9 +172,9 @@ describe('histogram frames frames', () => {
             10,
           ],
         },
-        Object {
+        {
           "name": "Count",
-          "values": Array [
+          "values": [
             1,
             1,
             2,
diff --git a/packages/grafana-data/src/transformations/transformers/joinByField.test.ts b/packages/grafana-data/src/transformations/transformers/joinByField.test.ts
index 95f330b4331..1a1026017b3 100644
--- a/packages/grafana-data/src/transformations/transformers/joinByField.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinByField.test.ts
@@ -44,91 +44,91 @@ describe('JOIN Transformer', () => {
           const data = received[0];
           const filtered = data[0];
           expect(filtered.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {},
-              "name": "time",
-              "state": Object {},
-              "type": "time",
-              "values": Array [
-                1000,
-                3000,
-                4000,
-                5000,
-                6000,
-                7000,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "even",
+            [
+              {
+                "config": {},
+                "name": "time",
+                "state": {},
+                "type": "time",
+                "values": [
+                  1000,
+                  3000,
+                  4000,
+                  5000,
+                  6000,
+                  7000,
+                ],
               },
-              "name": "temperature",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                undefined,
-                10.3,
-                10.4,
-                10.5,
-                10.6,
-                undefined,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "even",
+              {
+                "config": {},
+                "labels": {
+                  "name": "even",
+                },
+                "name": "temperature",
+                "state": {},
+                "type": "number",
+                "values": [
+                  undefined,
+                  10.3,
+                  10.4,
+                  10.5,
+                  10.6,
+                  undefined,
+                ],
               },
-              "name": "humidity",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                undefined,
-                10000.3,
-                10000.4,
-                10000.5,
-                10000.6,
-                undefined,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "odd",
+              {
+                "config": {},
+                "labels": {
+                  "name": "even",
+                },
+                "name": "humidity",
+                "state": {},
+                "type": "number",
+                "values": [
+                  undefined,
+                  10000.3,
+                  10000.4,
+                  10000.5,
+                  10000.6,
+                  undefined,
+                ],
               },
-              "name": "temperature",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                11.1,
-                11.3,
-                undefined,
-                11.5,
-                undefined,
-                11.7,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "odd",
+              {
+                "config": {},
+                "labels": {
+                  "name": "odd",
+                },
+                "name": "temperature",
+                "state": {},
+                "type": "number",
+                "values": [
+                  11.1,
+                  11.3,
+                  undefined,
+                  11.5,
+                  undefined,
+                  11.7,
+                ],
               },
-              "name": "humidity",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                11000.1,
-                11000.3,
-                undefined,
-                11000.5,
-                undefined,
-                11000.7,
-              ],
-            },
-          ]
-        `);
+              {
+                "config": {},
+                "labels": {
+                  "name": "odd",
+                },
+                "name": "humidity",
+                "state": {},
+                "type": "number",
+                "values": [
+                  11000.1,
+                  11000.3,
+                  undefined,
+                  11000.5,
+                  undefined,
+                  11000.7,
+                ],
+              },
+            ]
+          `);
         }
       );
     });
@@ -146,105 +146,105 @@ describe('JOIN Transformer', () => {
           const data = received[0];
           const filtered = data[0];
           expect(filtered.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {},
-              "name": "temperature",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                10.3,
-                10.4,
-                10.5,
-                10.6,
-                11.1,
-                11.3,
-                11.5,
-                11.7,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "even",
+            [
+              {
+                "config": {},
+                "name": "temperature",
+                "state": {},
+                "type": "number",
+                "values": [
+                  10.3,
+                  10.4,
+                  10.5,
+                  10.6,
+                  11.1,
+                  11.3,
+                  11.5,
+                  11.7,
+                ],
               },
-              "name": "time",
-              "state": Object {
-                "multipleFrames": true,
+              {
+                "config": {},
+                "labels": {
+                  "name": "even",
+                },
+                "name": "time",
+                "state": {
+                  "multipleFrames": true,
+                },
+                "type": "time",
+                "values": [
+                  3000,
+                  4000,
+                  5000,
+                  6000,
+                  undefined,
+                  undefined,
+                  undefined,
+                  undefined,
+                ],
               },
-              "type": "time",
-              "values": Array [
-                3000,
-                4000,
-                5000,
-                6000,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "even",
+              {
+                "config": {},
+                "labels": {
+                  "name": "even",
+                },
+                "name": "humidity",
+                "state": {},
+                "type": "number",
+                "values": [
+                  10000.3,
+                  10000.4,
+                  10000.5,
+                  10000.6,
+                  undefined,
+                  undefined,
+                  undefined,
+                  undefined,
+                ],
               },
-              "name": "humidity",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                10000.3,
-                10000.4,
-                10000.5,
-                10000.6,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "odd",
+              {
+                "config": {},
+                "labels": {
+                  "name": "odd",
+                },
+                "name": "time",
+                "state": {
+                  "multipleFrames": true,
+                },
+                "type": "time",
+                "values": [
+                  undefined,
+                  undefined,
+                  undefined,
+                  undefined,
+                  1000,
+                  3000,
+                  5000,
+                  7000,
+                ],
               },
-              "name": "time",
-              "state": Object {
-                "multipleFrames": true,
+              {
+                "config": {},
+                "labels": {
+                  "name": "odd",
+                },
+                "name": "humidity",
+                "state": {},
+                "type": "number",
+                "values": [
+                  undefined,
+                  undefined,
+                  undefined,
+                  undefined,
+                  11000.1,
+                  11000.3,
+                  11000.5,
+                  11000.7,
+                ],
               },
-              "type": "time",
-              "values": Array [
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                1000,
-                3000,
-                5000,
-                7000,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "odd",
-              },
-              "name": "humidity",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                11000.1,
-                11000.3,
-                11000.5,
-                11000.7,
-              ],
-            },
-          ]
-        `);
+            ]
+          `);
         }
       );
     });
@@ -266,93 +266,93 @@ describe('JOIN Transformer', () => {
           const data = received[0];
           const filtered = data[0];
           expect(filtered.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {},
-              "name": "time",
-              "state": Object {
-                "multipleFrames": true,
+            [
+              {
+                "config": {},
+                "name": "time",
+                "state": {
+                  "multipleFrames": true,
+                },
+                "type": "time",
+                "values": [
+                  1000,
+                  3000,
+                  4000,
+                  5000,
+                  6000,
+                  7000,
+                ],
               },
-              "type": "time",
-              "values": Array [
-                1000,
-                3000,
-                4000,
-                5000,
-                6000,
-                7000,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "even",
+              {
+                "config": {},
+                "labels": {
+                  "name": "even",
+                },
+                "name": "temperature",
+                "state": {},
+                "type": "number",
+                "values": [
+                  undefined,
+                  10.3,
+                  10.4,
+                  10.5,
+                  10.6,
+                  undefined,
+                ],
               },
-              "name": "temperature",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                undefined,
-                10.3,
-                10.4,
-                10.5,
-                10.6,
-                undefined,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "even",
+              {
+                "config": {},
+                "labels": {
+                  "name": "even",
+                },
+                "name": "humidity",
+                "state": {},
+                "type": "number",
+                "values": [
+                  undefined,
+                  10000.3,
+                  10000.4,
+                  10000.5,
+                  10000.6,
+                  undefined,
+                ],
               },
-              "name": "humidity",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                undefined,
-                10000.3,
-                10000.4,
-                10000.5,
-                10000.6,
-                undefined,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "odd",
+              {
+                "config": {},
+                "labels": {
+                  "name": "odd",
+                },
+                "name": "temperature",
+                "state": {},
+                "type": "number",
+                "values": [
+                  11.1,
+                  11.3,
+                  undefined,
+                  11.5,
+                  undefined,
+                  11.7,
+                ],
               },
-              "name": "temperature",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                11.1,
-                11.3,
-                undefined,
-                11.5,
-                undefined,
-                11.7,
-              ],
-            },
-            Object {
-              "config": Object {},
-              "labels": Object {
-                "name": "odd",
+              {
+                "config": {},
+                "labels": {
+                  "name": "odd",
+                },
+                "name": "humidity",
+                "state": {},
+                "type": "number",
+                "values": [
+                  11000.1,
+                  11000.3,
+                  undefined,
+                  11000.5,
+                  undefined,
+                  11000.7,
+                ],
               },
-              "name": "humidity",
-              "state": Object {},
-              "type": "number",
-              "values": Array [
-                11000.1,
-                11000.3,
-                undefined,
-                11000.5,
-                undefined,
-                11000.7,
-              ],
-            },
-          ]
-        `);
+            ]
+          `);
         }
       );
     });
@@ -387,51 +387,51 @@ describe('JOIN Transformer', () => {
             const data = received[0];
             const filtered = data[0];
             expect(filtered.fields).toMatchInlineSnapshot(`
-            Array [
-              Object {
-                "config": Object {},
-                "name": "time",
-                "state": Object {},
-                "type": "time",
-                "values": Array [
-                  1000,
-                  2000,
-                  3000,
-                  4000,
-                ],
-              },
-              Object {
-                "config": Object {},
-                "labels": Object {
+              [
+                {
+                  "config": {},
+                  "name": "time",
+                  "state": {},
+                  "type": "time",
+                  "values": [
+                    1000,
+                    2000,
+                    3000,
+                    4000,
+                  ],
+                },
+                {
+                  "config": {},
+                  "labels": {
+                    "name": "temperature",
+                  },
                   "name": "temperature",
+                  "state": {},
+                  "type": "number",
+                  "values": [
+                    1,
+                    3,
+                    5,
+                    7,
+                  ],
                 },
-                "name": "temperature",
-                "state": Object {},
-                "type": "number",
-                "values": Array [
-                  1,
-                  3,
-                  5,
-                  7,
-                ],
-              },
-              Object {
-                "config": Object {},
-                "labels": Object {
-                  "name": "B",
+                {
+                  "config": {},
+                  "labels": {
+                    "name": "B",
+                  },
+                  "name": "temperature",
+                  "state": {},
+                  "type": "number",
+                  "values": [
+                    2,
+                    4,
+                    6,
+                    8,
+                  ],
                 },
-                "name": "temperature",
-                "state": Object {},
-                "type": "number",
-                "values": Array [
-                  2,
-                  4,
-                  6,
-                  8,
-                ],
-              },
-            ]
-          `);
+              ]
+            `);
           }
         );
       });
@@ -470,48 +470,48 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "time",
-            "state": Object {},
-            "type": "time",
-            "values": Array [
-              1,
-              2,
-              3,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+          [
+            {
+              "config": {},
+              "name": "time",
+              "state": {},
+              "type": "time",
+              "values": [
+                1,
+                2,
+                3,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10,
-              11,
-              12,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "C",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10,
+                11,
+                12,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              20,
-              22,
-              24,
-            ],
-          },
-        ]
-      `);
+            {
+              "config": {},
+              "labels": {
+                "name": "C",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                20,
+                22,
+                24,
+              ],
+            },
+          ]
+        `);
       });
     });
 
@@ -541,38 +541,38 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "time",
-            "state": Object {},
-            "type": "time",
-            "values": Array [
-              1,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {},
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {},
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              20,
-            ],
-          },
-        ]
-      `);
+          [
+            {
+              "config": {},
+              "name": "time",
+              "state": {},
+              "type": "time",
+              "values": [
+                1,
+              ],
+            },
+            {
+              "config": {},
+              "labels": {},
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10,
+              ],
+            },
+            {
+              "config": {},
+              "labels": {},
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                20,
+              ],
+            },
+          ]
+        `);
       });
     });
   });
@@ -609,71 +609,71 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "time",
-            "state": Object {},
-            "type": "time",
-            "values": Array [
-              3000,
-              5000,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+          [
+            {
+              "config": {},
+              "name": "time",
+              "state": {},
+              "type": "time",
+              "values": [
+                3000,
+                5000,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10.3,
-              10.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10.3,
+                10.5,
+              ],
             },
-            "name": "humidity",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10000.3,
-              10000.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "B",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "humidity",
+              "state": {},
+              "type": "number",
+              "values": [
+                10000.3,
+                10000.5,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10.3,
-              10.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "B",
+            {
+              "config": {},
+              "labels": {
+                "name": "B",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10.3,
+                10.5,
+              ],
             },
-            "name": "humidity",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10000.3,
-              10000.5,
-            ],
-          },
-        ]
-      `);
+            {
+              "config": {},
+              "labels": {
+                "name": "B",
+              },
+              "name": "humidity",
+              "state": {},
+              "type": "number",
+              "values": [
+                10000.3,
+                10000.5,
+              ],
+            },
+          ]
+        `);
       });
     });
 
@@ -690,75 +690,75 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10.3,
-              10.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+          [
+            {
+              "config": {},
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10.3,
+                10.5,
+              ],
             },
-            "name": "time",
-            "state": Object {
-              "multipleFrames": true,
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "time",
+              "state": {
+                "multipleFrames": true,
+              },
+              "type": "time",
+              "values": [
+                3000,
+                5000,
+              ],
             },
-            "type": "time",
-            "values": Array [
-              3000,
-              5000,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "humidity",
+              "state": {},
+              "type": "number",
+              "values": [
+                10000.3,
+                10000.5,
+              ],
             },
-            "name": "humidity",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10000.3,
-              10000.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "B",
+            {
+              "config": {},
+              "labels": {
+                "name": "B",
+              },
+              "name": "time",
+              "state": {
+                "multipleFrames": true,
+              },
+              "type": "time",
+              "values": [
+                3000,
+                5000,
+              ],
             },
-            "name": "time",
-            "state": Object {
-              "multipleFrames": true,
+            {
+              "config": {},
+              "labels": {
+                "name": "B",
+              },
+              "name": "humidity",
+              "state": {},
+              "type": "number",
+              "values": [
+                10000.3,
+                10000.5,
+              ],
             },
-            "type": "time",
-            "values": Array [
-              3000,
-              5000,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "B",
-            },
-            "name": "humidity",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10000.3,
-              10000.5,
-            ],
-          },
-        ]
-      `);
+          ]
+        `);
       });
     });
 
@@ -779,73 +779,73 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "time",
-            "state": Object {
-              "multipleFrames": true,
+          [
+            {
+              "config": {},
+              "name": "time",
+              "state": {
+                "multipleFrames": true,
+              },
+              "type": "time",
+              "values": [
+                3000,
+                5000,
+              ],
             },
-            "type": "time",
-            "values": Array [
-              3000,
-              5000,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10.3,
+                10.5,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10.3,
-              10.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "humidity",
+              "state": {},
+              "type": "number",
+              "values": [
+                10000.3,
+                10000.5,
+              ],
             },
-            "name": "humidity",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10000.3,
-              10000.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "B",
+            {
+              "config": {},
+              "labels": {
+                "name": "B",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10.3,
+                10.5,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10.3,
-              10.5,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "B",
+            {
+              "config": {},
+              "labels": {
+                "name": "B",
+              },
+              "name": "humidity",
+              "state": {},
+              "type": "number",
+              "values": [
+                10000.3,
+                10000.5,
+              ],
             },
-            "name": "humidity",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10000.3,
-              10000.5,
-            ],
-          },
-        ]
-      `);
+          ]
+        `);
       });
     });
 
@@ -880,51 +880,51 @@ describe('JOIN Transformer', () => {
             const data = received[0];
             const filtered = data[0];
             expect(filtered.fields).toMatchInlineSnapshot(`
-            Array [
-              Object {
-                "config": Object {},
-                "name": "time",
-                "state": Object {},
-                "type": "time",
-                "values": Array [
-                  1000,
-                  2000,
-                  3000,
-                  4000,
-                ],
-              },
-              Object {
-                "config": Object {},
-                "labels": Object {
+              [
+                {
+                  "config": {},
+                  "name": "time",
+                  "state": {},
+                  "type": "time",
+                  "values": [
+                    1000,
+                    2000,
+                    3000,
+                    4000,
+                  ],
+                },
+                {
+                  "config": {},
+                  "labels": {
+                    "name": "temperature",
+                  },
                   "name": "temperature",
+                  "state": {},
+                  "type": "number",
+                  "values": [
+                    1,
+                    3,
+                    5,
+                    7,
+                  ],
                 },
-                "name": "temperature",
-                "state": Object {},
-                "type": "number",
-                "values": Array [
-                  1,
-                  3,
-                  5,
-                  7,
-                ],
-              },
-              Object {
-                "config": Object {},
-                "labels": Object {
-                  "name": "B",
+                {
+                  "config": {},
+                  "labels": {
+                    "name": "B",
+                  },
+                  "name": "temperature",
+                  "state": {},
+                  "type": "number",
+                  "values": [
+                    2,
+                    4,
+                    6,
+                    8,
+                  ],
                 },
-                "name": "temperature",
-                "state": Object {},
-                "type": "number",
-                "values": Array [
-                  2,
-                  4,
-                  6,
-                  8,
-                ],
-              },
-            ]
-          `);
+              ]
+            `);
           }
         );
       });
@@ -964,48 +964,48 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "time",
-            "state": Object {},
-            "type": "time",
-            "values": Array [
-              1,
-              2,
-              3,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "A",
+          [
+            {
+              "config": {},
+              "name": "time",
+              "state": {},
+              "type": "time",
+              "values": [
+                1,
+                2,
+                3,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10,
-              11,
-              12,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {
-              "name": "C",
+            {
+              "config": {},
+              "labels": {
+                "name": "A",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10,
+                11,
+                12,
+              ],
             },
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              20,
-              22,
-              24,
-            ],
-          },
-        ]
-      `);
+            {
+              "config": {},
+              "labels": {
+                "name": "C",
+              },
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                20,
+                22,
+                24,
+              ],
+            },
+          ]
+        `);
       });
     });
 
@@ -1036,38 +1036,38 @@ describe('JOIN Transformer', () => {
         const data = received[0];
         const filtered = data[0];
         expect(filtered.fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
-            "name": "time",
-            "state": Object {},
-            "type": "time",
-            "values": Array [
-              1,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {},
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              10,
-            ],
-          },
-          Object {
-            "config": Object {},
-            "labels": Object {},
-            "name": "temperature",
-            "state": Object {},
-            "type": "number",
-            "values": Array [
-              20,
-            ],
-          },
-        ]
-      `);
+          [
+            {
+              "config": {},
+              "name": "time",
+              "state": {},
+              "type": "time",
+              "values": [
+                1,
+              ],
+            },
+            {
+              "config": {},
+              "labels": {},
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                10,
+              ],
+            },
+            {
+              "config": {},
+              "labels": {},
+              "name": "temperature",
+              "state": {},
+              "type": "number",
+              "values": [
+                20,
+              ],
+            },
+          ]
+        `);
       });
     });
   });
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
index d0d3332dce5..5f4ef23427b 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
@@ -36,42 +36,42 @@ describe('align frames', () => {
           values: f.values.toArray(),
         }))
       ).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "TheTime",
-            "values": Array [
+            "values": [
               1000,
               1500,
               2000,
             ],
           },
-          Object {
+          {
             "name": "A",
-            "values": Array [
+            "values": [
               1,
               undefined,
               100,
             ],
           },
-          Object {
+          {
             "name": "A",
-            "values": Array [
+            "values": [
               2,
               20,
               200,
             ],
           },
-          Object {
+          {
             "name": "B",
-            "values": Array [
+            "values": [
               3,
               30,
               300,
             ],
           },
-          Object {
+          {
             "name": "C",
-            "values": Array [
+            "values": [
               "first",
               "second",
               "third",
@@ -89,38 +89,38 @@ describe('align frames', () => {
           values: f.values.toArray(),
         }))
       ).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "TheTime",
-            "values": Array [
+            "values": [
               1000,
               2000,
             ],
           },
-          Object {
+          {
             "name": "A",
-            "values": Array [
+            "values": [
               1,
               100,
             ],
           },
-          Object {
+          {
             "name": "A",
-            "values": Array [
+            "values": [
               2,
               200,
             ],
           },
-          Object {
+          {
             "name": "B",
-            "values": Array [
+            "values": [
               3,
               300,
             ],
           },
-          Object {
+          {
             "name": "C",
-            "values": Array [
+            "values": [
               "first",
               "third",
             ],
@@ -154,44 +154,44 @@ describe('align frames', () => {
         state: f.state,
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "name": "TheTime",
-          "state": Object {
-            "origin": Object {
+          "state": {
+            "origin": {
               "fieldIndex": 0,
               "frameIndex": 0,
             },
           },
-          "values": Array [
+          "values": [
             1000,
             1500,
             2000,
           ],
         },
-        Object {
+        {
           "name": "A1",
-          "state": Object {
-            "origin": Object {
+          "state": {
+            "origin": {
               "fieldIndex": 1,
               "frameIndex": 0,
             },
           },
-          "values": Array [
+          "values": [
             1,
             15,
             2,
           ],
         },
-        Object {
+        {
           "name": "A2",
-          "state": Object {
-            "origin": Object {
+          "state": {
+            "origin": {
               "fieldIndex": 1,
               "frameIndex": 1,
             },
           },
-          "values": Array [
+          "values": [
             1,
             undefined,
             2,
@@ -208,20 +208,20 @@ describe('align frames', () => {
         state: f.state,
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "name": "TheTime",
-          "state": Object {
-            "origin": Object {
+          "state": {
+            "origin": {
               "fieldIndex": 0,
               "frameIndex": 0,
             },
           },
         },
-        Object {
+        {
           "name": "A1",
-          "state": Object {
-            "origin": Object {
+          "state": {
+            "origin": {
               "fieldIndex": 1,
               "frameIndex": 0,
             },
@@ -246,18 +246,18 @@ describe('align frames', () => {
         values: f.values.toArray(),
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "name": "TheTime",
-          "values": Array [
+          "values": [
             1500,
             2000,
             6000,
           ],
         },
-        Object {
+        {
           "name": "A1",
-          "values": Array [
+          "values": [
             15,
             22,
             1,
@@ -293,24 +293,24 @@ describe('align frames', () => {
         values: f.values.toArray(),
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "name": "TheTime",
-          "values": Array [
+          "values": [
             1000,
             2000,
           ],
         },
-        Object {
+        {
           "name": "A",
-          "values": Array [
+          "values": [
             1,
             100,
           ],
         },
-        Object {
+        {
           "name": "A",
-          "values": Array [
+          "values": [
             200,
             undefined,
           ],
diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts b/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts
index 41dccaeb826..53fa647eb5a 100644
--- a/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts
@@ -28,20 +28,20 @@ describe('Labels as Columns', () => {
     await expect(transformDataFrame([cfg], [source])).toEmitValuesWith((received) => {
       const data = received[0];
       expect(toSimpleObject(data[0])).toMatchInlineSnapshot(`
-        Object {
-          "Value": Array [
+        {
+          "Value": [
             1,
             2,
           ],
-          "feelsLike": Array [
+          "feelsLike": [
             "ok",
             "ok",
           ],
-          "location": Array [
+          "location": [
             "inside",
             "inside",
           ],
-          "time": Array [
+          "time": [
             1000,
             2000,
           ],
@@ -119,27 +119,27 @@ describe('Labels as Columns', () => {
       expect(data.length).toEqual(2);
 
       expect(toSimpleObject(data[0])).toMatchInlineSnapshot(`
-        Object {
-          "location": Array [
+        {
+          "location": [
             "inside",
           ],
-          "temp": Array [
+          "temp": [
             1,
           ],
-          "time": Array [
+          "time": [
             1000,
           ],
         }
       `);
       expect(toSimpleObject(data[1])).toMatchInlineSnapshot(`
-        Object {
-          "location": Array [
+        {
+          "location": [
             "outside",
           ],
-          "temp": Array [
+          "temp": [
             -1,
           ],
-          "time": Array [
+          "time": [
             2000,
           ],
         }
@@ -196,33 +196,33 @@ describe('Labels as Columns', () => {
 
     await expect(transformDataFrame([cfg], [source])).toEmitValuesWith((received) => {
       expect(received[0][0].fields.map((f) => ({ [f.name]: f.values.toArray() }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "time": Array [
+        [
+          {
+            "time": [
               1000,
               2000,
             ],
           },
-          Object {
-            "a": Array [
+          {
+            "a": [
               1,
               3,
             ],
           },
-          Object {
-            "b": Array [
+          {
+            "b": [
               2,
               4,
             ],
           },
-          Object {
-            "foo": Array [
+          {
+            "foo": [
               "thing",
               "thing",
             ],
           },
-          Object {
-            "bar": Array [
+          {
+            "bar": [
               "thing",
               "thing",
             ],
@@ -285,42 +285,42 @@ describe('Labels as Columns', () => {
       expect(
         received[0].map((f) => ({ name: f.name, fields: f.fields.map((v) => ({ [v.name]: v.values.toArray() })) }))
       ).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "fields": Array [
-              Object {
-                "label": Array [
+        [
+          {
+            "fields": [
+              {
+                "label": [
                   "foo",
                   "bar",
                   "zaz",
                 ],
               },
-              Object {
-                "value": Array [
+              {
+                "value": [
                   "thing",
                   "a",
                   "xyz",
                 ],
               },
             ],
-            "name": "a {bar=\\"a\\", foo=\\"thing\\", zaz=\\"xyz\\"}",
+            "name": "a {bar="a", foo="thing", zaz="xyz"}",
           },
-          Object {
-            "fields": Array [
-              Object {
-                "label": Array [
+          {
+            "fields": [
+              {
+                "label": [
                   "foo",
                   "bar",
                 ],
               },
-              Object {
-                "value": Array [
+              {
+                "value": [
                   "thing",
                   "b",
                 ],
               },
             ],
-            "name": "b {bar=\\"b\\", foo=\\"thing\\"}",
+            "name": "b {bar="b", foo="thing"}",
           },
         ]
       `);
@@ -349,40 +349,40 @@ describe('Labels as Columns', () => {
       expect(
         received[0].map((f) => ({ name: f.name, fields: f.fields.map((v) => ({ [v.name]: v.values.toArray() })) }))
       ).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "fields": Array [
-              Object {
-                "label": Array [
+        [
+          {
+            "fields": [
+              {
+                "label": [
                   "zaz",
                   "bar",
                 ],
               },
-              Object {
-                "value": Array [
+              {
+                "value": [
                   "xyz",
                   "a",
                 ],
               },
             ],
-            "name": "a {bar=\\"a\\", foo=\\"thing\\", zaz=\\"xyz\\"}",
+            "name": "a {bar="a", foo="thing", zaz="xyz"}",
           },
-          Object {
-            "fields": Array [
-              Object {
-                "label": Array [
+          {
+            "fields": [
+              {
+                "label": [
                   "zaz",
                   "bar",
                 ],
               },
-              Object {
-                "value": Array [
+              {
+                "value": [
                   undefined,
                   "b",
                 ],
               },
             ],
-            "name": "b {bar=\\"b\\", foo=\\"thing\\"}",
+            "name": "b {bar="b", foo="thing"}",
           },
         ]
       `);
diff --git a/packages/grafana-data/src/transformations/transformers/reduce.test.ts b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
index 92369e07222..1825618d26a 100644
--- a/packages/grafana-data/src/transformations/transformers/reduce.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
@@ -264,12 +264,12 @@ describe('Reducer Transformer', () => {
     const view0 = new DataFrameView<any>(frames[0]);
     const view1 = new DataFrameView<any>(frames[1]);
     expect({ ...view0.get(0) }).toMatchInlineSnapshot(`
-      Object {
+      {
         "temperature": 6,
       }
     `);
     expect({ ...view1.get(0) }).toMatchInlineSnapshot(`
-      Object {
+      {
         "humidity": 10000.6,
         "temperature": 6,
       }
@@ -398,45 +398,45 @@ describe('Reducer Transformer', () => {
 
       expect(processed.length).toEqual(1);
       expect(processed[0].fields).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "config": Object {},
+        [
+          {
+            "config": {},
             "name": "Field",
             "type": "string",
-            "values": Array [
+            "values": [
               "value",
               "value",
               "value",
               "value",
             ],
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "state",
             "type": "string",
-            "values": Array [
+            "values": [
               "CA",
               "NY",
               "CA",
               ,
             ],
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "country",
             "type": "string",
-            "values": Array [
+            "values": [
               ,
               ,
               "USA",
               "USA",
             ],
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "Max",
             "type": "number",
-            "values": Array [
+            "values": [
               6,
               6,
               6,
diff --git a/packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts b/packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts
index e7e3fc0d010..26e5b438d49 100644
--- a/packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts
@@ -42,35 +42,35 @@ describe('Rename By Regex Transformer', () => {
         const data = received[0];
         const frame = data[0];
         expect(frame.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {
+          [
+            {
+              "config": {
                 "name": "Time",
               },
               "name": "Time",
-              "state": Object {
+              "state": {
                 "displayName": "Time",
                 "multipleFrames": false,
               },
               "type": "time",
-              "values": Array [
+              "values": [
                 3000,
                 4000,
                 5000,
                 6000,
               ],
             },
-            Object {
-              "config": Object {
+            {
+              "config": {
                 "displayName": "web-01",
               },
               "name": "Value",
-              "state": Object {
+              "state": {
                 "displayName": "web-01",
                 "multipleFrames": false,
               },
               "type": "number",
-              "values": Array [
+              "values": [
                 10000.3,
                 10000.4,
                 10000.5,
@@ -94,36 +94,36 @@ describe('Rename By Regex Transformer', () => {
         const data = received[0];
         const frame = data[0];
         expect(frame.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {
+          [
+            {
+              "config": {
                 "displayName": "TimE",
                 "name": "Time",
               },
               "name": "Time",
-              "state": Object {
+              "state": {
                 "displayName": "TimE",
                 "multipleFrames": false,
               },
               "type": "time",
-              "values": Array [
+              "values": [
                 3000,
                 4000,
                 5000,
                 6000,
               ],
             },
-            Object {
-              "config": Object {
+            {
+              "config": {
                 "displayName": "wEb-01.ExamplE.com",
               },
               "name": "Value",
-              "state": Object {
+              "state": {
                 "displayName": "wEb-01.ExamplE.com",
                 "multipleFrames": false,
               },
               "type": "number",
-              "values": Array [
+              "values": [
                 10000.3,
                 10000.4,
                 10000.5,
@@ -147,35 +147,35 @@ describe('Rename By Regex Transformer', () => {
         const data = received[0];
         const frame = data[0];
         expect(frame.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {
+          [
+            {
+              "config": {
                 "name": "Time",
               },
               "name": "Time",
-              "state": Object {
+              "state": {
                 "displayName": "Time",
                 "multipleFrames": false,
               },
               "type": "time",
-              "values": Array [
+              "values": [
                 3000,
                 4000,
                 5000,
                 6000,
               ],
             },
-            Object {
-              "config": Object {
+            {
+              "config": {
                 "displayName": "web-01.example.com",
               },
               "name": "Value",
-              "state": Object {
+              "state": {
                 "displayName": "web-01.example.com",
                 "multipleFrames": false,
               },
               "type": "number",
-              "values": Array [
+              "values": [
                 10000.3,
                 10000.4,
                 10000.5,
@@ -199,35 +199,35 @@ describe('Rename By Regex Transformer', () => {
         const data = received[0];
         const frame = data[0];
         expect(frame.fields).toMatchInlineSnapshot(`
-          Array [
-            Object {
-              "config": Object {
+          [
+            {
+              "config": {
                 "name": "Time",
               },
               "name": "Time",
-              "state": Object {
+              "state": {
                 "displayName": "Time",
                 "multipleFrames": false,
               },
               "type": "time",
-              "values": Array [
+              "values": [
                 3000,
                 4000,
                 5000,
                 6000,
               ],
             },
-            Object {
-              "config": Object {
+            {
+              "config": {
                 "displayName": "web-01.example.com",
               },
               "name": "Value",
-              "state": Object {
+              "state": {
                 "displayName": "web-01.example.com",
                 "multipleFrames": false,
               },
               "type": "number",
-              "values": Array [
+              "values": [
                 10000.3,
                 10000.4,
                 10000.5,
diff --git a/packages/grafana-data/src/transformations/transformers/sortBy.test.ts b/packages/grafana-data/src/transformations/transformers/sortBy.test.ts
index da00368ac78..557a79e7308 100644
--- a/packages/grafana-data/src/transformations/transformers/sortBy.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/sortBy.test.ts
@@ -48,9 +48,9 @@ describe('SortBy transformer', () => {
 
     await expect(transformDataFrame([cfg], [testFrame])).toEmitValuesWith((received) => {
       expect(getFieldSnapshot(received[0][0].fields[0])).toMatchInlineSnapshot(`
-        Object {
+        {
           "name": "time",
-          "values": Array [
+          "values": [
             5,
             6,
             7,
@@ -78,9 +78,9 @@ describe('SortBy transformer', () => {
 
     await expect(transformDataFrame([cfg], [testFrame])).toEmitValuesWith((received) => {
       expect(getFieldSnapshot(received[0][0].fields[0])).toMatchInlineSnapshot(`
-        Object {
+        {
           "name": "time",
-          "values": Array [
+          "values": [
             10,
             9,
             8,
diff --git a/packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap b/packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap
index a505486dc54..f373bd9641c 100644
--- a/packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap
+++ b/packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap
@@ -1,50 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`read csv should get X and y 1`] = `
-Object {
-  "fields": Array [
-    Object {
-      "config": Object {},
+{
+  "fields": [
+    {
+      "config": {},
       "labels": undefined,
       "name": "Field 1",
       "type": "string",
-      "values": Array [
+      "values": [
         "",
         "2",
         "5",
         "",
       ],
     },
-    Object {
-      "config": Object {},
+    {
+      "config": {},
       "labels": undefined,
       "name": "Field 2",
       "type": "number",
-      "values": Array [
+      "values": [
         1,
         3,
         6,
         NaN,
       ],
     },
-    Object {
-      "config": Object {},
+    {
+      "config": {},
       "labels": undefined,
       "name": "Field 3",
       "type": "number",
-      "values": Array [
+      "values": [
         undefined,
         4,
         undefined,
         NaN,
       ],
     },
-    Object {
-      "config": Object {},
+    {
+      "config": {},
       "labels": undefined,
       "name": "Field 4",
       "type": "number",
-      "values": Array [
+      "values": [
         undefined,
         undefined,
         undefined,
@@ -59,34 +59,34 @@ Object {
 `;
 
 exports[`read csv should read csv from local file system 1`] = `
-Object {
-  "fields": Array [
-    Object {
-      "config": Object {},
+{
+  "fields": [
+    {
+      "config": {},
       "labels": undefined,
       "name": "a",
       "type": "number",
-      "values": Array [
+      "values": [
         10,
         40,
       ],
     },
-    Object {
-      "config": Object {},
+    {
+      "config": {},
       "labels": undefined,
       "name": "b",
       "type": "number",
-      "values": Array [
+      "values": [
         20,
         50,
       ],
     },
-    Object {
-      "config": Object {},
+    {
+      "config": {},
       "labels": undefined,
       "name": "c",
       "type": "number",
-      "values": Array [
+      "values": [
         30,
         60,
       ],
@@ -99,44 +99,44 @@ Object {
 `;
 
 exports[`read csv should read csv with headers 1`] = `
-Object {
-  "fields": Array [
-    Object {
-      "config": Object {
+{
+  "fields": [
+    {
+      "config": {
         "unit": "ms",
       },
       "labels": undefined,
       "name": "a",
       "type": "number",
-      "values": Array [
+      "values": [
         10,
         40,
         40,
         40,
       ],
     },
-    Object {
-      "config": Object {
+    {
+      "config": {
         "unit": "lengthm",
       },
       "labels": undefined,
       "name": "b",
       "type": "number",
-      "values": Array [
+      "values": [
         20,
         50,
         500,
         50,
       ],
     },
-    Object {
-      "config": Object {
+    {
+      "config": {
         "unit": "s",
       },
       "labels": undefined,
       "name": "c",
       "type": "boolean",
-      "values": Array [
+      "values": [
         true,
         false,
         false,
diff --git a/packages/grafana-data/src/utils/csv.test.ts b/packages/grafana-data/src/utils/csv.test.ts
index f6e6ff6817f..0512aca9fa4 100644
--- a/packages/grafana-data/src/utils/csv.test.ts
+++ b/packages/grafana-data/src/utils/csv.test.ts
@@ -102,7 +102,7 @@ describe('write csv', () => {
     const csv = toCSV([dataFrame], { useExcelHeader: true });
     expect(csv).toMatchInlineSnapshot(`
       "sep=,
-      \\"Time\\",\\"Value\\"
+      "Time","Value"
       1598784913123,1234
       1598784914123,5678
 
@@ -130,7 +130,7 @@ describe('DataFrame to CSV', () => {
 
     const csv = toCSV([dataFrame]);
     expect(csv).toMatchInlineSnapshot(`
-      "\\"Time\\",\\"{label1=\\"\\"value1\\"\\", label2=\\"\\"value1\\"\\"}\\"
+      ""Time","{label1=""value1"", label2=""value1""}"
       1589455688623,1234
 
       "
@@ -159,7 +159,7 @@ describe('DataFrame to CSV', () => {
 
     const csv = toCSV([dataFrame]);
     expect(csv).toMatchInlineSnapshot(`
-      "\\"Time\\",\\"Value\\"
+      ""Time","Value"
       1589455688623,2020-05-14 11:28:08
 
       "
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 6615eb7c6ce..a724775f4fd 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -56,7 +56,7 @@
     "@testing-library/user-event": "14.4.3",
     "@types/angular": "1.8.4",
     "@types/history": "4.7.11",
-    "@types/jest": "28.1.6",
+    "@types/jest": "29.2.3",
     "@types/lodash": "4.14.187",
     "@types/react": "17.0.42",
     "@types/react-dom": "17.0.14",
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
index db7a43baa03..34a60eb96bb 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
@@ -55,11 +55,11 @@ describe('DataSourceWithBackend', () => {
 
     expect(mock.calls.length).toBe(1);
     expect(args).toMatchInlineSnapshot(`
-      Object {
-        "data": Object {
-          "queries": Array [
-            Object {
-              "datasource": Object {
+      {
+        "data": {
+          "queries": [
+            {
+              "datasource": {
                 "type": "dummy",
                 "uid": "abc",
               },
@@ -68,8 +68,8 @@ describe('DataSourceWithBackend', () => {
               "maxDataPoints": 10,
               "refId": "A",
             },
-            Object {
-              "datasource": Object {
+            {
+              "datasource": {
                 "type": "sample",
                 "uid": "<mockuid>",
               },
@@ -80,7 +80,7 @@ describe('DataSourceWithBackend', () => {
             },
           ],
         },
-        "headers": Object {
+        "headers": {
           "X-Dashboard-Uid": "dashA",
           "X-Datasource-Uid": "abc, <mockuid>",
           "X-Panel-Id": "123",
@@ -122,11 +122,11 @@ describe('DataSourceWithBackend', () => {
 
     expect(mock.calls.length).toBe(1);
     expect(args).toMatchInlineSnapshot(`
-      Object {
-        "data": Object {
-          "queries": Array [
-            Object {
-              "datasource": Object {
+      {
+        "data": {
+          "queries": [
+            {
+              "datasource": {
                 "type": "dummy",
                 "uid": "abc",
               },
@@ -135,8 +135,8 @@ describe('DataSourceWithBackend', () => {
               "maxDataPoints": 10,
               "refId": "A",
             },
-            Object {
-              "datasource": Object {
+            {
+              "datasource": {
                 "type": "sample",
                 "uid": "<mockuid>",
               },
@@ -147,7 +147,7 @@ describe('DataSourceWithBackend', () => {
             },
           ],
         },
-        "headers": Object {
+        "headers": {
           "X-Dashboard-Uid": "dashA",
           "X-Datasource-Uid": "abc, <mockuid>",
           "X-Panel-Id": "123",
diff --git a/packages/grafana-runtime/src/utils/queryResponse.test.ts b/packages/grafana-runtime/src/utils/queryResponse.test.ts
index f99fb5b2dc8..e14ea0eed7f 100644
--- a/packages/grafana-runtime/src/utils/queryResponse.test.ts
+++ b/packages/grafana-runtime/src/utils/queryResponse.test.ts
@@ -91,15 +91,15 @@ describe('Query Response parser', () => {
 
     const norm = frames.map((f) => toDataFrameDTO(f));
     expect(norm).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
+      [
+        {
+          "fields": [
+            {
+              "config": {},
               "labels": undefined,
               "name": "time",
               "type": "time",
-              "values": Array [
+              "values": [
                 1611767228473,
                 1611767240473,
                 1611767252473,
@@ -108,12 +108,12 @@ describe('Query Response parser', () => {
                 1611767288473,
               ],
             },
-            Object {
-              "config": Object {},
+            {
+              "config": {},
               "labels": undefined,
               "name": "A-series",
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 20,
                 90,
@@ -127,14 +127,14 @@ describe('Query Response parser', () => {
           "name": undefined,
           "refId": "A",
         },
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
+        {
+          "fields": [
+            {
+              "config": {},
               "labels": undefined,
               "name": "time",
               "type": "time",
-              "values": Array [
+              "values": [
                 1611767228473,
                 1611767240473,
                 1611767252473,
@@ -143,12 +143,12 @@ describe('Query Response parser', () => {
                 1611767288473,
               ],
             },
-            Object {
-              "config": Object {},
+            {
+              "config": {},
               "labels": undefined,
               "name": "B-series",
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 20,
                 90,
@@ -176,15 +176,15 @@ describe('Query Response parser', () => {
 
     const norm = frames.map((f) => toDataFrameDTO(f));
     expect(norm).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
+      [
+        {
+          "fields": [
+            {
+              "config": {},
               "labels": undefined,
               "name": "time",
               "type": "time",
-              "values": Array [
+              "values": [
                 1611767228473,
                 1611767240473,
                 1611767252473,
@@ -193,12 +193,12 @@ describe('Query Response parser', () => {
                 1611767288473,
               ],
             },
-            Object {
-              "config": Object {},
+            {
+              "config": {},
               "labels": undefined,
               "name": "B-series",
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 20,
                 90,
@@ -212,14 +212,14 @@ describe('Query Response parser', () => {
           "name": undefined,
           "refId": "B",
         },
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
+        {
+          "fields": [
+            {
+              "config": {},
               "labels": undefined,
               "name": "time",
               "type": "time",
-              "values": Array [
+              "values": [
                 1611767228473,
                 1611767240473,
                 1611767252473,
@@ -228,12 +228,12 @@ describe('Query Response parser', () => {
                 1611767288473,
               ],
             },
-            Object {
-              "config": Object {},
+            {
+              "config": {},
               "labels": undefined,
               "name": "A-series",
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 20,
                 90,
@@ -351,7 +351,7 @@ describe('Query Response parser', () => {
     // }
     const res = toDataQueryResponse(resWithError);
     expect(res.error).toMatchInlineSnapshot(`
-      Object {
+      {
         "message": "Hello Error",
         "refId": "A",
       }
@@ -359,23 +359,23 @@ describe('Query Response parser', () => {
 
     const norm = res.data.map((f) => toDataFrameDTO(f));
     expect(norm).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "fields": Array [
-            Object {
-              "config": Object {},
+      [
+        {
+          "fields": [
+            {
+              "config": {},
               "labels": undefined,
               "name": "numbers",
               "type": "number",
-              "values": Array [
+              "values": [
                 1,
                 3,
               ],
             },
           ],
-          "meta": Object {
-            "notices": Array [
-              Object {
+          "meta": {
+            "notices": [
+              {
                 "severity": 2,
                 "text": "Text",
               },
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index e69b1f0876c..bc938f89625 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -145,7 +145,7 @@
     "@types/enzyme-adapter-react-16": "1.0.6",
     "@types/hoist-non-react-statics": "3.3.1",
     "@types/is-hotkey": "0.1.7",
-    "@types/jest": "28.1.6",
+    "@types/jest": "29.2.3",
     "@types/jquery": "3.5.14",
     "@types/lodash": "4.14.187",
     "@types/mock-raf": "1.0.3",
diff --git a/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap b/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
index 6011fd4d086..51bbeb3cb85 100644
--- a/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
+++ b/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
 <div
   className="css-12b7m5k"
   style={
-    Object {
+    {
       "height": "auto",
       "maxHeight": "100%",
       "minHeight": "0",
@@ -17,7 +17,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
   <div
     className="scrollbar-view"
     style={
-      Object {
+      {
         "WebkitOverflowScrolling": "touch",
         "bottom": undefined,
         "left": undefined,
@@ -39,7 +39,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
   <div
     className="track-horizontal"
     style={
-      Object {
+      {
         "display": "none",
         "height": 6,
         "position": "absolute",
@@ -49,7 +49,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
     <div
       className="thumb-horizontal"
       style={
-        Object {
+        {
           "display": "block",
           "height": "100%",
           "position": "relative",
@@ -60,7 +60,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
   <div
     className="track-vertical"
     style={
-      Object {
+      {
         "display": "none",
         "position": "absolute",
         "width": 6,
@@ -70,7 +70,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
     <div
       className="thumb-vertical"
       style={
-        Object {
+        {
           "display": "block",
           "position": "relative",
           "width": "100%",
diff --git a/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap b/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap
index f9c3fbbab73..33400367468 100644
--- a/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap
+++ b/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`GraphNG utils preparePlotConfigBuilder 1`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -21,7 +21,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -30,11 +30,11 @@ Object {
       "timeZone": "utc",
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -48,7 +48,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -58,48 +58,48 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "fill": [Function],
       "size": [Function],
       "stroke": [Function],
       "width": [Function],
     },
-    "sync": Object {
-      "filters": Object {
+    "sync": {
+      "filters": {
         "pub": [Function],
       },
       "key": "__global_",
-      "scales": Array [
+      "scales": [
         "x",
         "__fixed/na-na/na-na/auto/linear/na",
       ],
     },
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {},
-  "legend": Object {
+  "hooks": {},
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "__fixed/na-na/na-na/auto/linear/na": Object {
+  "scales": {
+    "__fixed/na-na/na-na/auto/linear/na": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -109,7 +109,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "auto": false,
       "dir": 1,
       "ori": 0,
@@ -118,12 +118,12 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
-      "dash": Array [
+    {
+      "dash": [
         1,
         2,
       ],
@@ -131,7 +131,7 @@ Object {
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#ff0000",
         "filter": [Function],
         "show": true,
@@ -146,8 +146,8 @@ Object {
       "value": [Function],
       "width": 2,
     },
-    Object {
-      "dash": Array [
+    {
+      "dash": [
         1,
         2,
       ],
@@ -155,7 +155,7 @@ Object {
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#ff0000",
         "filter": [Function],
         "show": true,
@@ -170,8 +170,8 @@ Object {
       "value": [Function],
       "width": 2,
     },
-    Object {
-      "dash": Array [
+    {
+      "dash": [
         1,
         2,
       ],
@@ -179,7 +179,7 @@ Object {
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#ff0000",
         "filter": [Function],
         "show": true,
@@ -194,8 +194,8 @@ Object {
       "value": [Function],
       "width": 2,
     },
-    Object {
-      "dash": Array [
+    {
+      "dash": [
         1,
         2,
       ],
@@ -203,7 +203,7 @@ Object {
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#ff0000",
         "filter": [Function],
         "show": true,
@@ -218,8 +218,8 @@ Object {
       "value": [Function],
       "width": 2,
     },
-    Object {
-      "dash": Array [
+    {
+      "dash": [
         1,
         2,
       ],
@@ -227,7 +227,7 @@ Object {
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#ff0000",
         "filter": [Function],
         "show": true,
diff --git a/packages/grafana-ui/src/components/GraphNG/utils.test.ts b/packages/grafana-ui/src/components/GraphNG/utils.test.ts
index 6f44020a288..e385018d12a 100644
--- a/packages/grafana-ui/src/components/GraphNG/utils.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/utils.test.ts
@@ -322,20 +322,20 @@ describe('GraphNG utils', () => {
     });
 
     expect(aligndFrame).toMatchInlineSnapshot(`
-      Object {
-        "fields": Array [
-          Object {
-            "config": Object {},
+      {
+        "fields": [
+          {
+            "config": {},
             "name": "time",
-            "state": Object {
+            "state": {
               "nullThresholdApplied": true,
-              "origin": Object {
+              "origin": {
                 "fieldIndex": 0,
                 "frameIndex": 0,
               },
             },
             "type": "time",
-            "values": Array [
+            "values": [
               1,
               1.1,
               2,
@@ -350,25 +350,25 @@ describe('GraphNG utils', () => {
               102,
             ],
           },
-          Object {
-            "config": Object {
-              "custom": Object {
+          {
+            "config": {
+              "custom": {
                 "drawStyle": "bars",
                 "spanNulls": -1,
               },
             },
-            "labels": Object {
+            "labels": {
               "name": "A",
             },
             "name": "value",
-            "state": Object {
-              "origin": Object {
+            "state": {
+              "origin": {
                 "fieldIndex": 1,
                 "frameIndex": 0,
               },
             },
             "type": "number",
-            "values": Array [
+            "values": [
               1,
               undefined,
               1,
@@ -383,25 +383,25 @@ describe('GraphNG utils', () => {
               null,
             ],
           },
-          Object {
-            "config": Object {
-              "custom": Object {
+          {
+            "config": {
+              "custom": {
                 "drawStyle": "bars",
                 "spanNulls": -1,
               },
             },
-            "labels": Object {
+            "labels": {
               "name": "B",
             },
             "name": "value",
-            "state": Object {
-              "origin": Object {
+            "state": {
+              "origin": {
                 "fieldIndex": 1,
                 "frameIndex": 1,
               },
             },
             "type": "number",
-            "values": Array [
+            "values": [
               undefined,
               undefined,
               undefined,
@@ -416,24 +416,24 @@ describe('GraphNG utils', () => {
               null,
             ],
           },
-          Object {
-            "config": Object {
-              "custom": Object {
+          {
+            "config": {
+              "custom": {
                 "drawStyle": "line",
               },
             },
-            "labels": Object {
+            "labels": {
               "name": "B",
             },
             "name": "value",
-            "state": Object {
-              "origin": Object {
+            "state": {
+              "origin": {
                 "fieldIndex": 2,
                 "frameIndex": 1,
               },
             },
             "type": "number",
-            "values": Array [
+            "values": [
               undefined,
               undefined,
               undefined,
@@ -448,24 +448,24 @@ describe('GraphNG utils', () => {
               undefined,
             ],
           },
-          Object {
-            "config": Object {
-              "custom": Object {
+          {
+            "config": {
+              "custom": {
                 "drawStyle": "line",
               },
             },
-            "labels": Object {
+            "labels": {
               "name": "C",
             },
             "name": "value",
-            "state": Object {
-              "origin": Object {
+            "state": {
+              "origin": {
                 "fieldIndex": 1,
                 "frameIndex": 2,
               },
             },
             "type": "number",
-            "values": Array [
+            "values": [
               4,
               4,
               undefined,
@@ -480,27 +480,27 @@ describe('GraphNG utils', () => {
               undefined,
             ],
           },
-          Object {
-            "config": Object {
-              "custom": Object {
+          {
+            "config": {
+              "custom": {
                 "drawStyle": "bars",
-                "hideFrom": Object {
+                "hideFrom": {
                   "viz": true,
                 },
               },
             },
-            "labels": Object {
+            "labels": {
               "name": "C",
             },
             "name": "value",
-            "state": Object {
-              "origin": Object {
+            "state": {
+              "origin": {
                 "fieldIndex": 2,
                 "frameIndex": 2,
               },
             },
             "type": "number",
-            "values": Array [
+            "values": [
               4,
               4,
               undefined,
diff --git a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.test.ts b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.test.ts
index fadc4db2ece..5672a56ad23 100644
--- a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.test.ts
+++ b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.test.ts
@@ -38,14 +38,14 @@ describe('sharedSingleStatMigrationHandler', () => {
 
     sharedSingleStatMigrationHandler(panel as any);
     expect((panel as any).fieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "defaults": Object {
-          "color": Object {
+      {
+        "defaults": {
+          "color": {
             "mode": "thresholds",
           },
           "decimals": 5,
-          "mappings": Array [
-            Object {
+          "mappings": [
+            {
               "text": "OK",
               "type": 1,
               "value": "1",
@@ -53,20 +53,20 @@ describe('sharedSingleStatMigrationHandler', () => {
           ],
           "max": 100,
           "min": 10,
-          "thresholds": Object {
+          "thresholds": {
             "mode": "absolute",
-            "steps": Array [
-              Object {
+            "steps": [
+              {
                 "color": "green",
                 "index": 0,
                 "value": -Infinity,
               },
-              Object {
+              {
                 "color": "orange",
                 "index": 1,
                 "value": 40,
               },
-              Object {
+              {
                 "color": "red",
                 "index": 2,
                 "value": 80,
@@ -75,7 +75,7 @@ describe('sharedSingleStatMigrationHandler', () => {
           },
           "unit": "watt",
         },
-        "overrides": Array [],
+        "overrides": [],
       }
     `);
   });
@@ -110,12 +110,12 @@ describe('sharedSingleStatMigrationHandler', () => {
     sharedSingleStatMigrationHandler(panel as any);
 
     expect((panel as any).fieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "defaults": Object {
+      {
+        "defaults": {
           "mappings": undefined,
           "thresholds": undefined,
         },
-        "overrides": Array [],
+        "overrides": [],
       }
     `);
   });
@@ -145,14 +145,14 @@ describe('sharedSingleStatMigrationHandler', () => {
 
     sharedSingleStatMigrationHandler(panel as any);
     expect((panel as any).fieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "defaults": Object {
+      {
+        "defaults": {
           "mappings": undefined,
           "max": 100,
           "min": 0,
           "thresholds": undefined,
         },
-        "overrides": Array [],
+        "overrides": [],
       }
     `);
   });
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
index a4714bddd7b..1e28fd6c97b 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
@@ -21,41 +21,41 @@ describe('UPlotConfigBuilder', () => {
     it('builds default config', () => {
       const builder = new UPlotConfigBuilder();
       expect(builder.getConfig()).toMatchInlineSnapshot(`
-        Object {
-          "axes": Array [],
-          "cursor": Object {
-            "drag": Object {
+        {
+          "axes": [],
+          "cursor": {
+            "drag": {
               "setScale": false,
             },
-            "focus": Object {
+            "focus": {
               "prox": 30,
             },
-            "points": Object {
+            "points": {
               "fill": [Function],
               "size": [Function],
               "stroke": [Function],
               "width": [Function],
             },
           },
-          "focus": Object {
+          "focus": {
             "alpha": 1,
           },
-          "hooks": Object {},
-          "legend": Object {
+          "hooks": {},
+          "legend": {
             "show": false,
           },
           "mode": 1,
           "ms": 1,
-          "padding": Array [
+          "padding": [
             [Function],
             [Function],
             [Function],
             [Function],
           ],
-          "scales": Object {},
+          "scales": {},
           "select": undefined,
-          "series": Array [
-            Object {
+          "series": [
+            {
               "value": [Function],
             },
           ],
@@ -84,46 +84,46 @@ describe('UPlotConfigBuilder', () => {
       });
 
       expect(builder.getConfig()).toMatchInlineSnapshot(`
-        Object {
-          "axes": Array [],
-          "cursor": Object {
-            "drag": Object {
+        {
+          "axes": [],
+          "cursor": {
+            "drag": {
               "setScale": false,
             },
-            "focus": Object {
+            "focus": {
               "prox": 30,
             },
-            "points": Object {
+            "points": {
               "fill": [Function],
               "size": [Function],
               "stroke": [Function],
               "width": [Function],
             },
           },
-          "focus": Object {
+          "focus": {
             "alpha": 1,
           },
-          "hooks": Object {},
-          "legend": Object {
+          "hooks": {},
+          "legend": {
             "show": false,
           },
           "mode": 1,
           "ms": 1,
-          "padding": Array [
+          "padding": [
             [Function],
             [Function],
             [Function],
             [Function],
           ],
-          "scales": Object {
-            "scale-x": Object {
+          "scales": {
+            "scale-x": {
               "auto": false,
               "dir": 1,
               "ori": 0,
               "range": [Function],
               "time": true,
             },
-            "scale-y": Object {
+            "scale-y": {
               "asinh": undefined,
               "auto": true,
               "dir": 1,
@@ -135,8 +135,8 @@ describe('UPlotConfigBuilder', () => {
             },
           },
           "select": undefined,
-          "series": Array [
-            Object {
+          "series": [
+            {
               "value": [Function],
             },
           ],
@@ -177,39 +177,39 @@ describe('UPlotConfigBuilder', () => {
           distribution: ScaleDistribution.Linear,
         });
         expect(builder.getConfig()).toMatchInlineSnapshot(`
-          Object {
-            "axes": Array [],
-            "cursor": Object {
-              "drag": Object {
+          {
+            "axes": [],
+            "cursor": {
+              "drag": {
                 "setScale": false,
               },
-              "focus": Object {
+              "focus": {
                 "prox": 30,
               },
-              "points": Object {
+              "points": {
                 "fill": [Function],
                 "size": [Function],
                 "stroke": [Function],
                 "width": [Function],
               },
             },
-            "focus": Object {
+            "focus": {
               "alpha": 1,
             },
-            "hooks": Object {},
-            "legend": Object {
+            "hooks": {},
+            "legend": {
               "show": false,
             },
             "mode": 1,
             "ms": 1,
-            "padding": Array [
+            "padding": [
               [Function],
               [Function],
               [Function],
               [Function],
             ],
-            "scales": Object {
-              "scale-y": Object {
+            "scales": {
+              "scale-y": {
                 "asinh": undefined,
                 "auto": true,
                 "dir": 1,
@@ -221,8 +221,8 @@ describe('UPlotConfigBuilder', () => {
               },
             },
             "select": undefined,
-            "series": Array [
-              Object {
+            "series": [
+              {
                 "value": [Function],
               },
             ],
@@ -243,39 +243,39 @@ describe('UPlotConfigBuilder', () => {
           });
 
           expect(builder.getConfig()).toMatchInlineSnapshot(`
-            Object {
-              "axes": Array [],
-              "cursor": Object {
-                "drag": Object {
+            {
+              "axes": [],
+              "cursor": {
+                "drag": {
                   "setScale": false,
                 },
-                "focus": Object {
+                "focus": {
                   "prox": 30,
                 },
-                "points": Object {
+                "points": {
                   "fill": [Function],
                   "size": [Function],
                   "stroke": [Function],
                   "width": [Function],
                 },
               },
-              "focus": Object {
+              "focus": {
                 "alpha": 1,
               },
-              "hooks": Object {},
-              "legend": Object {
+              "hooks": {},
+              "legend": {
                 "show": false,
               },
               "mode": 1,
               "ms": 1,
-              "padding": Array [
+              "padding": [
                 [Function],
                 [Function],
                 [Function],
                 [Function],
               ],
-              "scales": Object {
-                "scale-y": Object {
+              "scales": {
+                "scale-y": {
                   "asinh": undefined,
                   "auto": true,
                   "dir": 1,
@@ -287,8 +287,8 @@ describe('UPlotConfigBuilder', () => {
                 },
               },
               "select": undefined,
-              "series": Array [
-                Object {
+              "series": [
+                {
                   "value": [Function],
                 },
               ],
@@ -310,39 +310,39 @@ describe('UPlotConfigBuilder', () => {
           });
 
           expect(builder.getConfig()).toMatchInlineSnapshot(`
-            Object {
-              "axes": Array [],
-              "cursor": Object {
-                "drag": Object {
+            {
+              "axes": [],
+              "cursor": {
+                "drag": {
                   "setScale": false,
                 },
-                "focus": Object {
+                "focus": {
                   "prox": 30,
                 },
-                "points": Object {
+                "points": {
                   "fill": [Function],
                   "size": [Function],
                   "stroke": [Function],
                   "width": [Function],
                 },
               },
-              "focus": Object {
+              "focus": {
                 "alpha": 1,
               },
-              "hooks": Object {},
-              "legend": Object {
+              "hooks": {},
+              "legend": {
                 "show": false,
               },
               "mode": 1,
               "ms": 1,
-              "padding": Array [
+              "padding": [
                 [Function],
                 [Function],
                 [Function],
                 [Function],
               ],
-              "scales": Object {
-                "scale-y": Object {
+              "scales": {
+                "scale-y": {
                   "asinh": undefined,
                   "auto": true,
                   "dir": 1,
@@ -354,8 +354,8 @@ describe('UPlotConfigBuilder', () => {
                 },
               },
               "select": undefined,
-              "series": Array [
-                Object {
+              "series": [
+                {
                   "value": [Function],
                 },
               ],
@@ -411,19 +411,19 @@ describe('UPlotConfigBuilder', () => {
     });
 
     expect(builder.getConfig()).toMatchInlineSnapshot(`
-      Object {
-        "axes": Array [
-          Object {
+      {
+        "axes": [
+          {
             "filter": undefined,
-            "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+            "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
             "gap": 5,
-            "grid": Object {
+            "grid": {
               "show": false,
               "stroke": "rgba(240, 250, 255, 0.09)",
               "width": 1,
             },
             "label": "test label",
-            "labelFont": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+            "labelFont": "12px "Roboto", "Helvetica", "Arial", sans-serif",
             "labelGap": 8,
             "labelSize": 20,
             "rotate": undefined,
@@ -434,49 +434,49 @@ describe('UPlotConfigBuilder', () => {
             "space": [Function],
             "splits": undefined,
             "stroke": "rgb(204, 204, 220)",
-            "ticks": Object {
+            "ticks": {
               "show": true,
               "size": 4,
               "stroke": "rgba(240, 250, 255, 0.09)",
               "width": 1,
             },
             "timeZone": "browser",
-            "values": Array [],
+            "values": [],
           },
         ],
-        "cursor": Object {
-          "drag": Object {
+        "cursor": {
+          "drag": {
             "setScale": false,
           },
-          "focus": Object {
+          "focus": {
             "prox": 30,
           },
-          "points": Object {
+          "points": {
             "fill": [Function],
             "size": [Function],
             "stroke": [Function],
             "width": [Function],
           },
         },
-        "focus": Object {
+        "focus": {
           "alpha": 1,
         },
-        "hooks": Object {},
-        "legend": Object {
+        "hooks": {},
+        "legend": {
           "show": false,
         },
         "mode": 1,
         "ms": 1,
-        "padding": Array [
+        "padding": [
           [Function],
           [Function],
           [Function],
           [Function],
         ],
-        "scales": Object {},
+        "scales": {},
         "select": undefined,
-        "series": Array [
-          Object {
+        "series": [
+          {
             "value": [Function],
           },
         ],
@@ -573,49 +573,49 @@ describe('UPlotConfigBuilder', () => {
     });
 
     expect(builder.getConfig()).toMatchInlineSnapshot(`
-      Object {
-        "axes": Array [],
-        "cursor": Object {
-          "drag": Object {
+      {
+        "axes": [],
+        "cursor": {
+          "drag": {
             "setScale": false,
           },
-          "focus": Object {
+          "focus": {
             "prox": 30,
           },
-          "points": Object {
+          "points": {
             "fill": [Function],
             "size": [Function],
             "stroke": [Function],
             "width": [Function],
           },
         },
-        "focus": Object {
+        "focus": {
           "alpha": 1,
         },
-        "hooks": Object {},
-        "legend": Object {
+        "hooks": {},
+        "legend": {
           "show": false,
         },
         "mode": 1,
         "ms": 1,
-        "padding": Array [
+        "padding": [
           [Function],
           [Function],
           [Function],
           [Function],
         ],
-        "scales": Object {},
+        "scales": {},
         "select": undefined,
-        "series": Array [
-          Object {
+        "series": [
+          {
             "value": [Function],
           },
-          Object {
+          {
             "facets": undefined,
             "fill": [Function],
             "gaps": [Function],
             "paths": [Function],
-            "points": Object {
+            "points": {
               "fill": "#0000ff",
               "filter": undefined,
               "size": 5,
@@ -685,65 +685,65 @@ describe('UPlotConfigBuilder', () => {
       });
 
       expect(builder.getConfig()).toMatchInlineSnapshot(`
-        Object {
-          "axes": Array [],
-          "bands": Array [
-            Object {
+        {
+          "axes": [],
+          "bands": [
+            {
               "fill": "red",
-              "series": Array [
+              "series": [
                 3,
                 2,
               ],
             },
-            Object {
+            {
               "fill": "blue",
-              "series": Array [
+              "series": [
                 2,
                 1,
               ],
             },
           ],
-          "cursor": Object {
-            "drag": Object {
+          "cursor": {
+            "drag": {
               "setScale": false,
             },
-            "focus": Object {
+            "focus": {
               "prox": 30,
             },
-            "points": Object {
+            "points": {
               "fill": [Function],
               "size": [Function],
               "stroke": [Function],
               "width": [Function],
             },
           },
-          "focus": Object {
+          "focus": {
             "alpha": 1,
           },
-          "hooks": Object {},
-          "legend": Object {
+          "hooks": {},
+          "legend": {
             "show": false,
           },
           "mode": 1,
           "ms": 1,
-          "padding": Array [
+          "padding": [
             [Function],
             [Function],
             [Function],
             [Function],
           ],
-          "scales": Object {},
+          "scales": {},
           "select": undefined,
-          "series": Array [
-            Object {
+          "series": [
+            {
               "value": [Function],
             },
-            Object {
+            {
               "facets": undefined,
               "fill": [Function],
               "gaps": [Function],
               "paths": [Function],
-              "points": Object {
+              "points": {
                 "fill": "#0000ff",
                 "filter": undefined,
                 "size": undefined,
@@ -757,12 +757,12 @@ describe('UPlotConfigBuilder', () => {
               "value": [Function],
               "width": 1,
             },
-            Object {
+            {
               "facets": undefined,
               "fill": [Function],
               "gaps": [Function],
               "paths": [Function],
-              "points": Object {
+              "points": {
                 "fill": "#00ff00",
                 "filter": undefined,
                 "size": 5,
@@ -776,12 +776,12 @@ describe('UPlotConfigBuilder', () => {
               "value": [Function],
               "width": 1,
             },
-            Object {
+            {
               "facets": undefined,
               "fill": [Function],
               "gaps": [Function],
               "paths": [Function],
-              "points": Object {
+              "points": {
                 "fill": "#ff0000",
                 "filter": undefined,
                 "size": 5,
diff --git a/packages/grafana-ui/src/components/uPlot/utils.test.ts b/packages/grafana-ui/src/components/uPlot/utils.test.ts
index b09afd295fc..20b3012c259 100644
--- a/packages/grafana-ui/src/components/uPlot/utils.test.ts
+++ b/packages/grafana-ui/src/components/uPlot/utils.test.ts
@@ -31,23 +31,23 @@ describe('preparePlotData2', () => {
 
   it('creates array from DataFrame', () => {
     expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           9997,
           9998,
           9999,
         ],
-        Array [
+        [
           -10,
           20,
           10,
         ],
-        Array [
+        [
           10,
           10,
           10,
         ],
-        Array [
+        [
           20,
           20,
           20,
@@ -67,23 +67,23 @@ describe('preparePlotData2', () => {
         ],
       });
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             20,
             10,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             -20,
             -20,
             -20,
@@ -108,62 +108,62 @@ describe('preparePlotData2', () => {
         ],
       });
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
             undefined,
           ],
-          Array [
+          [
             -10,
             20,
             10,
             30,
           ],
-          Array [
+          [
             10,
             10,
             10,
             null,
           ],
-          Array [
+          [
             null,
             -20,
             -20,
             -20,
           ],
-          Array [
+          [
             -20,
             -20,
             -20,
             null,
           ],
-          Array [
+          [
             -20,
             null,
             -20,
             -20,
           ],
-          Array [
+          [
             10,
             10,
             10,
             undefined,
           ],
-          Array [
+          [
             undefined,
             -20,
             -20,
             -20,
           ],
-          Array [
+          [
             -20,
             -20,
             -20,
             undefined,
           ],
-          Array [
+          [
             -20,
             undefined,
             -20,
@@ -182,23 +182,23 @@ describe('preparePlotData2', () => {
         ],
       });
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             undefined,
             undefined,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             20,
             20,
             20,
@@ -230,23 +230,23 @@ describe('preparePlotData2', () => {
         ],
       });
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             20,
             10,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             20,
             20,
             20,
@@ -277,23 +277,23 @@ describe('preparePlotData2', () => {
         ],
       });
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             20,
             10,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             30,
             30,
             30,
@@ -333,28 +333,28 @@ describe('preparePlotData2', () => {
         ],
       });
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             20,
             10,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             -30,
             0,
             -10,
           ],
-          Array [
+          [
             -40,
             -10,
             -20,
@@ -401,38 +401,38 @@ describe('preparePlotData2', () => {
       });
 
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             20,
             10,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             30,
             30,
             30,
           ],
-          Array [
+          [
             1,
             2,
             3,
           ],
-          Array [
+          [
             2,
             4,
             6,
           ],
-          Array [
+          [
             3,
             6,
             9,
@@ -476,33 +476,33 @@ describe('preparePlotData2', () => {
       });
 
       expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-        Array [
-          Array [
+        [
+          [
             9997,
             9998,
             9999,
           ],
-          Array [
+          [
             -10,
             20,
             10,
           ],
-          Array [
+          [
             10,
             10,
             10,
           ],
-          Array [
+          [
             1,
             2,
             3,
           ],
-          Array [
+          [
             1,
             2,
             3,
           ],
-          Array [
+          [
             2,
             4,
             6,
@@ -615,8 +615,8 @@ describe('preparePlotData2', () => {
     })!;
 
     expect(preparePlotData2(df, getStackingGroups(df))).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           1639455966000,
           1639629625944,
           1639803285888,
@@ -636,7 +636,7 @@ describe('preparePlotData2', () => {
           1642234525104,
           1642408185048,
         ],
-        Array [
+        [
           0,
           0,
           0,
@@ -656,7 +656,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           0,
           0,
           2500,
@@ -676,7 +676,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           0,
           0,
           30500,
@@ -696,7 +696,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           0,
           0,
           30500,
@@ -716,7 +716,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           0,
           0,
           35500,
@@ -736,7 +736,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           122,
           123,
           47845,
@@ -756,7 +756,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           122,
           123,
           47845,
@@ -776,7 +776,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           122,
           123,
           47845,
@@ -796,7 +796,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           122,
           123,
           47845,
@@ -816,7 +816,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -836,7 +836,7 @@ describe('preparePlotData2', () => {
           0,
           0,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -856,7 +856,7 @@ describe('preparePlotData2', () => {
           1520,
           665.35,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -876,7 +876,7 @@ describe('preparePlotData2', () => {
           1520,
           665.35,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -896,7 +896,7 @@ describe('preparePlotData2', () => {
           5120,
           665.35,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -916,7 +916,7 @@ describe('preparePlotData2', () => {
           6795,
           665.35,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -936,7 +936,7 @@ describe('preparePlotData2', () => {
           6795,
           665.35,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -956,7 +956,7 @@ describe('preparePlotData2', () => {
           62118.84,
           14496.31,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -976,7 +976,7 @@ describe('preparePlotData2', () => {
           62118.84,
           14496.31,
         ],
-        Array [
+        [
           122,
           123,
           48095,
@@ -1020,16 +1020,16 @@ describe('auto stacking groups', () => {
     });
 
     expect(getStackingGroups(df)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             1,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             2,
           ],
         },
@@ -1068,17 +1068,17 @@ describe('auto stacking groups', () => {
     });
 
     expect(getStackingGroups(df)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "dir": -1,
-          "series": Array [
+          "series": [
             1,
             4,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             2,
             3,
           ],
@@ -1115,10 +1115,10 @@ describe('auto stacking groups', () => {
     });
 
     expect(getStackingGroups(df)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             1,
             2,
             3,
@@ -1186,34 +1186,34 @@ describe('auto stacking groups', () => {
     });
 
     expect(getStackingGroups(df)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             1,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             2,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             3,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             4,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             5,
           ],
         },
@@ -1239,16 +1239,16 @@ describe('auto stacking groups', () => {
     });
 
     expect(getStackingGroups(df)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             1,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             2,
           ],
         },
@@ -1296,35 +1296,35 @@ describe('auto stacking groups', () => {
     });
 
     expect(getStackingGroups(df)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             1,
             2,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             3,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             4,
           ],
         },
-        Object {
+        {
           "dir": 1,
-          "series": Array [
+          "series": [
             5,
           ],
         },
-        Object {
+        {
           "dir": -1,
-          "series": Array [
+          "series": [
             6,
           ],
         },
diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json
index 1fc08e847db..151c54674f4 100644
--- a/packages/jaeger-ui-components/package.json
+++ b/packages/jaeger-ui-components/package.json
@@ -16,7 +16,7 @@
     "@types/classnames": "^2.2.7",
     "@types/deep-freeze": "^0.1.1",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/jest": "28.1.6",
+    "@types/jest": "29.2.3",
     "@types/lodash": "4.14.187",
     "@types/prop-types": "15.7.5",
     "@types/react": "17.0.42",
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap b/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
index 3c12d1d9a8f..891f5a78940 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
@@ -3,14 +3,14 @@
 exports[`<ListView> shallow tests matches a snapshot 1`] = `
 <div
   style={
-    Object {
+    {
       "position": "relative",
     }
   }
 >
   <div
     style={
-      Object {
+      {
         "height": 1640,
         "position": "relative",
       }
@@ -19,7 +19,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
     <div
       className="SomeClassName"
       style={
-        Object {
+        {
           "margin": 0,
           "padding": 0,
           "position": "absolute",
@@ -31,7 +31,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
         data-item-key="0"
         key="0"
         style={
-          Object {
+          {
             "height": 2,
             "position": "absolute",
             "top": 0,
@@ -44,7 +44,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
         data-item-key="1"
         key="1"
         style={
-          Object {
+          {
             "height": 4,
             "position": "absolute",
             "top": 2,
@@ -57,7 +57,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
         data-item-key="2"
         key="2"
         style={
-          Object {
+          {
             "height": 6,
             "position": "absolute",
             "top": 6,
@@ -70,7 +70,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
         data-item-key="3"
         key="3"
         style={
-          Object {
+          {
             "height": 8,
             "position": "absolute",
             "top": 12,
@@ -83,7 +83,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
         data-item-key="4"
         key="4"
         style={
-          Object {
+          {
             "height": 10,
             "position": "absolute",
             "top": 20,
diff --git a/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap b/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap
index 95e81b6a8d3..8a6096a927d 100644
--- a/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap
+++ b/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap
@@ -1,36 +1,36 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PathElem legibility creates consumable JSON 1`] = `
-Object {
+{
   "memberIdx": 1,
-  "memberOf": Object {
+  "memberOf": {
     "focalIdx": 2,
-    "members": Array [
-      Object {
+    "members": [
+      {
         "memberIdx": 0,
         "operation": "firstOperation",
         "service": "firstService",
         "visibilityIdx": 4,
       },
-      Object {
+      {
         "memberIdx": 1,
         "operation": "beforeOperation",
         "service": "beforeService",
         "visibilityIdx": 2,
       },
-      Object {
+      {
         "memberIdx": 2,
         "operation": "focalOperation",
         "service": "focalService",
         "visibilityIdx": 0,
       },
-      Object {
+      {
         "memberIdx": 3,
         "operation": "afterOperation",
         "service": "afterService",
         "visibilityIdx": 1,
       },
-      Object {
+      {
         "memberIdx": 4,
         "operation": "lastOperation",
         "service": "lastService",
diff --git a/public/app/core/utils/timeRegions.test.ts b/public/app/core/utils/timeRegions.test.ts
index 16a20e47d24..643883a2707 100644
--- a/public/app/core/utils/timeRegions.test.ts
+++ b/public/app/core/utils/timeRegions.test.ts
@@ -19,20 +19,20 @@ describe('timeRegions', () => {
       };
       const regions = calculateTimesWithin(cfg, tr);
       expect(regions).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "from": 1609779600000,
             "to": 1609779600000,
           },
-          Object {
+          {
             "from": 1610384400000,
             "to": 1610384400000,
           },
-          Object {
+          {
             "from": 1610989200000,
             "to": 1610989200000,
           },
-          Object {
+          {
             "from": 1611594000000,
             "to": 1611594000000,
           },
diff --git a/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap b/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap
index f76953257c1..e6e9f68c60e 100644
--- a/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap
+++ b/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap
@@ -1,28 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PanelAlertTabContent Will render alerts belonging to panel and a button to create alert from panel queries 1`] = `
-Object {
-  "annotations": Array [
-    Object {
+{
+  "annotations": [
+    {
       "key": "__dashboardUid__",
       "value": "12",
     },
-    Object {
+    {
       "key": "__panelId__",
       "value": "34",
     },
   ],
   "condition": "C",
-  "folder": Object {
+  "folder": {
     "id": 1,
     "title": "super folder",
   },
   "name": "mypanel",
-  "queries": Array [
-    Object {
+  "queries": [
+    {
       "datasourceUid": "mock-ds-2",
-      "model": Object {
-        "datasource": Object {
+      "model": {
+        "datasource": {
           "type": "prometheus",
           "uid": "mock-ds-2",
         },
@@ -33,36 +33,36 @@ Object {
       },
       "queryType": "",
       "refId": "A",
-      "relativeTimeRange": Object {
+      "relativeTimeRange": {
         "from": 21600,
         "to": 0,
       },
     },
-    Object {
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [],
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [
+            "query": {
+              "params": [
                 "B",
               ],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "last",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "type": "__expr__",
           "uid": "-100",
         },
@@ -75,33 +75,33 @@ Object {
       "queryType": "",
       "refId": "B",
     },
-    Object {
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [
+            "query": {
+              "params": [
                 "C",
               ],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "last",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "type": "__expr__",
           "uid": "-100",
         },
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/__snapshots__/reducer.test.tsx.snap b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/__snapshots__/reducer.test.tsx.snap
index b8678183f40..abaaa52a6bd 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/__snapshots__/reducer.test.tsx.snap
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/__snapshots__/reducer.test.tsx.snap
@@ -1,42 +1,42 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Query and expressions reducer should add a new expression 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "A",
       },
       "queryType": "query",
       "refId": "A",
     },
-    Object {
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [],
+            "query": {
+              "params": [],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "avg",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "name": "Expression",
           "type": "__expr__",
           "uid": "__expr__",
@@ -55,20 +55,20 @@ Object {
 `;
 
 exports[`Query and expressions reducer should add query 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "A",
       },
       "queryType": "query",
       "refId": "A",
     },
-    Object {
+    {
       "datasourceUid": "c8eceabb-0275-4108-8f03-8f74faf4bf6d",
-      "model": Object {
-        "datasource": Object {
+      "model": {
+        "datasource": {
           "type": "prometheus",
           "uid": "c8eceabb-0275-4108-8f03-8f74faf4bf6d",
         },
@@ -77,7 +77,7 @@ Object {
       },
       "queryType": "",
       "refId": "B",
-      "relativeTimeRange": Object {
+      "relativeTimeRange": {
         "from": 600,
         "to": 0,
       },
@@ -87,25 +87,25 @@ Object {
 `;
 
 exports[`Query and expressions reducer should duplicate query 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "A",
       },
       "queryType": "query",
       "refId": "A",
     },
-    Object {
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "hide": false,
         "refId": "B",
       },
       "queryType": "",
       "refId": "B",
-      "relativeTimeRange": Object {
+      "relativeTimeRange": {
         "from": 600,
         "to": 0,
       },
@@ -115,11 +115,11 @@ Object {
 `;
 
 exports[`Query and expressions reducer should remove an expression or alert query 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "A",
       },
       "queryType": "query",
@@ -130,44 +130,44 @@ Object {
 `;
 
 exports[`Query and expressions reducer should rewire expressions 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "A",
       },
       "queryType": "query",
       "refId": "A",
     },
-    Object {
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [
+            "query": {
+              "params": [
                 "C",
               ],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "avg",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "name": "Expression",
           "type": "__expr__",
           "uid": "__expr__",
@@ -184,36 +184,36 @@ Object {
 `;
 
 exports[`Query and expressions reducer should set data queries 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [
+            "query": {
+              "params": [
                 "A",
               ],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "avg",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "name": "Expression",
           "type": "__expr__",
           "uid": "__expr__",
@@ -230,36 +230,36 @@ Object {
 `;
 
 exports[`Query and expressions reducer should update an expression 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [
+            "query": {
+              "params": [
                 "A",
               ],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "avg",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "name": "Expression",
           "type": "__expr__",
           "uid": "__expr__",
@@ -276,44 +276,44 @@ Object {
 `;
 
 exports[`Query and expressions reducer should update an expression refId and rewire expressions 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "C",
       },
       "queryType": "query",
       "refId": "C",
     },
-    Object {
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [
+            "query": {
+              "params": [
                 "C",
               ],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "avg",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "name": "Expression",
           "type": "__expr__",
           "uid": "__expr__",
@@ -330,42 +330,42 @@ Object {
 `;
 
 exports[`Query and expressions reducer should update expression type 1`] = `
-Object {
-  "queries": Array [
-    Object {
+{
+  "queries": [
+    {
       "datasourceUid": "abc123",
-      "model": Object {
+      "model": {
         "refId": "A",
       },
       "queryType": "query",
       "refId": "A",
     },
-    Object {
+    {
       "datasourceUid": "-100",
-      "model": Object {
-        "conditions": Array [
-          Object {
-            "evaluator": Object {
-              "params": Array [
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
                 0,
                 0,
               ],
               "type": "gt",
             },
-            "operator": Object {
+            "operator": {
               "type": "and",
             },
-            "query": Object {
-              "params": Array [],
+            "query": {
+              "params": [],
             },
-            "reducer": Object {
-              "params": Array [],
+            "reducer": {
+              "params": [],
               "type": "avg",
             },
             "type": "query",
           },
         ],
-        "datasource": Object {
+        "datasource": {
           "name": "Expression",
           "type": "__expr__",
           "uid": "__expr__",
diff --git a/public/app/features/alerting/unified/components/rules/__snapshots__/StateHistory.test.tsx.snap b/public/app/features/alerting/unified/components/rules/__snapshots__/StateHistory.test.tsx.snap
index 6068c9caec1..f9396ab2149 100644
--- a/public/app/features/alerting/unified/components/rules/__snapshots__/StateHistory.test.tsx.snap
+++ b/public/app/features/alerting/unified/components/rules/__snapshots__/StateHistory.test.tsx.snap
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`groupStateByLabels should group a list by labels 1`] = `
-Object {
-  "{cpu=0, type=cpu}": Array [
-    Object {
-      "data": Object {},
+{
+  "{cpu=0, type=cpu}": [
+    {
+      "data": {},
       "id": "1",
       "state": "alerting",
       "stringifiedLabels": "{cpu=0, type=cpu}",
@@ -12,9 +12,9 @@ Object {
       "timestamp": 1658834395024,
     },
   ],
-  "{cpu=1, type=cpu}": Array [
-    Object {
-      "data": Object {},
+  "{cpu=1, type=cpu}": [
+    {
+      "data": {},
       "id": "2",
       "state": "ok",
       "stringifiedLabels": "{cpu=1, type=cpu}",
@@ -26,10 +26,10 @@ Object {
 `;
 
 exports[`groupStateByLabels should group a list by labels even if the alert rule name has {} 1`] = `
-Object {
-  "{cpu=0, type=cpu}": Array [
-    Object {
-      "data": Object {},
+{
+  "{cpu=0, type=cpu}": [
+    {
+      "data": {},
       "id": "1",
       "state": "alerting",
       "stringifiedLabels": "{cpu=0, type=cpu}",
@@ -37,9 +37,9 @@ Object {
       "timestamp": 1658834395024,
     },
   ],
-  "{cpu=1, type=cpu}": Array [
-    Object {
-      "data": Object {},
+  "{cpu=1, type=cpu}": [
+    {
+      "data": {},
       "id": "2",
       "state": "ok",
       "stringifiedLabels": "{cpu=1, type=cpu}",
diff --git a/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap b/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap
index 91d24e856b6..77658b56588 100644
--- a/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap
+++ b/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap
@@ -1,40 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`formValuesToRulerGrafanaRuleDTO should correctly convert rule form values 1`] = `
-Object {
-  "annotations": Object {
+{
+  "annotations": {
     "description": "",
     "runbook_url": "",
     "summary": "",
   },
   "for": "5m",
-  "grafana_alert": Object {
+  "grafana_alert": {
     "condition": "A",
-    "data": Array [],
+    "data": [],
     "exec_err_state": "Error",
     "no_data_state": "NoData",
     "title": "",
   },
-  "labels": Object {
+  "labels": {
     "": "",
   },
 }
 `;
 
 exports[`formValuesToRulerGrafanaRuleDTO should not save both instant and range type queries 1`] = `
-Object {
-  "annotations": Object {
+{
+  "annotations": {
     "description": "",
     "runbook_url": "",
     "summary": "",
   },
   "for": "5m",
-  "grafana_alert": Object {
+  "grafana_alert": {
     "condition": "A",
-    "data": Array [
-      Object {
+    "data": [
+      {
         "datasourceUid": "dsuid",
-        "model": Object {
+        "model": {
           "expr": "",
           "instant": false,
           "range": true,
@@ -42,7 +42,7 @@ Object {
         },
         "queryType": "query",
         "refId": "A",
-        "relativeTimeRange": Object {
+        "relativeTimeRange": {
           "from": 900,
           "to": 1000,
         },
@@ -52,7 +52,7 @@ Object {
     "no_data_state": "NoData",
     "title": "",
   },
-  "labels": Object {
+  "labels": {
     "": "",
   },
 }
diff --git a/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.test.ts b/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.test.ts
index ccb5b7b5ff9..450b874685e 100644
--- a/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.test.ts
+++ b/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.test.ts
@@ -30,38 +30,38 @@ describe('SupportSnapshotService', () => {
     const service = new SupportSnapshotService(panel);
     await service.buildDebugDashboard();
     expect(service.state.snapshot.panels[0].targets[0]).toMatchInlineSnapshot(`
-      Object {
-        "datasource": Object {
+      {
+        "datasource": {
           "type": "grafana",
           "uid": "grafana",
         },
         "queryType": "snapshot",
         "refId": "A",
-        "snapshot": Array [
-          Object {
-            "data": Object {
-              "values": Array [
-                Array [
+        "snapshot": [
+          {
+            "data": {
+              "values": [
+                [
                   1,
                   2,
                   3,
                 ],
-                Array [
+                [
                   11,
                   22,
                   33,
                 ],
               ],
             },
-            "schema": Object {
-              "fields": Array [
-                Object {
-                  "config": Object {},
+            "schema": {
+              "fields": [
+                {
+                  "config": {},
                   "name": "Time",
                   "type": "time",
                 },
-                Object {
-                  "config": Object {},
+                {
+                  "config": {},
                   "name": "Value",
                   "type": "number",
                 },
diff --git a/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts b/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts
index 86f37cb761a..bb7c385e2d7 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts
@@ -23,14 +23,14 @@ describe('getPanelEditorTabs selector', () => {
 
   it('marks tab as active when tab param provided', () => {
     expect(getPanelEditorTabs('transform', { meta: { skipDataQuery: false } } as PanelPlugin)).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "active": false,
           "icon": "database",
           "id": "query",
           "text": "Query",
         },
-        Object {
+        {
           "active": true,
           "icon": "process",
           "id": "transform",
diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts
index 944bf97bd60..93f16735f99 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts
@@ -1258,15 +1258,15 @@ describe('DashboardModel', () => {
         ],
       });
       expect(model.panels[0].options).toMatchInlineSnapshot(`
-        Object {
-          "tooltip": Object {
+        {
+          "tooltip": {
             "mode": "multi",
           },
         }
       `);
       expect(model.panels[1].options).toMatchInlineSnapshot(`
-        Object {
-          "tooltip": Object {
+        {
+          "tooltip": {
             "mode": "single",
           },
         }
@@ -1314,18 +1314,18 @@ describe('DashboardModel', () => {
         ],
       });
       expect(model.panels[0].fieldConfig.defaults.mappings).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "options": Object {
-              "20": Object {
+        [
+          {
+            "options": {
+              "20": {
                 "color": undefined,
                 "text": "test",
               },
-              "30": Object {
+              "30": {
                 "color": undefined,
                 "text": "test1",
               },
-              "40": Object {
+              "40": {
                 "color": "orange",
                 "text": "50",
               },
@@ -1375,11 +1375,11 @@ describe('DashboardModel', () => {
         ],
       });
       expect(model.panels[0].fieldConfig.defaults.mappings).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "options": Object {
+        [
+          {
+            "options": {
               "from": 20,
-              "result": Object {
+              "result": {
                 "color": undefined,
                 "text": "text1",
               },
@@ -1387,10 +1387,10 @@ describe('DashboardModel', () => {
             },
             "type": "range",
           },
-          Object {
-            "options": Object {
+          {
+            "options": {
               "from": 1,
-              "result": Object {
+              "result": {
                 "color": undefined,
                 "text": "text2",
               },
@@ -1398,10 +1398,10 @@ describe('DashboardModel', () => {
             },
             "type": "range",
           },
-          Object {
-            "options": Object {
+          {
+            "options": {
               "from": 5,
-              "result": Object {
+              "result": {
                 "color": "orange",
                 "text": "50",
               },
@@ -1471,13 +1471,13 @@ describe('DashboardModel', () => {
     it('should create two transormatoins', () => {
       const xforms = model.panels[0].transformations;
       expect(xforms).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "id": "labelsToFields",
           },
-          Object {
+          {
             "id": "merge",
-            "options": Object {},
+            "options": {},
           },
         ]
       `);
@@ -1909,14 +1909,14 @@ describe('DashboardModel', () => {
       });
 
       expect(model.panels[0].fieldConfig.overrides).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "matcher": Object {
+        [
+          {
+            "matcher": {
               "id": "byType",
               "options": "time",
             },
-            "properties": Array [
-              Object {
+            "properties": [
+              {
                 "id": "custom.axisPlacement",
                 "value": "auto",
               },
diff --git a/public/app/features/dashboard/state/DashboardModel.test.ts b/public/app/features/dashboard/state/DashboardModel.test.ts
index b82e710c114..9d154c691bf 100644
--- a/public/app/features/dashboard/state/DashboardModel.test.ts
+++ b/public/app/features/dashboard/state/DashboardModel.test.ts
@@ -13,7 +13,7 @@ import { PanelModel } from '../state/PanelModel';
 
 jest.mock('app/core/services/context_srv');
 
-const mockContextSrv = jest.mocked(contextSrv, true);
+const mockContextSrv = jest.mocked(contextSrv);
 
 variableAdapters.setInit(() => [
   createQueryVariableAdapter(),
diff --git a/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts b/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts
index a56c2669238..07aa648d7ed 100644
--- a/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts
+++ b/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts
@@ -60,12 +60,12 @@ describe('getPanelOptionsWithDefaults', () => {
       });
 
       expect(result).toMatchInlineSnapshot(`
-        Object {
-          "fieldConfig": Object {
-            "defaults": Object {},
-            "overrides": Array [],
+        {
+          "fieldConfig": {
+            "defaults": {},
+            "overrides": [],
           },
-          "options": Object {},
+          "options": {},
         }
       `);
     });
@@ -84,29 +84,29 @@ describe('getPanelOptionsWithDefaults', () => {
       });
 
       expect(result).toMatchInlineSnapshot(`
-        Object {
-          "fieldConfig": Object {
-            "defaults": Object {
-              "custom": Object {
+        {
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
                 "hideLines": false,
               },
-              "thresholds": Object {
+              "thresholds": {
                 "mode": "absolute",
-                "steps": Array [
-                  Object {
+                "steps": [
+                  {
                     "color": "green",
                     "value": -Infinity,
                   },
-                  Object {
+                  {
                     "color": "red",
                     "value": 80,
                   },
                 ],
               },
             },
-            "overrides": Array [],
+            "overrides": [],
           },
-          "options": Object {
+          "options": {
             "name": "hello",
             "number": 10,
             "showThresholds": true,
@@ -135,21 +135,21 @@ describe('getPanelOptionsWithDefaults', () => {
       });
 
       expect(result).toMatchInlineSnapshot(`
-        Object {
-          "fieldConfig": Object {
-            "defaults": Object {
-              "custom": Object {
+        {
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
                 "hideLines": false,
               },
               "decimals": 2,
-              "thresholds": Object {
+              "thresholds": {
                 "mode": "absolute",
-                "steps": Array [
-                  Object {
+                "steps": [
+                  {
                     "color": "green",
                     "value": -Infinity,
                   },
-                  Object {
+                  {
                     "color": "red",
                     "value": 80,
                   },
@@ -157,9 +157,9 @@ describe('getPanelOptionsWithDefaults', () => {
               },
               "unit": "bytes",
             },
-            "overrides": Array [],
+            "overrides": [],
           },
-          "options": Object {
+          "options": {
             "name": "hello",
             "number": 20,
             "showThresholds": false,
@@ -292,21 +292,21 @@ describe('getPanelOptionsWithDefaults', () => {
       });
 
       expect(result.fieldConfig.defaults).toMatchInlineSnapshot(`
-        Object {
-          "custom": Object {
+        {
+          "custom": {
             "customProp": 20,
-            "nested": Object {
+            "nested": {
               "nestedA": "A",
             },
           },
-          "thresholds": Object {
+          "thresholds": {
             "mode": "absolute",
-            "steps": Array [
-              Object {
+            "steps": [
+              {
                 "color": "green",
                 "value": -Infinity,
               },
-              Object {
+              {
                 "color": "red",
                 "value": 80,
               },
diff --git a/public/app/features/dashboard/utils/getPanelMenu.test.ts b/public/app/features/dashboard/utils/getPanelMenu.test.ts
index ab6751711f7..0fae58b3e14 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.test.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.test.ts
@@ -20,37 +20,37 @@ describe('getPanelMenu', () => {
 
     const menuItems = getPanelMenu(dashboard, panel);
     expect(menuItems).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "iconClassName": "eye",
           "onClick": [Function],
           "shortcut": "v",
           "text": "View",
         },
-        Object {
+        {
           "iconClassName": "edit",
           "onClick": [Function],
           "shortcut": "e",
           "text": "Edit",
         },
-        Object {
+        {
           "iconClassName": "share-alt",
           "onClick": [Function],
           "shortcut": "p s",
           "text": "Share",
         },
-        Object {
+        {
           "iconClassName": "compass",
           "onClick": [Function],
           "shortcut": "x",
           "text": "Explore",
         },
-        Object {
+        {
           "iconClassName": "info-circle",
           "onClick": [Function],
           "shortcut": "i",
-          "subMenu": Array [
-            Object {
+          "subMenu": [
+            {
               "onClick": [Function],
               "text": "Panel JSON",
             },
@@ -58,20 +58,20 @@ describe('getPanelMenu', () => {
           "text": "Inspect",
           "type": "submenu",
         },
-        Object {
+        {
           "iconClassName": "cube",
           "onClick": [Function],
-          "subMenu": Array [
-            Object {
+          "subMenu": [
+            {
               "onClick": [Function],
               "shortcut": "p d",
               "text": "Duplicate",
             },
-            Object {
+            {
               "onClick": [Function],
               "text": "Copy",
             },
-            Object {
+            {
               "onClick": [Function],
               "text": "Create library panel",
             },
@@ -79,11 +79,11 @@ describe('getPanelMenu', () => {
           "text": "More...",
           "type": "submenu",
         },
-        Object {
+        {
           "text": "",
           "type": "divider",
         },
-        Object {
+        {
           "iconClassName": "trash-alt",
           "onClick": [Function],
           "shortcut": "p r",
@@ -104,37 +104,37 @@ describe('getPanelMenu', () => {
 
       const menuItems = getPanelMenu(dashboard, panel, angularComponent);
       expect(menuItems).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "iconClassName": "eye",
             "onClick": [Function],
             "shortcut": "v",
             "text": "View",
           },
-          Object {
+          {
             "iconClassName": "edit",
             "onClick": [Function],
             "shortcut": "e",
             "text": "Edit",
           },
-          Object {
+          {
             "iconClassName": "share-alt",
             "onClick": [Function],
             "shortcut": "p s",
             "text": "Share",
           },
-          Object {
+          {
             "iconClassName": "compass",
             "onClick": [Function],
             "shortcut": "x",
             "text": "Explore",
           },
-          Object {
+          {
             "iconClassName": "info-circle",
             "onClick": [Function],
             "shortcut": "i",
-            "subMenu": Array [
-              Object {
+            "subMenu": [
+              {
                 "onClick": [Function],
                 "text": "Panel JSON",
               },
@@ -142,11 +142,11 @@ describe('getPanelMenu', () => {
             "text": "Inspect",
             "type": "submenu",
           },
-          Object {
+          {
             "iconClassName": "cube",
             "onClick": [Function],
-            "subMenu": Array [
-              Object {
+            "subMenu": [
+              {
                 "href": undefined,
                 "onClick": [Function],
                 "shortcut": "p l",
diff --git a/public/app/features/dashboard/utils/panelMerge.test.ts b/public/app/features/dashboard/utils/panelMerge.test.ts
index 9882379d3a2..cc3f77a1d1d 100644
--- a/public/app/features/dashboard/utils/panelMerge.test.ts
+++ b/public/app/features/dashboard/utils/panelMerge.test.ts
@@ -49,16 +49,16 @@ describe('Merge dashbaord panels', () => {
       const info = dashboard.updatePanels(rawPanels);
       expect(info.changed).toBeFalsy();
       expect(info.actions).toMatchInlineSnapshot(`
-        Object {
-          "add": Array [],
-          "noop": Array [
+        {
+          "add": [],
+          "noop": [
             1,
             2,
             3,
           ],
-          "remove": Array [],
-          "replace": Array [],
-          "update": Array [],
+          "remove": [],
+          "replace": [],
+          "update": [],
         }
       `);
     });
@@ -115,17 +115,17 @@ describe('Merge dashbaord panels', () => {
       const info = dashboard.updatePanels(rawPanels);
       expect(info.changed).toBeTruthy();
       expect(info.actions).toMatchInlineSnapshot(`
-        Object {
-          "add": Array [],
-          "noop": Array [
+        {
+          "add": [],
+          "noop": [
             1,
             3,
           ],
-          "remove": Array [],
-          "replace": Array [
+          "remove": [],
+          "replace": [
             2,
           ],
-          "update": Array [],
+          "update": [],
         }
       `);
     });
diff --git a/public/app/features/dimensions/scale.test.ts b/public/app/features/dimensions/scale.test.ts
index d10d65e5875..86cb69421f7 100644
--- a/public/app/features/dimensions/scale.test.ts
+++ b/public/app/features/dimensions/scale.test.ts
@@ -9,7 +9,7 @@ describe('scale dimensions', () => {
       max: 10,
     });
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "fixed": 7.5,
         "max": 10,
         "min": 5,
@@ -30,7 +30,7 @@ describe('scale dimensions', () => {
       }
     );
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "fixed": 10,
         "max": 7,
         "min": 5,
diff --git a/public/app/features/geo/format/geojson.test.ts b/public/app/features/geo/format/geojson.test.ts
index fe00ba66035..f9572f22ac8 100644
--- a/public/app/features/geo/format/geojson.test.ts
+++ b/public/app/features/geo/format/geojson.test.ts
@@ -45,30 +45,30 @@ describe('Read GeoJSON', () => {
     });
     const msg = dataFrameToJSON(frame);
     expect(msg.schema).toMatchInlineSnapshot(`
-      Object {
-        "fields": Array [
-          Object {
-            "config": Object {},
+      {
+        "fields": [
+          {
+            "config": {},
             "name": "id",
             "type": "string",
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "geo",
             "type": "geo",
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "hello",
             "type": "string",
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "number",
             "type": "number",
           },
-          Object {
-            "config": Object {},
+          {
+            "config": {},
             "name": "mixed",
             "type": "string",
           },
@@ -87,23 +87,23 @@ describe('Read GeoJSON', () => {
         return acc;
       }, {} as any)
     ).toMatchInlineSnapshot(`
-      Object {
-        "hello": Array [
+      {
+        "hello": [
           "A",
           "B",
           null,
         ],
-        "id": Array [
+        "id": [
           "A",
           null,
           null,
         ],
-        "mixed": Array [
+        "mixed": [
           null,
           "first",
           "2",
         ],
-        "number": Array [
+        "number": [
           null,
           1.2,
           2.3,
diff --git a/public/app/features/geo/gazetteer/gazetteer.test.ts b/public/app/features/geo/gazetteer/gazetteer.test.ts
index f91d7d34fbd..45ee0005966 100644
--- a/public/app/features/geo/gazetteer/gazetteer.test.ts
+++ b/public/app/features/geo/gazetteer/gazetteer.test.ts
@@ -60,7 +60,7 @@ describe('Placename lookup from geojson format', () => {
     const gaz = await getGazetteer('local');
     expect(gaz.error).toBeUndefined();
     expect(getCenterPointWGS84(gaz.find('A')?.geometry())).toMatchInlineSnapshot(`
-      Array [
+      [
         0,
         0,
       ]
@@ -71,7 +71,7 @@ describe('Placename lookup from geojson format', () => {
     const gaz = await getGazetteer('airports');
     expect(gaz.error).toBeUndefined();
     expect(getCenterPointWGS84(gaz.find('B')?.geometry())).toMatchInlineSnapshot(`
-      Array [
+      [
         1,
         1,
       ]
@@ -83,7 +83,7 @@ describe('Placename lookup from geojson format', () => {
     const gaz = await getGazetteer('airports');
     expect(gaz.error).toBeUndefined();
     expect(getCenterPointWGS84(gaz.find('C')?.geometry())).toMatchInlineSnapshot(`
-      Array [
+      [
         2,
         2,
       ]
diff --git a/public/app/features/geo/gazetteer/worldmap.test.ts b/public/app/features/geo/gazetteer/worldmap.test.ts
index a43471f7363..d3342da7346 100644
--- a/public/app/features/geo/gazetteer/worldmap.test.ts
+++ b/public/app/features/geo/gazetteer/worldmap.test.ts
@@ -23,7 +23,7 @@ describe('Placename lookup from worldmap format', () => {
     const gaz = await getGazetteer('countries');
     expect(gaz.error).toBeUndefined();
     expect(toLonLat(gaz.find('US')?.point()?.getCoordinates()!)).toMatchInlineSnapshot(`
-      Array [
+      [
         -95.712891,
         37.09023999999998,
       ]
diff --git a/public/app/features/geo/utils/location.test.ts b/public/app/features/geo/utils/location.test.ts
index 6257e890376..18ce5d83b1a 100644
--- a/public/app/features/geo/utils/location.test.ts
+++ b/public/app/features/geo/utils/location.test.ts
@@ -33,17 +33,17 @@ describe('handle location parsing', () => {
     const info = getGeometryField(frame, matchers);
     expect(info.field!.type).toBe(FieldType.geo);
     expect(info.field!.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
-        Array [
-          Array [
-            -122.01416015625001,
-            36.979980468750014,
-          ],
-          Array [
-            -73.98193359375,
-            40.71533203125,
-          ],
-        ]
-      `);
+      [
+        [
+          -122.01416015625001,
+          36.979980468750014,
+        ],
+        [
+          -73.98193359375,
+          40.71533203125,
+        ],
+      ]
+    `);
   });
 
   it('auto should find coordinate fields', async () => {
@@ -59,12 +59,12 @@ describe('handle location parsing', () => {
     const matchers = await getLocationMatchers();
     const geo = getGeometryField(frame, matchers).field!;
     expect(geo.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           0,
           0,
         ],
-        Array [
+        [
           -74.1,
           40.69999999999999,
         ],
@@ -86,12 +86,12 @@ describe('handle location parsing', () => {
     });
     const geo = getGeometryField(frame, matchers).field!;
     expect(geo.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           -122.01416015625001,
           36.979980468750014,
         ],
-        Array [
+        [
           -73.98193359375,
           40.71533203125,
         ],
diff --git a/public/app/features/live/data/StreamingDataFrame.test.ts b/public/app/features/live/data/StreamingDataFrame.test.ts
index 984203ddaf1..fb3baab7396 100644
--- a/public/app/features/live/data/StreamingDataFrame.test.ts
+++ b/public/app/features/live/data/StreamingDataFrame.test.ts
@@ -91,26 +91,26 @@ describe('Streaming JSON', () => {
 
     it('should create frame with schema & data', () => {
       expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               100,
               200,
               300,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "a",
               "b",
               "c",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               1,
               2,
               3,
@@ -128,28 +128,28 @@ describe('Streaming JSON', () => {
       });
 
       expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               100,
               200,
               300,
               400,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "a",
               "b",
               "c",
               "d",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               1,
               2,
               3,
@@ -168,28 +168,28 @@ describe('Streaming JSON', () => {
       });
 
       expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               200,
               300,
               400,
               500,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "b",
               "c",
               "d",
               "e",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               2,
               3,
               4,
@@ -212,10 +212,10 @@ describe('Streaming JSON', () => {
       });
 
       expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               400,
               500,
               501,
@@ -223,9 +223,9 @@ describe('Streaming JSON', () => {
               503,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "d",
               "e",
               "f",
@@ -233,9 +233,9 @@ describe('Streaming JSON', () => {
               "h",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               4,
               5,
               6,
@@ -264,10 +264,10 @@ describe('Streaming JSON', () => {
       });
 
       expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               500,
               501,
               502,
@@ -275,9 +275,9 @@ describe('Streaming JSON', () => {
               601,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "e",
               "f",
               "g",
@@ -285,9 +285,9 @@ describe('Streaming JSON', () => {
               "i",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               5,
               6,
               7,
@@ -296,9 +296,9 @@ describe('Streaming JSON', () => {
               10,
             ],
           },
-          Object {
+          {
             "name": "value2",
-            "value": Array [
+            "value": [
               undefined,
               undefined,
               undefined,
@@ -559,26 +559,26 @@ describe('Streaming JSON', () => {
       ]);
       expect(frame.length).toEqual(3);
       expect(frame.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               300,
               601,
               602,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "c",
               "x",
               "y",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               3,
               10,
               11,
@@ -604,24 +604,24 @@ describe('Streaming JSON', () => {
       ]);
       expect(frame.length).toEqual(2);
       expect(frame.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "time",
-            "value": Array [
+            "value": [
               601,
               602,
             ],
           },
-          Object {
+          {
             "name": "name",
-            "value": Array [
+            "value": [
               "x",
               "y",
             ],
           },
-          Object {
+          {
             "name": "value",
-            "value": Array [
+            "value": [
               10,
               11,
             ],
@@ -722,83 +722,83 @@ describe('Streaming JSON', () => {
 
     expect(stream.fields.map((f) => ({ name: f.name, labels: f.labels, values: f.values.buffer })))
       .toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "labels": undefined,
           "name": "time",
-          "values": Array [
+          "values": [
             100,
             200,
             300,
             400,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "A",
           },
           "name": "speed",
-          "values": Array [
+          "values": [
             10,
             undefined,
             30,
             undefined,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "A",
           },
           "name": "light",
-          "values": Array [
+          "values": [
             1,
             undefined,
             5,
             undefined,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "B",
           },
           "name": "speed",
-          "values": Array [
+          "values": [
             15,
             20,
             undefined,
             undefined,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "B",
           },
           "name": "light",
-          "values": Array [
+          "values": [
             2,
             3,
             undefined,
             undefined,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "C",
           },
           "name": "speed",
-          "values": Array [
+          "values": [
             undefined,
             25,
             undefined,
             40,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "sensor": "C",
           },
           "name": "light",
-          "values": Array [
+          "values": [
             undefined,
             4,
             undefined,
@@ -817,7 +817,7 @@ describe('Streaming JSON', () => {
 
     // names are based on legend format
     expect(stream.fields.map((f) => getFieldDisplayName(f, stream, [stream]))).toMatchInlineSnapshot(`
-      Array [
+      [
         "time: sensor",
         "speed: A",
         "light: A",
@@ -860,14 +860,14 @@ describe('Streaming JSON', () => {
     };
 
     expect(getSnapshot(stream)).toMatchInlineSnapshot(`
-      Object {
-        "info": Object {
+      {
+        "info": {
           "action": "replace",
           "length": 3,
           "number": 1,
           "schemaChanged": true,
         },
-        "values": Array [
+        "values": [
           1,
           2,
           3,
@@ -884,14 +884,14 @@ describe('Streaming JSON', () => {
       },
     });
     expect(getSnapshot(stream)).toMatchInlineSnapshot(`
-      Object {
-        "info": Object {
+      {
+        "info": {
           "action": "append",
           "length": 2,
           "number": 2,
           "schemaChanged": false,
         },
-        "values": Array [
+        "values": [
           2,
           3,
           4,
@@ -906,14 +906,14 @@ describe('Streaming JSON', () => {
       },
     });
     expect(getSnapshot(stream)).toMatchInlineSnapshot(`
-      Object {
-        "info": Object {
+      {
+        "info": {
           "action": "append",
           "length": 1,
           "number": 3,
           "schemaChanged": false,
         },
-        "values": Array [
+        "values": [
           3,
           4,
           5,
@@ -946,25 +946,25 @@ describe('Streaming JSON', () => {
     let cTables = transpose(vrecsC);
 
     expect(cTables).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           "sensor=A",
           "sensor=C",
         ],
-        Array [
-          Array [
-            Array [
+        [
+          [
+            [
               300,
             ],
-            Array [
+            [
               30,
             ],
           ],
-          Array [
-            Array [
+          [
+            [
               400,
             ],
-            Array [
+            [
               40,
             ],
           ],
@@ -975,16 +975,16 @@ describe('Streaming JSON', () => {
     let cJoined = join(cTables[1]);
 
     expect(cJoined).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           300,
           400,
         ],
-        Array [
+        [
           30,
           undefined,
         ],
-        Array [
+        [
           undefined,
           40,
         ],
diff --git a/public/app/features/manage-dashboards/components/SnapshotListTable.test.tsx b/public/app/features/manage-dashboards/components/SnapshotListTable.test.tsx
index ac89f7f9684..582566c98dd 100644
--- a/public/app/features/manage-dashboards/components/SnapshotListTable.test.tsx
+++ b/public/app/features/manage-dashboards/components/SnapshotListTable.test.tsx
@@ -38,15 +38,15 @@ describe('getSnapshots', () => {
     const results = await getSnapshots();
 
     expect(results).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "external": true,
           "externalUrl": "https://www.externalSnapshotUrl.com",
           "key": "JRXqfKihKZek70FM6Xaq502NxH7OyyEs",
           "name": "Snap 1",
           "url": "/dashboard/snapshot/JRXqfKihKZek70FM6Xaq502NxH7OyyEs",
         },
-        Object {
+        {
           "external": false,
           "externalUrl": "",
           "id": 3,
diff --git a/public/app/features/panel/panellinks/linkSuppliers.test.ts b/public/app/features/panel/panellinks/linkSuppliers.test.ts
index 2bdf1977972..e199d823823 100644
--- a/public/app/features/panel/panellinks/linkSuppliers.test.ts
+++ b/public/app/features/panel/panellinks/linkSuppliers.test.ts
@@ -120,36 +120,36 @@ describe('getFieldLinksSupplier', () => {
       };
     });
     expect(links).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "href": "http://go/100.200 kW",
           "title": "By Name",
         },
-        Object {
+        {
           "href": "http://go/100.200 kW",
           "title": "By Index",
         },
-        Object {
+        {
           "href": "http://go/100.200 kW",
           "title": "By Title",
         },
-        Object {
+        {
           "href": "http://go/100.2000001",
           "title": "Numeric Value",
         },
-        Object {
+        {
           "href": "http://go/100.200",
           "title": "Text (no suffix)",
         },
-        Object {
+        {
           "href": "http://go/\${__data.fields.XYZ}",
           "title": "Unknown Field",
         },
-        Object {
+        {
           "href": "http://go/Hello Templates",
           "title": "Data Frame name",
         },
-        Object {
+        {
           "href": "http://go/ZZZ",
           "title": "Data Frame refId",
         },
diff --git a/public/app/features/plugins/tests/datasource_srv.test.ts b/public/app/features/plugins/tests/datasource_srv.test.ts
index 14517b7d3e8..1ab3a3be536 100644
--- a/public/app/features/plugins/tests/datasource_srv.test.ts
+++ b/public/app/features/plugins/tests/datasource_srv.test.ts
@@ -169,7 +169,7 @@ describe('datasource_srv', () => {
         expect(ds?.name).toBe('${datasource}');
         expect(ds?.uid).toBe('${datasource}');
         expect(ds?.rawRef).toMatchInlineSnapshot(`
-          Object {
+          {
             "type": "test-db",
             "uid": "uid-code-BBB",
           }
@@ -193,7 +193,7 @@ describe('datasource_srv', () => {
         expect(ds?.name).toBe('${datasourceDefault}');
         expect(ds?.uid).toBe('${datasourceDefault}');
         expect(ds?.rawRef).toMatchInlineSnapshot(`
-          Object {
+          {
             "type": "test-db",
             "uid": "uid-code-BBB",
           }
@@ -239,26 +239,26 @@ describe('datasource_srv', () => {
 
     it('Can get list  of data sources with metrics: true, builtIn: true, mixed: true', () => {
       expect(dataSourceSrv.getList({ metrics: true, dashboard: true, mixed: true })).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "meta": Object {
+        [
+          {
+            "meta": {
               "metrics": true,
             },
             "name": "aaa",
             "type": "test-db",
             "uid": "uid-code-aaa",
           },
-          Object {
+          {
             "isDefault": true,
-            "meta": Object {
+            "meta": {
               "metrics": true,
             },
             "name": "BBB",
             "type": "test-db",
             "uid": "uid-code-BBB",
           },
-          Object {
-            "meta": Object {
+          {
+            "meta": {
               "annotations": true,
               "metrics": true,
             },
@@ -266,16 +266,16 @@ describe('datasource_srv', () => {
             "type": "test-db",
             "uid": "uid-code-mmm",
           },
-          Object {
-            "meta": Object {
+          {
+            "meta": {
               "metrics": true,
             },
             "name": "ZZZ",
             "type": "test-db",
             "uid": "uid-code-ZZZ",
           },
-          Object {
-            "meta": Object {
+          {
+            "meta": {
               "builtIn": true,
               "id": "mixed",
               "metrics": true,
@@ -284,8 +284,8 @@ describe('datasource_srv', () => {
             "type": "test-db",
             "uid": "-- Mixed --",
           },
-          Object {
-            "meta": Object {
+          {
+            "meta": {
               "builtIn": true,
               "id": "dashboard",
               "metrics": true,
@@ -294,8 +294,8 @@ describe('datasource_srv', () => {
             "type": "dashboard",
             "uid": "-- Dashboard --",
           },
-          Object {
-            "meta": Object {
+          {
+            "meta": {
               "builtIn": true,
               "id": "grafana",
               "metrics": true,
diff --git a/public/app/features/query/state/runRequest.test.ts b/public/app/features/query/state/runRequest.test.ts
index 366e0282be9..52ec24b2481 100644
--- a/public/app/features/query/state/runRequest.test.ts
+++ b/public/app/features/query/state/runRequest.test.ts
@@ -209,12 +209,12 @@ describe('runRequest', () => {
 
     it('should keep data for X and Y', () => {
       expect(ctx.results[2].series).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "name": "DataX-1",
             "refId": "X",
           },
-          Object {
+          {
             "name": "DataY-2",
             "refId": "Y",
           },
diff --git a/public/app/features/query/state/updateQueries.test.ts b/public/app/features/query/state/updateQueries.test.ts
index f761b7a1d85..fd95693c388 100644
--- a/public/app/features/query/state/updateQueries.test.ts
+++ b/public/app/features/query/state/updateQueries.test.ts
@@ -226,9 +226,9 @@ describe('updateQueries with import', () => {
       expect(importSpy).toBeCalledWith(queries.map((q) => ({ ...q, exported: true })));
 
       expect(updated).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "datasource": Object {
+        [
+          {
+            "datasource": {
               "type": "new-type",
               "uid": "new-uid",
             },
@@ -236,8 +236,8 @@ describe('updateQueries with import', () => {
             "imported": true,
             "refId": "A",
           },
-          Object {
-            "datasource": Object {
+          {
+            "datasource": {
               "type": "new-type",
               "uid": "new-uid",
             },
@@ -349,17 +349,17 @@ describe('updateQueries with import', () => {
       expect(importSpy).toBeCalledWith(queries, { uid: 'old-uid', type: 'old-type', meta: { id: 'old-type' } });
 
       expect(updated).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "datasource": Object {
+        [
+          {
+            "datasource": {
               "type": "new-type",
               "uid": "new-uid",
             },
             "imported": true,
             "refId": "A",
           },
-          Object {
-            "datasource": Object {
+          {
+            "datasource": {
               "type": "new-type",
               "uid": "new-uid",
             },
diff --git a/public/app/features/search/service/frontend.test.ts b/public/app/features/search/service/frontend.test.ts
index 11beefac3e9..dbb64328381 100644
--- a/public/app/features/search/service/frontend.test.ts
+++ b/public/app/features/search/service/frontend.test.ts
@@ -26,7 +26,7 @@ describe('FrontendSearcher', () => {
     const results = await frontendSearcher.search(query);
 
     expect(results.view.fields.name.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         "foo cat",
         "bar dog",
         "cow baz",
@@ -44,7 +44,7 @@ describe('FrontendSearcher', () => {
     const results = await frontendSearcher.search(query);
 
     expect(results.view.fields.name.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         "bar dog",
         "cow baz",
       ]
@@ -61,7 +61,7 @@ describe('FrontendSearcher', () => {
     const results = await frontendSearcher.search(query);
 
     expect(results.view.fields.name.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         "bar dog",
       ]
     `);
diff --git a/public/app/features/transformers/calculateHeatmap/heatmap.test.ts b/public/app/features/transformers/calculateHeatmap/heatmap.test.ts
index afbbcd4a1d3..bff77a8fcff 100644
--- a/public/app/features/transformers/calculateHeatmap/heatmap.test.ts
+++ b/public/app/features/transformers/calculateHeatmap/heatmap.test.ts
@@ -19,16 +19,16 @@ describe('Heatmap transformer', () => {
 
     const heatmap = calculateHeatmapFromData([data], options);
     expect(heatmap.fields.map((f) => ({ name: f.name, type: f.type, config: f.config }))).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "config": Object {},
+      [
+        {
+          "config": {},
           "name": "xMin",
           "type": "time",
         },
-        Object {
-          "config": Object {
-            "custom": Object {
-              "scaleDistribution": Object {
+        {
+          "config": {
+            "custom": {
+              "scaleDistribution": {
                 "type": "linear",
               },
             },
@@ -37,8 +37,8 @@ describe('Heatmap transformer', () => {
           "name": "yMin",
           "type": "number",
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": "short",
           },
           "name": "Count",
@@ -60,21 +60,21 @@ describe('Heatmap transformer', () => {
 
     const heatmap = rowsToCellsHeatmap({ frame, value: 'Speed' });
     expect(heatmap.fields.map((f) => ({ name: f.name, type: f.type, config: f.config }))).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "config": Object {},
+      [
+        {
+          "config": {},
           "name": "xMax",
           "type": "time",
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": "short",
           },
           "name": "y",
           "type": "number",
         },
-        Object {
-          "config": Object {
+        {
+          "config": {
             "unit": "m2",
           },
           "name": "Speed",
@@ -83,10 +83,10 @@ describe('Heatmap transformer', () => {
       ]
     `);
     expect(heatmap.meta).toMatchInlineSnapshot(`
-      Object {
-        "custom": Object {
+      {
+        "custom": {
           "yMatchWithLabel": undefined,
-          "yOrdinalDisplay": Array [
+          "yOrdinalDisplay": [
             "A",
             "B",
             "C",
@@ -96,7 +96,7 @@ describe('Heatmap transformer', () => {
       }
     `);
     expect(heatmap.fields[1].values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         0,
         1,
         2,
diff --git a/public/app/features/transformers/configFromQuery/configFromQuery.test.ts b/public/app/features/transformers/configFromQuery/configFromQuery.test.ts
index 2e5266590c1..08f0f7efb87 100644
--- a/public/app/features/transformers/configFromQuery/configFromQuery.test.ts
+++ b/public/app/features/transformers/configFromQuery/configFromQuery.test.ts
@@ -132,20 +132,20 @@ describe('value mapping from data', () => {
 
     const results = extractConfigFromQuery(options, [config, seriesA]);
     expect(results[0].fields[1].config.mappings).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "options": Object {
-            "1": Object {
+      [
+        {
+          "options": {
+            "1": {
               "color": "red",
               "index": 0,
               "text": "one",
             },
-            "2": Object {
+            "2": {
               "color": "blue",
               "index": 1,
               "text": "two",
             },
-            "3": Object {
+            "3": {
               "color": "green",
               "index": 2,
               "text": "three",
diff --git a/public/app/features/transformers/extractFields/extractFields.test.ts b/public/app/features/transformers/extractFields/extractFields.test.ts
index a25d7b299d0..949fbdf6ccc 100644
--- a/public/app/features/transformers/extractFields/extractFields.test.ts
+++ b/public/app/features/transformers/extractFields/extractFields.test.ts
@@ -21,7 +21,7 @@ describe('Fields from JSON', () => {
         return acc;
       }, {} as any)
     ).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "string",
         "av": "number",
         "c": "string",
diff --git a/public/app/features/transformers/extractFields/fieldExtractor.test.ts b/public/app/features/transformers/extractFields/fieldExtractor.test.ts
index fd1b62a7d8d..8e5f9865a31 100644
--- a/public/app/features/transformers/extractFields/fieldExtractor.test.ts
+++ b/public/app/features/transformers/extractFields/fieldExtractor.test.ts
@@ -6,7 +6,7 @@ describe('Extract fields from text', () => {
     const out = extractor.parse('{"a":"148.1672","av":41923755,"c":148.25}');
 
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "148.1672",
         "av": 41923755,
         "c": 148.25,
@@ -18,7 +18,7 @@ describe('Extract fields from text', () => {
     const extractor = fieldExtractors.get(FieldExtractorID.KeyValues);
     const out = extractor.parse('a="1",   "b"=\'2\',c=3  x:y ;\r\nz="d and 4"');
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "1",
         "b": "2",
         "c": "3",
@@ -35,12 +35,12 @@ describe('Extract fields from text', () => {
     );
 
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "1",
         "b": "2",
         "c": "3",
         "x": "y",
-        "z": "dbl_quotes=\\"Double Quotes\\" sgl_quotes='Single Quotes'",
+        "z": "dbl_quotes="Double Quotes" sgl_quotes='Single Quotes'",
       }
     `);
   });
@@ -50,7 +50,7 @@ describe('Extract fields from text', () => {
     const out = extractor.parse(`a="1",   "b"=\'2\',c=3  x:y ;\r\nz="This is; testing& validating, 1=:2"`);
 
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "1",
         "b": "2",
         "c": "3",
@@ -65,7 +65,7 @@ describe('Extract fields from text', () => {
     const out = extractor.parse(`a=, "b"=\'2\',c=3  x: `);
 
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "",
         "b": "2",
         "c": "3",
@@ -78,7 +78,7 @@ describe('Extract fields from text', () => {
     const extractor = fieldExtractors.get(FieldExtractorID.KeyValues);
     const out = extractor.parse('a="1",   "b"=\'2\',c=3  x:y ;\r\nz="7"');
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "1",
         "b": "2",
         "c": "3",
@@ -92,7 +92,7 @@ describe('Extract fields from text', () => {
     const extractor = fieldExtractors.get(FieldExtractorID.KeyValues);
     const out = extractor.parse('a=b&c=d&x=123');
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "a": "b",
         "c": "d",
         "x": "123",
@@ -104,7 +104,7 @@ describe('Extract fields from text', () => {
     const extractor = fieldExtractors.get(FieldExtractorID.KeyValues);
     const out = extractor.parse('{foo="bar", baz="42"}');
     expect(out).toMatchInlineSnapshot(`
-      Object {
+      {
         "baz": "42",
         "foo": "bar",
       }
diff --git a/public/app/features/transformers/joinByLabels/joinByLabels.test.ts b/public/app/features/transformers/joinByLabels/joinByLabels.test.ts
index 7e8acc9f4f7..aeaf32651c6 100644
--- a/public/app/features/transformers/joinByLabels/joinByLabels.test.ts
+++ b/public/app/features/transformers/joinByLabels/joinByLabels.test.ts
@@ -55,35 +55,35 @@ describe('Join by labels', () => {
       },
       input
     );
-    expect(result.fields[result.fields.length - 1].config).toMatchInlineSnapshot(`Object {}`);
+    expect(result.fields[result.fields.length - 1].config).toMatchInlineSnapshot(`{}`);
     expect(toRowsSnapshow(result)).toMatchInlineSnapshot(`
-      Object {
-        "columns": Array [
+      {
+        "columns": [
           "cluster",
           "job",
           "Temp",
           "Speed",
         ],
-        "rows": Array [
-          Array [
+        "rows": [
+          [
             "A",
             "J1",
             10,
             undefined,
           ],
-          Array [
+          [
             "A",
             "J1",
             200,
             undefined,
           ],
-          Array [
+          [
             "B",
             "J1",
             10,
             22,
           ],
-          Array [
+          [
             "B",
             "J1",
             200,
@@ -115,21 +115,21 @@ describe('Join by labels', () => {
       input
     );
     expect(result).toMatchInlineSnapshot(`
-      Object {
-        "fields": Array [
-          Object {
-            "config": Object {},
+      {
+        "fields": [
+          {
+            "config": {},
             "name": "Error",
             "type": "string",
-            "values": Array [
+            "values": [
               "No labels in result",
             ],
           },
         ],
         "length": 0,
-        "meta": Object {
-          "notices": Array [
-            Object {
+        "meta": {
+          "notices": [
+            {
               "severity": "error",
               "text": "No labels in result",
             },
diff --git a/public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts b/public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts
index be0f273246f..ee4ad88faf8 100644
--- a/public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts
+++ b/public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts
@@ -36,12 +36,12 @@ describe('Lookup gazetteer', () => {
     const out = await addFieldsFromGazetteer([data], gaz, matcher)[0];
 
     expect(out.fields).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "config": Object {},
+      [
+        {
+          "config": {},
           "name": "location",
           "type": "string",
-          "values": Array [
+          "values": [
             "AL",
             "AK",
             "Arizona",
@@ -49,11 +49,11 @@ describe('Lookup gazetteer', () => {
             "Somewhere",
           ],
         },
-        Object {
-          "config": Object {},
+        {
+          "config": {},
           "name": "id",
           "type": "string",
-          "values": Array [
+          "values": [
             "AL",
             "AK",
             ,
@@ -61,11 +61,11 @@ describe('Lookup gazetteer', () => {
             ,
           ],
         },
-        Object {
-          "config": Object {},
+        {
+          "config": {},
           "name": "name",
           "type": "string",
-          "values": Array [
+          "values": [
             "Alabama",
             "Arkansas",
             ,
@@ -73,11 +73,11 @@ describe('Lookup gazetteer', () => {
             ,
           ],
         },
-        Object {
-          "config": Object {},
+        {
+          "config": {},
           "name": "lng",
           "type": "number",
-          "values": Array [
+          "values": [
             -80.891064,
             -100.891064,
             ,
@@ -85,11 +85,11 @@ describe('Lookup gazetteer', () => {
             ,
           ],
         },
-        Object {
-          "config": Object {},
+        {
+          "config": {},
           "name": "lat",
           "type": "number",
-          "values": Array [
+          "values": [
             12.448457,
             24.448457,
             ,
@@ -97,15 +97,15 @@ describe('Lookup gazetteer', () => {
             ,
           ],
         },
-        Object {
-          "config": Object {},
+        {
+          "config": {},
           "name": "values",
-          "state": Object {
+          "state": {
             "displayName": "values",
             "multipleFrames": false,
           },
           "type": "number",
-          "values": Array [
+          "values": [
             0,
             10,
             5,
diff --git a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
index 4dd2dc7b030..3cc056fe66d 100644
--- a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
+++ b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
@@ -85,59 +85,59 @@ describe('Prepare time series transformer', () => {
         values: f.fields[1].values.toArray(),
       }))
     ).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "labels": Object {
+      [
+        {
+          "labels": {
             "region": "a",
           },
           "name": "wide",
-          "time": Array [
+          "time": [
             1,
             2,
           ],
-          "values": Array [
+          "values": [
             10,
             30,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "region": "b",
           },
           "name": "wide",
-          "time": Array [
+          "time": [
             1,
             2,
           ],
-          "values": Array [
+          "values": [
             20,
             40,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "region": "a",
           },
           "name": "wide",
-          "time": Array [
+          "time": [
             1,
             2,
           ],
-          "values": Array [
+          "values": [
             2,
             4,
           ],
         },
-        Object {
-          "labels": Object {
+        {
+          "labels": {
             "region": "b",
           },
           "name": "wide",
-          "time": Array [
+          "time": [
             1,
             2,
           ],
-          "values": Array [
+          "values": [
             3,
             5,
           ],
diff --git a/public/app/features/transformers/rowsToFields/rowsToFields.test.ts b/public/app/features/transformers/rowsToFields/rowsToFields.test.ts
index 9b6c6f3b583..bcfab657e51 100644
--- a/public/app/features/transformers/rowsToFields/rowsToFields.test.ts
+++ b/public/app/features/transformers/rowsToFields/rowsToFields.test.ts
@@ -27,31 +27,31 @@ describe('Rows to fields', () => {
     );
 
     expect(result).toMatchInlineSnapshot(`
-      Object {
-        "fields": Array [
-          Object {
-            "config": Object {
+      {
+        "fields": [
+          {
+            "config": {
               "max": 15,
               "min": 3,
               "unit": "degree",
             },
-            "labels": Object {},
+            "labels": {},
             "name": "Temperature",
             "type": "number",
-            "values": Array [
+            "values": [
               10,
             ],
           },
-          Object {
-            "config": Object {
+          {
+            "config": {
               "max": 200,
               "min": 100,
               "unit": "pressurebar",
             },
-            "labels": Object {},
+            "labels": {},
             "name": "Pressure",
             "type": "number",
-            "values": Array [
+            "values": [
               200,
             ],
           },
diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts b/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
index 50f465b96f4..390310cbac6 100644
--- a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
@@ -17,5 +17,5 @@ export const createMockDatasource = (overrides?: Partial<Datasource>) => {
     ...overrides,
   };
 
-  return jest.mocked(datasource as Datasource, true);
+  return jest.mocked(datasource as Datasource);
 };
diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts
index 4086d9c956d..c353dd7559a 100644
--- a/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts
+++ b/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts
@@ -77,11 +77,11 @@ describe('SharedQueryRunner', () => {
     }).subscribe((v) => {
       try {
         expect(v).toMatchInlineSnapshot(`
-          Object {
+          {
             "annotations": undefined,
-            "series": Array [
-              Object {
-                "fields": Array [],
+            "series": [
+              {
+                "fields": [],
                 "length": 0,
                 "refId": "X",
               },
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts
index a6d66c28ed6..13ccd63ac85 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts
@@ -49,5 +49,5 @@ export default function createMockDatasource(overrides?: DeepPartial<Datasource>
 
   const mockDatasource = _mockDatasource as Datasource;
 
-  return jest.mocked(mockDatasource, true);
+  return jest.mocked(mockDatasource);
 }
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/panelData.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/panelData.ts
index 9ccdfe28a92..640f96c5db6 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/panelData.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/panelData.ts
@@ -46,5 +46,5 @@ export default function createMockPanelData(overrides?: DeepPartial<PanelData>)
 
   const mockPanelData = _mockPanelData as PanelData;
 
-  return jest.mocked(mockPanelData, true);
+  return jest.mocked(mockPanelData);
 }
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts
index 540d3e04834..05ee0215a38 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts
@@ -775,16 +775,16 @@ describe('AzureMonitorDatasource', () => {
           })
           .then((results: any) => {
             expect(results.dimensions).toMatchInlineSnapshot(`
-              Array [
-                Object {
+              [
+                {
                   "label": "Response type",
                   "value": "ResponseType",
                 },
-                Object {
+                {
                   "label": "Geo type",
                   "value": "GeoType",
                 },
-                Object {
+                {
                   "label": "API name",
                   "value": "ApiName",
                 },
diff --git a/public/app/plugins/datasource/graphite/meta.test.ts b/public/app/plugins/datasource/graphite/meta.test.ts
index 647341005c9..a417d834558 100644
--- a/public/app/plugins/datasource/graphite/meta.test.ts
+++ b/public/app/plugins/datasource/graphite/meta.test.ts
@@ -5,29 +5,29 @@ describe('metadata parsing', () => {
     const retentions = '1s:35d:20min:5:1542274085,1min:38d:2h:1:true,10min:120d:6h:1:true,2h:2y:6h:2';
     const info = parseSchemaRetentions(retentions);
     expect(info).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "chunkspan": "20min",
           "interval": "1s",
           "numchunks": 5,
           "ready": 1542274085,
           "retention": "35d",
         },
-        Object {
+        {
           "chunkspan": "2h",
           "interval": "1min",
           "numchunks": 1,
           "ready": true,
           "retention": "38d",
         },
-        Object {
+        {
           "chunkspan": "6h",
           "interval": "10min",
           "numchunks": 1,
           "ready": true,
           "retention": "120d",
         },
-        Object {
+        {
           "chunkspan": "6h",
           "interval": "2h",
           "numchunks": 2,
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
index ad9d01d6722..5f48c504af6 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { DataSourcePluginMeta } from '@grafana/data';
@@ -39,7 +39,9 @@ describe('LokiQueryBuilderContainer', () => {
     render(<LokiQueryBuilderContainer {...props} />);
     const selector = await screen.findByLabelText('selector');
     expect(selector.textContent).toBe('{job="testjob"}');
-    await addOperation('Range functions', 'Rate');
+    await act(async () => {
+      await addOperation('Range functions', 'Rate');
+    });
     expect(await screen.findByText('Rate')).toBeInTheDocument();
     expect(props.onChange).toBeCalledWith({
       expr: 'rate({job="testjob"} [$__interval])',
diff --git a/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap b/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
index 874d31dbfd9..9fe14c366ec 100644
--- a/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
+++ b/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`BarChart utils preparePlotConfigBuilder orientation 1`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -21,7 +21,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -30,11 +30,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -48,7 +48,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -58,17 +58,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -78,33 +78,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -114,7 +114,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -126,16 +126,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -155,13 +155,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder orientation 2`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -175,7 +175,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -184,11 +184,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -202,7 +202,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -212,17 +212,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -232,33 +232,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -268,7 +268,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -280,16 +280,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -309,13 +309,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder orientation 3`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -329,7 +329,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -338,11 +338,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -356,7 +356,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -366,17 +366,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -386,33 +386,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -422,7 +422,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -434,16 +434,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -463,13 +463,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder stacking 1`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -483,7 +483,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -492,11 +492,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -510,7 +510,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -520,17 +520,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -540,33 +540,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -576,7 +576,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -588,16 +588,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -617,13 +617,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder stacking 2`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -637,7 +637,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -646,11 +646,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -664,7 +664,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -674,17 +674,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -694,33 +694,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -730,7 +730,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -742,16 +742,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -771,13 +771,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder stacking 3`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -791,7 +791,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -800,11 +800,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -818,7 +818,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -828,17 +828,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -848,33 +848,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -884,7 +884,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -896,16 +896,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -925,13 +925,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder value visibility 1`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -945,7 +945,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -954,11 +954,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -972,7 +972,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -982,17 +982,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -1002,33 +1002,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -1038,7 +1038,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -1050,16 +1050,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
@@ -1079,13 +1079,13 @@ Object {
 `;
 
 exports[`BarChart utils preparePlotConfigBuilder value visibility 2`] = `
-Object {
-  "axes": Array [
-    Object {
+{
+  "axes": [
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 15,
-      "grid": Object {
+      "grid": {
         "show": false,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -1099,7 +1099,7 @@ Object {
       "space": [Function],
       "splits": [Function],
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": false,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -1108,11 +1108,11 @@ Object {
       "timeZone": undefined,
       "values": [Function],
     },
-    Object {
+    {
       "filter": undefined,
-      "font": "12px \\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+      "font": "12px "Roboto", "Helvetica", "Arial", sans-serif",
       "gap": 5,
-      "grid": Object {
+      "grid": {
         "show": true,
         "stroke": "rgba(240, 250, 255, 0.09)",
         "width": 1,
@@ -1126,7 +1126,7 @@ Object {
       "space": [Function],
       "splits": undefined,
       "stroke": "rgb(204, 204, 220)",
-      "ticks": Object {
+      "ticks": {
         "show": true,
         "size": 4,
         "stroke": "rgba(240, 250, 255, 0.09)",
@@ -1136,17 +1136,17 @@ Object {
       "values": [Function],
     },
   ],
-  "cursor": Object {
+  "cursor": {
     "dataIdx": [Function],
-    "drag": Object {
+    "drag": {
       "setScale": false,
       "x": false,
       "y": false,
     },
-    "focus": Object {
+    "focus": {
       "prox": 30,
     },
-    "points": Object {
+    "points": {
       "bbox": [Function],
       "fill": "rgba(255,255,255,0.4)",
       "size": [Function],
@@ -1156,33 +1156,33 @@ Object {
     "x": false,
     "y": false,
   },
-  "focus": Object {
+  "focus": {
     "alpha": 1,
   },
-  "hooks": Object {
-    "draw": Array [
+  "hooks": {
+    "draw": [
       [Function],
     ],
-    "drawClear": Array [
+    "drawClear": [
       [Function],
     ],
-    "init": Array [
+    "init": [
       [Function],
     ],
   },
-  "legend": Object {
+  "legend": {
     "show": false,
   },
   "mode": 1,
   "ms": 1,
-  "padding": Array [
+  "padding": [
     [Function],
     [Function],
     [Function],
     [Function],
   ],
-  "scales": Object {
-    "m/s": Object {
+  "scales": {
+    "m/s": {
       "asinh": undefined,
       "auto": true,
       "dir": 1,
@@ -1192,7 +1192,7 @@ Object {
       "range": [Function],
       "time": undefined,
     },
-    "x": Object {
+    "x": {
       "asinh": undefined,
       "auto": true,
       "dir": -1,
@@ -1204,16 +1204,16 @@ Object {
     },
   },
   "select": undefined,
-  "series": Array [
-    Object {
+  "series": [
+    {
       "value": [Function],
     },
-    Object {
+    {
       "facets": undefined,
       "fill": [Function],
       "gaps": [Function],
       "paths": [Function],
-      "points": Object {
+      "points": {
         "fill": "#808080",
         "filter": undefined,
         "size": undefined,
diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts
index 4b917ab6b7f..8cfc749eb93 100644
--- a/public/app/plugins/panel/barchart/utils.test.ts
+++ b/public/app/plugins/panel/barchart/utils.test.ts
@@ -202,14 +202,14 @@ describe('BarChart utils', () => {
 
       const field = displayValues.viz[0].fields[1];
       expect(field.values.toArray()).toMatchInlineSnapshot(`
-      Array [
-        -10,
-        null,
-        10,
-        null,
-        null,
-      ]
-    `);
+        [
+          -10,
+          null,
+          10,
+          null,
+          null,
+        ]
+      `);
     });
 
     it('should sort fields when legend sortBy and sortDesc are set', () => {
diff --git a/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts b/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts
index 14b08ad0b88..44c75efcefb 100644
--- a/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts
+++ b/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts
@@ -50,29 +50,29 @@ describe('BarGauge Panel Migrations', () => {
 
     // should mutate panel model and move field config out of panel.options
     expect((panel as PanelModel).fieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "defaults": Object {
-          "color": Object {
+      {
+        "defaults": {
+          "color": {
             "mode": "thresholds",
           },
           "decimals": null,
-          "mappings": Array [],
+          "mappings": [],
           "max": 33,
           "min": -22,
-          "thresholds": Object {
+          "thresholds": {
             "mode": "absolute",
-            "steps": Array [
-              Object {
+            "steps": [
+              {
                 "color": "green",
                 "index": 0,
                 "value": -Infinity,
               },
-              Object {
+              {
                 "color": "orange",
                 "index": 1,
                 "value": 40,
               },
-              Object {
+              {
                 "color": "red",
                 "index": 2,
                 "value": 80,
@@ -81,17 +81,17 @@ describe('BarGauge Panel Migrations', () => {
           },
           "unit": "watt",
         },
-        "overrides": Array [],
+        "overrides": [],
       }
     `);
 
     // should options options
     expect(newOptions).toMatchInlineSnapshot(`
-      Object {
+      {
         "displayMode": "lcd",
         "orientation": "vertical",
-        "reduceOptions": Object {
-          "calcs": Array [
+        "reduceOptions": {
+          "calcs": [
             "mean",
           ],
           "limit": undefined,
diff --git a/public/app/plugins/panel/candlestick/fields.test.ts b/public/app/plugins/panel/candlestick/fields.test.ts
index 2f68c4bf838..2fbc73c32ec 100644
--- a/public/app/plugins/panel/candlestick/fields.test.ts
+++ b/public/app/plugins/panel/candlestick/fields.test.ts
@@ -44,7 +44,7 @@ describe('Candlestick data', () => {
       theme
     );
     expect(info?.names).toMatchInlineSnapshot(`
-      Object {
+      {
         "close": "Next open",
         "high": "MAX",
         "low": "min",
@@ -82,13 +82,13 @@ describe('Candlestick data', () => {
 
     // Close should be offset by one and dupliate last point
     expect({ open: info.open!.values.toArray(), close: info.close!.values.toArray() }).toMatchInlineSnapshot(`
-      Object {
-        "close": Array [
+      {
+        "close": [
           5,
           6,
           6,
         ],
-        "open": Array [
+        "open": [
           4,
           5,
           6,
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap b/public/app/plugins/panel/flamegraph/components/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap
index e7adebec7e1..ff595f45137 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FlameGraph should render correctly 1`] = `
-Array [
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+[
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17,14 +17,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1599,
             "x": 0.5,
             "y": 0,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36,7 +36,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -46,13 +46,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -62,14 +62,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1599,
             "x": 0.5,
             "y": 0,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -81,7 +81,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -91,14 +91,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "total (16.5 Bil)",
       "x": 4,
       "y": 11,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -108,12 +108,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -123,14 +123,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 397.5419198055893,
             "x": 0.5,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -142,7 +142,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -152,13 +152,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -168,14 +168,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 397.5419198055893,
             "x": 0.5,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -187,7 +187,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -197,14 +197,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/agent.(*Target).start.func1 (4.10 Bil)",
       "x": 4,
       "y": 33,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -214,12 +214,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -229,14 +229,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 546.26609963548,
             "x": 399.0419198055893,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -248,7 +248,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -258,13 +258,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -274,14 +274,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 546.26609963548,
             "x": 399.0419198055893,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -293,7 +293,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -303,14 +303,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.(*conn).serve (5.63 Bil)",
       "x": 402.5419198055893,
       "y": 33,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -320,12 +320,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -335,14 +335,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 600.7010935601459,
             "x": 946.3080194410693,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -354,7 +354,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -364,13 +364,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -380,14 +380,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 600.7010935601459,
             "x": 946.3080194410693,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -399,7 +399,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -409,14 +409,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.gcBgMarkWorker (6.19 Bil)",
       "x": 949.8080194410693,
       "y": 33,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -426,13 +426,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -442,14 +442,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 1547.5091130012152,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -461,7 +461,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -471,12 +471,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -486,14 +486,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 1551.897326852977,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -505,7 +505,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -515,13 +515,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -531,14 +531,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 1551.897326852977,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -550,7 +550,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -560,12 +560,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -575,14 +575,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 1568.4222357229648,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -594,7 +594,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -604,13 +604,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -620,14 +620,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 1568.4222357229648,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -639,7 +639,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -649,13 +649,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -665,14 +665,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.552855407047389,
             "x": 1584.4471445929528,
             "y": 22,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -684,7 +684,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -694,12 +694,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -709,14 +709,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 397.5419198055893,
             "x": 0.5,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -728,7 +728,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -738,13 +738,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -754,14 +754,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 397.5419198055893,
             "x": 0.5,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -773,7 +773,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -783,14 +783,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/agent.(*Target).scrape (4.10 Bil)",
       "x": 4,
       "y": 55,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -800,12 +800,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -815,14 +815,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -834,7 +834,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -844,13 +844,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -860,14 +860,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -879,7 +879,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -889,14 +889,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.serverHandler.ServeHTTP (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 55,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -906,13 +906,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -922,14 +922,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 940.947752126367,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -941,7 +941,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -951,12 +951,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -966,14 +966,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 598.7569866342649,
             "x": 946.3080194410693,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -985,7 +985,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -995,13 +995,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1011,14 +1011,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 598.7569866342649,
             "x": 946.3080194410693,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1030,7 +1030,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1040,14 +1040,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.systemstack (6.17 Bil)",
       "x": 949.8080194410693,
       "y": 55,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1057,13 +1057,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1073,14 +1073,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 1545.5650060753342,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1092,7 +1092,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1102,12 +1102,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1117,14 +1117,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.552855407047389,
             "x": 1551.897326852977,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1136,7 +1136,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1146,13 +1146,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1162,14 +1162,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.552855407047389,
             "x": 1551.897326852977,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1181,7 +1181,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1191,13 +1191,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1207,14 +1207,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 33.0498177399757,
             "x": 1566.9501822600243,
             "y": 44,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1226,7 +1226,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1236,12 +1236,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1251,14 +1251,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 355.74362089914945,
             "x": 0.5,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1270,7 +1270,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1280,13 +1280,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1296,14 +1296,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 355.74362089914945,
             "x": 0.5,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1315,7 +1315,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1325,14 +1325,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/distributor.(*Distributor).Push (3.67 Bil)",
       "x": 4,
       "y": 77,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1342,12 +1342,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1357,14 +1357,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1376,7 +1376,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1386,13 +1386,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1402,14 +1402,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1421,7 +1421,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1431,14 +1431,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "io/ioutil.ReadAll (430 Mil)",
       "x": 360.74362089914945,
       "y": 77,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1448,12 +1448,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1463,14 +1463,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1482,7 +1482,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1492,13 +1492,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1508,14 +1508,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1527,7 +1527,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1537,14 +1537,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.HandlerFunc.ServeHTTP (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 77,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1554,13 +1554,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1570,14 +1570,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 940.947752126367,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1589,7 +1589,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1599,12 +1599,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1614,14 +1614,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 598.7569866342649,
             "x": 946.3080194410693,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1633,7 +1633,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1643,13 +1643,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1659,14 +1659,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 598.7569866342649,
             "x": 946.3080194410693,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1678,7 +1678,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1688,14 +1688,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.gcBgMarkWorker.func2 (6.17 Bil)",
       "x": 949.8080194410693,
       "y": 77,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1705,13 +1705,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1721,14 +1721,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.441069258809236,
             "x": 1545.5650060753342,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1740,7 +1740,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1750,13 +1750,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1766,14 +1766,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 32.077764277035236,
             "x": 1567.9222357229648,
             "y": 66,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1785,7 +1785,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1795,12 +1795,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1810,14 +1810,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 108.84204131227219,
             "x": 0.5,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1829,7 +1829,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1839,13 +1839,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1855,14 +1855,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 108.84204131227219,
             "x": 0.5,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1874,7 +1874,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1884,14 +1884,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/gzip.(*Writer).Write (1.13 Bil)",
       "x": 4,
       "y": 99,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1901,12 +1901,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1916,14 +1916,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 36.91008505467801,
             "x": 110.34204131227219,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1935,7 +1935,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1945,13 +1945,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -1961,14 +1961,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 36.91008505467801,
             "x": 110.34204131227219,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -1980,7 +1980,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -1990,14 +1990,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/pprof.OpenRaw (390 Mil)",
       "x": 113.84204131227219,
       "y": 99,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2007,12 +2007,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2022,14 +2022,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 148.2521263669502,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2041,7 +2041,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2051,13 +2051,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2067,14 +2067,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 148.2521263669502,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2086,7 +2086,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2096,12 +2096,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2111,14 +2111,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 177.85783718104497,
             "x": 168.66524908869988,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2130,7 +2130,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2140,13 +2140,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2156,14 +2156,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 177.85783718104497,
             "x": 168.66524908869988,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2175,7 +2175,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2185,14 +2185,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/pprof.(*Profile).Normalize (1.84 Bil)",
       "x": 172.16524908869988,
       "y": 99,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2202,13 +2202,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2218,14 +2218,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.720534629404618,
             "x": 347.02308626974485,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2237,7 +2237,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2247,12 +2247,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2262,14 +2262,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2281,7 +2281,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2291,13 +2291,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2307,14 +2307,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2326,7 +2326,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2336,14 +2336,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "io.ReadAll (430 Mil)",
       "x": 360.74362089914945,
       "y": 99,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2353,12 +2353,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2368,14 +2368,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2387,7 +2387,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2397,13 +2397,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2413,14 +2413,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2432,7 +2432,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2442,14 +2442,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/util.glob..func1.1 (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 99,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2459,13 +2459,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2475,14 +2475,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 940.947752126367,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2494,7 +2494,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2504,12 +2504,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2519,14 +2519,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 589.0364520048603,
             "x": 946.3080194410693,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2538,7 +2538,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2548,13 +2548,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2564,14 +2564,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 589.0364520048603,
             "x": 946.3080194410693,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2583,7 +2583,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2593,14 +2593,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.gcDrain (6.07 Bil)",
       "x": 949.8080194410693,
       "y": 99,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2610,13 +2610,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2626,14 +2626,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.552855407047389,
             "x": 1535.8444714459297,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2645,7 +2645,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2655,13 +2655,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2671,14 +2671,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1558.2017010935601,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2690,7 +2690,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2700,13 +2700,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2716,14 +2716,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 32.077764277035236,
             "x": 1567.9222357229648,
             "y": 88,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2735,7 +2735,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2745,12 +2745,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2760,14 +2760,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 102.03766707168894,
             "x": 0.5,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2779,7 +2779,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2789,13 +2789,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2805,14 +2805,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 102.03766707168894,
             "x": 0.5,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2824,7 +2824,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2834,14 +2834,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/flate.(*compressor).write (1.06 Bil)",
       "x": 4,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2851,13 +2851,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2867,14 +2867,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 103.03766707168894,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2886,7 +2886,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2896,12 +2896,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2911,14 +2911,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 36.91008505467801,
             "x": 110.34204131227219,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2930,7 +2930,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2940,13 +2940,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -2956,14 +2956,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 36.91008505467801,
             "x": 110.34204131227219,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -2975,7 +2975,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -2985,14 +2985,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/gen/google/v1.(*Profile).UnmarshalVT (390 Mil)",
       "x": 113.84204131227219,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3002,12 +3002,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3017,14 +3017,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 148.2521263669502,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3036,7 +3036,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3046,13 +3046,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3062,14 +3062,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 148.2521263669502,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3081,7 +3081,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3091,12 +3091,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3106,14 +3106,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 22.329283110571083,
             "x": 168.66524908869988,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3125,7 +3125,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3135,13 +3135,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3151,14 +3151,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 22.329283110571083,
             "x": 168.66524908869988,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3170,7 +3170,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3180,14 +3180,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "sort.Sort (240 Mil)",
       "x": 172.16524908869988,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3197,12 +3197,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3212,14 +3212,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 128.2831105710814,
             "x": 191.99453219927096,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3231,7 +3231,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3241,13 +3241,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3257,14 +3257,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 128.2831105710814,
             "x": 191.99453219927096,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3276,7 +3276,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3286,14 +3286,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/pprof.(*Profile).clearSampleReferences (1.33 Bil)",
       "x": 195.49453219927096,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3303,12 +3303,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3318,14 +3318,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 321.2776427703524,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3337,7 +3337,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3347,13 +3347,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3363,14 +3363,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 321.2776427703524,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3382,7 +3382,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3392,13 +3392,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3408,14 +3408,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 23.329283110571083,
             "x": 333.4143377885784,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3427,7 +3427,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3437,12 +3437,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3452,14 +3452,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3471,7 +3471,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3481,13 +3481,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3497,14 +3497,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3516,7 +3516,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3526,14 +3526,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/gzip.(*Reader).Read (430 Mil)",
       "x": 360.74362089914945,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3543,12 +3543,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3558,14 +3558,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3577,7 +3577,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3587,13 +3587,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3603,14 +3603,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3622,7 +3622,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3632,14 +3632,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "golang.org/x/net/http2/h2c.h2cHandler.ServeHTTP (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3649,13 +3649,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3665,14 +3665,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 940.947752126367,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3684,7 +3684,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3694,12 +3694,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3709,14 +3709,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 432.53584447144596,
             "x": 946.3080194410693,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3728,7 +3728,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3738,13 +3738,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3754,14 +3754,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 432.53584447144596,
             "x": 946.3080194410693,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3773,7 +3773,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3783,14 +3783,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.scanobject (4.46 Bil)",
       "x": 949.8080194410693,
       "y": 121,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3800,12 +3800,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3815,14 +3815,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 1379.8438639125152,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3834,7 +3834,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3844,13 +3844,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3860,14 +3860,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 1379.8438639125152,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3879,7 +3879,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3889,13 +3889,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3905,14 +3905,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 8.748481166464156,
             "x": 1399.7569866342649,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3924,7 +3924,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3934,12 +3934,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3949,14 +3949,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 1409.005467800729,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -3968,7 +3968,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -3978,13 +3978,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -3994,14 +3994,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 1409.005467800729,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4013,7 +4013,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4023,13 +4023,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4039,14 +4039,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1426.0024301336575,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4058,7 +4058,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4068,12 +4068,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4083,14 +4083,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 1427.4744835965978,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4102,7 +4102,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4112,13 +4112,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4128,14 +4128,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 1427.4744835965978,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4147,7 +4147,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4157,13 +4157,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4173,14 +4173,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1447.3876063183475,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4192,7 +4192,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4202,13 +4202,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4218,14 +4218,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 1545.5650060753342,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4237,7 +4237,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4247,13 +4247,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4263,14 +4263,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 1567.9222357229648,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4282,7 +4282,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4292,13 +4292,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4308,14 +4308,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 1577.6427703523696,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4327,7 +4327,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4337,13 +4337,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4353,14 +4353,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.580801944106927,
             "x": 1584.4471445929528,
             "y": 110,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4372,7 +4372,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4382,12 +4382,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4397,14 +4397,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 98.1494532199271,
             "x": 0.5,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4416,7 +4416,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4426,13 +4426,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4442,14 +4442,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 98.1494532199271,
             "x": 0.5,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4461,7 +4461,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4471,14 +4471,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/flate.(*compressor).deflate (1.02 Bil)",
       "x": 4,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4488,13 +4488,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4504,14 +4504,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 99.1494532199271,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4523,7 +4523,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4533,12 +4533,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4548,14 +4548,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 110.34204131227219,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4567,7 +4567,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4577,13 +4577,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4593,14 +4593,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 110.34204131227219,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4612,7 +4612,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4622,12 +4622,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4637,14 +4637,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 127.83900364520049,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4656,7 +4656,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4666,13 +4666,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4682,14 +4682,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 127.83900364520049,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4701,7 +4701,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4711,13 +4711,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4727,14 +4727,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 138.03159173754557,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4746,7 +4746,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4756,12 +4756,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4771,14 +4771,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 148.2521263669502,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4790,7 +4790,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4800,13 +4800,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4816,14 +4816,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 148.2521263669502,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4835,7 +4835,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4845,12 +4845,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4860,14 +4860,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 22.329283110571083,
             "x": 168.66524908869988,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4879,7 +4879,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4889,13 +4889,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4905,14 +4905,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 22.329283110571083,
             "x": 168.66524908869988,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4924,7 +4924,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4934,14 +4934,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "sort.quickSort (240 Mil)",
       "x": 172.16524908869988,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4951,12 +4951,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -4966,14 +4966,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 124.39489671931958,
             "x": 191.99453219927096,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -4985,7 +4985,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -4995,13 +4995,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5011,14 +5011,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 124.39489671931958,
             "x": 191.99453219927096,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5030,7 +5030,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5040,14 +5040,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/slices.RemoveInPlace[...] (1.29 Bil)",
       "x": 195.49453219927096,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5057,13 +5057,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5073,14 +5073,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 316.88942891859057,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5092,7 +5092,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5102,13 +5102,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5118,14 +5118,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 320.7776427703524,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5137,7 +5137,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5147,13 +5147,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5163,14 +5163,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 333.4143377885784,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5182,7 +5182,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5192,13 +5192,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5208,14 +5208,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 343.134872417983,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5227,7 +5227,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5237,13 +5237,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5253,14 +5253,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 347.02308626974485,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5272,7 +5272,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5282,12 +5282,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5297,14 +5297,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5316,7 +5316,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5326,13 +5326,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5342,14 +5342,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 40.798298906439854,
             "x": 357.24362089914945,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5361,7 +5361,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5371,14 +5371,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/flate.(*decompressor).Read (430 Mil)",
       "x": 360.74362089914945,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5388,12 +5388,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5403,14 +5403,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5422,7 +5422,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5432,13 +5432,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5448,14 +5448,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5467,7 +5467,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5477,14 +5477,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.HandlerFunc.ServeHTTP (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5494,13 +5494,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5510,14 +5510,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 940.947752126367,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5529,7 +5529,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5539,13 +5539,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5555,14 +5555,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 945.8080194410693,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5574,7 +5574,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5584,12 +5584,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5599,14 +5599,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 41.77035236938032,
             "x": 952.140340218712,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5618,7 +5618,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5628,13 +5628,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5644,14 +5644,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 41.77035236938032,
             "x": 952.140340218712,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5663,7 +5663,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5673,14 +5673,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.pageIndexOf (440 Mil)",
       "x": 955.640340218712,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5690,12 +5690,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5705,14 +5705,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 51.49088699878494,
             "x": 994.9106925880924,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5724,7 +5724,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5734,13 +5734,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5750,14 +5750,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 51.49088699878494,
             "x": 994.9106925880924,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5769,7 +5769,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5779,14 +5779,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.greyobject (540 Mil)",
       "x": 998.4106925880924,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5796,12 +5796,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5811,14 +5811,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 94.26123936816525,
             "x": 1047.4015795868772,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5830,7 +5830,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5840,13 +5840,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5856,14 +5856,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 94.26123936816525,
             "x": 1047.4015795868772,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5875,7 +5875,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5885,14 +5885,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.findObject (980 Mil)",
       "x": 1050.9015795868772,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5902,13 +5902,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5918,14 +5918,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 1142.1628189550427,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5937,7 +5937,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5947,12 +5947,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -5962,14 +5962,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 45.658566221142166,
             "x": 1147.523086269745,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -5981,7 +5981,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -5991,13 +5991,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6007,14 +6007,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 45.658566221142166,
             "x": 1147.523086269745,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6026,7 +6026,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6036,14 +6036,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.spanOf (480 Mil)",
       "x": 1151.023086269745,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6053,12 +6053,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6068,14 +6068,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 51.49088699878494,
             "x": 1194.181652490887,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6087,7 +6087,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6097,13 +6097,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6113,14 +6113,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 51.49088699878494,
             "x": 1194.181652490887,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6132,7 +6132,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6142,14 +6142,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.markBits.isMarked (540 Mil)",
       "x": 1197.681652490887,
       "y": 143,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6159,13 +6159,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6175,14 +6175,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 1246.172539489672,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6194,7 +6194,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6204,13 +6204,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6220,14 +6220,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1399.7569866342649,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6239,7 +6239,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6249,13 +6249,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6265,14 +6265,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1447.3876063183475,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6284,7 +6284,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6294,13 +6294,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6310,14 +6310,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 1545.5650060753342,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6329,7 +6329,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6339,13 +6339,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6355,14 +6355,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1567.9222357229648,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6374,7 +6374,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6384,13 +6384,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6400,14 +6400,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1569.8663426488458,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6419,7 +6419,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6429,13 +6429,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6445,14 +6445,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1573.7545565006076,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6464,7 +6464,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6474,13 +6474,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6490,14 +6490,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1577.6427703523696,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6509,7 +6509,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6519,13 +6519,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6535,14 +6535,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1580.5589307411908,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6554,7 +6554,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6564,13 +6564,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6580,14 +6580,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.580801944106927,
             "x": 1584.4471445929528,
             "y": 132,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6599,7 +6599,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6609,12 +6609,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6624,14 +6624,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 0.5,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6643,7 +6643,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6653,13 +6653,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6669,14 +6669,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 0.5,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6688,7 +6688,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6698,12 +6698,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6713,14 +6713,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 50.51883353584447,
             "x": 15.080801944106927,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6732,7 +6732,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6742,13 +6742,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6758,14 +6758,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 50.51883353584447,
             "x": 15.080801944106927,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6777,7 +6777,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6787,14 +6787,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/flate.(*compressor).findMatch (530 Mil)",
       "x": 18.580801944106927,
       "y": 165,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6804,13 +6804,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6820,14 +6820,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 66.0996354799514,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6839,7 +6839,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6849,13 +6849,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6865,14 +6865,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.52490886998785,
             "x": 103.03766707168894,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6884,7 +6884,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6894,13 +6894,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6910,14 +6910,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 18.469015795868774,
             "x": 127.33900364520049,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6929,7 +6929,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6939,12 +6939,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6954,14 +6954,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 148.2521263669502,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -6973,7 +6973,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -6983,13 +6983,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -6999,14 +6999,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 148.2521263669502,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7018,7 +7018,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7028,13 +7028,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7044,14 +7044,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 160.3888213851762,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7063,7 +7063,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7073,13 +7073,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7089,14 +7089,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 168.16524908869988,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7108,7 +7108,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7118,12 +7118,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7133,14 +7133,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 17.469015795868774,
             "x": 173.5255164034022,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7152,7 +7152,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7162,13 +7162,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7178,14 +7178,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 17.469015795868774,
             "x": 173.5255164034022,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7197,7 +7197,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7207,12 +7207,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7222,14 +7222,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 30.105710814094778,
             "x": 191.99453219927096,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7241,7 +7241,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7251,13 +7251,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7267,14 +7267,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 30.105710814094778,
             "x": 191.99453219927096,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7286,7 +7286,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7296,14 +7296,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/pprof.(*Profile).clearSampleReferences.func1 (320 Mil)",
       "x": 195.49453219927096,
       "y": 165,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7313,13 +7313,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7329,14 +7329,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 316.88942891859057,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7348,7 +7348,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7358,13 +7358,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7374,14 +7374,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 333.4143377885784,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7393,7 +7393,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7403,13 +7403,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7419,14 +7419,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 343.134872417983,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7438,7 +7438,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7448,13 +7448,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7464,14 +7464,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 356.74362089914945,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7483,7 +7483,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7493,12 +7493,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7508,14 +7508,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.96597812879708,
             "x": 362.1038882138518,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7527,7 +7527,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7537,13 +7537,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7553,14 +7553,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.96597812879708,
             "x": 362.1038882138518,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7572,7 +7572,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7582,14 +7582,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "compress/flate.(*decompressor).huffmanBlock (370 Mil)",
       "x": 365.6038882138518,
       "y": 165,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7599,13 +7599,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7615,14 +7615,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 397.5698663426489,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7634,7 +7634,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7644,12 +7644,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7659,14 +7659,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7678,7 +7678,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7688,13 +7688,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7704,14 +7704,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7723,7 +7723,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7733,14 +7733,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/create.(*create).initServer.func2.1 (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 165,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7750,13 +7750,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7766,14 +7766,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 940.947752126367,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7785,7 +7785,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7795,13 +7795,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7811,14 +7811,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 994.4106925880924,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7830,7 +7830,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7840,13 +7840,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7856,14 +7856,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1046.9015795868772,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7875,7 +7875,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7885,13 +7885,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7901,14 +7901,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1447.3876063183475,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7920,7 +7920,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7930,13 +7930,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7946,14 +7946,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 1546.5370595382747,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -7965,7 +7965,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -7975,13 +7975,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -7991,14 +7991,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1569.8663426488458,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8010,7 +8010,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8020,13 +8020,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8036,14 +8036,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1573.7545565006076,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8055,7 +8055,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8065,13 +8065,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8081,14 +8081,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.608748481166465,
             "x": 1585.419198055893,
             "y": 154,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8100,7 +8100,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8110,12 +8110,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8125,14 +8125,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 0.5,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8144,7 +8144,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8154,13 +8154,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8170,14 +8170,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 0.5,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8189,7 +8189,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8199,13 +8199,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8215,14 +8215,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.552855407047389,
             "x": 103.03766707168894,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8234,7 +8234,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8244,13 +8244,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8260,14 +8260,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.720534629404618,
             "x": 127.33900364520049,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8279,7 +8279,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8289,13 +8289,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8305,14 +8305,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 138.03159173754557,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8324,7 +8324,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8334,13 +8334,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8350,14 +8350,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 141.91980558930743,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8369,7 +8369,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8379,12 +8379,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8394,14 +8394,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 148.2521263669502,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8413,7 +8413,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8423,13 +8423,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8439,14 +8439,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 148.2521263669502,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8458,7 +8458,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8468,13 +8468,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8484,14 +8484,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 168.16524908869988,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8503,7 +8503,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8513,12 +8513,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8528,14 +8528,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 173.5255164034022,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8547,7 +8547,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8557,13 +8557,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8573,14 +8573,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 173.5255164034022,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8592,7 +8592,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8602,13 +8602,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8618,14 +8618,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 185.6622114216282,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8637,7 +8637,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8647,13 +8647,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8663,14 +8663,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 343.134872417983,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8682,7 +8682,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8692,13 +8692,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8708,14 +8708,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 357.71567436208994,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8727,7 +8727,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8737,13 +8737,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8753,14 +8753,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 361.6038882138518,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8772,7 +8772,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8782,12 +8782,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8797,14 +8797,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 364.0479951397327,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8816,7 +8816,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8826,13 +8826,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8842,14 +8842,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 364.0479951397327,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8861,7 +8861,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8871,13 +8871,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8887,14 +8887,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 381.044957472661,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8906,7 +8906,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8916,13 +8916,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8932,14 +8932,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 397.5698663426489,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8951,7 +8951,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -8961,12 +8961,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -8976,14 +8976,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -8995,7 +8995,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9005,13 +9005,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9021,14 +9021,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9040,7 +9040,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9050,14 +9050,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.HandlerFunc.ServeHTTP (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 187,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9067,13 +9067,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9083,14 +9083,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 940.947752126367,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9102,7 +9102,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9112,13 +9112,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9128,14 +9128,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 994.4106925880924,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9147,7 +9147,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9157,13 +9157,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9173,14 +9173,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 1546.5370595382747,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9192,7 +9192,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9202,13 +9202,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9218,14 +9218,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1569.8663426488458,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9237,7 +9237,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9247,13 +9247,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9263,14 +9263,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.608748481166465,
             "x": 1585.419198055893,
             "y": 176,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9282,7 +9282,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9292,13 +9292,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9308,14 +9308,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.580801944106927,
             "x": 0,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9327,7 +9327,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9337,13 +9337,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9353,14 +9353,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 105.95382746051034,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9372,7 +9372,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9382,13 +9382,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9398,14 +9398,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 127.33900364520049,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9417,7 +9417,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9427,13 +9427,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9443,14 +9443,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 143.86391251518833,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9462,7 +9462,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9472,13 +9472,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9488,14 +9488,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 12.636695018226003,
             "x": 147.7521263669502,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9507,7 +9507,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9517,13 +9517,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9533,14 +9533,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.608748481166465,
             "x": 173.0255164034022,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9552,7 +9552,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9562,13 +9562,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9578,14 +9578,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 361.6038882138518,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9597,7 +9597,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9607,13 +9607,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9623,14 +9623,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 363.5479951397327,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9642,7 +9642,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9652,13 +9652,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9668,14 +9668,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 397.5698663426489,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9687,7 +9687,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9697,12 +9697,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9712,14 +9712,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9731,7 +9731,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9741,13 +9741,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9757,14 +9757,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 541.4058323207777,
             "x": 399.0419198055893,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9776,7 +9776,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9786,14 +9786,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/opentracing-contrib/go-stdlib/nethttp.MiddlewareFunc.func5 (5.58 Bil)",
       "x": 402.5419198055893,
       "y": 209,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9803,13 +9803,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9819,14 +9819,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 941.9198055893074,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9838,7 +9838,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9848,13 +9848,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9864,14 +9864,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 995.3827460510329,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9883,7 +9883,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9893,13 +9893,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9909,14 +9909,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1546.5370595382747,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9928,7 +9928,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9938,13 +9938,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9954,14 +9954,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1548.4811664641556,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -9973,7 +9973,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -9983,13 +9983,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -9999,14 +9999,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1585.419198055893,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10018,7 +10018,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10028,13 +10028,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10044,14 +10044,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 1592.2235722964765,
             "y": 198,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10063,7 +10063,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10073,13 +10073,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10089,14 +10089,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 0,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10108,7 +10108,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10118,13 +10118,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10134,14 +10134,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 4.860267314702309,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10153,7 +10153,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10163,13 +10163,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10179,14 +10179,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 105.95382746051034,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10198,7 +10198,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10208,13 +10208,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10224,14 +10224,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 110.81409477521264,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10243,7 +10243,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10253,13 +10253,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10269,14 +10269,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 128.31105710814094,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10288,7 +10288,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10298,13 +10298,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10314,14 +10314,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 143.86391251518833,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10333,7 +10333,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10343,13 +10343,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10359,14 +10359,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 148.72417982989066,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10378,7 +10378,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10388,13 +10388,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10404,14 +10404,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 153.58444714459296,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10423,7 +10423,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10433,13 +10433,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10449,14 +10449,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 173.0255164034022,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10468,7 +10468,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10478,13 +10478,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10494,14 +10494,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 177.8857837181045,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10513,7 +10513,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10523,12 +10523,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10538,14 +10538,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 537.5176184690158,
             "x": 399.0419198055893,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10557,7 +10557,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10567,13 +10567,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10583,14 +10583,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 537.5176184690158,
             "x": 399.0419198055893,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10602,7 +10602,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10612,14 +10612,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.HandlerFunc.ServeHTTP (5.54 Bil)",
       "x": 402.5419198055893,
       "y": 231,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10629,13 +10629,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10645,14 +10645,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 937.0595382746052,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10664,7 +10664,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10674,13 +10674,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10690,14 +10690,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1585.419198055893,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10709,7 +10709,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10719,13 +10719,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10735,14 +10735,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10754,7 +10754,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10764,13 +10764,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10780,14 +10780,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1596.1117861482383,
             "y": 220,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10799,7 +10799,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10809,13 +10809,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10825,14 +10825,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 0,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10844,7 +10844,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10854,13 +10854,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10870,14 +10870,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 105.95382746051034,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10889,7 +10889,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10899,13 +10899,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10915,14 +10915,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 107.89793438639126,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10934,7 +10934,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10944,13 +10944,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -10960,14 +10960,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 110.81409477521264,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -10979,7 +10979,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -10989,13 +10989,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11005,14 +11005,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 128.31105710814094,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11024,7 +11024,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11034,13 +11034,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11050,14 +11050,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 143.86391251518833,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11069,7 +11069,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11079,13 +11079,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11095,14 +11095,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 148.72417982989066,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11114,7 +11114,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11124,13 +11124,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11140,14 +11140,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 173.0255164034022,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11159,7 +11159,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11169,13 +11169,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11185,14 +11185,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 175.94167679222357,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11204,7 +11204,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11214,13 +11214,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11230,14 +11230,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11249,7 +11249,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11259,12 +11259,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11274,14 +11274,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 537.5176184690158,
             "x": 399.0419198055893,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11293,7 +11293,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11303,13 +11303,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11319,14 +11319,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 537.5176184690158,
             "x": 399.0419198055893,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11338,7 +11338,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11348,14 +11348,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/weaveworks/common/middleware.Log.Wrap.func1 (5.54 Bil)",
       "x": 402.5419198055893,
       "y": 253,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11365,13 +11365,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11381,14 +11381,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 937.0595382746052,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11400,7 +11400,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11410,13 +11410,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11426,14 +11426,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1585.419198055893,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11445,7 +11445,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11455,13 +11455,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11471,14 +11471,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11490,7 +11490,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11500,13 +11500,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11516,14 +11516,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1596.1117861482383,
             "y": 242,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11535,7 +11535,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11545,13 +11545,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11561,14 +11561,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 0,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11580,7 +11580,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11590,13 +11590,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11606,14 +11606,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1.9441069258809236,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11625,7 +11625,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11635,13 +11635,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11651,14 +11651,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 105.95382746051034,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11670,7 +11670,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11680,13 +11680,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11696,14 +11696,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 107.89793438639126,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11715,7 +11715,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11725,13 +11725,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11741,14 +11741,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 110.81409477521264,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11760,7 +11760,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11770,13 +11770,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11786,14 +11786,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11805,7 +11805,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11815,13 +11815,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11831,14 +11831,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 143.86391251518833,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11850,7 +11850,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11860,13 +11860,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11876,14 +11876,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 173.0255164034022,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11895,7 +11895,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11905,13 +11905,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11921,14 +11921,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11940,7 +11940,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11950,12 +11950,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -11965,14 +11965,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 536.5455650060753,
             "x": 399.0419198055893,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -11984,7 +11984,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -11994,13 +11994,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12010,14 +12010,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 536.5455650060753,
             "x": 399.0419198055893,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12029,7 +12029,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12039,14 +12039,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.HandlerFunc.ServeHTTP (5.53 Bil)",
       "x": 402.5419198055893,
       "y": 275,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12056,13 +12056,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12072,14 +12072,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 936.0874848116647,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12091,7 +12091,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12101,13 +12101,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12117,14 +12117,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1585.419198055893,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12136,7 +12136,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12146,13 +12146,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12162,14 +12162,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12181,7 +12181,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12191,13 +12191,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12207,14 +12207,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1596.1117861482383,
             "y": 264,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12226,7 +12226,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12236,13 +12236,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12252,14 +12252,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1.9441069258809236,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12271,7 +12271,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12281,13 +12281,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12297,14 +12297,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 105.95382746051034,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12316,7 +12316,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12326,13 +12326,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12342,14 +12342,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 107.89793438639126,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12361,7 +12361,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12371,13 +12371,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12387,14 +12387,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 111.7861482381531,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12406,7 +12406,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12416,13 +12416,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12432,14 +12432,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12451,7 +12451,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12461,13 +12461,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12477,14 +12477,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 173.0255164034022,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12496,7 +12496,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12506,13 +12506,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12522,14 +12522,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12541,7 +12541,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12551,12 +12551,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12566,14 +12566,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 534.6014580801944,
             "x": 399.0419198055893,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12585,7 +12585,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12595,13 +12595,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12611,14 +12611,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 534.6014580801944,
             "x": 399.0419198055893,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12630,7 +12630,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12640,14 +12640,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/weaveworks/common/middleware.Instrument.Wrap.func1 (5.51 Bil)",
       "x": 402.5419198055893,
       "y": 297,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12657,13 +12657,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12673,14 +12673,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 934.1433778857838,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12692,7 +12692,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12702,13 +12702,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12718,14 +12718,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1585.419198055893,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12737,7 +12737,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12747,13 +12747,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12763,14 +12763,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12782,7 +12782,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12792,13 +12792,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12808,14 +12808,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1596.1117861482383,
             "y": 286,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12827,7 +12827,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12837,13 +12837,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12853,14 +12853,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1.9441069258809236,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12872,7 +12872,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12882,13 +12882,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12898,14 +12898,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 107.89793438639126,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12917,7 +12917,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12927,13 +12927,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12943,14 +12943,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -12962,7 +12962,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -12972,13 +12972,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -12988,14 +12988,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13007,7 +13007,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13017,12 +13017,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13032,14 +13032,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 533.629404617254,
             "x": 399.0419198055893,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13051,7 +13051,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13061,13 +13061,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13077,14 +13077,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 533.629404617254,
             "x": 399.0419198055893,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13096,7 +13096,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13106,14 +13106,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/felixge/httpsnoop.(*Metrics).CaptureMetrics (5.50 Bil)",
       "x": 402.5419198055893,
       "y": 319,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13123,13 +13123,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13139,14 +13139,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 933.1713244228433,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13158,7 +13158,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13168,13 +13168,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13184,14 +13184,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 939.0036452004861,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13203,7 +13203,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13213,13 +13213,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13229,14 +13229,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13248,7 +13248,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13258,13 +13258,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13274,14 +13274,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 1596.1117861482383,
             "y": 308,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13293,7 +13293,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13303,13 +13303,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13319,14 +13319,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1.9441069258809236,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13338,7 +13338,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13348,13 +13348,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13364,14 +13364,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 107.89793438639126,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13383,7 +13383,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13393,13 +13393,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13409,14 +13409,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13428,7 +13428,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13438,13 +13438,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13454,14 +13454,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13473,7 +13473,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13483,12 +13483,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13498,14 +13498,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 532.6573511543135,
             "x": 399.0419198055893,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13517,7 +13517,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13527,13 +13527,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13543,14 +13543,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 532.6573511543135,
             "x": 399.0419198055893,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13562,7 +13562,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13572,14 +13572,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/weaveworks/common/middleware.Instrument.Wrap.func1.2 (5.49 Bil)",
       "x": 402.5419198055893,
       "y": 341,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13589,13 +13589,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13605,14 +13605,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 932.1992709599028,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13624,7 +13624,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13634,13 +13634,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13650,14 +13650,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 939.0036452004861,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13669,7 +13669,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13679,13 +13679,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13695,14 +13695,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13714,7 +13714,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13724,13 +13724,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13740,14 +13740,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 330,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13759,7 +13759,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13769,13 +13769,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13785,14 +13785,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1.9441069258809236,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13804,7 +13804,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13814,13 +13814,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13830,14 +13830,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13849,7 +13849,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13859,13 +13859,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13875,14 +13875,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13894,7 +13894,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13904,12 +13904,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13919,14 +13919,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 532.6573511543135,
             "x": 399.0419198055893,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13938,7 +13938,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13948,13 +13948,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -13964,14 +13964,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 532.6573511543135,
             "x": 399.0419198055893,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -13983,7 +13983,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -13993,14 +13993,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/gorilla/mux.(*Router).ServeHTTP (5.49 Bil)",
       "x": 402.5419198055893,
       "y": 363,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14010,13 +14010,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14026,14 +14026,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 933.1713244228433,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14045,7 +14045,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14055,13 +14055,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14071,14 +14071,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14090,7 +14090,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14100,13 +14100,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14116,14 +14116,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 352,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14135,7 +14135,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14145,13 +14145,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14161,14 +14161,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14180,7 +14180,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14190,13 +14190,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14206,14 +14206,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 179.82989064398544,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14225,7 +14225,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14235,12 +14235,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14250,14 +14250,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 155.50060753341435,
             "x": 399.0419198055893,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14269,7 +14269,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14279,13 +14279,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14295,14 +14295,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 155.50060753341435,
             "x": 399.0419198055893,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14314,7 +14314,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14324,14 +14324,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/bufbuild/connect-go.(*Handler).ServeHTTP (1.61 Bil)",
       "x": 402.5419198055893,
       "y": 385,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14341,12 +14341,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14356,14 +14356,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14375,7 +14375,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14385,13 +14385,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14401,14 +14401,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14420,7 +14420,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14430,14 +14430,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.(*ServeMux).ServeHTTP (3.88 Bil)",
       "x": 559.0425273390036,
       "y": 385,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14447,13 +14447,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14463,14 +14463,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 933.1713244228433,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14482,7 +14482,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14492,13 +14492,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14508,14 +14508,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 935.1154313487242,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14527,7 +14527,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14537,13 +14537,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14553,14 +14553,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14572,7 +14572,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14582,13 +14582,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14598,14 +14598,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 374,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14617,7 +14617,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14627,13 +14627,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14643,14 +14643,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 128.31105710814094,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14662,7 +14662,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14672,12 +14672,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14687,14 +14687,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 155.50060753341435,
             "x": 399.0419198055893,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14706,7 +14706,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14716,13 +14716,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14732,14 +14732,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 155.50060753341435,
             "x": 399.0419198055893,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14751,7 +14751,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14761,14 +14761,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/bufbuild/connect-go.NewUnaryHandler[...].func1 (1.61 Bil)",
       "x": 402.5419198055893,
       "y": 407,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14778,12 +14778,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14793,14 +14793,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14812,7 +14812,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14822,13 +14822,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14838,14 +14838,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14857,7 +14857,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14867,14 +14867,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http.HandlerFunc.ServeHTTP (3.88 Bil)",
       "x": 559.0425273390036,
       "y": 407,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14884,13 +14884,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14900,14 +14900,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 935.1154313487242,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14919,7 +14919,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14929,13 +14929,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14945,14 +14945,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -14964,7 +14964,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -14974,13 +14974,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -14990,14 +14990,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 396,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15009,7 +15009,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15019,12 +15019,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15034,14 +15034,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 148.69623329283112,
             "x": 399.0419198055893,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15053,7 +15053,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15063,13 +15063,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15079,14 +15079,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 148.69623329283112,
             "x": 399.0419198055893,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15098,7 +15098,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15108,14 +15108,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "github.com/bufbuild/connect-go.NewUnaryHandler[...].func1.1 (1.54 Bil)",
       "x": 402.5419198055893,
       "y": 429,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15125,13 +15125,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15141,14 +15141,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 548.2381530984204,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15160,7 +15160,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15170,12 +15170,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15185,14 +15185,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15204,7 +15204,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15214,13 +15214,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15230,14 +15230,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15249,7 +15249,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15259,14 +15259,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http/pprof.Index (3.88 Bil)",
       "x": 559.0425273390036,
       "y": 429,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15276,13 +15276,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15292,14 +15292,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 935.1154313487242,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15311,7 +15311,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15321,13 +15321,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15337,14 +15337,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 1592.2235722964765,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15356,7 +15356,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15366,13 +15366,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15382,14 +15382,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 418,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15401,7 +15401,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15411,12 +15411,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15426,14 +15426,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 148.69623329283112,
             "x": 399.0419198055893,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15445,7 +15445,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15455,13 +15455,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15471,14 +15471,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 148.69623329283112,
             "x": 399.0419198055893,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15490,7 +15490,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15500,14 +15500,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/ingester.(*Ingester).Push (1.54 Bil)",
       "x": 402.5419198055893,
       "y": 451,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15517,13 +15517,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15533,14 +15533,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 548.2381530984204,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15552,7 +15552,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15562,12 +15562,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15577,14 +15577,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15596,7 +15596,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15606,13 +15606,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15622,14 +15622,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 376.1567436208992,
             "x": 555.5425273390036,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15641,7 +15641,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15651,14 +15651,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "net/http/pprof.handler.ServeHTTP (3.88 Bil)",
       "x": 559.0425273390036,
       "y": 451,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15668,13 +15668,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15684,14 +15684,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 935.1154313487242,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15703,7 +15703,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15713,13 +15713,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15729,14 +15729,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1592.2235722964765,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15748,7 +15748,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15758,13 +15758,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15774,14 +15774,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1594.1676792223573,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15793,7 +15793,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15803,13 +15803,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15819,14 +15819,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 440,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15838,7 +15838,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15848,12 +15848,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15863,14 +15863,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 17.469015795868774,
             "x": 399.0419198055893,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15882,7 +15882,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15892,13 +15892,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15908,14 +15908,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 17.469015795868774,
             "x": 399.0419198055893,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15927,7 +15927,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15937,12 +15937,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15952,14 +15952,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 81.62454434993926,
             "x": 417.51093560145813,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -15971,7 +15971,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -15981,13 +15981,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -15997,14 +15997,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 81.62454434993926,
             "x": 417.51093560145813,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16016,7 +16016,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16026,14 +16026,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/create.(*Head).Ingest (850 Mil)",
       "x": 421.01093560145813,
       "y": 473,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16043,12 +16043,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16058,14 +16058,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 45.658566221142166,
             "x": 500.1354799513974,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16077,7 +16077,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16087,13 +16087,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16103,14 +16103,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 45.658566221142166,
             "x": 500.1354799513974,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16122,7 +16122,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16132,14 +16132,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/gen/google/v1.(*Profile).UnmarshalVT (480 Mil)",
       "x": 503.6354799513974,
       "y": 473,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16149,13 +16149,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16165,14 +16165,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 8.748481166464156,
             "x": 546.2940461725395,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16184,7 +16184,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16194,12 +16194,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16209,14 +16209,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 375.1846901579587,
             "x": 555.5425273390036,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16228,7 +16228,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16238,13 +16238,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16254,14 +16254,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 375.1846901579587,
             "x": 555.5425273390036,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16273,7 +16273,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16283,14 +16283,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.(*Profile).WriteTo (3.87 Bil)",
       "x": 559.0425273390036,
       "y": 473,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16300,13 +16300,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16316,14 +16316,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1592.2235722964765,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16335,7 +16335,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16345,13 +16345,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16361,14 +16361,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1594.1676792223573,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16380,7 +16380,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16390,13 +16390,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16406,14 +16406,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 462,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16425,7 +16425,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16435,12 +16435,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16450,14 +16450,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 399.0419198055893,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16469,7 +16469,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16479,13 +16479,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16495,14 +16495,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 399.0419198055893,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16514,7 +16514,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16524,13 +16524,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16540,14 +16540,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 415.0668286755772,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16559,7 +16559,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16569,12 +16569,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16584,14 +16584,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 33.02187120291616,
             "x": 417.51093560145813,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16603,7 +16603,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16613,13 +16613,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16629,14 +16629,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 33.02187120291616,
             "x": 417.51093560145813,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16648,7 +16648,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16658,14 +16658,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/create.(*Head).convertSamples (350 Mil)",
       "x": 421.01093560145813,
       "y": 495,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16675,12 +16675,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16690,14 +16690,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.96597812879708,
             "x": 451.5328068043743,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16709,7 +16709,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16719,13 +16719,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16735,14 +16735,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.96597812879708,
             "x": 451.5328068043743,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16754,7 +16754,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16764,14 +16764,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/create.(*deduplicatingSlice[...]).ingest (370 Mil)",
       "x": 455.0328068043743,
       "y": 495,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16781,13 +16781,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16797,14 +16797,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 486.99878493317135,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16816,7 +16816,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16826,12 +16826,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16841,14 +16841,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 488.4708383961118,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16860,7 +16860,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16870,13 +16870,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16886,14 +16886,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 488.4708383961118,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16905,7 +16905,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16915,13 +16915,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16931,14 +16931,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16950,7 +16950,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -16960,12 +16960,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -16975,14 +16975,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 500.1354799513974,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -16994,7 +16994,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17004,13 +17004,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17020,14 +17020,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 500.1354799513974,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17039,7 +17039,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17049,12 +17049,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17064,14 +17064,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 12.608748481166465,
             "x": 514.7162818955043,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17083,7 +17083,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17093,13 +17093,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17109,14 +17109,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 12.608748481166465,
             "x": 514.7162818955043,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17128,7 +17128,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17138,12 +17138,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17153,14 +17153,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 528.3250303766707,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17172,7 +17172,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17182,13 +17182,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17198,14 +17198,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 528.3250303766707,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17217,7 +17217,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17227,13 +17227,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17243,14 +17243,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 539.4896719319563,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17262,7 +17262,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17272,13 +17272,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17288,14 +17288,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 8.748481166464156,
             "x": 546.2940461725395,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17307,7 +17307,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17317,12 +17317,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17332,14 +17332,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 312.97326852976914,
             "x": 555.5425273390036,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17351,7 +17351,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17361,13 +17361,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17377,14 +17377,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 312.97326852976914,
             "x": 555.5425273390036,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17396,7 +17396,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17406,14 +17406,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.writeAlloc (3.23 Bil)",
       "x": 559.0425273390036,
       "y": 495,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17423,12 +17423,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17438,14 +17438,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 61.211421628189555,
             "x": 869.5157958687728,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17457,7 +17457,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17467,13 +17467,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17483,14 +17483,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 61.211421628189555,
             "x": 869.5157958687728,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17502,7 +17502,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17512,14 +17512,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.writeGoroutine (640 Mil)",
       "x": 873.0157958687728,
       "y": 495,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17529,13 +17529,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17545,14 +17545,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1592.2235722964765,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17564,7 +17564,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17574,13 +17574,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17590,14 +17590,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1594.1676792223573,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17609,7 +17609,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17619,13 +17619,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17635,14 +17635,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 484,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17654,7 +17654,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17664,12 +17664,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17679,14 +17679,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 399.0419198055893,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17698,7 +17698,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17708,13 +17708,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17724,14 +17724,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 399.0419198055893,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17743,7 +17743,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17753,13 +17753,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17769,14 +17769,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 415.0668286755772,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17788,7 +17788,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17798,12 +17798,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17813,14 +17813,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 28.161603888213854,
             "x": 417.51093560145813,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17832,7 +17832,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17842,13 +17842,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17858,14 +17858,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 28.161603888213854,
             "x": 417.51093560145813,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17877,7 +17877,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17887,14 +17887,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "test/pkg/create.(*deduplicatingSlice[...]).ingest (300 Mil)",
       "x": 421.01093560145813,
       "y": 517,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17904,13 +17904,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17920,14 +17920,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 446.172539489672,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17939,7 +17939,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17949,13 +17949,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -17965,14 +17965,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 33.0498177399757,
             "x": 451.0328068043743,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -17984,7 +17984,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -17994,13 +17994,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18010,14 +18010,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 486.99878493317135,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18029,7 +18029,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18039,12 +18039,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18054,14 +18054,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 488.4708383961118,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18073,7 +18073,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18083,13 +18083,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18099,14 +18099,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 488.4708383961118,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18118,7 +18118,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18128,13 +18128,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18144,14 +18144,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 498.6634264884569,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18163,7 +18163,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18173,12 +18173,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18188,14 +18188,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 501.1075334143378,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18207,7 +18207,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18217,13 +18217,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18233,14 +18233,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 501.1075334143378,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18252,7 +18252,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18262,13 +18262,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18278,14 +18278,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 514.2162818955043,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18297,7 +18297,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18307,13 +18307,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18323,14 +18323,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 527.8250303766707,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18342,7 +18342,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18352,13 +18352,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18368,14 +18368,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 539.4896719319563,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18387,7 +18387,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18397,13 +18397,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18413,14 +18413,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 546.2940461725395,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18432,7 +18432,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18442,13 +18442,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18458,14 +18458,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 548.2381530984204,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18477,7 +18477,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18487,12 +18487,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18502,14 +18502,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 312.97326852976914,
             "x": 555.5425273390036,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18521,7 +18521,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18531,13 +18531,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18547,14 +18547,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 312.97326852976914,
             "x": 555.5425273390036,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18566,7 +18566,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18576,14 +18576,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.writeHeapInternal (3.23 Bil)",
       "x": 559.0425273390036,
       "y": 517,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18593,12 +18593,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18608,14 +18608,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 61.211421628189555,
             "x": 869.5157958687728,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18627,7 +18627,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18637,13 +18637,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18653,14 +18653,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 61.211421628189555,
             "x": 869.5157958687728,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18672,7 +18672,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18682,14 +18682,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.writeRuntimeProfile (640 Mil)",
       "x": 873.0157958687728,
       "y": 517,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18699,13 +18699,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18715,14 +18715,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1592.2235722964765,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18734,7 +18734,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18744,13 +18744,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18760,14 +18760,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1594.1676792223573,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18779,7 +18779,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18789,13 +18789,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18805,14 +18805,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1596.1117861482383,
             "y": 506,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18824,7 +18824,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18834,13 +18834,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18850,14 +18850,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 398.5419198055893,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18869,7 +18869,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18879,12 +18879,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18894,14 +18894,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 401.95808019441074,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18913,7 +18913,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18923,13 +18923,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18939,14 +18939,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 401.95808019441074,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -18958,7 +18958,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -18968,13 +18968,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -18984,14 +18984,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 413.12272174969627,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19003,7 +19003,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19013,13 +19013,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19029,14 +19029,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19048,7 +19048,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19058,12 +19058,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19073,14 +19073,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 417.51093560145813,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19092,7 +19092,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19102,13 +19102,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19118,14 +19118,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 417.51093560145813,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19137,7 +19137,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19147,13 +19147,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19163,14 +19163,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.552855407047389,
             "x": 428.67557715674366,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19182,7 +19182,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19192,13 +19192,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19208,14 +19208,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 446.172539489672,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19227,7 +19227,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19237,13 +19237,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19253,14 +19253,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 451.0328068043743,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19272,7 +19272,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19282,13 +19282,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19298,14 +19298,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 454.92102065613614,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19317,7 +19317,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19327,13 +19327,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19343,14 +19343,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 464.64155528554073,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19362,7 +19362,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19372,13 +19372,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19388,14 +19388,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 473.3900364520049,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19407,7 +19407,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19417,13 +19417,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19433,14 +19433,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 483.1105710814095,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19452,7 +19452,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19462,13 +19462,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19478,14 +19478,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 486.99878493317135,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19497,7 +19497,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19507,13 +19507,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19523,14 +19523,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19542,7 +19542,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19552,13 +19552,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19568,14 +19568,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 500.6075334143378,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19587,7 +19587,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19597,13 +19597,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19613,14 +19613,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 514.2162818955043,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19632,7 +19632,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19642,13 +19642,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19658,14 +19658,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 521.992709599028,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19677,7 +19677,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19687,13 +19687,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19703,14 +19703,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 527.8250303766707,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19722,7 +19722,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19732,13 +19732,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19748,14 +19748,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 539.4896719319563,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19767,7 +19767,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19777,13 +19777,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19793,14 +19793,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 546.2940461725395,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19812,7 +19812,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19822,13 +19822,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19838,14 +19838,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 548.2381530984204,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19857,7 +19857,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19867,12 +19867,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19882,14 +19882,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 311.0291616038882,
             "x": 555.5425273390036,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19901,7 +19901,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19911,13 +19911,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19927,14 +19927,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 311.0291616038882,
             "x": 555.5425273390036,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -19946,7 +19946,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19956,14 +19956,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.writeHeapProto (3.21 Bil)",
       "x": 559.0425273390036,
       "y": 539,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -19973,13 +19973,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -19989,14 +19989,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 867.0716889428919,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20008,7 +20008,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20018,12 +20018,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20033,14 +20033,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 23.301336573511545,
             "x": 869.5157958687728,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20052,7 +20052,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20062,13 +20062,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20078,14 +20078,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 23.301336573511545,
             "x": 869.5157958687728,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20097,7 +20097,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20107,14 +20107,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.runtime_goroutineProfileWithLabels (250 Mil)",
       "x": 873.0157958687728,
       "y": 539,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20124,12 +20124,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20139,14 +20139,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 36.91008505467801,
             "x": 893.8171324422843,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20158,7 +20158,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20168,13 +20168,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20184,14 +20184,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 36.91008505467801,
             "x": 893.8171324422843,
             "y": 528,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20203,7 +20203,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20213,14 +20213,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.printCountProfile (390 Mil)",
       "x": 897.3171324422843,
       "y": 539,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20230,13 +20230,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20246,14 +20246,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 401.45808019441074,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20265,7 +20265,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20275,13 +20275,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20291,14 +20291,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 413.12272174969627,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20310,7 +20310,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20320,13 +20320,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20336,14 +20336,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20355,7 +20355,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20365,12 +20365,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20380,14 +20380,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 417.51093560145813,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20399,7 +20399,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20409,13 +20409,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20425,14 +20425,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 417.51093560145813,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20444,7 +20444,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20454,13 +20454,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20470,14 +20470,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 428.67557715674366,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20489,7 +20489,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20499,13 +20499,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20515,14 +20515,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 437.4240583232078,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20534,7 +20534,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20544,13 +20544,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20560,14 +20560,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 447.1445929526124,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20579,7 +20579,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20589,13 +20589,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20605,14 +20605,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 454.92102065613614,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20624,7 +20624,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20634,13 +20634,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20650,14 +20650,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 466.58566221142166,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20669,7 +20669,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20679,13 +20679,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20695,14 +20695,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 483.1105710814095,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20714,7 +20714,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20724,13 +20724,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20740,14 +20740,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 486.99878493317135,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20759,7 +20759,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20769,13 +20769,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20785,14 +20785,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20804,7 +20804,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20814,13 +20814,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20830,14 +20830,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 514.2162818955043,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20849,7 +20849,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20859,13 +20859,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20875,14 +20875,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 527.8250303766707,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20894,7 +20894,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20904,13 +20904,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20920,14 +20920,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20939,7 +20939,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20949,13 +20949,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -20965,14 +20965,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 546.2940461725395,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -20984,7 +20984,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -20994,13 +20994,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21010,14 +21010,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 548.2381530984204,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21029,7 +21029,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21039,12 +21039,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21054,14 +21054,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 30.105710814094778,
             "x": 555.5425273390036,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21073,7 +21073,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21083,13 +21083,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21099,14 +21099,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 30.105710814094778,
             "x": 555.5425273390036,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21118,7 +21118,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21128,14 +21128,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.(*profileBuilder).pbSample (320 Mil)",
       "x": 559.0425273390036,
       "y": 561,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21145,12 +21145,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21160,14 +21160,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 178.82989064398544,
             "x": 586.6482381530984,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21179,7 +21179,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21189,13 +21189,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21205,14 +21205,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 178.82989064398544,
             "x": 586.6482381530984,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21224,7 +21224,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21234,14 +21234,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.(*profileBuilder).appendLocsForStack (1.85 Bil)",
       "x": 590.1482381530984,
       "y": 561,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21251,13 +21251,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21267,14 +21267,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 765.9781287970839,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21286,7 +21286,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21296,12 +21296,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21311,14 +21311,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 26.21749696233293,
             "x": 767.4501822600243,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21330,7 +21330,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21340,13 +21340,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21356,14 +21356,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 26.21749696233293,
             "x": 767.4501822600243,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21375,7 +21375,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21385,14 +21385,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.(*profileBuilder).build (280 Mil)",
       "x": 770.9501822600243,
       "y": 561,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21402,12 +21402,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21417,14 +21417,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 56.35115431348724,
             "x": 794.6676792223573,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21436,7 +21436,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21446,13 +21446,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21462,14 +21462,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 56.35115431348724,
             "x": 794.6676792223573,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21481,7 +21481,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21491,14 +21491,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.FuncForPC (590 Mil)",
       "x": 798.1676792223573,
       "y": 561,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21508,13 +21508,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21524,14 +21524,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 851.5188335358445,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21543,7 +21543,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21553,13 +21553,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21569,14 +21569,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 867.0716889428919,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21588,7 +21588,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21598,12 +21598,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21613,14 +21613,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 23.301336573511545,
             "x": 869.5157958687728,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21632,7 +21632,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21642,13 +21642,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21658,14 +21658,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 23.301336573511545,
             "x": 869.5157958687728,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21677,7 +21677,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21687,14 +21687,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.goroutineProfileWithLabels (250 Mil)",
       "x": 873.0157958687728,
       "y": 561,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21704,13 +21704,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21720,14 +21720,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 17.496962332928312,
             "x": 893.3171324422843,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21739,7 +21739,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21749,12 +21749,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21764,14 +21764,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 911.3140947752127,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21783,7 +21783,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21793,13 +21793,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21809,14 +21809,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 911.3140947752127,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21828,7 +21828,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21838,13 +21838,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21854,14 +21854,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 928.311057108141,
             "y": 550,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21873,7 +21873,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21883,13 +21883,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21899,14 +21899,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 401.45808019441074,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21918,7 +21918,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21928,13 +21928,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21944,14 +21944,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.720534629404618,
             "x": 416.03888213851764,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -21963,7 +21963,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -21973,13 +21973,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -21989,14 +21989,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 428.67557715674366,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22008,7 +22008,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22018,13 +22018,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22034,14 +22034,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 437.4240583232078,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22053,7 +22053,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22063,13 +22063,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22079,14 +22079,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 454.92102065613614,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22098,7 +22098,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22108,13 +22108,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22124,14 +22124,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 487.9708383961118,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22143,7 +22143,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22153,13 +22153,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22169,14 +22169,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22188,7 +22188,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22198,13 +22198,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22214,14 +22214,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 528.7970838396112,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22233,7 +22233,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22243,13 +22243,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22259,14 +22259,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22278,7 +22278,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22288,13 +22288,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22304,14 +22304,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 546.2940461725395,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22323,7 +22323,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22333,13 +22333,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22349,14 +22349,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.993924665856625,
             "x": 548.2381530984204,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22368,7 +22368,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22378,12 +22378,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22393,14 +22393,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 38.85419198055893,
             "x": 586.6482381530984,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22412,7 +22412,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22422,13 +22422,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22438,14 +22438,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 38.85419198055893,
             "x": 586.6482381530984,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22457,7 +22457,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22467,14 +22467,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.(*profileBuilder).emitLocation (410 Mil)",
       "x": 590.1482381530984,
       "y": 583,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22484,12 +22484,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22499,14 +22499,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.552855407047389,
             "x": 626.5024301336574,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22518,7 +22518,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22528,13 +22528,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22544,14 +22544,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.552855407047389,
             "x": 626.5024301336574,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22563,7 +22563,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22573,12 +22573,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22588,14 +22588,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 61.211421628189555,
             "x": 642.0552855407047,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22607,7 +22607,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22617,13 +22617,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22633,14 +22633,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 61.211421628189555,
             "x": 642.0552855407047,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22652,7 +22652,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22662,14 +22662,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime/pprof.allFrames (640 Mil)",
       "x": 645.5552855407047,
       "y": 583,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22679,12 +22679,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22694,14 +22694,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 27.189550425273392,
             "x": 704.2667071688943,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22713,7 +22713,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22723,13 +22723,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22739,14 +22739,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 27.189550425273392,
             "x": 704.2667071688943,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22758,7 +22758,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22768,14 +22768,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.mapaccess2_fast64 (290 Mil)",
       "x": 707.7667071688943,
       "y": 583,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22785,13 +22785,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22801,14 +22801,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 731.9562575941677,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22820,7 +22820,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22830,12 +22830,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22845,14 +22845,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 735.3724179829891,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22864,7 +22864,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22874,13 +22874,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22890,14 +22890,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.413122721749698,
             "x": 735.3724179829891,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22909,7 +22909,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22919,13 +22919,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22935,14 +22935,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 755.2855407047388,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22954,7 +22954,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -22964,12 +22964,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -22979,14 +22979,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 767.4501822600243,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -22998,7 +22998,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23008,13 +23008,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23024,14 +23024,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 767.4501822600243,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23043,7 +23043,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23053,12 +23053,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23068,14 +23068,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 782.0309842041313,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23087,7 +23087,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23097,13 +23097,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23113,14 +23113,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 782.0309842041313,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23132,7 +23132,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23142,13 +23142,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23158,14 +23158,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 794.1676792223573,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23177,7 +23177,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23187,12 +23187,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23202,14 +23202,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 800.5,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23221,7 +23221,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23231,13 +23231,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23247,14 +23247,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 800.5,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23266,7 +23266,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23276,12 +23276,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23291,14 +23291,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.96597812879708,
             "x": 815.080801944107,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23310,7 +23310,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23320,13 +23320,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23336,14 +23336,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 34.96597812879708,
             "x": 815.080801944107,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23355,7 +23355,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23365,14 +23365,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.funcline1 (370 Mil)",
       "x": 818.580801944107,
       "y": 583,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23382,13 +23382,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23398,14 +23398,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23417,7 +23417,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23427,13 +23427,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23443,14 +23443,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 854.434993924666,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23462,7 +23462,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23472,12 +23472,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23487,14 +23487,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 21.35722964763062,
             "x": 869.5157958687728,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23506,7 +23506,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23516,13 +23516,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23532,14 +23532,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 21.35722964763062,
             "x": 869.5157958687728,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23551,7 +23551,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23561,14 +23561,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.forEachGRace (230 Mil)",
       "x": 873.0157958687728,
       "y": 583,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23578,13 +23578,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23594,14 +23594,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 891.3730255164035,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23613,7 +23613,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23623,13 +23623,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23639,14 +23639,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 899.1494532199272,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23658,7 +23658,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23668,13 +23668,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23684,14 +23684,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 8.748481166464156,
             "x": 902.0656136087485,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23703,7 +23703,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23713,12 +23713,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23728,14 +23728,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 911.3140947752127,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23747,7 +23747,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23757,13 +23757,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23773,14 +23773,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 911.3140947752127,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23792,7 +23792,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23802,13 +23802,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23818,14 +23818,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 927.3390036452006,
             "y": 572,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23837,7 +23837,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23847,13 +23847,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23863,14 +23863,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 416.03888213851764,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23882,7 +23882,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23892,13 +23892,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23908,14 +23908,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 437.4240583232078,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23927,7 +23927,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23937,13 +23937,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23953,14 +23953,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 487.9708383961118,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -23972,7 +23972,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -23982,13 +23982,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -23998,14 +23998,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 489.9149453219927,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24017,7 +24017,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24027,13 +24027,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24043,14 +24043,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24062,7 +24062,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24072,13 +24072,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24088,14 +24088,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 528.7970838396112,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24107,7 +24107,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24117,13 +24117,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24133,14 +24133,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24152,7 +24152,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24162,13 +24162,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24178,14 +24178,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 546.2940461725395,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24197,7 +24197,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24207,13 +24207,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24223,14 +24223,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 22.35722964763062,
             "x": 548.2381530984204,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24242,7 +24242,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24252,12 +24252,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24267,14 +24267,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 586.6482381530984,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24286,7 +24286,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24296,13 +24296,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24312,14 +24312,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 586.6482381530984,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24331,7 +24331,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24341,13 +24341,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24357,14 +24357,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 28.189550425273392,
             "x": 596.8408262454435,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24376,7 +24376,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24386,12 +24386,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24401,14 +24401,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 626.5024301336574,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24420,7 +24420,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24430,13 +24430,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24446,14 +24446,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 626.5024301336574,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24465,7 +24465,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24475,13 +24475,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24491,14 +24491,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 641.5552855407047,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24510,7 +24510,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24520,12 +24520,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24535,14 +24535,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 52.462940461725395,
             "x": 643.0273390036452,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24554,7 +24554,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24564,13 +24564,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24580,14 +24580,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 52.462940461725395,
             "x": 643.0273390036452,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24599,7 +24599,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24609,14 +24609,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.(*Frames).Next (550 Mil)",
       "x": 646.5273390036452,
       "y": 605,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24626,13 +24626,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24642,14 +24642,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 695.9902794653706,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24661,7 +24661,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24671,13 +24671,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24687,14 +24687,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 8.748481166464156,
             "x": 703.7667071688943,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24706,7 +24706,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24716,13 +24716,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24732,14 +24732,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 731.9562575941677,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24751,7 +24751,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24761,13 +24761,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24777,14 +24777,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 734.8724179829891,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24796,7 +24796,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24806,12 +24806,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24821,14 +24821,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 737.3165249088701,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24840,7 +24840,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24850,13 +24850,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24866,14 +24866,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 737.3165249088701,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24885,7 +24885,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24895,13 +24895,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24911,14 +24911,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 748.4811664641555,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24930,7 +24930,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24940,12 +24940,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -24955,14 +24955,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 767.4501822600243,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -24974,7 +24974,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -24984,13 +24984,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25000,14 +25000,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 767.4501822600243,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25019,7 +25019,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25029,12 +25029,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25044,14 +25044,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 782.0309842041313,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25063,7 +25063,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25073,13 +25073,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25089,14 +25089,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 782.0309842041313,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25108,7 +25108,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25118,13 +25118,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25134,14 +25134,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 794.1676792223573,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25153,7 +25153,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25163,13 +25163,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25179,14 +25179,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 800,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25198,7 +25198,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25208,12 +25208,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25223,14 +25223,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 803.4161603888215,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25242,7 +25242,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25252,13 +25252,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25268,14 +25268,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.664641555285542,
             "x": 803.4161603888215,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25287,7 +25287,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25297,12 +25297,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25312,14 +25312,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 24.273390036452007,
             "x": 815.080801944107,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25331,7 +25331,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25341,13 +25341,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25357,14 +25357,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 24.273390036452007,
             "x": 815.080801944107,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25376,7 +25376,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25386,14 +25386,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.pcvalue (260 Mil)",
       "x": 818.580801944107,
       "y": 605,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25403,12 +25403,12 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25418,14 +25418,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 840.354191980559,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25437,7 +25437,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25447,13 +25447,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25463,14 +25463,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 840.354191980559,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25482,7 +25482,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25492,13 +25492,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25508,14 +25508,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25527,7 +25527,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25537,13 +25537,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25553,14 +25553,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 854.434993924666,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25572,7 +25572,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25582,12 +25582,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25597,14 +25597,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 869.5157958687728,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25616,7 +25616,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25626,13 +25626,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25642,14 +25642,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 16.496962332928312,
             "x": 869.5157958687728,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25661,7 +25661,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25671,13 +25671,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25687,14 +25687,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 886.5127582017011,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25706,7 +25706,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25716,13 +25716,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25732,14 +25732,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 899.1494532199272,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25751,7 +25751,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25761,13 +25761,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25777,14 +25777,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 902.0656136087485,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25796,7 +25796,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25806,13 +25806,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25822,14 +25822,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 18.469015795868774,
             "x": 908.8699878493318,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25841,7 +25841,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25851,13 +25851,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25867,14 +25867,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 928.311057108141,
             "y": 594,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25886,7 +25886,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25896,13 +25896,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25912,14 +25912,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25931,7 +25931,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25941,13 +25941,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -25957,14 +25957,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -25976,7 +25976,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -25986,13 +25986,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26002,14 +26002,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 487.9708383961118,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26021,7 +26021,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26031,13 +26031,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26047,14 +26047,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 489.9149453219927,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26066,7 +26066,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26076,13 +26076,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26092,14 +26092,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26111,7 +26111,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26121,13 +26121,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26137,14 +26137,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26156,7 +26156,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26166,13 +26166,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26182,14 +26182,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 546.2940461725395,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26201,7 +26201,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26211,13 +26211,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26227,14 +26227,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 19.441069258809236,
             "x": 548.2381530984204,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26246,7 +26246,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26256,12 +26256,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26271,14 +26271,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 586.6482381530984,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26290,7 +26290,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26300,13 +26300,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26316,14 +26316,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.69258809234508,
             "x": 586.6482381530984,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26335,7 +26335,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26345,13 +26345,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26361,14 +26361,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 596.8408262454435,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26380,7 +26380,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26390,13 +26390,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26406,14 +26406,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 603.6452004860267,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26425,7 +26425,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26435,13 +26435,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26451,14 +26451,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 607.5334143377886,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26470,7 +26470,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26480,13 +26480,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26496,14 +26496,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 615.3098420413123,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26515,7 +26515,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26525,13 +26525,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26541,14 +26541,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 622.1142162818956,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26560,7 +26560,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26570,13 +26570,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26586,14 +26586,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 626.0024301336574,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26605,7 +26605,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26615,12 +26615,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26630,14 +26630,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 38.85419198055893,
             "x": 643.0273390036452,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26649,7 +26649,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26659,13 +26659,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26675,14 +26675,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 38.85419198055893,
             "x": 643.0273390036452,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26694,7 +26694,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26704,14 +26704,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.funcline1 (410 Mil)",
       "x": 646.5273390036452,
       "y": 627,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26721,13 +26721,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26737,14 +26737,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 682.3815309842041,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26756,7 +26756,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26766,13 +26766,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26782,14 +26782,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 695.9902794653706,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26801,7 +26801,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26811,13 +26811,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26827,14 +26827,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 732.9283110571082,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26846,7 +26846,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26856,13 +26856,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26872,14 +26872,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 14.580801944106927,
             "x": 734.8724179829891,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26891,7 +26891,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26901,12 +26901,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26916,14 +26916,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 767.4501822600243,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26935,7 +26935,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26945,13 +26945,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -26961,14 +26961,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 767.4501822600243,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -26980,7 +26980,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -26990,12 +26990,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27005,14 +27005,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 782.0309842041313,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27024,7 +27024,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27034,13 +27034,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27050,14 +27050,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.636695018226003,
             "x": 782.0309842041313,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27069,7 +27069,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27079,13 +27079,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27095,14 +27095,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 794.1676792223573,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27114,7 +27114,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27124,13 +27124,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27140,14 +27140,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 800,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27159,7 +27159,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27169,13 +27169,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27185,14 +27185,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 814.580801944107,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27204,7 +27204,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27214,12 +27214,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27229,14 +27229,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 818.9690157958688,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27248,7 +27248,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27258,13 +27258,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27274,14 +27274,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 13.580801944106927,
             "x": 818.9690157958688,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27293,7 +27293,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27303,13 +27303,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27319,14 +27319,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 8.748481166464156,
             "x": 839.854191980559,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27338,7 +27338,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27348,13 +27348,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27364,14 +27364,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27383,7 +27383,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27393,13 +27393,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27409,14 +27409,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 854.434993924666,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27428,7 +27428,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27438,12 +27438,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27453,14 +27453,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27472,7 +27472,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27482,13 +27482,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27498,14 +27498,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27517,7 +27517,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27527,13 +27527,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27543,14 +27543,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 9.720534629404618,
             "x": 885.5407047387607,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27562,7 +27562,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27572,13 +27572,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27588,14 +27588,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 896.2332928311058,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27607,7 +27607,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27617,13 +27617,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27633,14 +27633,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 899.1494532199272,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27652,7 +27652,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27662,13 +27662,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27678,14 +27678,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 904.0097205346294,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27697,7 +27697,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27707,13 +27707,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27723,14 +27723,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 18.469015795868774,
             "x": 908.8699878493318,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27742,7 +27742,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27752,13 +27752,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27768,14 +27768,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 928.311057108141,
             "y": 616,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27787,7 +27787,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27797,13 +27797,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27813,14 +27813,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27832,7 +27832,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27842,13 +27842,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27858,14 +27858,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27877,7 +27877,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27887,13 +27887,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27903,14 +27903,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 489.9149453219927,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27922,7 +27922,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27932,13 +27932,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27948,14 +27948,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -27967,7 +27967,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -27977,13 +27977,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -27993,14 +27993,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28012,7 +28012,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28022,13 +28022,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28038,14 +28038,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28057,7 +28057,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28067,13 +28067,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28083,14 +28083,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 554.0704738760633,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28102,7 +28102,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28112,13 +28112,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28128,14 +28128,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 566.7071688942892,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28147,7 +28147,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28157,13 +28157,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28173,14 +28173,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 586.1482381530984,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28192,7 +28192,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28202,13 +28202,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28218,14 +28218,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28237,7 +28237,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28247,13 +28247,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28263,14 +28263,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 607.5334143377886,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28282,7 +28282,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28292,13 +28292,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28308,14 +28308,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 618.2260024301337,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28327,7 +28327,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28337,13 +28337,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28353,14 +28353,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 627.9465370595383,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28372,7 +28372,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28382,13 +28382,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28398,14 +28398,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 642.5273390036452,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28417,7 +28417,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28427,12 +28427,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28442,14 +28442,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 24.273390036452007,
             "x": 650.803766707169,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28461,7 +28461,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28471,13 +28471,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28487,14 +28487,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 24.273390036452007,
             "x": 650.803766707169,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28506,7 +28506,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28516,14 +28516,14 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "maxWidth": null,
       "text": "runtime.pcvalue (260 Mil)",
       "x": 654.303766707169,
       "y": 649,
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28533,13 +28533,13 @@ Array [
     ],
     "type": "fillText",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28549,14 +28549,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 675.5771567436209,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28568,7 +28568,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28578,13 +28578,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28594,14 +28594,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 682.3815309842041,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28613,7 +28613,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28623,13 +28623,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28639,14 +28639,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 688.213851761847,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28658,7 +28658,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28668,13 +28668,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28684,14 +28684,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 732.9283110571082,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28703,7 +28703,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28713,13 +28713,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28729,14 +28729,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 734.8724179829891,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28748,7 +28748,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28758,13 +28758,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28774,14 +28774,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 736.8165249088701,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28793,7 +28793,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28803,13 +28803,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28819,14 +28819,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 27.21749696233293,
             "x": 766.9501822600243,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28838,7 +28838,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28848,13 +28848,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28864,14 +28864,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28883,7 +28883,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28893,12 +28893,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28908,14 +28908,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28927,7 +28927,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28937,13 +28937,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28953,14 +28953,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -28972,7 +28972,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -28982,13 +28982,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -28998,14 +28998,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 885.5407047387607,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29017,7 +29017,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29027,13 +29027,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29043,14 +29043,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 891.3730255164035,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29062,7 +29062,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29072,13 +29072,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29088,14 +29088,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 899.1494532199272,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29107,7 +29107,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29117,13 +29117,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29133,14 +29133,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 904.0097205346294,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29152,7 +29152,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29162,13 +29162,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29178,14 +29178,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 17.496962332928312,
             "x": 909.8420413122723,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29197,7 +29197,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29207,13 +29207,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29223,14 +29223,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 928.311057108141,
             "y": 638,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29242,7 +29242,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29252,13 +29252,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29268,14 +29268,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29287,7 +29287,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29297,13 +29297,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29313,14 +29313,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29332,7 +29332,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29342,13 +29342,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29358,14 +29358,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29377,7 +29377,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29387,13 +29387,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29403,14 +29403,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29422,7 +29422,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29432,13 +29432,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29448,14 +29448,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29467,7 +29467,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29477,13 +29477,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29493,14 +29493,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 554.0704738760633,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29512,7 +29512,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29522,13 +29522,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29538,14 +29538,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 586.1482381530984,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29557,7 +29557,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29567,13 +29567,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29583,14 +29583,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29602,7 +29602,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29612,13 +29612,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29628,14 +29628,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29647,7 +29647,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29657,13 +29657,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29673,14 +29673,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 5.832320777642771,
             "x": 642.5273390036452,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29692,7 +29692,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29702,13 +29702,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29718,14 +29718,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 650.303766707169,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29737,7 +29737,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29747,12 +29747,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29762,14 +29762,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 652.7478736330498,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29781,7 +29781,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29791,13 +29791,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29807,14 +29807,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 652.7478736330498,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29826,7 +29826,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29836,13 +29836,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29852,14 +29852,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 675.5771567436209,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29871,7 +29871,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29881,13 +29881,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29897,14 +29897,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 682.3815309842041,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29916,7 +29916,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29926,13 +29926,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29942,14 +29942,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 688.213851761847,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -29961,7 +29961,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -29971,13 +29971,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -29987,14 +29987,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 692.1020656136088,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30006,7 +30006,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30016,13 +30016,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30032,14 +30032,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 736.8165249088701,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30051,7 +30051,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30061,13 +30061,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30077,14 +30077,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 745.5650060753342,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30096,7 +30096,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30106,13 +30106,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30122,14 +30122,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 766.9501822600243,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30141,7 +30141,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30151,13 +30151,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30167,14 +30167,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 7.776427703523694,
             "x": 772.7825030376671,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30186,7 +30186,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30196,13 +30196,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30212,14 +30212,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 6.804374240583233,
             "x": 781.5309842041313,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30231,7 +30231,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30241,13 +30241,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30257,14 +30257,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30276,7 +30276,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30286,12 +30286,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30301,14 +30301,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30320,7 +30320,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30330,13 +30330,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30346,14 +30346,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30365,7 +30365,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30375,13 +30375,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30391,14 +30391,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 885.5407047387607,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30410,7 +30410,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30420,13 +30420,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30436,14 +30436,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 891.3730255164035,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30455,7 +30455,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30465,13 +30465,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30481,14 +30481,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 893.3171324422843,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30500,7 +30500,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30510,13 +30510,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30526,14 +30526,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 904.0097205346294,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30545,7 +30545,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30555,13 +30555,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30571,14 +30571,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 910.8140947752127,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30590,7 +30590,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30600,13 +30600,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30616,14 +30616,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 915.674362089915,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30635,7 +30635,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30645,13 +30645,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30661,14 +30661,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 929.2831105710815,
             "y": 660,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30680,7 +30680,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30690,13 +30690,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30706,14 +30706,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30725,7 +30725,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30735,13 +30735,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30751,14 +30751,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30770,7 +30770,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30780,13 +30780,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30796,14 +30796,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30815,7 +30815,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30825,13 +30825,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30841,14 +30841,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30860,7 +30860,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30870,13 +30870,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30886,14 +30886,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30905,7 +30905,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30915,13 +30915,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30931,14 +30931,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 554.0704738760633,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30950,7 +30950,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -30960,13 +30960,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -30976,14 +30976,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 558.9307411907655,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -30995,7 +30995,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31005,13 +31005,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31021,14 +31021,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 586.1482381530984,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31040,7 +31040,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31050,13 +31050,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31066,14 +31066,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31085,7 +31085,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31095,13 +31095,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31111,14 +31111,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31130,7 +31130,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31140,13 +31140,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31156,14 +31156,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 675.5771567436209,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31175,7 +31175,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31185,13 +31185,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31201,14 +31201,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 745.5650060753342,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31220,7 +31220,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31230,13 +31230,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31246,14 +31246,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 772.7825030376671,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31265,7 +31265,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31275,13 +31275,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31291,14 +31291,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 777.6427703523694,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31310,7 +31310,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31320,13 +31320,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31336,14 +31336,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 784.4471445929527,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31355,7 +31355,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31365,13 +31365,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31381,14 +31381,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31400,7 +31400,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31410,12 +31410,12 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31425,14 +31425,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31444,7 +31444,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31454,13 +31454,13 @@ Array [
     ],
     "type": "stroke",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31470,14 +31470,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 15.52490886998785,
             "x": 869.5157958687728,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31489,7 +31489,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31499,13 +31499,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31515,14 +31515,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 885.5407047387607,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31534,7 +31534,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31544,13 +31544,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31560,14 +31560,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 891.3730255164035,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31579,7 +31579,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31589,13 +31589,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31605,14 +31605,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 904.0097205346294,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31624,7 +31624,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31634,13 +31634,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31650,14 +31650,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 910.8140947752127,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31669,7 +31669,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31679,13 +31679,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31695,14 +31695,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 915.674362089915,
             "y": 682,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31714,7 +31714,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31724,13 +31724,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31740,14 +31740,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 416.03888213851764,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31759,7 +31759,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31769,13 +31769,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31785,14 +31785,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31804,7 +31804,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31814,13 +31814,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31830,14 +31830,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31849,7 +31849,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31859,13 +31859,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31875,14 +31875,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 539.4896719319563,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31894,7 +31894,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31904,13 +31904,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31920,14 +31920,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31939,7 +31939,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31949,13 +31949,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -31965,14 +31965,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 554.0704738760633,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -31984,7 +31984,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -31994,13 +31994,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32010,14 +32010,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 558.9307411907655,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32029,7 +32029,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32039,13 +32039,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32055,14 +32055,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 586.1482381530984,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32074,7 +32074,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32084,13 +32084,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32100,14 +32100,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32119,7 +32119,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32129,13 +32129,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32145,14 +32145,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32164,7 +32164,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32174,13 +32174,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32190,14 +32190,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 745.5650060753342,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32209,7 +32209,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32219,13 +32219,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32235,14 +32235,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32254,7 +32254,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32264,13 +32264,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32280,14 +32280,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 777.6427703523694,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32299,7 +32299,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32309,13 +32309,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32325,14 +32325,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32344,7 +32344,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32354,13 +32354,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32370,14 +32370,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32389,7 +32389,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32399,13 +32399,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32415,14 +32415,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 11.664641555285542,
             "x": 869.0157958687728,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32434,7 +32434,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32444,13 +32444,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32460,14 +32460,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 891.3730255164035,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32479,7 +32479,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32489,13 +32489,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32505,14 +32505,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 904.0097205346294,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32524,7 +32524,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32534,13 +32534,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32550,14 +32550,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 910.8140947752127,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32569,7 +32569,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32579,13 +32579,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32595,14 +32595,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 917.6184690157959,
             "y": 704,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32614,7 +32614,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32624,13 +32624,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32640,14 +32640,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32659,7 +32659,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32669,13 +32669,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32685,14 +32685,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 498.6634264884569,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32704,7 +32704,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32714,13 +32714,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32730,14 +32730,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32749,7 +32749,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32759,13 +32759,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32775,14 +32775,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 554.0704738760633,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32794,7 +32794,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32804,13 +32804,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32820,14 +32820,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 558.9307411907655,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32839,7 +32839,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32849,13 +32849,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32865,14 +32865,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 590.0364520048603,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32884,7 +32884,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32894,13 +32894,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32910,14 +32910,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32929,7 +32929,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32939,13 +32939,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -32955,14 +32955,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -32974,7 +32974,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -32984,13 +32984,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33000,14 +33000,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33019,7 +33019,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33029,13 +33029,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33045,14 +33045,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33064,7 +33064,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33074,13 +33074,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33090,14 +33090,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33109,7 +33109,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33119,13 +33119,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33135,14 +33135,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33154,7 +33154,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33164,13 +33164,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33180,14 +33180,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 10.69258809234508,
             "x": 869.0157958687728,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33199,7 +33199,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33209,13 +33209,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33225,14 +33225,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 891.3730255164035,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33244,7 +33244,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33254,13 +33254,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33270,14 +33270,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 904.0097205346294,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33289,7 +33289,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33299,13 +33299,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33315,14 +33315,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 917.6184690157959,
             "y": 726,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33334,7 +33334,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33344,13 +33344,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33360,14 +33360,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33379,7 +33379,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33389,13 +33389,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33405,14 +33405,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33424,7 +33424,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33434,13 +33434,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33450,14 +33450,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 554.0704738760633,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33469,7 +33469,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33479,13 +33479,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33495,14 +33495,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 558.9307411907655,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33514,7 +33514,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33524,13 +33524,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33540,14 +33540,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 4.860267314702309,
             "x": 590.0364520048603,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33559,7 +33559,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33569,13 +33569,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33585,14 +33585,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33604,7 +33604,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33614,13 +33614,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33630,14 +33630,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33649,7 +33649,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33659,13 +33659,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33675,14 +33675,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33694,7 +33694,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33704,13 +33704,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33720,14 +33720,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33739,7 +33739,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33749,13 +33749,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33765,14 +33765,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33784,7 +33784,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33794,13 +33794,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33810,14 +33810,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 851.5188335358445,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33829,7 +33829,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33839,13 +33839,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33855,14 +33855,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 869.9878493317133,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33874,7 +33874,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33884,13 +33884,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33900,14 +33900,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 3.888213851761847,
             "x": 873.8760631834751,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33919,7 +33919,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33929,13 +33929,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33945,14 +33945,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 891.3730255164035,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -33964,7 +33964,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -33974,13 +33974,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -33990,14 +33990,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 904.0097205346294,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34009,7 +34009,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34019,13 +34019,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34035,14 +34035,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 917.6184690157959,
             "y": 748,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34054,7 +34054,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34064,13 +34064,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34080,14 +34080,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 437.4240583232078,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34099,7 +34099,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34109,13 +34109,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34125,14 +34125,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 548.2381530984204,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34144,7 +34144,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34154,13 +34154,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34170,14 +34170,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34189,7 +34189,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34199,13 +34199,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34215,14 +34215,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 558.9307411907655,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34234,7 +34234,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34244,13 +34244,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34260,14 +34260,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 592.9526123936816,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34279,7 +34279,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34289,13 +34289,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34305,14 +34305,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34324,7 +34324,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34334,13 +34334,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34350,14 +34350,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34369,7 +34369,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34379,13 +34379,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34395,14 +34395,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34414,7 +34414,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34424,13 +34424,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34440,14 +34440,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34459,7 +34459,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34469,13 +34469,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34485,14 +34485,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34504,7 +34504,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34514,13 +34514,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34530,14 +34530,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 904.0097205346294,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34549,7 +34549,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34559,13 +34559,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34575,14 +34575,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 917.6184690157959,
             "y": 770,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34594,7 +34594,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34604,13 +34604,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34620,14 +34620,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34639,7 +34639,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34649,13 +34649,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34665,14 +34665,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 558.9307411907655,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34684,7 +34684,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34694,13 +34694,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34710,14 +34710,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 592.9526123936816,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34729,7 +34729,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34739,13 +34739,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34755,14 +34755,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34774,7 +34774,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34784,13 +34784,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34800,14 +34800,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 607.5334143377886,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34819,7 +34819,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34829,13 +34829,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34845,14 +34845,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34864,7 +34864,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34874,13 +34874,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34890,14 +34890,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34909,7 +34909,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34919,13 +34919,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34935,14 +34935,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34954,7 +34954,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -34964,13 +34964,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -34980,14 +34980,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 904.0097205346294,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -34999,7 +34999,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35009,13 +35009,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35025,14 +35025,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 918.5905224787364,
             "y": 792,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35044,7 +35044,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35054,13 +35054,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35070,14 +35070,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35089,7 +35089,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35099,13 +35099,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35115,14 +35115,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 558.9307411907655,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35134,7 +35134,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35144,13 +35144,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35160,14 +35160,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 592.9526123936816,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35179,7 +35179,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35189,13 +35189,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35205,14 +35205,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35224,7 +35224,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35234,13 +35234,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35250,14 +35250,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35269,7 +35269,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35279,13 +35279,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35295,14 +35295,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35314,7 +35314,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35324,13 +35324,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35340,14 +35340,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35359,7 +35359,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35369,13 +35369,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35385,14 +35385,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 2.9161603888213854,
             "x": 904.0097205346294,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35404,7 +35404,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35414,13 +35414,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35430,14 +35430,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 918.5905224787364,
             "y": 814,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35449,7 +35449,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35459,13 +35459,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35475,14 +35475,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35494,7 +35494,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35504,13 +35504,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35520,14 +35520,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 592.9526123936816,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35539,7 +35539,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35549,13 +35549,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35565,14 +35565,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35584,7 +35584,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35594,13 +35594,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35610,14 +35610,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35629,7 +35629,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35639,13 +35639,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35655,14 +35655,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35674,7 +35674,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35684,13 +35684,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35700,14 +35700,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35719,7 +35719,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35729,13 +35729,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35745,14 +35745,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 904.0097205346294,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35764,7 +35764,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35774,13 +35774,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35790,14 +35790,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 918.5905224787364,
             "y": 836,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35809,7 +35809,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35819,13 +35819,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35835,14 +35835,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35854,7 +35854,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35864,13 +35864,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35880,14 +35880,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 592.9526123936816,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35899,7 +35899,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35909,13 +35909,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35925,14 +35925,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35944,7 +35944,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35954,13 +35954,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -35970,14 +35970,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -35989,7 +35989,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -35999,13 +35999,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36015,14 +36015,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36034,7 +36034,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36044,13 +36044,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36060,14 +36060,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36079,7 +36079,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36089,13 +36089,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36105,14 +36105,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 904.9817739975699,
             "y": 858,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36124,7 +36124,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36134,13 +36134,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36150,14 +36150,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 880,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36169,7 +36169,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36179,13 +36179,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36195,14 +36195,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 599.7569866342649,
             "y": 880,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36214,7 +36214,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36224,13 +36224,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36240,14 +36240,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 880,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36259,7 +36259,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36269,13 +36269,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36285,14 +36285,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 880,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36304,7 +36304,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36314,13 +36314,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36330,14 +36330,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 880,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36349,7 +36349,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36359,13 +36359,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36375,14 +36375,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 902,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36394,7 +36394,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36404,13 +36404,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36420,14 +36420,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 902,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36439,7 +36439,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36449,13 +36449,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36465,14 +36465,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 902,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36484,7 +36484,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36494,13 +36494,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36510,14 +36510,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 902,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36529,7 +36529,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36539,13 +36539,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36555,14 +36555,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 924,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36574,7 +36574,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36584,13 +36584,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36600,14 +36600,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 1.9441069258809236,
             "x": 772.7825030376671,
             "y": 924,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36619,7 +36619,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36629,13 +36629,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36645,14 +36645,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 924,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36664,7 +36664,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36674,13 +36674,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36690,14 +36690,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 924,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36709,7 +36709,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36719,13 +36719,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36735,14 +36735,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 946,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36754,7 +36754,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36764,13 +36764,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36780,14 +36780,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 772.7825030376671,
             "y": 946,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36799,7 +36799,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36809,13 +36809,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36825,14 +36825,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 946,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36844,7 +36844,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36854,13 +36854,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36870,14 +36870,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 946,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36889,7 +36889,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36899,13 +36899,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36915,14 +36915,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 968,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36934,7 +36934,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36944,13 +36944,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -36960,14 +36960,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 772.7825030376671,
             "y": 968,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -36979,7 +36979,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -36989,13 +36989,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37005,14 +37005,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 968,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37024,7 +37024,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37034,13 +37034,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37050,14 +37050,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 968,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37069,7 +37069,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37079,13 +37079,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37095,14 +37095,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 990,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37114,7 +37114,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37124,13 +37124,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37140,14 +37140,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 772.7825030376671,
             "y": 990,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37159,7 +37159,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37169,13 +37169,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37185,14 +37185,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 990,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37204,7 +37204,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37214,13 +37214,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37230,14 +37230,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 784.4471445929527,
             "y": 990,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37249,7 +37249,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37259,13 +37259,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37275,14 +37275,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 1012,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37294,7 +37294,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37304,13 +37304,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37320,14 +37320,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 772.7825030376671,
             "y": 1012,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37339,7 +37339,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37349,13 +37349,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37365,14 +37365,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 1012,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37384,7 +37384,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37394,13 +37394,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37410,14 +37410,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 1034,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37429,7 +37429,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37439,13 +37439,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37455,14 +37455,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 772.7825030376671,
             "y": 1034,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37474,7 +37474,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37484,13 +37484,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37500,14 +37500,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 1034,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37519,7 +37519,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37529,13 +37529,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37545,14 +37545,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 1056,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37564,7 +37564,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37574,13 +37574,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37590,14 +37590,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 772.7825030376671,
             "y": 1056,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37609,7 +37609,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37619,13 +37619,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37635,14 +37635,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 779.5868772782503,
             "y": 1056,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37654,7 +37654,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
@@ -37664,13 +37664,13 @@ Array [
     ],
     "type": "fill",
   },
-  Object {
-    "props": Object {
+  {
+    "props": {
       "fillRule": "nonzero",
-      "path": Array [
-        Object {
-          "props": Object {},
-          "transform": Array [
+      "path": [
+        {
+          "props": {},
+          "transform": [
             1,
             0,
             0,
@@ -37680,14 +37680,14 @@ Array [
           ],
           "type": "beginPath",
         },
-        Object {
-          "props": Object {
+        {
+          "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 555.0425273390036,
             "y": 1078,
           },
-          "transform": Array [
+          "transform": [
             1,
             0,
             0,
@@ -37699,7 +37699,7 @@ Array [
         },
       ],
     },
-    "transform": Array [
+    "transform": [
       1,
       0,
       0,
diff --git a/public/app/plugins/panel/gauge/GaugeMigrations.test.ts b/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
index 853359c4bfb..5ba0cfd84d0 100644
--- a/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
+++ b/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
@@ -89,14 +89,14 @@ describe('Gauge Panel Migrations', () => {
     expect(result.reduceOptions.overrides).toBeUndefined();
 
     expect((panel as PanelModel).fieldConfig).toMatchInlineSnapshot(`
-      Object {
-        "defaults": Object {
-          "color": Object {
+      {
+        "defaults": {
+          "color": {
             "mode": "thresholds",
           },
           "decimals": 3,
-          "mappings": Array [
-            Object {
+          "mappings": [
+            {
               "from": "50",
               "id": 1,
               "operator": "",
@@ -108,25 +108,25 @@ describe('Gauge Panel Migrations', () => {
           ],
           "max": "50",
           "min": "-50",
-          "thresholds": Object {
+          "thresholds": {
             "mode": "absolute",
-            "steps": Array [
-              Object {
+            "steps": [
+              {
                 "color": "green",
                 "index": 0,
                 "value": -Infinity,
               },
-              Object {
+              {
                 "color": "#EAB839",
                 "index": 1,
                 "value": -25,
               },
-              Object {
+              {
                 "color": "#6ED0E0",
                 "index": 2,
                 "value": 0,
               },
-              Object {
+              {
                 "color": "red",
                 "index": 3,
                 "value": 25,
@@ -135,7 +135,7 @@ describe('Gauge Panel Migrations', () => {
           },
           "unit": "accMS2",
         },
-        "overrides": Array [],
+        "overrides": [],
       }
     `);
   });
diff --git a/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap b/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap
index 86d48544c74..f7631babc3e 100644
--- a/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap
+++ b/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Gauge Panel Migrations from 6.1.1 1`] = `
-Object {
+{
   "orientation": "auto",
-  "reduceOptions": Object {
-    "calcs": Array [
+  "reduceOptions": {
+    "calcs": [
       "last",
     ],
     "limit": undefined,
diff --git a/public/app/plugins/panel/geomap/migrations.test.ts b/public/app/plugins/panel/geomap/migrations.test.ts
index 88d3da0df0a..3b6f3d97ca2 100644
--- a/public/app/plugins/panel/geomap/migrations.test.ts
+++ b/public/app/plugins/panel/geomap/migrations.test.ts
@@ -18,48 +18,48 @@ describe('Worldmap Migrations', () => {
     const panel = {} as PanelModel;
     panel.options = mapPanelChangedHandler(panel, 'grafana-worldmap-panel', old, prevFieldConfig);
     expect(panel).toMatchInlineSnapshot(`
-      Object {
-        "fieldConfig": Object {
-          "defaults": Object {
+      {
+        "fieldConfig": {
+          "defaults": {
             "decimals": 3,
-            "thresholds": Object {
+            "thresholds": {
               "mode": "absolute",
-              "steps": Array [
-                Object {
+              "steps": [
+                {
                   "color": "#37872D",
                   "value": -Infinity,
                 },
-                Object {
+                {
                   "color": "#E0B400",
                   "value": 0,
                 },
-                Object {
+                {
                   "color": "#C4162A",
                   "value": 50,
                 },
-                Object {
+                {
                   "color": "#8F3BB8",
                   "value": 100,
                 },
               ],
             },
           },
-          "overrides": Array [],
+          "overrides": [],
         },
-        "options": Object {
-          "basemap": Object {
+        "options": {
+          "basemap": {
             "name": "Basemap",
             "type": "default",
           },
-          "controls": Object {
+          "controls": {
             "mouseWheelZoom": true,
             "showZoom": true,
           },
-          "layers": Array [],
-          "tooltip": Object {
+          "layers": [],
+          "tooltip": {
             "mode": "details",
           },
-          "view": Object {
+          "view": {
             "id": "europe",
             "lat": 46,
             "lon": 14,
@@ -142,35 +142,35 @@ describe('geomap migrations', () => {
     panel.options = mapMigrationHandler(panel);
 
     expect(panel).toMatchInlineSnapshot(`
-      Object {
-        "options": Object {
-          "layers": Array [
-            Object {
-              "config": Object {
+      {
+        "options": {
+          "layers": [
+            {
+              "config": {
                 "showLegend": true,
-                "style": Object {
-                  "color": Object {
+                "style": {
+                  "color": {
                     "field": "Price",
                     "fixed": "dark-green",
                   },
                   "opacity": 0.4,
-                  "rotation": Object {
+                  "rotation": {
                     "fixed": 0,
                     "max": 360,
                     "min": -360,
                     "mode": "mod",
                   },
-                  "size": Object {
+                  "size": {
                     "field": "Count",
                     "fixed": 5,
                     "max": 15,
                     "min": 2,
                   },
-                  "symbol": Object {
+                  "symbol": {
                     "fixed": "img/icons/marker/triangle.svg",
                     "mode": "fixed",
                   },
-                  "textConfig": Object {
+                  "textConfig": {
                     "fontSize": 12,
                     "offsetX": 0,
                     "offsetY": 0,
diff --git a/public/app/plugins/panel/geomap/style/utils.test.ts b/public/app/plugins/panel/geomap/style/utils.test.ts
index 8c79844a266..be53d13fe41 100644
--- a/public/app/plugins/panel/geomap/style/utils.test.ts
+++ b/public/app/plugins/panel/geomap/style/utils.test.ts
@@ -34,8 +34,8 @@ describe('style utils', () => {
     state.config = null as unknown as StyleConfig; // not interesting in the snapshot
     expect(state.hasText).toBe(false);
     expect(state).toMatchInlineSnapshot(`
-      Object {
-        "base": Object {
+      {
+        "base": {
           "color": "#37872D",
           "lineWidth": 1,
           "opacity": 0.4,
@@ -43,7 +43,7 @@ describe('style utils', () => {
           "size": 5,
         },
         "config": null,
-        "fields": Object {
+        "fields": {
           "color": "Price",
           "size": "Count",
         },
diff --git a/public/app/plugins/panel/geomap/utils/getFeatures.test.ts b/public/app/plugins/panel/geomap/utils/getFeatures.test.ts
index 6bc61033399..0b2b31a3f45 100644
--- a/public/app/plugins/panel/geomap/utils/getFeatures.test.ts
+++ b/public/app/plugins/panel/geomap/utils/getFeatures.test.ts
@@ -16,7 +16,7 @@ describe('get features utils', () => {
     const info = getLayerPropertyInfo(features);
     expect(info.geometryType).toBe(GeometryTypeId.Point);
     expect(info.propertes.map((v) => v.value)).toMatchInlineSnapshot(`
-      Array [
+      [
         "a",
         "b",
         "hello",
@@ -29,13 +29,13 @@ describe('get features utils', () => {
     const uniqueA = getUniqueFeatureValues(features, 'a');
     const uniqueB = getUniqueFeatureValues(features, 'b');
     expect(uniqueA).toMatchInlineSnapshot(`
-      Array [
+      [
         "1",
         "2",
       ]
     `);
     expect(uniqueB).toMatchInlineSnapshot(`
-      Array [
+      [
         "10",
         "20",
         "30",
diff --git a/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap b/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap
index d1a47a1594c..e92044fa765 100644
--- a/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap
+++ b/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap
@@ -1,25 +1,25 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Graph DataProcessor getTimeSeries from LegacyResponseData Should return a new series for each field 1`] = `
-Array [
+[
   TimeSeries {
     "alias": "Value",
     "aliasEscaped": "Value",
-    "bars": Object {
+    "bars": {
       "fillColor": "#7EB26D",
     },
     "color": "#7EB26D",
     "dataFrameIndex": 0,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         1,
         1001,
       ],
-      Array [
+      [
         2,
         1002,
       ],
-      Array [
+      [
         3,
         1003,
       ],
@@ -29,28 +29,28 @@ Array [
     "id": "Value",
     "label": "Value",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": "watt",
     "valueFormater": [Function],
   },
   TimeSeries {
     "alias": "table_data v1",
     "aliasEscaped": "table_data v1",
-    "bars": Object {
+    "bars": {
       "fillColor": "#EAB839",
     },
     "color": "#EAB839",
     "dataFrameIndex": 1,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         0.1,
         1001,
       ],
-      Array [
+      [
         0.2,
         1002,
       ],
-      Array [
+      [
         0.3,
         1003,
       ],
@@ -60,28 +60,28 @@ Array [
     "id": "table_data v1",
     "label": "table_data v1",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": "ohm",
     "valueFormater": [Function],
   },
   TimeSeries {
     "alias": "table_data v2",
     "aliasEscaped": "table_data v2",
-    "bars": Object {
+    "bars": {
       "fillColor": "#6ED0E0",
     },
     "color": "#6ED0E0",
     "dataFrameIndex": 1,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         1.1,
         1001,
       ],
-      Array [
+      [
         2.2,
         1002,
       ],
-      Array [
+      [
         3.3,
         1003,
       ],
@@ -91,28 +91,28 @@ Array [
     "id": "table_data v2",
     "label": "table_data v2",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": undefined,
     "valueFormater": [Function],
   },
   TimeSeries {
     "alias": "series v1",
     "aliasEscaped": "series v1",
-    "bars": Object {
+    "bars": {
       "fillColor": "#EF843C",
     },
     "color": "#EF843C",
     "dataFrameIndex": 2,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         0.1,
         1001,
       ],
-      Array [
+      [
         0.2,
         1002,
       ],
-      Array [
+      [
         0.3,
         1003,
       ],
@@ -122,28 +122,28 @@ Array [
     "id": "series v1",
     "label": "series v1",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": undefined,
     "valueFormater": [Function],
   },
   TimeSeries {
     "alias": "series v2",
     "aliasEscaped": "series v2",
-    "bars": Object {
+    "bars": {
       "fillColor": "#E24D42",
     },
     "color": "#E24D42",
     "dataFrameIndex": 2,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         1.1,
         1001,
       ],
-      Array [
+      [
         2.2,
         1002,
       ],
-      Array [
+      [
         3.3,
         1003,
       ],
@@ -153,28 +153,28 @@ Array [
     "id": "series v2",
     "label": "series v2",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": undefined,
     "valueFormater": [Function],
   },
   TimeSeries {
     "alias": "series with time as strings v1",
     "aliasEscaped": "series with time as strings v1",
-    "bars": Object {
+    "bars": {
       "fillColor": "#1F78C1",
     },
     "color": "#1F78C1",
     "dataFrameIndex": 3,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         0.1,
         1609462800000,
       ],
-      Array [
+      [
         0.2,
         1609462800000,
       ],
-      Array [
+      [
         0.3,
         1609466400000,
       ],
@@ -184,7 +184,7 @@ Array [
     "id": "series with time as strings v1",
     "label": "series with time as strings v1",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": undefined,
     "valueFormater": [Function],
   },
@@ -192,85 +192,85 @@ Array [
 `;
 
 exports[`Graph DataProcessor getTimeSeries from LegacyResponseData Should return single histogram 1`] = `
-Array [
+[
   TimeSeries {
     "alias": "Count",
     "aliasEscaped": "Count",
-    "bars": Object {
+    "bars": {
       "fillColor": "#7EB26D",
     },
     "color": "#7EB26D",
     "dataFrameIndex": 0,
-    "datapoints": Array [
-      Array [
+    "datapoints": [
+      [
         1,
         1001,
       ],
-      Array [
+      [
         2,
         1002,
       ],
-      Array [
+      [
         3,
         1003,
       ],
-      Array [
+      [
         0.1,
         1001,
       ],
-      Array [
+      [
         0.2,
         1002,
       ],
-      Array [
+      [
         0.3,
         1003,
       ],
-      Array [
+      [
         1.1,
         1001,
       ],
-      Array [
+      [
         2.2,
         1002,
       ],
-      Array [
+      [
         3.3,
         1003,
       ],
-      Array [
+      [
         0.1,
         1001,
       ],
-      Array [
+      [
         0.2,
         1002,
       ],
-      Array [
+      [
         0.3,
         1003,
       ],
-      Array [
+      [
         1.1,
         1001,
       ],
-      Array [
+      [
         2.2,
         1002,
       ],
-      Array [
+      [
         3.3,
         1003,
       ],
-      Array [
+      [
         0.1,
         1609462800000,
       ],
-      Array [
+      [
         0.2,
         1609462800000,
       ],
-      Array [
+      [
         0.3,
         1609466400000,
       ],
@@ -280,7 +280,7 @@ Array [
     "id": "Value",
     "label": "Value",
     "legend": true,
-    "stats": Object {},
+    "stats": {},
     "unit": "watt",
     "valueFormater": [Function],
   },
diff --git a/public/app/plugins/panel/heatmap/migrations.test.ts b/public/app/plugins/panel/heatmap/migrations.test.ts
index fd12e6fd556..5d919a9187b 100644
--- a/public/app/plugins/panel/heatmap/migrations.test.ts
+++ b/public/app/plugins/panel/heatmap/migrations.test.ts
@@ -23,21 +23,21 @@ describe('Heatmap Migrations', () => {
       prevFieldConfig
     );
     expect(panel).toMatchInlineSnapshot(`
-      Object {
-        "fieldConfig": Object {
-          "defaults": Object {},
-          "overrides": Array [],
+      {
+        "fieldConfig": {
+          "defaults": {},
+          "overrides": [],
         },
-        "options": Object {
+        "options": {
           "calculate": true,
-          "calculation": Object {
-            "xBuckets": Object {
+          "calculation": {
+            "xBuckets": {
               "mode": "count",
               "value": "100",
             },
-            "yBuckets": Object {
+            "yBuckets": {
               "mode": "count",
-              "scale": Object {
+              "scale": {
                 "log": 2,
                 "type": "log",
               },
@@ -46,10 +46,10 @@ describe('Heatmap Migrations', () => {
           },
           "cellGap": 2,
           "cellRadius": 10,
-          "cellValues": Object {
+          "cellValues": {
             "decimals": undefined,
           },
-          "color": Object {
+          "color": {
             "exponent": 0.5,
             "fill": "#b4ff00",
             "max": 100,
@@ -60,24 +60,24 @@ describe('Heatmap Migrations', () => {
             "scheme": "BuGn",
             "steps": 128,
           },
-          "exemplars": Object {
+          "exemplars": {
             "color": "rgba(255,0,255,0.7)",
           },
-          "filterValues": Object {
+          "filterValues": {
             "le": 1e-9,
           },
-          "legend": Object {
+          "legend": {
             "show": true,
           },
-          "rowsFrame": Object {
+          "rowsFrame": {
             "layout": "auto",
           },
           "showValue": "never",
-          "tooltip": Object {
+          "tooltip": {
             "show": true,
             "yHistogram": true,
           },
-          "yAxis": Object {
+          "yAxis": {
             "axisPlacement": "left",
             "axisWidth": 400,
             "decimals": 6,
diff --git a/public/app/plugins/panel/state-timeline/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/state-timeline/__snapshots__/migrations.test.ts.snap
index 38b0ff20b6d..bf4852cfbe9 100644
--- a/public/app/plugins/panel/state-timeline/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/state-timeline/__snapshots__/migrations.test.ts.snap
@@ -1,54 +1,54 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Timeline Migrations from discrete panel 1`] = `
-Object {
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+{
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "fillOpacity": 100,
         "lineWidth": 0,
       },
-      "mappings": Array [
-        Object {
-          "options": Object {
-            "1": Object {
+      "mappings": [
+        {
+          "options": {
+            "1": {
               "color": "#7EB26D",
             },
-            "111": Object {
+            "111": {
               "text": "ONE",
             },
-            "20": Object {
+            "20": {
               "color": "#EAB839",
             },
-            "222": Object {
+            "222": {
               "text": "TWO",
             },
-            "30": Object {
+            "30": {
               "color": "#EF843C",
             },
-            "5": Object {
+            "5": {
               "color": "#E24D42",
             },
-            "90": Object {
+            "90": {
               "color": "#6ED0E0",
             },
           },
           "type": "value",
         },
-        Object {
-          "options": Object {
+        {
+          "options": {
             "from": 1,
-            "result": Object {
+            "result": {
               "text": "AAA",
             },
             "to": 3,
           },
           "type": "range",
         },
-        Object {
-          "options": Object {
+        {
+          "options": {
             "from": 4,
-            "result": Object {
+            "result": {
               "text": "BBB",
             },
             "to": 5,
@@ -58,9 +58,9 @@ Object {
       ],
       "unit": "currencyGBP",
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "options": Object {
+  "options": {
     "mergeValues": true,
   },
 }
diff --git a/public/app/plugins/panel/state-timeline/utils.test.ts b/public/app/plugins/panel/state-timeline/utils.test.ts
index d4cc5208b38..809490326fd 100644
--- a/public/app/plugins/panel/state-timeline/utils.test.ts
+++ b/public/app/plugins/panel/state-timeline/utils.test.ts
@@ -59,7 +59,7 @@ describe('prepare timeline graph', () => {
 
     const field = out.fields.find((f) => f.name === 'b');
     expect(field?.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         1,
         1,
         undefined,
diff --git a/public/app/plugins/panel/table/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/table/__snapshots__/migrations.test.ts.snap
index 1408187af14..965c68b5c56 100644
--- a/public/app/plugins/panel/table/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/table/__snapshots__/migrations.test.ts.snap
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Table Migrations migrates styles to field config overrides and defaults 1`] = `
-Object {
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+{
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "align": "right",
         "displayMode": undefined,
       },
@@ -12,63 +12,63 @@ Object {
       "displayName": "",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "Time",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "displayName",
             "value": "Time",
           },
-          Object {
+          {
             "id": "unit",
             "value": "time: YYYY-MM-DD HH:mm:ss",
           },
-          Object {
+          {
             "id": "custom.align",
             "value": null,
           },
         ],
       },
-      Object {
-        "matcher": Object {
+      {
+        "matcher": {
           "id": "byName",
           "options": "ColorCell",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "unit",
             "value": "currencyUSD",
           },
-          Object {
+          {
             "id": "decimals",
             "value": 2,
           },
-          Object {
+          {
             "id": "custom.displayMode",
             "value": "color-background",
           },
-          Object {
+          {
             "id": "custom.align",
             "value": "left",
           },
-          Object {
+          {
             "id": "thresholds",
-            "value": Object {
+            "value": {
               "mode": "absolute",
-              "steps": Array [
-                Object {
+              "steps": [
+                {
                   "color": "rgba(245, 54, 54, 0.9)",
                   "value": -Infinity,
                 },
-                Object {
+                {
                   "color": "rgba(237, 129, 40, 0.89)",
                   "value": 5,
                 },
-                Object {
+                {
                   "color": "rgba(50, 172, 45, 0.97)",
                   "value": 10,
                 },
@@ -77,52 +77,52 @@ Object {
           },
         ],
       },
-      Object {
-        "matcher": Object {
+      {
+        "matcher": {
           "id": "byName",
           "options": "ColorValue",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "unit",
             "value": "Bps",
           },
-          Object {
+          {
             "id": "decimals",
             "value": 2,
           },
-          Object {
+          {
             "id": "links",
-            "value": Array [
-              Object {
+            "value": [
+              {
                 "targetBlank": true,
                 "title": "",
                 "url": "http://www.grafana.com",
               },
             ],
           },
-          Object {
+          {
             "id": "custom.displayMode",
             "value": "color-text",
           },
-          Object {
+          {
             "id": "custom.align",
             "value": null,
           },
-          Object {
+          {
             "id": "thresholds",
-            "value": Object {
+            "value": {
               "mode": "absolute",
-              "steps": Array [
-                Object {
+              "steps": [
+                {
                   "color": "rgba(245, 54, 54, 0.9)",
                   "value": -Infinity,
                 },
-                Object {
+                {
                   "color": "rgba(237, 129, 40, 0.89)",
                   "value": 5,
                 },
-                Object {
+                {
                   "color": "rgba(50, 172, 45, 0.97)",
                   "value": 10,
                 },
@@ -133,23 +133,23 @@ Object {
       },
     ],
   },
-  "transformations": Array [],
+  "transformations": [],
 }
 `;
 
 exports[`Table Migrations migrates transform out to core transforms 1`] = `
-Object {
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {},
+{
+  "fieldConfig": {
+    "defaults": {
+      "custom": {},
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "transformations": Array [
-    Object {
+  "transformations": [
+    {
       "id": "seriesToColumns",
-      "options": Object {
-        "reducers": Array [],
+      "options": {
+        "reducers": [],
       },
     },
   ],
@@ -157,18 +157,18 @@ Object {
 `;
 
 exports[`Table Migrations migrates transform out to core transforms 2`] = `
-Object {
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {},
+{
+  "fieldConfig": {
+    "defaults": {
+      "custom": {},
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "transformations": Array [
-    Object {
+  "transformations": [
+    {
       "id": "seriesToRows",
-      "options": Object {
-        "reducers": Array [],
+      "options": {
+        "reducers": [],
       },
     },
   ],
@@ -176,19 +176,19 @@ Object {
 `;
 
 exports[`Table Migrations migrates transform out to core transforms 3`] = `
-Object {
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {},
+{
+  "fieldConfig": {
+    "defaults": {
+      "custom": {},
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "transformations": Array [
-    Object {
+  "transformations": [
+    {
       "id": "reduce",
-      "options": Object {
+      "options": {
         "includeTimeField": false,
-        "reducers": Array [
+        "reducers": [
           "mean",
           "max",
           "lastNotNull",
@@ -200,18 +200,18 @@ Object {
 `;
 
 exports[`Table Migrations migrates transform out to core transforms 4`] = `
-Object {
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {},
+{
+  "fieldConfig": {
+    "defaults": {
+      "custom": {},
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "transformations": Array [
-    Object {
+  "transformations": [
+    {
       "id": "merge",
-      "options": Object {
-        "reducers": Array [],
+      "options": {
+        "reducers": [],
       },
     },
   ],
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 63ab57895cc..5fbc82701a1 100644
--- a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Graph Migrations legend with multiple values 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "auto",
         "drawStyle": "line",
         "fillOpacity": 50,
@@ -17,16 +17,16 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "A-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "red",
               "mode": "fixed",
             },
@@ -35,9 +35,9 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "mean",
         "lastNotNull",
         "sum",
@@ -46,7 +46,7 @@ Object {
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -55,27 +55,27 @@ Object {
 `;
 
 exports[`Graph Migrations legend with single value 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "drawStyle": "points",
         "spanNulls": false,
       },
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "sum",
       ],
       "displayMode": "list",
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "single",
       "sort": "none",
     },
@@ -84,25 +84,25 @@ Object {
 `;
 
 exports[`Graph Migrations legend without values 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "drawStyle": "points",
         "spanNulls": false,
       },
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [],
+  "options": {
+    "legend": {
+      "calcs": [],
       "displayMode": "list",
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "single",
       "sort": "none",
     },
@@ -111,11 +111,11 @@ Object {
 `;
 
 exports[`Graph Migrations preserves colors from series overrides 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "hidden",
         "drawStyle": "line",
         "fillOpacity": 60,
@@ -128,31 +128,31 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "A-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "rgba(165, 72, 170, 0.77)",
               "mode": "fixed",
             },
           },
         ],
       },
-      Object {
-        "matcher": Object {
+      {
+        "matcher": {
           "id": "byName",
           "options": "B-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "rgba(16, 72, 170, 0.77)",
               "mode": "fixed",
             },
@@ -161,9 +161,9 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "mean",
         "lastNotNull",
         "max",
@@ -174,7 +174,7 @@ Object {
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -183,11 +183,11 @@ Object {
 `;
 
 exports[`Graph Migrations preserves series overrides using a regex alias 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "hidden",
         "drawStyle": "line",
         "fillOpacity": 60,
@@ -200,31 +200,31 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byRegexp",
           "options": "/^A-/",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "rgba(165, 72, 170, 0.77)",
               "mode": "fixed",
             },
           },
         ],
       },
-      Object {
-        "matcher": Object {
+      {
+        "matcher": {
           "id": "byRegexp",
           "options": "/.*Status: 2[0-9]+.*/i",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "rgba(16, 72, 170, 0.77)",
               "mode": "fixed",
             },
@@ -233,9 +233,9 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "mean",
         "lastNotNull",
         "max",
@@ -246,7 +246,7 @@ Object {
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -255,27 +255,27 @@ Object {
 `;
 
 exports[`Graph Migrations simple bars 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "drawStyle": "bars",
         "fillOpacity": 100,
         "showPoints": "never",
         "spanNulls": false,
       },
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [],
+  "options": {
+    "legend": {
+      "calcs": [],
       "displayMode": "list",
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "single",
       "sort": "none",
     },
@@ -284,11 +284,11 @@ Object {
 `;
 
 exports[`Graph Migrations stacking groups 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "auto",
         "drawStyle": "line",
         "fillOpacity": 50,
@@ -296,7 +296,7 @@ Object {
         "lineWidth": 5,
         "showPoints": "never",
         "spanNulls": false,
-        "stacking": Object {
+        "stacking": {
           "group": "A",
           "mode": "normal",
         },
@@ -304,46 +304,46 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "A-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "red",
               "mode": "fixed",
             },
           },
         ],
       },
-      Object {
-        "matcher": Object {
+      {
+        "matcher": {
           "id": "byName",
           "options": "A-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "custom.stacking",
-            "value": Object {
+            "value": {
               "group": "A",
               "mode": "normal",
             },
           },
         ],
       },
-      Object {
-        "matcher": Object {
+      {
+        "matcher": {
           "id": "byName",
           "options": "B-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "custom.stacking",
-            "value": Object {
+            "value": {
               "group": "A",
               "mode": "normal",
             },
@@ -352,9 +352,9 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "mean",
         "lastNotNull",
         "sum",
@@ -363,7 +363,7 @@ Object {
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -372,11 +372,11 @@ Object {
 `;
 
 exports[`Graph Migrations stacking simple 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "auto",
         "drawStyle": "line",
         "fillOpacity": 50,
@@ -384,7 +384,7 @@ Object {
         "lineWidth": 5,
         "showPoints": "never",
         "spanNulls": false,
-        "stacking": Object {
+        "stacking": {
           "group": "A",
           "mode": "normal",
         },
@@ -392,16 +392,16 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "A-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "red",
               "mode": "fixed",
             },
@@ -410,9 +410,9 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "mean",
         "lastNotNull",
         "sum",
@@ -421,7 +421,7 @@ Object {
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -430,11 +430,11 @@ Object {
 `;
 
 exports[`Graph Migrations stairscase 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "hidden",
         "drawStyle": "line",
         "fillOpacity": 60,
@@ -448,11 +448,11 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [],
+    "overrides": [],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [
+  "options": {
+    "legend": {
+      "calcs": [
         "mean",
         "lastNotNull",
         "max",
@@ -463,7 +463,7 @@ Object {
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -472,11 +472,11 @@ Object {
 `;
 
 exports[`Graph Migrations stepped line 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisPlacement": "auto",
         "drawStyle": "line",
         "fillOpacity": 50,
@@ -488,16 +488,16 @@ Object {
       "nullValueMode": "null",
       "unit": "short",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "A-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "color",
-            "value": Object {
+            "value": {
               "fixedColor": "red",
               "mode": "fixed",
             },
@@ -506,14 +506,14 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [],
+  "options": {
+    "legend": {
+      "calcs": [],
       "displayMode": "list",
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -522,21 +522,21 @@ Object {
 `;
 
 exports[`Graph Migrations transforms should preserve "constant" transform 1`] = `
-Object {
-  "defaults": Object {
-    "custom": Object {
+{
+  "defaults": {
+    "custom": {
       "drawStyle": "points",
       "spanNulls": false,
     },
   },
-  "overrides": Array [
-    Object {
-      "matcher": Object {
+  "overrides": [
+    {
+      "matcher": {
         "id": "byName",
         "options": "out",
       },
-      "properties": Array [
-        Object {
+      "properties": [
+        {
           "id": "custom.transform",
           "value": "constant",
         },
@@ -547,21 +547,21 @@ Object {
 `;
 
 exports[`Graph Migrations transforms should preserve "negative-Y" transform 1`] = `
-Object {
-  "defaults": Object {
-    "custom": Object {
+{
+  "defaults": {
+    "custom": {
       "drawStyle": "points",
       "spanNulls": false,
     },
   },
-  "overrides": Array [
-    Object {
-      "matcher": Object {
+  "overrides": [
+    {
+      "matcher": {
         "id": "byName",
         "options": "out",
       },
-      "properties": Array [
-        Object {
+      "properties": [
+        {
           "id": "custom.transform",
           "value": "negative-Y",
         },
@@ -572,24 +572,24 @@ Object {
 `;
 
 exports[`Graph Migrations twoYAxis 1`] = `
-Object {
+{
   "alert": undefined,
-  "fieldConfig": Object {
-    "defaults": Object {
-      "custom": Object {
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
         "axisLabel": "Y111",
         "axisPlacement": "auto",
         "drawStyle": "line",
         "fillOpacity": 10,
-        "lineStyle": Object {
-          "dash": Array [
+        "lineStyle": {
+          "dash": [
             10,
             10,
           ],
           "fill": "dash",
         },
         "lineWidth": 1,
-        "scaleDistribution": Object {
+        "scaleDistribution": {
           "log": 10,
           "type": "log",
         },
@@ -602,37 +602,37 @@ Object {
       "nullValueMode": "null",
       "unit": "areaMI2",
     },
-    "overrides": Array [
-      Object {
-        "matcher": Object {
+    "overrides": [
+      {
+        "matcher": {
           "id": "byName",
           "options": "B-series",
         },
-        "properties": Array [
-          Object {
+        "properties": [
+          {
             "id": "unit",
             "value": "degree",
           },
-          Object {
+          {
             "id": "decimals",
             "value": 2,
           },
-          Object {
+          {
             "id": "min",
             "value": -10,
           },
-          Object {
+          {
             "id": "max",
             "value": 25,
           },
-          Object {
+          {
             "id": "custom.axisLabel",
             "value": "Y222",
           },
-          Object {
+          {
             "id": "custom.lineStyle",
-            "value": Object {
-              "dash": Array [
+            "value": {
+              "dash": [
                 5,
                 8,
               ],
@@ -643,14 +643,14 @@ Object {
       },
     ],
   },
-  "options": Object {
-    "legend": Object {
-      "calcs": Array [],
+  "options": {
+    "legend": {
+      "calcs": [],
       "displayMode": "list",
       "placement": "bottom",
       "showLegend": true,
     },
-    "tooltip": Object {
+    "tooltip": {
       "mode": "multi",
       "sort": "none",
     },
@@ -659,21 +659,21 @@ Object {
 `;
 
 exports[`Graph Migrations x axis should hide x axis 1`] = `
-Object {
-  "defaults": Object {
-    "custom": Object {
+{
+  "defaults": {
+    "custom": {
       "drawStyle": "points",
       "spanNulls": false,
     },
   },
-  "overrides": Array [
-    Object {
-      "matcher": Object {
+  "overrides": [
+    {
+      "matcher": {
         "id": "byType",
         "options": "time",
       },
-      "properties": Array [
-        Object {
+      "properties": [
+        {
           "id": "custom.axisPlacement",
           "value": "hidden",
         },
diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts
index 6daee162a78..3d23da85fe7 100644
--- a/public/app/plugins/panel/timeseries/migrations.test.ts
+++ b/public/app/plugins/panel/timeseries/migrations.test.ts
@@ -193,16 +193,16 @@ describe('Graph Migrations', () => {
       panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
       expect(panel.fieldConfig.defaults.custom.thresholdsStyle.mode).toBe('area');
       expect(panel.fieldConfig.defaults.thresholds?.steps).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "color": "transparent",
             "value": -Infinity,
           },
-          Object {
+          {
             "color": "orange",
             "value": 50,
           },
-          Object {
+          {
             "color": "red",
             "value": 80,
           },
@@ -238,16 +238,16 @@ describe('Graph Migrations', () => {
       panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
       expect(panel.fieldConfig.defaults.custom.thresholdsStyle.mode).toBe('line+area');
       expect(panel.fieldConfig.defaults.thresholds?.steps).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "color": "orange",
             "value": -Infinity,
           },
-          Object {
+          {
             "color": "transparent",
             "value": 40,
           },
-          Object {
+          {
             "color": "red",
             "value": 80,
           },
@@ -275,12 +275,12 @@ describe('Graph Migrations', () => {
       panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
       expect(panel.fieldConfig.defaults.custom.thresholdsStyle.mode).toBe('line+area');
       expect(panel.fieldConfig.defaults.thresholds?.steps).toMatchInlineSnapshot(`
-        Array [
-          Object {
+        [
+          {
             "color": "orange",
             "value": -Infinity,
           },
-          Object {
+          {
             "color": "transparent",
             "value": 40,
           },
diff --git a/public/app/plugins/panel/timeseries/utils.test.ts b/public/app/plugins/panel/timeseries/utils.test.ts
index 9be6bde5c11..1c765afe277 100644
--- a/public/app/plugins/panel/timeseries/utils.test.ts
+++ b/public/app/plugins/panel/timeseries/utils.test.ts
@@ -48,7 +48,7 @@ describe('prepare timeseries graph', () => {
     const field = out.fields.find((f) => f.name === 'c');
     expect(field?.display).toBeDefined();
     expect(field!.display!(1)).toMatchInlineSnapshot(`
-      Object {
+      {
         "color": "#808080",
         "numeric": 1,
         "percent": 1,
@@ -70,7 +70,7 @@ describe('prepare timeseries graph', () => {
 
     const field = frames![0].fields.find((f) => f.name === 'a');
     expect(field!.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         -10,
         null,
         10,
@@ -91,7 +91,7 @@ describe('prepare timeseries graph', () => {
 
     const field = frames![0].fields.find((f) => f.name === 'a');
     expect(field!.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         1,
         null,
         2,
@@ -115,7 +115,7 @@ describe('prepare timeseries graph', () => {
 
     const field = frames![0].fields.find((f) => f.name === 'a');
     expect(field!.values.toArray()).toMatchInlineSnapshot(`
-      Array [
+      [
         1,
         20,
         2,
diff --git a/yarn.lock b/yarn.lock
index c97b0ca2335..8718f167344 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1921,7 +1921,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.17.12, @babel/plugin-syntax-jsx@npm:^7.18.6":
+"@babel/plugin-syntax-jsx@npm:^7.17.12, @babel/plugin-syntax-jsx@npm:^7.18.6, @babel/plugin-syntax-jsx@npm:^7.7.2":
   version: 7.18.6
   resolution: "@babel/plugin-syntax-jsx@npm:7.18.6"
   dependencies:
@@ -4316,7 +4316,7 @@ __metadata:
     "@testing-library/user-event": 14.4.3
     "@types/d3-interpolate": ^1.4.0
     "@types/history": 4.7.11
-    "@types/jest": 28.1.6
+    "@types/jest": 29.2.3
     "@types/jquery": 3.5.14
     "@types/lodash": 4.14.187
     "@types/marked": 4.0.7
@@ -4525,7 +4525,7 @@ __metadata:
     "@testing-library/user-event": 14.4.3
     "@types/angular": 1.8.4
     "@types/history": 4.7.11
-    "@types/jest": 28.1.6
+    "@types/jest": 29.2.3
     "@types/lodash": 4.14.187
     "@types/react": 17.0.42
     "@types/react-dom": 17.0.14
@@ -4726,7 +4726,7 @@ __metadata:
     "@types/enzyme-adapter-react-16": 1.0.6
     "@types/hoist-non-react-statics": 3.3.1
     "@types/is-hotkey": 0.1.7
-    "@types/jest": 28.1.6
+    "@types/jest": 29.2.3
     "@types/jquery": 3.5.14
     "@types/lodash": 4.14.187
     "@types/mock-raf": 1.0.3
@@ -4967,7 +4967,7 @@ __metadata:
     "@types/classnames": ^2.2.7
     "@types/deep-freeze": ^0.1.1
     "@types/hoist-non-react-statics": ^3.3.1
-    "@types/jest": 28.1.6
+    "@types/jest": 29.2.3
     "@types/lodash": 4.14.187
     "@types/prop-types": 15.7.5
     "@types/react": 17.0.42
@@ -5017,17 +5017,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/console@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/console@npm:28.1.3"
+"@jest/console@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/console@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     "@types/node": "*"
     chalk: ^4.0.0
-    jest-message-util: ^28.1.3
-    jest-util: ^28.1.3
+    jest-message-util: ^29.3.1
+    jest-util: ^29.3.1
     slash: ^3.0.0
-  checksum: fe50d98d26d02ce2901c76dff4bd5429a33c13affb692c9ebf8a578ca2f38a5dd854363d40d6c394f215150791fd1f692afd8e730a4178dda24107c8dfd9750a
+  checksum: 9eecbfb6df4f5b810374849b7566d321255e6fd6e804546236650384966be532ff75a3e445a3277eadefe67ddf4dc56cd38332abd72d6a450f1bea9866efc6d7
   languageName: node
   linkType: hard
 
@@ -5072,37 +5072,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/core@npm:28.1.3"
+"@jest/core@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/core@npm:29.3.1"
   dependencies:
-    "@jest/console": ^28.1.3
-    "@jest/reporters": ^28.1.3
-    "@jest/test-result": ^28.1.3
-    "@jest/transform": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/console": ^29.3.1
+    "@jest/reporters": ^29.3.1
+    "@jest/test-result": ^29.3.1
+    "@jest/transform": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/node": "*"
     ansi-escapes: ^4.2.1
     chalk: ^4.0.0
     ci-info: ^3.2.0
     exit: ^0.1.2
     graceful-fs: ^4.2.9
-    jest-changed-files: ^28.1.3
-    jest-config: ^28.1.3
-    jest-haste-map: ^28.1.3
-    jest-message-util: ^28.1.3
-    jest-regex-util: ^28.0.2
-    jest-resolve: ^28.1.3
-    jest-resolve-dependencies: ^28.1.3
-    jest-runner: ^28.1.3
-    jest-runtime: ^28.1.3
-    jest-snapshot: ^28.1.3
-    jest-util: ^28.1.3
-    jest-validate: ^28.1.3
-    jest-watcher: ^28.1.3
+    jest-changed-files: ^29.2.0
+    jest-config: ^29.3.1
+    jest-haste-map: ^29.3.1
+    jest-message-util: ^29.3.1
+    jest-regex-util: ^29.2.0
+    jest-resolve: ^29.3.1
+    jest-resolve-dependencies: ^29.3.1
+    jest-runner: ^29.3.1
+    jest-runtime: ^29.3.1
+    jest-snapshot: ^29.3.1
+    jest-util: ^29.3.1
+    jest-validate: ^29.3.1
+    jest-watcher: ^29.3.1
     micromatch: ^4.0.4
-    pretty-format: ^28.1.3
-    rimraf: ^3.0.0
+    pretty-format: ^29.3.1
     slash: ^3.0.0
     strip-ansi: ^6.0.0
   peerDependencies:
@@ -5110,7 +5109,7 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: cb79f34bafc4637e7130df12257f5b29075892a2be2c7f45c6d4c0420853e80b5dae11016e652530eb234f4c44c00910cdca3c2cd86275721860725073f7d9b4
+  checksum: e3ac9201e8a084ccd832b17877b56490402b919f227622bb24f9372931e77b869e60959d34144222ce20fb619d0a6a6be20b257adb077a6b0f430a4584a45b0f
   languageName: node
   linkType: hard
 
@@ -5126,34 +5125,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/environment@npm:28.1.3"
+"@jest/environment@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/environment@npm:29.3.1"
   dependencies:
-    "@jest/fake-timers": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/fake-timers": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/node": "*"
-    jest-mock: ^28.1.3
-  checksum: 14c496b84aef951df33128cea68988e9de43b2e9d62be9f9c4308d4ac307fa345642813679f80d0a4cedeb900cf6f0b6bb2b92ce089528e8721f72295fdc727f
+    jest-mock: ^29.3.1
+  checksum: 974102aba7cc80508f787bb5504dcc96e5392e0a7776a63dffbf54ddc2c77d52ef4a3c08ed2eedec91965befff873f70cd7c9ed56f62bb132dcdb821730e6076
   languageName: node
   linkType: hard
 
-"@jest/expect-utils@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/expect-utils@npm:28.1.3"
+"@jest/expect-utils@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/expect-utils@npm:29.3.1"
   dependencies:
-    jest-get-type: ^28.0.2
-  checksum: 808ea3a68292a7e0b95490fdd55605c430b4cf209ea76b5b61bfb2a1badcb41bc046810fe4e364bd5fe04663978aa2bd73d8f8465a761dd7c655aeb44cf22987
+    jest-get-type: ^29.2.0
+  checksum: 7f3b853eb1e4299988f66b9aa49c1aacb7b8da1cf5518dca4ccd966e865947eed8f1bde6c8f5207d8400e9af870112a44b57aa83515ad6ea5e4a04a971863adb
   languageName: node
   linkType: hard
 
-"@jest/expect@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/expect@npm:28.1.3"
+"@jest/expect@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/expect@npm:29.3.1"
   dependencies:
-    expect: ^28.1.3
-    jest-snapshot: ^28.1.3
-  checksum: 4197f6fdddc33dc45ba4e838f992fc61839c421d7aed0dfe665ef9c2f172bb1df8a8cac9cecee272b40e744a326da521d5e182709fe82a0b936055bfffa3b473
+    expect: ^29.3.1
+    jest-snapshot: ^29.3.1
+  checksum: 1d7b5cc735c8a99bfbed884d80fdb43b23b3456f4ec88c50fd86404b097bb77fba84f44e707fc9b49f106ca1154ae03f7c54dc34754b03f8a54eeb420196e5bf
   languageName: node
   linkType: hard
 
@@ -5171,17 +5170,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/fake-timers@npm:28.1.3"
+"@jest/fake-timers@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/fake-timers@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     "@sinonjs/fake-timers": ^9.1.2
     "@types/node": "*"
-    jest-message-util: ^28.1.3
-    jest-mock: ^28.1.3
-    jest-util: ^28.1.3
-  checksum: cec14d5b14913a54dce64a62912c5456235f5d90b509ceae19c727565073114dae1aaf960ac6be96b3eb94789a3a758b96b72c8fca7e49a6ccac415fbc0321e1
+    jest-message-util: ^29.3.1
+    jest-mock: ^29.3.1
+    jest-util: ^29.3.1
+  checksum: b1dafa8cdc439ef428cd772c775f0b22703677f52615513eda11a104bbfc352d7ec69b1225db95d4ef2e1b4ef0f23e1a7d96de5313aeb0950f672e6548ae069d
   languageName: node
   linkType: hard
 
@@ -5196,14 +5195,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/globals@npm:28.1.3"
+"@jest/globals@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/globals@npm:29.3.1"
   dependencies:
-    "@jest/environment": ^28.1.3
-    "@jest/expect": ^28.1.3
-    "@jest/types": ^28.1.3
-  checksum: 3504bb23de629d466c6f2b6b75d2e1c1b10caccbbcfb7eaa82d22cc37711c8e364c243929581184846605c023b475ea6c42c2e3ea5994429a988d8d527af32cd
+    "@jest/environment": ^29.3.1
+    "@jest/expect": ^29.3.1
+    "@jest/types": ^29.3.1
+    jest-mock: ^29.3.1
+  checksum: 4d2b9458aabf7c28fd167e53984477498c897b64eec67a7f84b8fff465235cae1456ee0721cb0e7943f0cda443c7656adb9801f9f34e27495b8ebbd9f3033100
   languageName: node
   linkType: hard
 
@@ -5245,16 +5245,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/reporters@npm:28.1.3"
+"@jest/reporters@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/reporters@npm:29.3.1"
   dependencies:
     "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^28.1.3
-    "@jest/test-result": ^28.1.3
-    "@jest/transform": ^28.1.3
-    "@jest/types": ^28.1.3
-    "@jridgewell/trace-mapping": ^0.3.13
+    "@jest/console": ^29.3.1
+    "@jest/test-result": ^29.3.1
+    "@jest/transform": ^29.3.1
+    "@jest/types": ^29.3.1
+    "@jridgewell/trace-mapping": ^0.3.15
     "@types/node": "*"
     chalk: ^4.0.0
     collect-v8-coverage: ^1.0.0
@@ -5266,38 +5266,19 @@ __metadata:
     istanbul-lib-report: ^3.0.0
     istanbul-lib-source-maps: ^4.0.0
     istanbul-reports: ^3.1.3
-    jest-message-util: ^28.1.3
-    jest-util: ^28.1.3
-    jest-worker: ^28.1.3
+    jest-message-util: ^29.3.1
+    jest-util: ^29.3.1
+    jest-worker: ^29.3.1
     slash: ^3.0.0
     string-length: ^4.0.1
     strip-ansi: ^6.0.0
-    terminal-link: ^2.0.0
     v8-to-istanbul: ^9.0.1
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: a7440887ce837922cbeaa64c3232eb48aae02aa9123f29fc4280ad3e1afe4b35dcba171ba1d5fd219037c396c5152d9c2d102cff1798dd5ae3bd33ac4759ae0a
-  languageName: node
-  linkType: hard
-
-"@jest/schemas@npm:^28.0.2":
-  version: 28.0.2
-  resolution: "@jest/schemas@npm:28.0.2"
-  dependencies:
-    "@sinclair/typebox": ^0.23.3
-  checksum: 6a177e97b112c99f377697fe803a34f4489b92cd07949876250c69edc9029c7cbda771fcbb03caebd20ffbcfa89b9c22b4dc9d1e9a7fbc9873185459b48ba780
-  languageName: node
-  linkType: hard
-
-"@jest/schemas@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/schemas@npm:28.1.3"
-  dependencies:
-    "@sinclair/typebox": ^0.24.1
-  checksum: 3cf1d4b66c9c4ffda58b246de1ddcba8e6ad085af63dccdf07922511f13b68c0cc480a7bc620cb4f3099a6f134801c747e1df7bfc7a4ef4dceefbdea3e31e1de
+  checksum: 273e0c6953285f01151e9d84ac1e55744802a1ec79fb62dafeea16a49adfe7b24e7f35bef47a0214e5e057272dbfdacf594208286b7766046fd0f3cfa2043840
   languageName: node
   linkType: hard
 
@@ -5321,14 +5302,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/source-map@npm:^28.1.2":
-  version: 28.1.2
-  resolution: "@jest/source-map@npm:28.1.2"
+"@jest/source-map@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "@jest/source-map@npm:29.2.0"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.13
+    "@jridgewell/trace-mapping": ^0.3.15
     callsites: ^3.0.0
     graceful-fs: ^4.2.9
-  checksum: b82a5c2e93d35d86779c61a02ccb967d1b5cd2e9dd67d26d8add44958637cbbb99daeeb8129c7653389cb440dc2a2f5ae4d2183dc453c67669ff98938b775a3a
+  checksum: 09f76ab63d15dcf44b3035a79412164f43be34ec189575930f1a00c87e36ea0211ebd6a4fbe2253c2516e19b49b131f348ddbb86223ca7b6bbac9a6bc76ec96e
   languageName: node
   linkType: hard
 
@@ -5344,15 +5325,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/test-result@npm:28.1.3"
+"@jest/test-result@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/test-result@npm:29.3.1"
   dependencies:
-    "@jest/console": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/console": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/istanbul-lib-coverage": ^2.0.0
     collect-v8-coverage: ^1.0.0
-  checksum: 957a5dd2fd2e84aabe86698f93c0825e96128ccaa23abf548b159a9b08ac74e4bde7acf4bec48479243dbdb27e4ea1b68c171846d21fb64855c6b55cead9ef27
+  checksum: b24ac283321189b624c372a6369c0674b0ee6d9e3902c213452c6334d037113718156b315364bee8cee0f03419c2bdff5e2c63967193fb422830e79cbb26866a
   languageName: node
   linkType: hard
 
@@ -5368,15 +5349,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/test-sequencer@npm:28.1.3"
+"@jest/test-sequencer@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/test-sequencer@npm:29.3.1"
   dependencies:
-    "@jest/test-result": ^28.1.3
+    "@jest/test-result": ^29.3.1
     graceful-fs: ^4.2.9
-    jest-haste-map: ^28.1.3
+    jest-haste-map: ^29.3.1
     slash: ^3.0.0
-  checksum: 13f8905e6d1ec8286694146f7be3cf90eff801bbdea5e5c403e6881444bb390ed15494c7b9948aa94bd7e9c9a851e0d3002ed6e7371d048b478596e5b23df953
+  checksum: a8325b1ea0ce644486fb63bb67cedd3524d04e3d7b1e6c1e3562bf12ef477ecd0cf34044391b2a07d925e1c0c8b4e0f3285035ceca3a474a2c55980f1708caf3
   languageName: node
   linkType: hard
 
@@ -5426,26 +5407,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/transform@npm:28.1.3"
+"@jest/transform@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/transform@npm:29.3.1"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/types": ^28.1.3
-    "@jridgewell/trace-mapping": ^0.3.13
+    "@jest/types": ^29.3.1
+    "@jridgewell/trace-mapping": ^0.3.15
     babel-plugin-istanbul: ^6.1.1
     chalk: ^4.0.0
-    convert-source-map: ^1.4.0
-    fast-json-stable-stringify: ^2.0.0
+    convert-source-map: ^2.0.0
+    fast-json-stable-stringify: ^2.1.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^28.1.3
-    jest-regex-util: ^28.0.2
-    jest-util: ^28.1.3
+    jest-haste-map: ^29.3.1
+    jest-regex-util: ^29.2.0
+    jest-util: ^29.3.1
     micromatch: ^4.0.4
     pirates: ^4.0.4
     slash: ^3.0.0
     write-file-atomic: ^4.0.1
-  checksum: dadf618936e0aa84342f07f532801d5bed43cdf95d1417b929e4f8782c872cff1adc84096d5a287a796d0039a2691c06d8450cce5a713a8b52fbb9f872a1e760
+  checksum: 673df5900ffc95bc811084e09d6e47948034dea6ab6cc4f81f80977e3a52468a6c2284d0ba9796daf25a62ae50d12f7e97fc9a3a0c587f11f2a479ff5493ca53
   languageName: node
   linkType: hard
 
@@ -5501,34 +5482,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^28.1.0":
-  version: 28.1.0
-  resolution: "@jest/types@npm:28.1.0"
-  dependencies:
-    "@jest/schemas": ^28.0.2
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^17.0.8
-    chalk: ^4.0.0
-  checksum: 22705aed92a76d45465a6c51147bc71c1fbd300b912ebad2769e3ff7fd51c1938017e29fcea52e00c00dab7130697359b2a2c2be6ee601e37c8b1042a2c4040e
-  languageName: node
-  linkType: hard
-
-"@jest/types@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "@jest/types@npm:28.1.3"
-  dependencies:
-    "@jest/schemas": ^28.1.3
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^17.0.8
-    chalk: ^4.0.0
-  checksum: 1e258d9c063fcf59ebc91e46d5ea5984674ac7ae6cae3e50aa780d22b4405bf2c925f40350bf30013839eb5d4b5e521d956ddf8f3b7c78debef0e75a07f57350
-  languageName: node
-  linkType: hard
-
 "@jest/types@npm:^29.2.1":
   version: 29.2.1
   resolution: "@jest/types@npm:29.2.1"
@@ -5543,6 +5496,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/types@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "@jest/types@npm:29.3.1"
+  dependencies:
+    "@jest/schemas": ^29.0.0
+    "@types/istanbul-lib-coverage": ^2.0.0
+    "@types/istanbul-reports": ^3.0.0
+    "@types/node": "*"
+    "@types/yargs": ^17.0.8
+    chalk: ^4.0.0
+  checksum: 6f9faf27507b845ff3839c1adc6dbd038d7046d03d37e84c9fc956f60718711a801a5094c7eeee6b39ccf42c0ab61347fdc0fa49ab493ae5a8efd2fd41228ee8
+  languageName: node
+  linkType: hard
+
 "@jridgewell/gen-mapping@npm:^0.3.0":
   version: 0.3.1
   resolution: "@jridgewell/gen-mapping@npm:0.3.1"
@@ -5637,7 +5604,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.13":
+"@jridgewell/trace-mapping@npm:^0.3.12":
   version: 0.3.14
   resolution: "@jridgewell/trace-mapping@npm:0.3.14"
   dependencies:
@@ -5647,7 +5614,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.14":
+"@jridgewell/trace-mapping@npm:^0.3.14, @jridgewell/trace-mapping@npm:^0.3.15":
   version: 0.3.17
   resolution: "@jridgewell/trace-mapping@npm:0.3.17"
   dependencies:
@@ -8259,13 +8226,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.23.3":
-  version: 0.23.5
-  resolution: "@sinclair/typebox@npm:0.23.5"
-  checksum: c96056d35d9cb862aeb635ff8873e2e7633e668dd544e162aee2690a82c970d0b3f90aa2b3501fe374dfa8e792388559a3e3a86712b23ebaef10061add534f47
-  languageName: node
-  linkType: hard
-
 "@sinclair/typebox@npm:^0.24.1":
   version: 0.24.21
   resolution: "@sinclair/typebox@npm:0.24.21"
@@ -11002,13 +10962,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:28.1.6":
-  version: 28.1.6
-  resolution: "@types/jest@npm:28.1.6"
+"@types/jest@npm:29.2.3":
+  version: 29.2.3
+  resolution: "@types/jest@npm:29.2.3"
   dependencies:
-    jest-matcher-utils: ^28.0.0
-    pretty-format: ^28.0.0
-  checksum: f2ba5fbefc8f44d1c16ee19d8d2811bca75754a2846e222287f2788d96062801c568215e6b81eb532a48e8cb2a7282729da1d4f6fb496831da8269c5abaad4c5
+    expect: ^29.0.0
+    pretty-format: ^29.0.0
+  checksum: 55370906711b600a05b9e497c22aa74d80d8adcdbe4ac2f1bc9311f6f6ca0dd192862b6f38df6ac0d45e92396bcd796e377b1d8058c10bdfd584aeee580c3ce1
   languageName: node
   linkType: hard
 
@@ -11042,14 +11002,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jsdom@npm:^16.2.4":
-  version: 16.2.14
-  resolution: "@types/jsdom@npm:16.2.14"
+"@types/jsdom@npm:^20.0.0":
+  version: 20.0.1
+  resolution: "@types/jsdom@npm:20.0.1"
   dependencies:
     "@types/node": "*"
-    "@types/parse5": "*"
     "@types/tough-cookie": "*"
-  checksum: 12bb926fa74ea07c0ba0bfd5bf185ac0fd771b28666a5e8784b9af4bb96bb0c51fc5f494eff7da1d3cd804e4757f640a23c344c1cd5d188f95ab0ab51770d88b
+    parse5: ^7.0.0
+  checksum: d55402c5256ef451f93a6e3d3881f98339fe73a5ac2030588df056d6835df8367b5a857b48d27528289057e26dcdd3f502edc00cb877c79174cb3a4c7f2198c1
   languageName: node
   linkType: hard
 
@@ -11281,13 +11241,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/parse5@npm:*":
-  version: 6.0.3
-  resolution: "@types/parse5@npm:6.0.3"
-  checksum: ddb59ee4144af5dfcc508a8dcf32f37879d11e12559561e65788756b95b33e6f03ea027d88e1f5408f9b7bfb656bf630ace31a2169edf44151daaf8dd58df1b7
-  languageName: node
-  linkType: hard
-
 "@types/parse5@npm:^5.0.0":
   version: 5.0.3
   resolution: "@types/parse5@npm:5.0.3"
@@ -12934,6 +12887,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-globals@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "acorn-globals@npm:7.0.1"
+  dependencies:
+    acorn: ^8.1.0
+    acorn-walk: ^8.0.2
+  checksum: 2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8
+  languageName: node
+  linkType: hard
+
 "acorn-import-assertions@npm:^1.7.6":
   version: 1.8.0
   resolution: "acorn-import-assertions@npm:1.8.0"
@@ -12959,7 +12922,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.1.1":
+"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
   version: 8.2.0
   resolution: "acorn-walk@npm:8.2.0"
   checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
@@ -12984,7 +12947,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.0":
+"acorn@npm:^8.0.0, acorn@npm:^8.1.0":
   version: 8.8.1
   resolution: "acorn@npm:8.8.1"
   bin:
@@ -13951,20 +13914,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:28.1.3, babel-jest@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "babel-jest@npm:28.1.3"
+"babel-jest@npm:29.3.1, babel-jest@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "babel-jest@npm:29.3.1"
   dependencies:
-    "@jest/transform": ^28.1.3
+    "@jest/transform": ^29.3.1
     "@types/babel__core": ^7.1.14
     babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^28.1.3
+    babel-preset-jest: ^29.2.0
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     slash: ^3.0.0
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: 57ccd2296e1839687b5df2fd138c3d00717e0369e385254b012ccd4ee70e75f5d5c8e6cfcdf92d155015b468cfebb847b38e69bb5805d8aaf730e20575127cc6
+  checksum: 793848238a771a931ddeb5930b9ec8ab800522ac8d64933665698f4a39603d157e572e20b57d79610277e1df88d3ee82b180d59a21f3570388f602beeb38a595
   languageName: node
   linkType: hard
 
@@ -14087,15 +14050,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "babel-plugin-jest-hoist@npm:28.1.3"
+"babel-plugin-jest-hoist@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "babel-plugin-jest-hoist@npm:29.2.0"
   dependencies:
     "@babel/template": ^7.3.3
     "@babel/types": ^7.3.3
     "@types/babel__core": ^7.1.14
     "@types/babel__traverse": ^7.0.6
-  checksum: 648d89f9d80f6450ce7e50d0c32eb91b7f26269b47c3e37aaf2e0f2f66a980978345bd6b8c9b8c3aa6a8252ad2bc2c9fb50630e9895622c9a0972af5f70ed20e
+  checksum: 368d271ceae491ae6b96cd691434859ea589fbe5fd5aead7660df75d02394077273c6442f61f390e9347adffab57a32b564d0fabcf1c53c4b83cd426cb644072
   languageName: node
   linkType: hard
 
@@ -14300,15 +14263,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "babel-preset-jest@npm:28.1.3"
+"babel-preset-jest@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "babel-preset-jest@npm:29.2.0"
   dependencies:
-    babel-plugin-jest-hoist: ^28.1.3
+    babel-plugin-jest-hoist: ^29.2.0
     babel-preset-current-node-syntax: ^1.0.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 8248a4a5ca4242cc06ad13b10b9183ad2664da8fb0da060c352223dcf286f0ce9c708fa17901dc44ecabec25e6d309e5e5b9830a61dd777c3925f187a345a47d
+  checksum: 1b09a2db968c36e064daf98082cfffa39c849b63055112ddc56fc2551fd0d4783897265775b1d2f8a257960a3339745de92e74feb01bad86d41c4cecbfa854fc
   languageName: node
   linkType: hard
 
@@ -16214,6 +16177,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"convert-source-map@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "convert-source-map@npm:2.0.0"
+  checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035
+  languageName: node
+  linkType: hard
+
 "cookie-signature@npm:1.0.6":
   version: 1.0.6
   resolution: "cookie-signature@npm:1.0.6"
@@ -17476,7 +17446,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^3.0.1":
+"data-urls@npm:^3.0.2":
   version: 3.0.2
   resolution: "data-urls@npm:3.0.2"
   dependencies:
@@ -17628,13 +17598,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.2.1, decimal.js@npm:^10.3.1":
+"decimal.js@npm:^10.2.1":
   version: 10.3.1
   resolution: "decimal.js@npm:10.3.1"
   checksum: 0351ac9f05fe050f23227aa6a4573bee2d58fa7378fcf28d969a8c789525032effb488a90320fd3fe86a66e17b4bc507d811b15eada5b7f0e7ec5d2af4c24a59
   languageName: node
   linkType: hard
 
+"decimal.js@npm:^10.4.1":
+  version: 10.4.2
+  resolution: "decimal.js@npm:10.4.2"
+  checksum: 536cd6816a3197f2e1aa3da4860856cb5a2db73f6fafe8cb3b924ccc63f9b7d78296acc13dccbd419bd958ccc6357921fb15467f883b37cab04bfba7044cada2
+  languageName: node
+  linkType: hard
+
 "decode-named-character-reference@npm:^1.0.0":
   version: 1.0.2
   resolution: "decode-named-character-reference@npm:1.0.2"
@@ -17944,10 +17921,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^28.1.1":
-  version: 28.1.1
-  resolution: "diff-sequences@npm:28.1.1"
-  checksum: e2529036505567c7ca5a2dea86b6bcd1ca0e3ae63bf8ebf529b8a99cfa915bbf194b7021dc1c57361a4017a6d95578d4ceb29fabc3232a4f4cb866a2726c7690
+"diff-sequences@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "diff-sequences@npm:29.3.1"
+  checksum: 8edab8c383355022e470779a099852d595dd856f9f5bd7af24f177e74138a668932268b4c4fd54096eed643861575c3652d4ecbbb1a9d710488286aed3ffa443
   languageName: node
   linkType: hard
 
@@ -18349,10 +18326,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emittery@npm:^0.10.2":
-  version: 0.10.2
-  resolution: "emittery@npm:0.10.2"
-  checksum: ee3e21788b043b90885b18ea756ec3105c1cedc50b29709c92b01e239c7e55345d4bb6d3aef4ddbaf528eef448a40b3bb831bad9ee0fc9c25cbf1367ab1ab5ac
+"emittery@npm:^0.13.1":
+  version: 0.13.1
+  resolution: "emittery@npm:0.13.1"
+  checksum: 2b089ab6306f38feaabf4f6f02792f9ec85fc054fda79f44f6790e61bbf6bc4e1616afb9b232e0c5ec5289a8a452f79bfa6d905a6fd64e94b49981f0934001c6
   languageName: node
   linkType: hard
 
@@ -18521,7 +18498,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.2.0, entities@npm:^4.3.1":
+"entities@npm:^4.2.0, entities@npm:^4.3.1, entities@npm:^4.4.0":
   version: 4.4.0
   resolution: "entities@npm:4.4.0"
   checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2
@@ -19867,16 +19844,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expect@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "expect@npm:28.1.3"
+"expect@npm:^29.0.0, expect@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "expect@npm:29.3.1"
   dependencies:
-    "@jest/expect-utils": ^28.1.3
-    jest-get-type: ^28.0.2
-    jest-matcher-utils: ^28.1.3
-    jest-message-util: ^28.1.3
-    jest-util: ^28.1.3
-  checksum: 101e0090de300bcafedb7dbfd19223368a2251ce5fe0105bbb6de5720100b89fb6b64290ebfb42febc048324c76d6a4979cdc4b61eb77747857daf7a5de9b03d
+    "@jest/expect-utils": ^29.3.1
+    jest-get-type: ^29.2.0
+    jest-matcher-utils: ^29.3.1
+    jest-message-util: ^29.3.1
+    jest-util: ^29.3.1
+  checksum: e9588c2a430b558b9a3dc72d4ad05f36b047cb477bc6a7bb9cfeef7614fe7e5edbab424c2c0ce82739ee21ecbbbd24596259528209f84cd72500cc612d910d30
   languageName: node
   linkType: hard
 
@@ -20138,7 +20115,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0":
+"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
   checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb
@@ -21582,7 +21559,7 @@ __metadata:
     "@types/gtag.js": ^0.0.12
     "@types/history": 4.7.11
     "@types/hoist-non-react-statics": 3.3.1
-    "@types/jest": 28.1.6
+    "@types/jest": 29.2.3
     "@types/jquery": 3.5.14
     "@types/js-yaml": ^4.0.5
     "@types/jsurl": ^1.2.28
@@ -21638,7 +21615,7 @@ __metadata:
     ansicolor: 1.1.100
     app: "link:./public/app"
     autoprefixer: 10.4.13
-    babel-jest: 28.1.3
+    babel-jest: 29.3.1
     babel-loader: 9.1.0
     babel-plugin-angularjs-annotate: 0.10.0
     babel-plugin-macros: 3.1.0
@@ -21693,13 +21670,13 @@ __metadata:
     i18next-parser: 6.6.0
     immer: 9.0.16
     immutable: 4.1.0
-    jest: 28.1.3
+    jest: 29.3.1
     jest-canvas-mock: 2.4.0
     jest-date-mock: 1.0.8
-    jest-environment-jsdom: 28.1.3
+    jest-environment-jsdom: 29.3.1
     jest-fail-on-console: 3.0.2
     jest-junit: 14.0.1
-    jest-matcher-utils: 28.1.3
+    jest-matcher-utils: 29.3.1
     jquery: 3.6.1
     js-yaml: ^4.1.0
     json-source-map: 0.6.1
@@ -21799,7 +21776,7 @@ __metadata:
     testing-library-selector: 0.2.1
     tether-drop: "https://github.com/torkelo/drop"
     tinycolor2: 1.4.2
-    ts-jest: 28.0.7
+    ts-jest: 29.0.3
     ts-loader: 9.3.1
     ts-node: 10.9.1
     tslib: 2.4.1
@@ -22632,6 +22609,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "https-proxy-agent@npm:5.0.1"
+  dependencies:
+    agent-base: 6
+    debug: 4
+  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
+  languageName: node
+  linkType: hard
+
 "human-signals@npm:^1.1.1":
   version: 1.1.1
   resolution: "human-signals@npm:1.1.1"
@@ -24134,13 +24121,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-changed-files@npm:28.1.3"
+"jest-changed-files@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "jest-changed-files@npm:29.2.0"
   dependencies:
     execa: ^5.0.0
     p-limit: ^3.1.0
-  checksum: c78af14a68b9b19101623ae7fde15a2488f9b3dbe8cca12a05c4a223bc9bfd3bf41ee06830f20fb560c52434435d6153c9cc6cf450b1f7b03e5e7f96a953a6a6
+  checksum: 8ad8290324db1de2ee3c9443d3e3fbfdcb6d72ec7054c5796be2854b2bc239dea38a7c797c8c9c2bd959f539d44305790f2f75b18f3046b04317ed77c7480cb1
   languageName: node
   linkType: hard
 
@@ -24171,30 +24158,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-circus@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-circus@npm:28.1.3"
+"jest-circus@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-circus@npm:29.3.1"
   dependencies:
-    "@jest/environment": ^28.1.3
-    "@jest/expect": ^28.1.3
-    "@jest/test-result": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/environment": ^29.3.1
+    "@jest/expect": ^29.3.1
+    "@jest/test-result": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/node": "*"
     chalk: ^4.0.0
     co: ^4.6.0
     dedent: ^0.7.0
     is-generator-fn: ^2.0.0
-    jest-each: ^28.1.3
-    jest-matcher-utils: ^28.1.3
-    jest-message-util: ^28.1.3
-    jest-runtime: ^28.1.3
-    jest-snapshot: ^28.1.3
-    jest-util: ^28.1.3
+    jest-each: ^29.3.1
+    jest-matcher-utils: ^29.3.1
+    jest-message-util: ^29.3.1
+    jest-runtime: ^29.3.1
+    jest-snapshot: ^29.3.1
+    jest-util: ^29.3.1
     p-limit: ^3.1.0
-    pretty-format: ^28.1.3
+    pretty-format: ^29.3.1
     slash: ^3.0.0
     stack-utils: ^2.0.3
-  checksum: b635e60a9c92adaefc3f24def8eba691e7c2fdcf6c9fa640cddf2eb8c8b26ee62eab73ebb88798fd7c52a74c1495a984e39b748429b610426f02e9d3d56e09b2
+  checksum: 125710debd998ad9693893e7c1235e271b79f104033b8169d82afe0bc0d883f8f5245feef87adcbb22ad27ff749fd001aa998d11a132774b03b4e2b8af77d5d8
   languageName: node
   linkType: hard
 
@@ -24225,20 +24212,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-cli@npm:28.1.3"
+"jest-cli@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-cli@npm:29.3.1"
   dependencies:
-    "@jest/core": ^28.1.3
-    "@jest/test-result": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/core": ^29.3.1
+    "@jest/test-result": ^29.3.1
+    "@jest/types": ^29.3.1
     chalk: ^4.0.0
     exit: ^0.1.2
     graceful-fs: ^4.2.9
     import-local: ^3.0.2
-    jest-config: ^28.1.3
-    jest-util: ^28.1.3
-    jest-validate: ^28.1.3
+    jest-config: ^29.3.1
+    jest-util: ^29.3.1
+    jest-validate: ^29.3.1
     prompts: ^2.0.1
     yargs: ^17.3.1
   peerDependencies:
@@ -24248,7 +24235,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: fb424576bf38346318daddee3fcc597cd78cb8dda1759d09c529d8ba1a748f2765c17b00671072a838826e59465a810ff8a232bc6ba2395c131bf3504425a363
+  checksum: 829895d33060042443bd1e9e87eb68993773d74f2c8a9b863acf53cece39d227ae0e7d76df2e9c5934c414bdf70ce398a34b3122cfe22164acb2499a74d7288d
   languageName: node
   linkType: hard
 
@@ -24289,30 +24276,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-config@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-config@npm:28.1.3"
+"jest-config@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-config@npm:29.3.1"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/test-sequencer": ^28.1.3
-    "@jest/types": ^28.1.3
-    babel-jest: ^28.1.3
+    "@jest/test-sequencer": ^29.3.1
+    "@jest/types": ^29.3.1
+    babel-jest: ^29.3.1
     chalk: ^4.0.0
     ci-info: ^3.2.0
     deepmerge: ^4.2.2
     glob: ^7.1.3
     graceful-fs: ^4.2.9
-    jest-circus: ^28.1.3
-    jest-environment-node: ^28.1.3
-    jest-get-type: ^28.0.2
-    jest-regex-util: ^28.0.2
-    jest-resolve: ^28.1.3
-    jest-runner: ^28.1.3
-    jest-util: ^28.1.3
-    jest-validate: ^28.1.3
+    jest-circus: ^29.3.1
+    jest-environment-node: ^29.3.1
+    jest-get-type: ^29.2.0
+    jest-regex-util: ^29.2.0
+    jest-resolve: ^29.3.1
+    jest-runner: ^29.3.1
+    jest-util: ^29.3.1
+    jest-validate: ^29.3.1
     micromatch: ^4.0.4
     parse-json: ^5.2.0
-    pretty-format: ^28.1.3
+    pretty-format: ^29.3.1
     slash: ^3.0.0
     strip-json-comments: ^3.1.1
   peerDependencies:
@@ -24323,7 +24310,7 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-  checksum: ddabffd3a3a8cb6c2f58f06cdf3535157dbf8c70bcde3e5c3de7bee6a8d617840ffc8cffb0083e38c6814f2a08c225ca19f58898efaf4f351af94679f22ce6bc
+  checksum: 6e663f04ae1024a53a4c2c744499b4408ca9a8b74381dd5e31b11bb3c7393311ecff0fb61b06287768709eb2c9e5a2fd166d258f5a9123abbb4c5812f99c12fe
   languageName: node
   linkType: hard
 
@@ -24370,15 +24357,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-diff@npm:28.1.3"
+"jest-diff@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-diff@npm:29.3.1"
   dependencies:
     chalk: ^4.0.0
-    diff-sequences: ^28.1.1
-    jest-get-type: ^28.0.2
-    pretty-format: ^28.1.3
-  checksum: fa8583e0ccbe775714ce850b009be1b0f6b17a4b6759f33ff47adef27942ebc610dbbcc8a5f7cfb7f12b3b3b05afc9fb41d5f766674616025032ff1e4f9866e0
+    diff-sequences: ^29.3.1
+    jest-get-type: ^29.2.0
+    pretty-format: ^29.3.1
+  checksum: ac5c09745f2b1897e6f53216acaf6ed44fc4faed8e8df053ff4ac3db5d2a1d06a17b876e49faaa15c8a7a26f5671bcbed0a93781dcc2835f781c79a716a591a9
   languageName: node
   linkType: hard
 
@@ -24391,12 +24378,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^28.1.1":
-  version: 28.1.1
-  resolution: "jest-docblock@npm:28.1.1"
+"jest-docblock@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "jest-docblock@npm:29.2.0"
   dependencies:
     detect-newline: ^3.0.0
-  checksum: 22fca68d988ecb2933bc65f448facdca85fc71b4bd0a188ea09a5ae1b0cc3a049a2a6ec7e7eaa2542c1d5cb5e5145e420a3df4fa280f5070f486c44da1d36151
+  checksum: b3f1227b7d73fc9e4952180303475cf337b36fa65c7f730ac92f0580f1c08439983262fee21cf3dba11429aa251b4eee1e3bc74796c5777116b400d78f9d2bbe
   languageName: node
   linkType: hard
 
@@ -24413,32 +24400,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-each@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-each@npm:28.1.3"
+"jest-each@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-each@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     chalk: ^4.0.0
-    jest-get-type: ^28.0.2
-    jest-util: ^28.1.3
-    pretty-format: ^28.1.3
-  checksum: 5c5b8ccb1484e58b027bea682cfa020a45e5bf5379cc7c23bdec972576c1dc3c3bf03df2b78416cefc1a58859dd33b7cf5fff54c370bc3c0f14a3e509eb87282
+    jest-get-type: ^29.2.0
+    jest-util: ^29.3.1
+    pretty-format: ^29.3.1
+  checksum: 16d51ef8f96fba44a3479f1c6f7672027e3b39236dc4e41217c38fe60a3b66b022ffcee72f8835a442f7a8a0a65980a93fb8e73a9782d192452526e442ad049a
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom@npm:28.1.3":
-  version: 28.1.3
-  resolution: "jest-environment-jsdom@npm:28.1.3"
+"jest-environment-jsdom@npm:29.3.1":
+  version: 29.3.1
+  resolution: "jest-environment-jsdom@npm:29.3.1"
   dependencies:
-    "@jest/environment": ^28.1.3
-    "@jest/fake-timers": ^28.1.3
-    "@jest/types": ^28.1.3
-    "@types/jsdom": ^16.2.4
+    "@jest/environment": ^29.3.1
+    "@jest/fake-timers": ^29.3.1
+    "@jest/types": ^29.3.1
+    "@types/jsdom": ^20.0.0
     "@types/node": "*"
-    jest-mock: ^28.1.3
-    jest-util: ^28.1.3
-    jsdom: ^19.0.0
-  checksum: 32758f9b9a1fd04ec3ebaaa608d740a36b960d37d00bd3d4d83fdc4b527afc474c14f04fa860817e1fa22923e2dc3cd2b497db41af6a5d73e91327951612025e
+    jest-mock: ^29.3.1
+    jest-util: ^29.3.1
+    jsdom: ^20.0.0
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 91b04ed02b2275c3a47740e20c2691f67c4295e17174c8ccd3a71fe77707239e487506bd157279b4257ce1be0a8c2be377817ee85689966a9e604bb6ef1199f0
   languageName: node
   linkType: hard
 
@@ -24471,17 +24463,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-environment-node@npm:28.1.3"
+"jest-environment-node@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-environment-node@npm:29.3.1"
   dependencies:
-    "@jest/environment": ^28.1.3
-    "@jest/fake-timers": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/environment": ^29.3.1
+    "@jest/fake-timers": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/node": "*"
-    jest-mock: ^28.1.3
-    jest-util: ^28.1.3
-  checksum: 1048fe306a6a8b0880a4c66278ebb57479f29c12cff89aab3aa79ab77a8859cf17ab8aa9919fd21c329a7db90e35581b43664e694ad453d5b04e00f3c6420469
+    jest-mock: ^29.3.1
+    jest-util: ^29.3.1
+  checksum: 16d4854bd2d35501bd4862ca069baf27ce9f5fd7642fdcab9d2dab49acd28c082d0c8882bf2bb28ed7bbaada486da577c814c9688ddc62d1d9f74a954fde996a
   languageName: node
   linkType: hard
 
@@ -24515,10 +24507,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^28.0.2":
-  version: 28.0.2
-  resolution: "jest-get-type@npm:28.0.2"
-  checksum: 5281d7c89bc8156605f6d15784f45074f4548501195c26e9b188742768f72d40948252d13230ea905b5349038865a1a8eeff0e614cc530ff289dfc41fe843abd
+"jest-get-type@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "jest-get-type@npm:29.2.0"
+  checksum: e396fd880a30d08940ed8a8e43cd4595db1b8ff09649018eb358ca701811137556bae82626af73459e3c0f8c5e972ed1e57fd3b1537b13a260893dac60a90942
   languageName: node
   linkType: hard
 
@@ -24571,26 +24563,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-haste-map@npm:28.1.3"
+"jest-haste-map@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-haste-map@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     "@types/graceful-fs": ^4.1.3
     "@types/node": "*"
     anymatch: ^3.0.3
     fb-watchman: ^2.0.0
     fsevents: ^2.3.2
     graceful-fs: ^4.2.9
-    jest-regex-util: ^28.0.2
-    jest-util: ^28.1.3
-    jest-worker: ^28.1.3
+    jest-regex-util: ^29.2.0
+    jest-util: ^29.3.1
+    jest-worker: ^29.3.1
     micromatch: ^4.0.4
     walker: ^1.0.8
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: d05fdc108645fc2b39fcd4001952cc7a8cb550e93494e98c1e9ab1fc542686f6ac67177c132e564cf94fe8f81503f3f8db8b825b9b713dc8c5748aec63ba4688
+  checksum: 97ea26af0c28a2ba568c9c65d06211487bbcd501cb4944f9d55e07fd2b00ad96653ea2cc9033f3d5b7dc1feda33e47ae9cc56b400191ea4533be213c9f82e67c
   languageName: node
   linkType: hard
 
@@ -24653,25 +24645,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-leak-detector@npm:28.1.3"
+"jest-leak-detector@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-leak-detector@npm:29.3.1"
   dependencies:
-    jest-get-type: ^28.0.2
-    pretty-format: ^28.1.3
-  checksum: 2e976a4880cf9af11f53a19f6a3820e0f90b635a900737a5427fc42e337d5628ba446dcd7c020ecea3806cf92bc0bbf6982ed62a9cd84e5a13d8751aa30fbbb7
+    jest-get-type: ^29.2.0
+    pretty-format: ^29.3.1
+  checksum: 0dd8ed31ae0b5a3d14f13f567ca8567f2663dd2d540d1e55511d3b3fd7f80a1d075392179674ebe9fab9be0b73678bf4d2f8bbbc0f4bdd52b9815259194da559
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:28.1.3, jest-matcher-utils@npm:^28.0.0, jest-matcher-utils@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-matcher-utils@npm:28.1.3"
+"jest-matcher-utils@npm:29.3.1, jest-matcher-utils@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-matcher-utils@npm:29.3.1"
   dependencies:
     chalk: ^4.0.0
-    jest-diff: ^28.1.3
-    jest-get-type: ^28.0.2
-    pretty-format: ^28.1.3
-  checksum: 6b34f0cf66f6781e92e3bec97bf27796bd2ba31121e5c5997218d9adba6deea38a30df5203937d6785b68023ed95cbad73663cc9aad6fb0cb59aeb5813a58daf
+    jest-diff: ^29.3.1
+    jest-get-type: ^29.2.0
+    pretty-format: ^29.3.1
+  checksum: 311e8d9f1e935216afc7dd8c6acf1fbda67a7415e1afb1bf72757213dfb025c1f2dc5e2c185c08064a35cdc1f2d8e40c57616666774ed1b03e57eb311c20ec77
   languageName: node
   linkType: hard
 
@@ -24704,20 +24696,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-message-util@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-message-util@npm:28.1.3"
+"jest-message-util@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-message-util@npm:29.3.1"
   dependencies:
     "@babel/code-frame": ^7.12.13
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     "@types/stack-utils": ^2.0.0
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     micromatch: ^4.0.4
-    pretty-format: ^28.1.3
+    pretty-format: ^29.3.1
     slash: ^3.0.0
     stack-utils: ^2.0.3
-  checksum: 1f266854166dcc6900d75a88b54a25225a2f3710d463063ff1c99021569045c35c7d58557b25447a17eb3a65ce763b2f9b25550248b468a9d4657db365f39e96
+  checksum: 15d0a2fca3919eb4570bbf575734780c4b9e22de6aae903c4531b346699f7deba834c6c86fe6e9a83ad17fac0f7935511cf16dce4d71a93a71ebb25f18a6e07b
   languageName: node
   linkType: hard
 
@@ -24731,13 +24723,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-mock@npm:28.1.3"
+"jest-mock@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-mock@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     "@types/node": "*"
-  checksum: a573bf8e5f12f4c29c661266c31b5c6b69a28d3195b83049983bce025b2b1a0152351567e89e63b102ef817034c2a3aa97eda4e776f3bae2aee54c5765573aa7
+    jest-util: ^29.3.1
+  checksum: 9098852cb2866db4a1a59f9f7581741dfc572f648e9e574a1b187fd69f5f2f6190ad387ede21e139a8b80a6a1343ecc3d6751cd2ae1ae11d7ea9fa1950390fb2
   languageName: node
   linkType: hard
 
@@ -24767,10 +24760,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^28.0.2":
-  version: 28.0.2
-  resolution: "jest-regex-util@npm:28.0.2"
-  checksum: 0ea8c5c82ec88bc85e273c0ec82e0c0f35f7a1e2d055070e50f0cc2a2177f848eec55f73e37ae0d045c3db5014c42b2f90ac62c1ab3fdb354d2abd66a9e08add
+"jest-regex-util@npm:^29.2.0":
+  version: 29.2.0
+  resolution: "jest-regex-util@npm:29.2.0"
+  checksum: 7c533e51c51230dac20c0d7395b19b8366cb022f7c6e08e6bcf2921626840ff90424af4c9b4689f02f0addfc9b071c4cd5f8f7a989298a4c8e0f9c94418ca1c3
   languageName: node
   linkType: hard
 
@@ -24785,13 +24778,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-resolve-dependencies@npm:28.1.3"
+"jest-resolve-dependencies@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-resolve-dependencies@npm:29.3.1"
   dependencies:
-    jest-regex-util: ^28.0.2
-    jest-snapshot: ^28.1.3
-  checksum: 4eea9ec33aefc1c71dc5956391efbcc7be76bda986b366ab3931d99c5f7ed01c9ebd7520e405ea2c76e1bb2c7ce504be6eca2b9831df16564d1e625500f3bfe7
+    jest-regex-util: ^29.2.0
+    jest-snapshot: ^29.3.1
+  checksum: 6ec4727a87c6e7954e93de9949ab9967b340ee2f07626144c273355f05a2b65fa47eb8dece2d6e5f4fd99cdb893510a3540aa5e14ba443f70b3feb63f6f98982
   languageName: node
   linkType: hard
 
@@ -24813,20 +24806,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-resolve@npm:28.1.3"
+"jest-resolve@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-resolve@npm:29.3.1"
   dependencies:
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^28.1.3
+    jest-haste-map: ^29.3.1
     jest-pnp-resolver: ^1.2.2
-    jest-util: ^28.1.3
-    jest-validate: ^28.1.3
+    jest-util: ^29.3.1
+    jest-validate: ^29.3.1
     resolve: ^1.20.0
     resolve.exports: ^1.1.0
     slash: ^3.0.0
-  checksum: df61a490c93f4f4cf52135e43d6a4fcacb07b0b7d4acc6319e9289529c1d14f2d8e1638e095dbf96f156834802755e38db68caca69dba21a3261ee711d4426b6
+  checksum: 0dea22ed625e07b8bfee52dea1391d3a4b453c1a0c627a0fa7c22e44bb48e1c289afe6f3c316def70753773f099c4e8f436c7a2cc12fcc6c7dd6da38cba2cd5f
   languageName: node
   linkType: hard
 
@@ -24859,32 +24852,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-runner@npm:28.1.3"
+"jest-runner@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-runner@npm:29.3.1"
   dependencies:
-    "@jest/console": ^28.1.3
-    "@jest/environment": ^28.1.3
-    "@jest/test-result": ^28.1.3
-    "@jest/transform": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/console": ^29.3.1
+    "@jest/environment": ^29.3.1
+    "@jest/test-result": ^29.3.1
+    "@jest/transform": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/node": "*"
     chalk: ^4.0.0
-    emittery: ^0.10.2
+    emittery: ^0.13.1
     graceful-fs: ^4.2.9
-    jest-docblock: ^28.1.1
-    jest-environment-node: ^28.1.3
-    jest-haste-map: ^28.1.3
-    jest-leak-detector: ^28.1.3
-    jest-message-util: ^28.1.3
-    jest-resolve: ^28.1.3
-    jest-runtime: ^28.1.3
-    jest-util: ^28.1.3
-    jest-watcher: ^28.1.3
-    jest-worker: ^28.1.3
+    jest-docblock: ^29.2.0
+    jest-environment-node: ^29.3.1
+    jest-haste-map: ^29.3.1
+    jest-leak-detector: ^29.3.1
+    jest-message-util: ^29.3.1
+    jest-resolve: ^29.3.1
+    jest-runtime: ^29.3.1
+    jest-util: ^29.3.1
+    jest-watcher: ^29.3.1
+    jest-worker: ^29.3.1
     p-limit: ^3.1.0
     source-map-support: 0.5.13
-  checksum: 32405cd970fa6b11e039192dae699fd1bcc6f61f67d50605af81d193f24dd4373b25f5fcc1c571a028ec1b02174e8a4b6d0d608772063fb06f08a5105693533b
+  checksum: 61ad445d8a5f29573332f27a21fc942fb0d2a82bf901a0ea1035bf3bd7f349d1e425f71f54c3a3f89b292a54872c3248d395a2829d987f26b6025b15530ea5d2
   languageName: node
   linkType: hard
 
@@ -24918,33 +24911,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-runtime@npm:28.1.3"
+"jest-runtime@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-runtime@npm:29.3.1"
   dependencies:
-    "@jest/environment": ^28.1.3
-    "@jest/fake-timers": ^28.1.3
-    "@jest/globals": ^28.1.3
-    "@jest/source-map": ^28.1.2
-    "@jest/test-result": ^28.1.3
-    "@jest/transform": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/environment": ^29.3.1
+    "@jest/fake-timers": ^29.3.1
+    "@jest/globals": ^29.3.1
+    "@jest/source-map": ^29.2.0
+    "@jest/test-result": ^29.3.1
+    "@jest/transform": ^29.3.1
+    "@jest/types": ^29.3.1
+    "@types/node": "*"
     chalk: ^4.0.0
     cjs-module-lexer: ^1.0.0
     collect-v8-coverage: ^1.0.0
-    execa: ^5.0.0
     glob: ^7.1.3
     graceful-fs: ^4.2.9
-    jest-haste-map: ^28.1.3
-    jest-message-util: ^28.1.3
-    jest-mock: ^28.1.3
-    jest-regex-util: ^28.0.2
-    jest-resolve: ^28.1.3
-    jest-snapshot: ^28.1.3
-    jest-util: ^28.1.3
+    jest-haste-map: ^29.3.1
+    jest-message-util: ^29.3.1
+    jest-mock: ^29.3.1
+    jest-regex-util: ^29.2.0
+    jest-resolve: ^29.3.1
+    jest-snapshot: ^29.3.1
+    jest-util: ^29.3.1
     slash: ^3.0.0
     strip-bom: ^4.0.0
-  checksum: b17c40af858e74dafa4f515ef3711c1e9ef3d4ad7d74534ee0745422534bc04fd166d4eceb62a3aa7dc951505d6f6d2a81d16e90bebb032be409ec0500974a36
+  checksum: 82f27b48f000be074064a854e16e768f9453e9b791d8c5f9316606c37f871b5b10f70544c1b218ab9784f00bd972bb77f868c5ab6752c275be2cd219c351f5a7
   languageName: node
   linkType: hard
 
@@ -24998,34 +24991,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-snapshot@npm:28.1.3"
+"jest-snapshot@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-snapshot@npm:29.3.1"
   dependencies:
     "@babel/core": ^7.11.6
     "@babel/generator": ^7.7.2
+    "@babel/plugin-syntax-jsx": ^7.7.2
     "@babel/plugin-syntax-typescript": ^7.7.2
     "@babel/traverse": ^7.7.2
     "@babel/types": ^7.3.3
-    "@jest/expect-utils": ^28.1.3
-    "@jest/transform": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/expect-utils": ^29.3.1
+    "@jest/transform": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/babel__traverse": ^7.0.6
     "@types/prettier": ^2.1.5
     babel-preset-current-node-syntax: ^1.0.0
     chalk: ^4.0.0
-    expect: ^28.1.3
+    expect: ^29.3.1
     graceful-fs: ^4.2.9
-    jest-diff: ^28.1.3
-    jest-get-type: ^28.0.2
-    jest-haste-map: ^28.1.3
-    jest-matcher-utils: ^28.1.3
-    jest-message-util: ^28.1.3
-    jest-util: ^28.1.3
+    jest-diff: ^29.3.1
+    jest-get-type: ^29.2.0
+    jest-haste-map: ^29.3.1
+    jest-matcher-utils: ^29.3.1
+    jest-message-util: ^29.3.1
+    jest-util: ^29.3.1
     natural-compare: ^1.4.0
-    pretty-format: ^28.1.3
+    pretty-format: ^29.3.1
     semver: ^7.3.5
-  checksum: 2a46a5493f1fb50b0a236a21f25045e7f46a244f9f3ae37ef4fbcd40249d0d68bb20c950ce77439e4e2cac985b05c3061c90b34739bf6069913a1199c8c716e1
+  checksum: d7d0077935e78c353c828be78ccb092e12ba7622cb0577f21641fadd728ae63a7c1f4a0d8113bfb38db3453a64bfa232fb1cdeefe0e2b48c52ef4065b0ab75ae
   languageName: node
   linkType: hard
 
@@ -25071,31 +25065,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-util@npm:^28.0.0":
-  version: 28.1.0
-  resolution: "jest-util@npm:28.1.0"
+"jest-util@npm:^29.0.0, jest-util@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-util@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.0
+    "@jest/types": ^29.3.1
     "@types/node": "*"
     chalk: ^4.0.0
     ci-info: ^3.2.0
     graceful-fs: ^4.2.9
     picomatch: ^2.2.3
-  checksum: 14c2ee1c24c6efa2d7adfe81ece8b9bbda78fa871f40bed80db72726166e96f7fb22bf1d9fb1689fb433b9bcd748027eb1ee5f0851a12f1aa1c49ee0bd4d7508
-  languageName: node
-  linkType: hard
-
-"jest-util@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-util@npm:28.1.3"
-  dependencies:
-    "@jest/types": ^28.1.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
-  checksum: fd6459742c941f070223f25e38a2ac0719aad92561591e9fb2a50d602a5d19d754750b79b4074327a42b00055662b95da3b006542ceb8b54309da44d4a62e721
+  checksum: f67c60f062b94d21cb60e84b3b812d64b7bfa81fe980151de5c17a74eb666042d0134e2e756d099b7606a1fcf1d633824d2e58197d01d76dde1e2dc00dfcd413
   languageName: node
   linkType: hard
 
@@ -25127,17 +25107,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-validate@npm:28.1.3"
+"jest-validate@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-validate@npm:29.3.1"
   dependencies:
-    "@jest/types": ^28.1.3
+    "@jest/types": ^29.3.1
     camelcase: ^6.2.0
     chalk: ^4.0.0
-    jest-get-type: ^28.0.2
+    jest-get-type: ^29.2.0
     leven: ^3.1.0
-    pretty-format: ^28.1.3
-  checksum: 95e0513b3803c3372a145cda86edbdb33d9dfeaa18818176f2d581e821548ceac9a179f065b6d4671a941de211354efd67f1fff8789a4fb89962565c85f646db
+    pretty-format: ^29.3.1
+  checksum: 92584f0b8ac284235f12b3b812ccbc43ef6dea080a3b98b1aa81adbe009e962d0aa6131f21c8157b30ac3d58f335961694238a93d553d1d1e02ab264c923778c
   languageName: node
   linkType: hard
 
@@ -25156,19 +25136,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "jest-watcher@npm:28.1.3"
+"jest-watcher@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-watcher@npm:29.3.1"
   dependencies:
-    "@jest/test-result": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/test-result": ^29.3.1
+    "@jest/types": ^29.3.1
     "@types/node": "*"
     ansi-escapes: ^4.2.1
     chalk: ^4.0.0
-    emittery: ^0.10.2
-    jest-util: ^28.1.3
+    emittery: ^0.13.1
+    jest-util: ^29.3.1
     string-length: ^4.0.1
-  checksum: 8f6d674a4865e7df251f71544f1b51f06fd36b5a3a61f2ac81aeb81fa2a196be354fba51d0f97911c88f67cd254583b3a22ee124bf2c5b6ee2fadec27356c207
+  checksum: 60d189473486c73e9d540406a30189da5a3c67bfb0fb4ad4a83991c189135ef76d929ec99284ca5a505fe4ee9349ae3c99b54d2e00363e72837b46e77dec9642
   languageName: node
   linkType: hard
 
@@ -25216,7 +25196,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^28.0.2, jest-worker@npm:^28.1.3":
+"jest-worker@npm:^28.0.2":
   version: 28.1.3
   resolution: "jest-worker@npm:28.1.3"
   dependencies:
@@ -25239,6 +25219,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-worker@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "jest-worker@npm:29.3.1"
+  dependencies:
+    "@types/node": "*"
+    jest-util: ^29.3.1
+    merge-stream: ^2.0.0
+    supports-color: ^8.0.0
+  checksum: 38687fcbdc2b7ddc70bbb5dfc703ae095b46b3c7f206d62ecdf5f4d16e336178e217302138f3b906125576bb1cfe4cfe8d43681276fa5899d138ed9422099fb3
+  languageName: node
+  linkType: hard
+
 "jest@npm:27.5.1":
   version: 27.5.1
   resolution: "jest@npm:27.5.1"
@@ -25257,14 +25249,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest@npm:28.1.3":
-  version: 28.1.3
-  resolution: "jest@npm:28.1.3"
+"jest@npm:29.3.1":
+  version: 29.3.1
+  resolution: "jest@npm:29.3.1"
   dependencies:
-    "@jest/core": ^28.1.3
-    "@jest/types": ^28.1.3
+    "@jest/core": ^29.3.1
+    "@jest/types": ^29.3.1
     import-local: ^3.0.2
-    jest-cli: ^28.1.3
+    jest-cli: ^29.3.1
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
@@ -25272,7 +25264,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: b9dcb542eb7c16261c281cdc2bf37155dbb3f1205bae0b567f05051db362c85ddd4b765f126591efb88f6d298eb10336d0aa6c7d5373b4d53f918137a9a70182
+  checksum: 613f4ec657b14dd84c0056b2fef1468502927fd551bef0b19d4a91576a609678fb316c6a5b5fc6120dd30dd4ff4569070ffef3cb507db9bb0260b28ddaa18d7a
   languageName: node
   linkType: hard
 
@@ -25429,43 +25421,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^19.0.0":
-  version: 19.0.0
-  resolution: "jsdom@npm:19.0.0"
+"jsdom@npm:^20.0.0":
+  version: 20.0.2
+  resolution: "jsdom@npm:20.0.2"
   dependencies:
-    abab: ^2.0.5
-    acorn: ^8.5.0
-    acorn-globals: ^6.0.0
+    abab: ^2.0.6
+    acorn: ^8.8.0
+    acorn-globals: ^7.0.0
     cssom: ^0.5.0
     cssstyle: ^2.3.0
-    data-urls: ^3.0.1
-    decimal.js: ^10.3.1
+    data-urls: ^3.0.2
+    decimal.js: ^10.4.1
     domexception: ^4.0.0
     escodegen: ^2.0.0
     form-data: ^4.0.0
     html-encoding-sniffer: ^3.0.0
     http-proxy-agent: ^5.0.0
-    https-proxy-agent: ^5.0.0
+    https-proxy-agent: ^5.0.1
     is-potential-custom-element-name: ^1.0.1
-    nwsapi: ^2.2.0
-    parse5: 6.0.1
-    saxes: ^5.0.1
+    nwsapi: ^2.2.2
+    parse5: ^7.1.1
+    saxes: ^6.0.0
     symbol-tree: ^3.2.4
-    tough-cookie: ^4.0.0
-    w3c-hr-time: ^1.0.2
+    tough-cookie: ^4.1.2
     w3c-xmlserializer: ^3.0.0
     webidl-conversions: ^7.0.0
     whatwg-encoding: ^2.0.0
     whatwg-mimetype: ^3.0.0
-    whatwg-url: ^10.0.0
-    ws: ^8.2.3
+    whatwg-url: ^11.0.0
+    ws: ^8.9.0
     xml-name-validator: ^4.0.0
   peerDependencies:
     canvas: ^2.5.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 94b693bf4a394097dd96705550bb7b6cd3c8db3c5414e6e9c92a0995ed8b61067597da2f37fca6bed4b5a2f1ef33960ee759522156dccd0b306311988ea87cfb
+  checksum: 1912e73ecbc7cb1e458b63c4976a1f1dd40c1cdb9f91559cfeccb08c68ad1b9918c6260bd021559ecb1a7c233fae0d0c3fdcbd2ce82df597ef9373d67c8934c0
   languageName: node
   linkType: hard
 
@@ -28663,6 +28654,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nwsapi@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "nwsapi@npm:2.2.2"
+  checksum: 43769106292bc95f776756ca2f3513dab7b4d506a97c67baec32406447841a35f65f29c1f95ab5d42785210fd41668beed33ca16fa058780be43b101ad73e205
+  languageName: node
+  linkType: hard
+
 "nx@npm:14.8.2, nx@npm:>=14.6.1 < 16":
   version: 14.8.2
   resolution: "nx@npm:14.8.2"
@@ -29523,6 +29521,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "parse5@npm:7.1.1"
+  dependencies:
+    entities: ^4.4.0
+  checksum: 8f72fbfa6df83a3f29f58e1818f7bd46b47ff3e26d79c74e10b8fc7ef7ee76163f205113f1b2f6a5b8dc4e31e726f490444f04890cead6e974dbcbe8172b1321
+  languageName: node
+  linkType: hard
+
 "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
@@ -31089,15 +31096,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^28.0.0, pretty-format@npm:^28.1.3":
-  version: 28.1.3
-  resolution: "pretty-format@npm:28.1.3"
+"pretty-format@npm:^29.0.0, pretty-format@npm:^29.3.1":
+  version: 29.3.1
+  resolution: "pretty-format@npm:29.3.1"
   dependencies:
-    "@jest/schemas": ^28.1.3
-    ansi-regex: ^5.0.1
+    "@jest/schemas": ^29.0.0
     ansi-styles: ^5.0.0
     react-is: ^18.0.0
-  checksum: e69f857358a3e03d271252d7524bec758c35e44680287f36c1cb905187fbc82da9981a6eb07edfd8a03bc3cbeebfa6f5234c13a3d5b59f2bbdf9b4c4053e0a7f
+  checksum: 9917a0bb859cd7a24a343363f70d5222402c86d10eb45bcc2f77b23a4e67586257390e959061aec22762a782fe6bafb59bf34eb94527bc2e5d211afdb287eb4e
   languageName: node
   linkType: hard
 
@@ -31450,6 +31456,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  languageName: node
+  linkType: hard
+
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -34267,6 +34280,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"saxes@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "saxes@npm:6.0.0"
+  dependencies:
+    xmlchars: ^2.2.0
+  checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b
+  languageName: node
+  linkType: hard
+
 "scheduler@npm:^0.20.1, scheduler@npm:^0.20.2":
   version: 0.20.2
   resolution: "scheduler@npm:0.20.2"
@@ -36773,6 +36795,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "tough-cookie@npm:4.1.2"
+  dependencies:
+    psl: ^1.1.33
+    punycode: ^2.1.1
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: a7359e9a3e875121a84d6ba40cc184dec5784af84f67f3a56d1d2ae39b87c0e004e6ba7c7331f9622a7d2c88609032473488b28fe9f59a1fec115674589de39a
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:~2.5.0":
   version: 2.5.0
   resolution: "tough-cookie@npm:2.5.0"
@@ -36926,13 +36960,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:28.0.7":
-  version: 28.0.7
-  resolution: "ts-jest@npm:28.0.7"
+"ts-jest@npm:29.0.3":
+  version: 29.0.3
+  resolution: "ts-jest@npm:29.0.3"
   dependencies:
     bs-logger: 0.x
     fast-json-stable-stringify: 2.x
-    jest-util: ^28.0.0
+    jest-util: ^29.0.0
     json5: ^2.2.1
     lodash.memoize: 4.x
     make-error: 1.x
@@ -36940,9 +36974,9 @@ __metadata:
     yargs-parser: ^21.0.1
   peerDependencies:
     "@babel/core": ">=7.0.0-beta.0 <8"
-    "@jest/types": ^28.0.0
-    babel-jest: ^28.0.0
-    jest: ^28.0.0
+    "@jest/types": ^29.0.0
+    babel-jest: ^29.0.0
+    jest: ^29.0.0
     typescript: ">=4.3"
   peerDependenciesMeta:
     "@babel/core":
@@ -36955,7 +36989,7 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: be6ad6382e3b2e7b0c45d06616a4a02aeb6815bad2026fe8eeb4e0941205faa50ac3f5930adb7ba2fda5fea6a5739bfa507e2eac8764d2c729ddc8010681707a
+  checksum: 541e51776d367fa2279af47f75af94b03e0538f1839ea9983de0f4ad7f188002f6eb1fc72440651d96daa62d25a7bc679a129c14e6ef291277eea9346751d56b
   languageName: node
   linkType: hard
 
@@ -37773,6 +37807,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  languageName: node
+  linkType: hard
+
 "universalify@npm:^2.0.0":
   version: 2.0.0
   resolution: "universalify@npm:2.0.0"
@@ -37881,6 +37922,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: ^2.1.1
+    requires-port: ^1.0.0
+  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+  languageName: node
+  linkType: hard
+
 "use-isomorphic-layout-effect@npm:^1.1.2":
   version: 1.1.2
   resolution: "use-isomorphic-layout-effect@npm:1.1.2"
@@ -38822,16 +38873,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "whatwg-url@npm:10.0.0"
-  dependencies:
-    tr46: ^3.0.0
-    webidl-conversions: ^7.0.0
-  checksum: a21ec309c5cc743fe9414509408bedf65eaf0fb5c17ac66baa08ef12fce16da4dd30ce90abefbd5a716408301c58a73666dabfd5042cf4242992eb98b954f861
-  languageName: node
-  linkType: hard
-
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -39138,6 +39179,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.9.0":
+  version: 8.11.0
+  resolution: "ws@npm:8.11.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ^5.0.2
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 316b33aba32f317cd217df66dbfc5b281a2f09ff36815de222bc859e3424d83766d9eb2bd4d667de658b6ab7be151f258318fb1da812416b30be13103e5b5c67
+  languageName: node
+  linkType: hard
+
 "x-default-browser@npm:^0.4.0":
   version: 0.4.0
   resolution: "x-default-browser@npm:0.4.0"