Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync

2024-12-06 07:34:11 +03:00
commit a210e1ec99
@@ -2291,6 +2291,9 @@ exports[`better eslint`] = {
    "public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
+    "public/app/features/dashboard-scene/v2schema/test-helpers.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
    "public/app/features/dashboard/api/dashboard_api.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
@@ -1,3 +1,13 @@
+<!-- 8.5.27 START -->
+
+# 8.5.27 (2023-06-22)
+
+### Bug fixes
+
+- **Auth:** Fixed CVE-2023-3128. [#70576](https://github.com/grafana/grafana/issues/70576), [@zerok](https://github.com/zerok)
+
+<!-- 8.5.27 END -->
+
 <!-- 8.5.22 START -->

 # 8.5.22 (2023-03-22)
@@ -1,3 +1,557 @@
+<!-- 9.5.20 START -->
+
+# 9.5.20 (2024-06-21)
+
+<!-- 9.5.20 END -->
+<!-- 9.5.19 START -->
+
+# 9.5.19 (2024-05-13)
+
+### Features and enhancements
+
+- **Chore:** Upgrade go to 1.21.10. [#87478](https://github.com/grafana/grafana/issues/87478), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
+- **Chore:** Upgrade go to 1.21.10. (Enterprise)
+
+### Bug fixes
+
+- **Provisioning:** Look up provisioned folders by UID when possible. [#87504](https://github.com/grafana/grafana/issues/87504), [@DanCech](https://github.com/DanCech)
+
+<!-- 9.5.19 END -->
+<!-- 9.5.18 START -->
+
+# 9.5.18 (2024-03-25)
+
+### Bug fixes
+
+- **Snapshots:** Require delete within same org (backport). [#84762](https://github.com/grafana/grafana/issues/84762), [@ryantxu](https://github.com/ryantxu)
+
+<!-- 9.5.18 END -->
+<!-- 9.5.17 START -->
+
+# 9.5.17 (2024-03-05)
+
+### Features and enhancements
+
+- Bump go-git to v5.11.0. [#83711](https://github.com/grafana/grafana/issues/83711), [@papagian](https://github.com/papagian)
+- **Plugins:** Bump otelgrpc instrumentation to 0.47.0. [#83674](https://github.com/grafana/grafana/issues/83674), [@wbrowne](https://github.com/wbrowne)
+
+### Bug fixes
+
+- **Auth:** Fix email verification bypass when using basic authentication. [#83494](https://github.com/grafana/grafana/issues/83494)
+
+<!-- 9.5.17 END -->
+<!-- 9.5.16 START -->
+
+# 9.5.16 (2024-01-29)
+
+### Bug fixes
+
+- **Annotations:** Split cleanup into separate queries and deletes to avoid deadlocks on MySQL. [#80682](https://github.com/grafana/grafana/issues/80682), [@alexweav](https://github.com/alexweav)
+
+<!-- 9.5.16 END -->
+<!-- 9.5.15 START -->
+
+# 9.5.15 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79209](https://github.com/grafana/grafana/issues/79209), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set to 1 by default. [#79109](https://github.com/grafana/grafana/issues/79109), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+
+<!-- 9.5.15 END -->
+<!-- 9.5.14 START -->
+
+# 9.5.14 (2023-11-13)
+
+### Bug fixes
+
+- **Alerting:** Fix state manager to not keep datasource_uid and ref_id labels in state after Error. [#77391](https://github.com/grafana/grafana/issues/77391), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Transformations:** Config overrides being lost when config from query transform is applied. [#75347](https://github.com/grafana/grafana/issues/75347), [@IbrahimCSAE](https://github.com/IbrahimCSAE)
+- **LDAP:** FIX Enable users on successful login . [#75192](https://github.com/grafana/grafana/issues/75192), [@gamab](https://github.com/gamab)
+- **Auditing and UsageInsights:** FIX Loki configuration to use proxy env variables. (Enterprise)
+
+<!-- 9.5.14 END -->
+<!-- 9.5.13 START -->
+
+# 9.5.13 (2023-10-11)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.10. [#76367](https://github.com/grafana/grafana/issues/76367), [@zerok](https://github.com/zerok)
+- **Licensing:** Updated grpc plugin factory newPlugin signature. (Enterprise)
+
+### Bug fixes
+
+- **BrowseDashboards:** Only remember the most recent expanded folder. [#74817](https://github.com/grafana/grafana/issues/74817), [@joshhunt](https://github.com/joshhunt)
+- **Licensing:** Pass func to update env variables when starting plugin. [#74681](https://github.com/grafana/grafana/issues/74681), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **RBAC:** Chore fix hasPermissionInOrg. (Enterprise)
+
+<!-- 9.5.13 END -->
+<!-- 9.5.12 START -->
+
+# 9.5.12 (2023-09-29)
+
+### Features and enhancements
+
+- **Azure:** Add support for Workload Identity authentication. [#75730](https://github.com/grafana/grafana/issues/75730), [@aangelisc](https://github.com/aangelisc)
+
+<!-- 9.5.12 END -->
+<!-- 9.5.10 START -->
+
+# 9.5.10 (2023-09-18)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Alpine base image to 3.18.3. [#74995](https://github.com/grafana/grafana/issues/74995), [@zerok](https://github.com/zerok)
+- **Chore:** Upgrade Go to 1.20.8. [#74982](https://github.com/grafana/grafana/issues/74982), [@zerok](https://github.com/zerok)
+
+<!-- 9.5.10 END -->
+<!-- 9.5.9 START -->
+
+# 9.5.9 (2023-09-05)
+
+### Features and enhancements
+
+- **SSE:** DSNode to update result with names to make each value identifiable by labels (only Graphite and TestData). [#73642](https://github.com/grafana/grafana/issues/73642), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Prometheus:** Add present_over_time syntax highlighting. [#72367](https://github.com/grafana/grafana/issues/72367), [@arnaudlemaignen](https://github.com/arnaudlemaignen)
+- **Alerting:** Improve performance of matching captures. [#71998](https://github.com/grafana/grafana/issues/71998), [@grobinson-grafana](https://github.com/grobinson-grafana)
+
+### Bug fixes
+
+- **LDAP:** Fix user disabling. [#74096](https://github.com/grafana/grafana/issues/74096), [@gamab](https://github.com/gamab)
+
+<!-- 9.5.9 END -->
+<!-- 9.5.8 START -->
+
+# 9.5.8 (2023-08-16)
+
+### Features and enhancements
+
+- **GenericOAuth:** Set sub as auth id. [#73223](https://github.com/grafana/grafana/issues/73223), [@kalleep](https://github.com/kalleep)
+
+### Bug fixes
+
+- **DataSourceProxy:** Fix url validation error handling. [#73320](https://github.com/grafana/grafana/issues/73320), [@ricci2511](https://github.com/ricci2511)
+
+<!-- 9.5.8 END -->
+<!-- 9.5.7 START -->
+
+# 9.5.7 (2023-07-20)
+
+### Features and enhancements
+
+- **Alerting:** Sort NumberCaptureValues in EvaluationString. [#71930](https://github.com/grafana/grafana/issues/71930), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** No longer silence paused alerts during legacy migration. [#71765](https://github.com/grafana/grafana/issues/71765), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Chore:** Upgrade Go to 1.20.6. [#71446](https://github.com/grafana/grafana/issues/71446), [@sakjur](https://github.com/sakjur)
+- **Alerting:** Remove and revert flag alertingBigTransactions. [#70910](https://github.com/grafana/grafana/issues/70910), [@santihernandezc](https://github.com/santihernandezc)
+- **Alerting:** Migrate unknown NoData\Error settings to the default. [#70905](https://github.com/grafana/grafana/issues/70905), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Tempo:** Escape regex-sensitive characters in span name before building promql query. [#68318](https://github.com/grafana/grafana/issues/68318), [@joey-grafana](https://github.com/joey-grafana)
+- **Alerting:** Update grafana/alerting to ce9fba9. [#67685](https://github.com/grafana/grafana/issues/67685), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Chore:** Upgrade Go to 1.20.6. (Enterprise)
+
+### Bug fixes
+
+- **Plugins:** Only configure plugin proxy transport once. [#71741](https://github.com/grafana/grafana/issues/71741), [@wbrowne](https://github.com/wbrowne)
+- **Alerting:** Fix unique violation when updating rule group with title chains/cycles. [#71330](https://github.com/grafana/grafana/issues/71330), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Fix:** Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug. [#70961](https://github.com/grafana/grafana/issues/70961), [@yangkb09](https://github.com/yangkb09)
+- **Alerting:** Convert 'Both' type Prometheus queries to 'Range' in migration. [#70907](https://github.com/grafana/grafana/issues/70907), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Support newer http_config struct. [#69718](https://github.com/grafana/grafana/issues/69718), [@gillesdemey](https://github.com/gillesdemey)
+- **InfluxDB:** Interpolate retention policies. [#69299](https://github.com/grafana/grafana/issues/69299), [@itsmylife](https://github.com/itsmylife)
+- **StatusHistory:** Fix rendering of value-mapped null. [#69107](https://github.com/grafana/grafana/issues/69107), [@leeoniya](https://github.com/leeoniya)
+- **Alerting:** Fix provenance guard checks for Alertmanager configuration to not cause panic when compared nested objects. [#69092](https://github.com/grafana/grafana/issues/69092), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **AnonymousAuth:** Fix concurrent read-write crash. [#68802](https://github.com/grafana/grafana/issues/68802), [@Jguer](https://github.com/Jguer)
+- **AzureMonitor:** Ensure legacy properties containing template variables are correctly migrated. [#68790](https://github.com/grafana/grafana/issues/68790), [@aangelisc](https://github.com/aangelisc)
+- **Explore:** Remove data source onboarding page. [#68643](https://github.com/grafana/grafana/issues/68643), [@harisrozajac](https://github.com/harisrozajac)
+- **Dashboard:** Re-align Save form. [#68625](https://github.com/grafana/grafana/issues/68625), [@polibb](https://github.com/polibb)
+- **Azure Monitor:** Fix bug that did not show alert rule preview. [#68582](https://github.com/grafana/grafana/issues/68582), [@alyssabull](https://github.com/alyssabull)
+- **Histogram:** Respect min/max panel settings for x-axis. [#68244](https://github.com/grafana/grafana/issues/68244), [@leeoniya](https://github.com/leeoniya)
+- **Heatmap:** Fix color rendering for value ranges < 1. [#68163](https://github.com/grafana/grafana/issues/68163), [@leeoniya](https://github.com/leeoniya)
+- **Heatmap:** Handle unsorted timestamps in calculate mode. [#68150](https://github.com/grafana/grafana/issues/68150), [@leeoniya](https://github.com/leeoniya)
+- **Google Cloud Monitor:** Fix mem usage for dropdown. [#67949](https://github.com/grafana/grafana/issues/67949), [@asimpson](https://github.com/asimpson)
+- **AzureMonitor:** Fix logs query multi-resource and timespan values. [#67932](https://github.com/grafana/grafana/issues/67932), [@aangelisc](https://github.com/aangelisc)
+- **Utils:** Reimplement util.GetRandomString to avoid modulo bias. [#66970](https://github.com/grafana/grafana/issues/66970), [@DanCech](https://github.com/DanCech)
+- **License:** Enable FeatureUserLimit for all products. (Enterprise)
+- **Auth:** Remove ldap init sync. (Enterprise)
+
+<!-- 9.5.7 END -->
+<!-- 9.5.6 START -->
+
+# 9.5.6 (2023-07-11)
+
+### Bug fixes
+
+- **Dashboard:** Fix library panels in collapsed rows not getting updated. [#66640](https://github.com/grafana/grafana/issues/66640), [@VictorColomb](https://github.com/VictorColomb)
+- **Auth:** Add and document option for enabling email lookup. [@vtorosyan](https://github.com/vtorosyan)
+
+<!-- 9.5.6 END -->
+<!-- 9.5.5 START -->
+
+# 9.5.5 (2023-06-22)
+
+### Bug fixes
+
+- **Auth:** Fixed CVE-2023-3128. [#70580](https://github.com/grafana/grafana/issues/70580), [@zerok](https://github.com/zerok)
+- **Auth:** Show invite button if disable login form is set to false. [#70154](https://github.com/grafana/grafana/issues/70154), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Azure:** Fix Kusto auto-completion for Azure datasources (#69685). [#69694](https://github.com/grafana/grafana/issues/69694), [@aangelisc](https://github.com/aangelisc)
+- **RBAC:** Remove legacy AC editor and admin role on new dashboard route. [#68776](https://github.com/grafana/grafana/issues/68776), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Revert:** Allow editors to access GET /datasources. [#68654](https://github.com/grafana/grafana/issues/68654), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Settings:** Add ability to override `skip_org_role_sync` with Env variables. [#68375](https://github.com/grafana/grafana/issues/68375), [@eleijonmarck](https://github.com/eleijonmarck)
+
+<!-- 9.5.5 END -->
+<!-- 9.5.3 START -->
+
+# 9.5.3 (2023-06-06)
+
+### Bug fixes
+
+- **Query:** Prevent crash while executing concurrent mixed queries
+- **Alerting:** Require alert.notifications:write permissions to test receivers and templates
+
+<!-- 9.5.3 END -->
+<!-- 9.5.2 START -->
+
+# 9.5.2 (2023-05-03)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.4. [#67757](https://github.com/grafana/grafana/issues/67757), [@papagian](https://github.com/papagian)
+- **Alerting:** Scheduler use rule fingerprint instead of version. [#67516](https://github.com/grafana/grafana/issues/67516), [@grafanabot](https://github.com/grafanabot)
+
+### Bug fixes
+
+- **TimeSeries:** Fix leading null-fill for missing intervals. [#67571](https://github.com/grafana/grafana/issues/67571), [@leeoniya](https://github.com/leeoniya)
+- **Dashboard:** Revert fixed header shown on mobile devices in the new panel header. [#67514](https://github.com/grafana/grafana/issues/67514), [@grafanabot](https://github.com/grafanabot)
+- **PostgreSQL:** Fix tls certificate issue by downgrading lib/pq. [#67393](https://github.com/grafana/grafana/issues/67393), [@grafanabot](https://github.com/grafanabot)
+- **Provisioning:** Fix provisioning issues with legacy alerting and data source permissions. [#67377](https://github.com/grafana/grafana/issues/67377), [@grafanabot](https://github.com/grafanabot)
+- **Alerting:** Fix misleading status code in provisioning API. [#67358](https://github.com/grafana/grafana/issues/67358), [@grafanabot](https://github.com/grafanabot)
+- **Explore:** Update table min height (#67321). [#67332](https://github.com/grafana/grafana/issues/67332), [@adrapereira](https://github.com/adrapereira)
+- **DataLinks:** Encoded URL fixed. [#67291](https://github.com/grafana/grafana/issues/67291), [@juanicabanas](https://github.com/juanicabanas)
+- **Loki:** Fix log samples using `instant` queries (#67271). [#67275](https://github.com/grafana/grafana/issues/67275), [@svennergr](https://github.com/svennergr)
+- **Panel Header Fix:** Implement new Panel Header on Angular Panels . [#67228](https://github.com/grafana/grafana/issues/67228), [@grafanabot](https://github.com/grafanabot)
+- **Azure Monitor:** Fix bug that was not showing resources for certain locations. [#67216](https://github.com/grafana/grafana/issues/67216), [@grafanabot](https://github.com/grafanabot)
+- **Alerting:** Fix panic when reparenting receivers to groups following an attempted rename via Provisioning. [#67175](https://github.com/grafana/grafana/issues/67175), [@grafanabot](https://github.com/grafanabot)
+- **Cloudwatch Logs:** Clarify Cloudwatch Logs Limits. [#67101](https://github.com/grafana/grafana/issues/67101), [@grafanabot](https://github.com/grafanabot)
+- **SAML:** Fix IdP metadata caching so that invalid metadata doesn't get cached. (Enterprise)
+
+<!-- 9.5.2 END -->
+<!-- 9.5.1 START -->
+
+# 9.5.1 (2023-04-26)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.3. [#66831](https://github.com/grafana/grafana/issues/66831), [@sakjur](https://github.com/sakjur)
+
+<!-- 9.5.1 END -->
+<!-- 9.5.0 START -->
+
+# 9.5.0 (2023-04-04)
+
+### Features and enhancements
+
+- **API keys:** Add deprecation to api keys. [#65948](https://github.com/grafana/grafana/pull/65948), [@eleijonmarck](https://github.com/eleijonmarck)
+- **API:** Enable serving Swagger UI by default and add docs and guidelines. [#63489](https://github.com/grafana/grafana/pull/63489), [@papagian](https://github.com/papagian)
+- **API:** Permit Cache-Control (browser caching) for datasource resources. [#62033](https://github.com/grafana/grafana/pull/62033), [@kylebrandt](https://github.com/kylebrandt)
+- **Accessibility:** Make row actions keyboard accessible. [#63367](https://github.com/grafana/grafana/pull/63367), [@ashharrison90](https://github.com/ashharrison90)
+- **Admin/Plugins:** Set category filter in connections link. [#64393](https://github.com/grafana/grafana/pull/64393), [@mikkancso](https://github.com/mikkancso)
+- **Alerting:** Add CustomDetails field in PagerDuty contact point. [#64860](https://github.com/grafana/grafana/pull/64860), [@santihernandezc](https://github.com/santihernandezc)
+- **Alerting:** Add dashboard and panel links to rule and instance annotations. [#63243](https://github.com/grafana/grafana/pull/63243), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Add filter and remove funcs for custom labels and annotations. [#63437](https://github.com/grafana/grafana/pull/63437), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Add fuzzy search to alert list view. [#63931](https://github.com/grafana/grafana/pull/63931), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Add metrics for active receiver and integrations. [#64050](https://github.com/grafana/grafana/pull/64050), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Better printing of labels. [#63348](https://github.com/grafana/grafana/pull/63348), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Create new state history "fanout" backend that dispatches to multiple other backends at once. [#64774](https://github.com/grafana/grafana/pull/64774), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Enable preview for recording rules. [#63260](https://github.com/grafana/grafana/pull/63260), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Fetch all applied alerting configurations. [#65728](https://github.com/grafana/grafana/pull/65728), [@santihernandezc](https://github.com/santihernandezc)
+- **Alerting:** Introduce proper feature toggles for common state history backend combinations. [#65497](https://github.com/grafana/grafana/pull/65497), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Make time range query parameters not required when querying Loki. [#62985](https://github.com/grafana/grafana/pull/62985), [@alexweav](https://github.com/alexweav)
+- **Alerting:** New notification policies view. [#61952](https://github.com/grafana/grafana/pull/61952), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** No longer index state history log streams by instance labels. [#65474](https://github.com/grafana/grafana/pull/65474), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Respect "For" Duration for NoData alerts. [#65574](https://github.com/grafana/grafana/pull/65574), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Support filtering rules by multiple datasources. [#64355](https://github.com/grafana/grafana/pull/64355), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Switch to snappy-compressed-protobuf for outgoing push requests to Loki. [#65077](https://github.com/grafana/grafana/pull/65077), [@alexweav](https://github.com/alexweav)
+- **Angular:** Prevent angular from loading when disabled. [#65755](https://github.com/grafana/grafana/pull/65755), [@torkelo](https://github.com/torkelo)
+- **Auth:** Add Generic oauth skip org role sync setting. [#62418](https://github.com/grafana/grafana/pull/62418), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Auth:** Add feature flag to move token rotation to client. [#65060](https://github.com/grafana/grafana/pull/65060), [@kalleep](https://github.com/kalleep)
+- **Auth:** Show user sync external Authentication status. [#62721](https://github.com/grafana/grafana/pull/62721), [@lokeswaran-aj](https://github.com/lokeswaran-aj)
+- **Backend:** Use sdk version 0.148.0. [#62822](https://github.com/grafana/grafana/pull/62822), [@kylebrandt](https://github.com/kylebrandt)
+- **Chore:** Add stat for remote cache config. [#64276](https://github.com/grafana/grafana/pull/64276), [@DanCech](https://github.com/DanCech)
+- **Chore:** Replace short UID generation with more standard UUIDs. [#62731](https://github.com/grafana/grafana/pull/62731), [@ryantxu](https://github.com/ryantxu)
+- **Chore:** Use DOMPurify to sanitize strings rather than js-xss. [#62787](https://github.com/grafana/grafana/pull/62787), [@KristianGrafana](https://github.com/KristianGrafana)
+- **CloudMonitoring:** Add possibility to use path for private key. [#65252](https://github.com/grafana/grafana/pull/65252), [@zoltanbedi](https://github.com/zoltanbedi)
+- **CloudWatch Logs:** Update default timeout to 30m. [#63155](https://github.com/grafana/grafana/pull/63155), [@ashnove](https://github.com/ashnove)
+- **CloudWatch:** Add AWS/IotSiteWise namespace and metrics. [#63534](https://github.com/grafana/grafana/pull/63534), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Add account support to variable queries. [#63822](https://github.com/grafana/grafana/pull/63822), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Make deeplinks work for us-gov and china regions. [#64080](https://github.com/grafana/grafana/pull/64080), [@iwysiu](https://github.com/iwysiu)
+- **Cloudwatch:** Add MeteredIOBytes metric for EFS. [#64793](https://github.com/grafana/grafana/pull/64793), [@xlagg5](https://github.com/xlagg5)
+- **Command Palette:** Display dashboard location. [#63807](https://github.com/grafana/grafana/pull/63807), [@ashharrison90](https://github.com/ashharrison90)
+- **Command palette:** Enable folder searching. [#62663](https://github.com/grafana/grafana/pull/62663), [@ashharrison90](https://github.com/ashharrison90)
+- **Connections:** Turn on feature toggle by default. [#64885](https://github.com/grafana/grafana/pull/64885), [@mikkancso](https://github.com/mikkancso)
+- **Cookies:** Provide a mechanism for per user control over cookies. [#61566](https://github.com/grafana/grafana/pull/61566), [@sakjur](https://github.com/sakjur)
+- **Dashboard Datasource:** Update Query List & Improve UX. [#64429](https://github.com/grafana/grafana/pull/64429), [@codeincarnate](https://github.com/codeincarnate)
+- **Dashboard:** Add a feature that creates a table panel when a spreadsheet file is dropped on the dashboard. [#62688](https://github.com/grafana/grafana/pull/62688), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Dashboard:** Add new visualization/row/library panel/pasted panel is now a dropdown menu. [#65361](https://github.com/grafana/grafana/pull/65361), [@polibb](https://github.com/polibb)
+- **Dashboard:** Add value format for requests per minute. [#62258](https://github.com/grafana/grafana/pull/62258), [@dwradcliffe](https://github.com/dwradcliffe)
+- **Dashboard:** Empty/No Panels dashboard with a new design. [#65161](https://github.com/grafana/grafana/pull/65161), [@polibb](https://github.com/polibb)
+- **Dashboard:** When dashboard is not found show message instead of empty page. [#65508](https://github.com/grafana/grafana/pull/65508), [@polibb](https://github.com/polibb)
+- **Dashboards:** Enable feature flag `newPanelChromeUI` by default. [#65593](https://github.com/grafana/grafana/pull/65593), [@axelavargas](https://github.com/axelavargas)
+- **Dataplane:** Support timeSeriesLong without transform. [#62732](https://github.com/grafana/grafana/pull/62732), [@bohandley](https://github.com/bohandley)
+- **Datasources:** Add user_agent header customization for outgoing HTTP requests. [#63769](https://github.com/grafana/grafana/pull/63769), [@zhichli](https://github.com/zhichli)
+- **Datasources:** Use getDefaultQuery in annotations editors. [#61870](https://github.com/grafana/grafana/pull/61870), [@idastambuk](https://github.com/idastambuk)
+- **Docs:** Add documentation on how to debug backend plugins. [#64814](https://github.com/grafana/grafana/pull/64814), [@xnyo](https://github.com/xnyo)
+- **Docs:** Deprecate dashboard previews. [#65698](https://github.com/grafana/grafana/pull/65698), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
+- **Elasticsearch:** Detect Elasticsearch version. [#63341](https://github.com/grafana/grafana/pull/63341), [@gabor](https://github.com/gabor)
+- **Elasticsearch:** Run Explore queries trough data source backend. [#65339](https://github.com/grafana/grafana/pull/65339), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Explore:** Add range option to internal data links. [#64063](https://github.com/grafana/grafana/pull/64063), [@connorlindsey](https://github.com/connorlindsey)
+- **Explore:** Add transformations to correlation data links. [#61799](https://github.com/grafana/grafana/pull/61799), [@gelicia](https://github.com/gelicia)
+- **Explore:** Support mixed data sources for supplementary query. [#63036](https://github.com/grafana/grafana/pull/63036), [@ifrost](https://github.com/ifrost)
+- **Extensions:** Expose an enum for available placements. [#64586](https://github.com/grafana/grafana/pull/64586), [@leventebalogh](https://github.com/leventebalogh)
+- **Feat:** Changing link destination for get more plugins. [#63517](https://github.com/grafana/grafana/pull/63517), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Feat:** Linking to plugin details page rather than externally for new datasources. [#63499](https://github.com/grafana/grafana/pull/63499), [@tolzhabayev](https://github.com/tolzhabayev)
+- **FieldMatchers:** Add match by value (reducer). [#64477](https://github.com/grafana/grafana/pull/64477), [@leeoniya](https://github.com/leeoniya)
+- **Flame graph:** Add context menu. [#62705](https://github.com/grafana/grafana/pull/62705), [@joey-grafana](https://github.com/joey-grafana)
+- **Flame graph:** Add metadata above flame graph. [#61921](https://github.com/grafana/grafana/pull/61921), [@joey-grafana](https://github.com/joey-grafana)
+- **Geomap:** Improve tooltip url for photos layer. [#63487](https://github.com/grafana/grafana/pull/63487), [@adela-almasan](https://github.com/adela-almasan)
+- **Geomap:** Release night / day layer. [#63435](https://github.com/grafana/grafana/pull/63435), [@adela-almasan](https://github.com/adela-almasan)
+- **InfluxDB:** Move database information into jsondata. [#62308](https://github.com/grafana/grafana/pull/62308), [@itsmylife](https://github.com/itsmylife)
+- **Jaeger and Zipkin:** Config & docs upgrade. [#64250](https://github.com/grafana/grafana/pull/64250), [@joey-grafana](https://github.com/joey-grafana)
+- **LDAP:** Allow setting minimum TLS version and accepted ciphers. [#63646](https://github.com/grafana/grafana/pull/63646), [@Jguer](https://github.com/Jguer)
+- **Licensing:** Allow server admin user to log in even if the active user limit is reached. (Enterprise)
+- **Live:** Remove (alpha) ability to configure live pipelines. [#65138](https://github.com/grafana/grafana/pull/65138), [@ryantxu](https://github.com/ryantxu)
+- **Logger:** Add feature toggle for errors in HTTP request logs. [#64425](https://github.com/grafana/grafana/pull/64425), [@sakjur](https://github.com/sakjur)
+- **Login:** Allow custom name and icon for social providers. [#63297](https://github.com/grafana/grafana/pull/63297), [@jkroepke](https://github.com/jkroepke)
+- **Logs Panel:** Refactor style generation to improve rendering performance. [#62599](https://github.com/grafana/grafana/pull/62599), [@matyax](https://github.com/matyax)
+- **Logs:** Add millisecond to timestamp in log line. [#64372](https://github.com/grafana/grafana/pull/64372), [@svennergr](https://github.com/svennergr)
+- **Logs:** Rename dedup to deduplicate. [#62944](https://github.com/grafana/grafana/pull/62944), [@gwdawson](https://github.com/gwdawson)
+- **Loki Query Editor:** Make Monaco the default editor. [#62247](https://github.com/grafana/grafana/pull/62247), [@matyax](https://github.com/matyax)
+- **Loki:** Add `unpack` query builder hint. [#65608](https://github.com/grafana/grafana/pull/65608), [@svennergr](https://github.com/svennergr)
+- **Loki:** Add descriptions to query builder operations. [#64046](https://github.com/grafana/grafana/pull/64046), [@gwdawson](https://github.com/gwdawson)
+- **Loki:** Add placeholder to the loki query editor. [#62773](https://github.com/grafana/grafana/pull/62773), [@gwdawson](https://github.com/gwdawson)
+- **Loki:** Always fetch for new label keys in the QueryBuilder. [#64597](https://github.com/grafana/grafana/pull/64597), [@svennergr](https://github.com/svennergr)
+- **Loki:** Display error with label filter conflicts. [#63109](https://github.com/grafana/grafana/pull/63109), [@gwdawson](https://github.com/gwdawson)
+- **Loki:** Improve the display of loki query stats. [#63623](https://github.com/grafana/grafana/pull/63623), [@gwdawson](https://github.com/gwdawson)
+- **MSSQL/Postgres:** List views in table dropdown as well. [#62867](https://github.com/grafana/grafana/pull/62867), [@zoltanbedi](https://github.com/zoltanbedi)
+- **MSSQL:** Update forked go-mssqldb dependency. [#65658](https://github.com/grafana/grafana/pull/65658), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
+- **Metrics:** Update comment to mention folders instead of dashboards. [#63312](https://github.com/grafana/grafana/pull/63312), [@monteiro-renato](https://github.com/monteiro-renato)
+- **Navigation:** Enable new navigation by default. [#65335](https://github.com/grafana/grafana/pull/65335), [@ashharrison90](https://github.com/ashharrison90)
+- **NodeGraph:** Support icons for nodes. [#60989](https://github.com/grafana/grafana/pull/60989), [@aocenas](https://github.com/aocenas)
+- **Notifications:** Enable display of trace ID by default. [#64884](https://github.com/grafana/grafana/pull/64884), [@ashharrison90](https://github.com/ashharrison90)
+- **Packaging:** Start Grafana service after InfluxDB. [#64090](https://github.com/grafana/grafana/pull/64090), [@MichaIng](https://github.com/MichaIng)
+- **Panel Header:** Add CancelQuery option to panel header. [#64796](https://github.com/grafana/grafana/pull/64796), [@axelavargas](https://github.com/axelavargas)
+- **Panel:** Show multiple errors info in the inspector. [#64340](https://github.com/grafana/grafana/pull/64340), [@andresmgot](https://github.com/andresmgot)
+- **PanelChrome:** Add option to show actions on the right side (actions = leftItems). [#65762](https://github.com/grafana/grafana/pull/65762), [@torkelo](https://github.com/torkelo)
+- **Phlare:** Allow variables in labelSelector (in query). [#64324](https://github.com/grafana/grafana/pull/64324), [@joey-grafana](https://github.com/joey-grafana)
+- **Plugin:** Skip preloading disabled app plugins. [#63083](https://github.com/grafana/grafana/pull/63083), [@mckn](https://github.com/mckn)
+- **Plugins:** Add optional logger for plugin requests sent to backend plugins. [#62981](https://github.com/grafana/grafana/pull/62981), [@bergquist](https://github.com/bergquist)
+- **Plugins:** Extend panel menu with commands from plugins. [#63802](https://github.com/grafana/grafana/pull/63802), [@mckn](https://github.com/mckn)
+- **Plugins:** Extend panel menu with links from plugins. [#63089](https://github.com/grafana/grafana/pull/63089), [@jackw](https://github.com/jackw)
+- **Plugins:** Improve instrumentation by adding metrics and tracing. [#61035](https://github.com/grafana/grafana/pull/61035), [@xnyo](https://github.com/xnyo)
+- **Plugins:** Support for distributed tracing in backend plugins SDK. [#63714](https://github.com/grafana/grafana/pull/63714), [@xnyo](https://github.com/xnyo)
+- **Plugins:** Support for link extensions. [#61663](https://github.com/grafana/grafana/pull/61663), [@mckn](https://github.com/mckn)
+- **Profiling:** Enable flame graph & Phlare/Parca data sources for all users. [#63488](https://github.com/grafana/grafana/pull/63488), [@joey-grafana](https://github.com/joey-grafana)
+- **Prometheus Datasource:** Improve Prom query variable editor. [#58292](https://github.com/grafana/grafana/pull/58292), [@bohandley](https://github.com/bohandley)
+- **Prometheus Metrics:** Add missing stat_total_teams metric. [#65133](https://github.com/grafana/grafana/pull/65133), [@gamab](https://github.com/gamab)
+- **Prometheus/Loki:** Run query explicitly instead of onblur in panel edit. [#64815](https://github.com/grafana/grafana/pull/64815), [@torkelo](https://github.com/torkelo)
+- **Prometheus:** Browser resource caching. [#60711](https://github.com/grafana/grafana/pull/60711), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Prometheus:** Improve prometheus query variable editor. [#63529](https://github.com/grafana/grafana/pull/63529), [@bohandley](https://github.com/bohandley)
+- **Prometheus:** Use $\_\_rate_interval for rate queries generated by metric browser. [#65386](https://github.com/grafana/grafana/pull/65386), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Pubdash:** Email sharing handle dashboard deleted. [#64247](https://github.com/grafana/grafana/pull/64247), [@owensmallwood](https://github.com/owensmallwood)
+- **Pubdash:** Email sharing handle dashboard deleted. (Enterprise)
+- **PublicDashboards:** Backfills share column with default value. [#63407](https://github.com/grafana/grafana/pull/63407), [@owensmallwood](https://github.com/owensmallwood)
+- **PublicDashboards:** Configuration modal redesign. [#63211](https://github.com/grafana/grafana/pull/63211), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Email sharing. [#63762](https://github.com/grafana/grafana/pull/63762), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Email sharing. (Enterprise)
+- **PublicDashboards:** Enable creation when dashboard has template variables. [#64560](https://github.com/grafana/grafana/pull/64560), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Paused or deleted public dashboard screen. [#63970](https://github.com/grafana/grafana/pull/63970), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Viewer can request and claim magic link. (Enterprise)
+- **QueryHistory:** Improve handling of mixed datasource entries. [#62214](https://github.com/grafana/grafana/pull/62214), [@Elfo404](https://github.com/Elfo404)
+- **Rendering:** Experimental support to use JWTs as auth method. [#60841](https://github.com/grafana/grafana/pull/60841), [@joanlopez](https://github.com/joanlopez)
+- **Reports:** Improve the UI for the new navigation. (Enterprise)
+- **SQL Datasources:** Add back help content. [#65383](https://github.com/grafana/grafana/pull/65383), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Schema:** Remove exclusion for timeseries and update imports. [#65242](https://github.com/grafana/grafana/pull/65242), [@ryantxu](https://github.com/ryantxu)
+- **Search:** Improvements for starred dashboard search. [#64758](https://github.com/grafana/grafana/pull/64758), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Select:** Show icon in the grafana/ui Select component. [#63827](https://github.com/grafana/grafana/pull/63827), [@ryantxu](https://github.com/ryantxu)
+- **Service accounts:** Creation logic simplification. [#63884](https://github.com/grafana/grafana/pull/63884), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Service accounts:** Remove Add API keys buttons and remove one state of migrating for API keys tab. [#63411](https://github.com/grafana/grafana/pull/63411), [@eleijonmarck](https://github.com/eleijonmarck)
+- **SplitOpen:** Update API to accept multiple queries. [#62245](https://github.com/grafana/grafana/pull/62245), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Stat Panel:** Add an option for a non-gradient/solid background. [#65052](https://github.com/grafana/grafana/pull/65052), [@baldm0mma](https://github.com/baldm0mma)
+- **Stat:** Add ability to remove default single-color background gradient. [#64353](https://github.com/grafana/grafana/pull/64353), [@baldm0mma](https://github.com/baldm0mma)
+- **SupportBundles:** Add OAuth bundle collectors. [#64810](https://github.com/grafana/grafana/pull/64810), [@Jguer](https://github.com/Jguer)
+- **Table Panel:** Add ability to use text color for value or hide value in gauge cell. [#61477](https://github.com/grafana/grafana/pull/61477), [@torkelo](https://github.com/torkelo)
+- **Table:** Introduce sparkline cell type. [#63182](https://github.com/grafana/grafana/pull/63182), [@domasx2](https://github.com/domasx2)
+- **Tempo:** Config and doc updates. [#64017](https://github.com/grafana/grafana/pull/64017), [@joey-grafana](https://github.com/joey-grafana)
+- **Tempo:** Update service graph view and docs. [#64875](https://github.com/grafana/grafana/pull/64875), [@joey-grafana](https://github.com/joey-grafana)
+- **TraceView:** Add key and url escaping of json tag values. [#64331](https://github.com/grafana/grafana/pull/64331), [@aocenas](https://github.com/aocenas)
+- **TraceView:** Reworked header. [#63105](https://github.com/grafana/grafana/pull/63105), [@joey-grafana](https://github.com/joey-grafana)
+- **Tracing:** Add more detail to HTTP Outgoing Request. [#64757](https://github.com/grafana/grafana/pull/64757), [@bboreham](https://github.com/bboreham)
+- **Tracing:** Docs and config improvements for Tempo/Jaeger/Zipkin. [#65255](https://github.com/grafana/grafana/pull/65255), [@joey-grafana](https://github.com/joey-grafana)
+- **Tracing:** Support multiple OTel propagators. [#61199](https://github.com/grafana/grafana/pull/61199), [@hairyhenderson](https://github.com/hairyhenderson)
+- **Transformations:** Support time format when converting time to strings. [#63826](https://github.com/grafana/grafana/pull/63826), [@ryantxu](https://github.com/ryantxu)
+- **Transformers:** Support adding the row index using calculate field transformer. [#65148](https://github.com/grafana/grafana/pull/65148), [@ryantxu](https://github.com/ryantxu)
+- **Units:** Format currency with negative before the symbol. [#65152](https://github.com/grafana/grafana/pull/65152), [@ryantxu](https://github.com/ryantxu)
+
+### Bug fixes
+
+- **API:** Fix "Updated by" Column in dashboard versions table. [#65351](https://github.com/grafana/grafana/pull/65351), [@papagian](https://github.com/papagian)
+- **AccessControl:** Allow editors to access GET /api/datasources. [#66343](https://github.com/grafana/grafana/pull/66343), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alerting:** Add "backend" label to state history writes metrics. [#65395](https://github.com/grafana/grafana/pull/65395), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Add alert instance labels to Loki log lines in addition to stream labels. [#65403](https://github.com/grafana/grafana/pull/65403), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Elide requests to Loki if nothing should be recorded. [#65011](https://github.com/grafana/grafana/pull/65011), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix DatasourceUID and RefID missing for DatasourceNoData alerts. [#66733](https://github.com/grafana/grafana/pull/66733), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Fix ambiguous handling of equals in labels when bucketing Loki state history streams. [#65013](https://github.com/grafana/grafana/pull/65013), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix attachment of external labels to Loki state history log streams. [#65140](https://github.com/grafana/grafana/pull/65140), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix creating a recording rule when having multiple datasources. [#66415](https://github.com/grafana/grafana/pull/66415), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Fix explore link in alert detail view. [#66106](https://github.com/grafana/grafana/pull/66106), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix share URL for Prometheus rules on subpath. [#66752](https://github.com/grafana/grafana/pull/66752), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix stats that display alert count when using unified alerting. [#64852](https://github.com/grafana/grafana/pull/64852), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Hide mute timing actions when dealing with vanilla prometheus. [#66457](https://github.com/grafana/grafana/pull/66457), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Paginate result previews. [#65257](https://github.com/grafana/grafana/pull/65257), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Prometheus-compatible Alertmanager timings editor. [#64526](https://github.com/grafana/grafana/pull/64526), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Update scheduler to get updates only from database. [#64635](https://github.com/grafana/grafana/pull/64635), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Use a completely isolated context for state history writes. [#64989](https://github.com/grafana/grafana/pull/64989), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Use displayNameFromDS if available in preview. [#65342](https://github.com/grafana/grafana/pull/65342), [@gillesdemey](https://github.com/gillesdemey)
+- **Annotation List:** Fix panel not updating when variable is changed. [#65899](https://github.com/grafana/grafana/pull/65899), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Annotations:** Ignore unique constraint violations for tags. [#65935](https://github.com/grafana/grafana/pull/65935), [@sakjur](https://github.com/sakjur)
+- **Auth:** Fix orgrole picker disabled if isSynced user. [#64033](https://github.com/grafana/grafana/pull/64033), [@eleijonmarck](https://github.com/eleijonmarck)
+- **AzureMonitor:** Fix Log Analytics portal links. [#65482](https://github.com/grafana/grafana/pull/65482), [@aangelisc](https://github.com/aangelisc)
+- **BrowseDashboards:** Fix move to General folder not working. [#65653](https://github.com/grafana/grafana/pull/65653), [@joshhunt](https://github.com/joshhunt)
+- **Catalog:** Show install error with incompatible version. [#65059](https://github.com/grafana/grafana/pull/65059), [@andresmgot](https://github.com/andresmgot)
+- **Chore:** Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b. [#64778](https://github.com/grafana/grafana/pull/64778), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **CloudMonitoring:** Add project selector for MQL editor[fix]. [#65567](https://github.com/grafana/grafana/pull/65567), [@alyssabull](https://github.com/alyssabull)
+- **CloudWatch Logs:** Fix running logs queries with expressions. [#65306](https://github.com/grafana/grafana/pull/65306), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch Logs:** Fix to make log queries use a relative time if available. [#65236](https://github.com/grafana/grafana/pull/65236), [@kevinwcyu](https://github.com/kevinwcyu)
+- **CloudWatch Logs:** Revert "Queries in an expression should run synchronously (#64443)". [#65036](https://github.com/grafana/grafana/pull/65036), [@fridgepoet](https://github.com/fridgepoet)
+- **CloudWatch:** Fix cachedQueries insights not being updated for metric queries. [#65495](https://github.com/grafana/grafana/pull/65495), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Cloudwatch:** Pass refId from query for expression queries. [#66147](https://github.com/grafana/grafana/pull/66147), [@idastambuk](https://github.com/idastambuk)
+- **Dashboards:** Evaluate provisioned dashboard titles in a backwards compatible way. [#65184](https://github.com/grafana/grafana/pull/65184), [@sakjur](https://github.com/sakjur)
+- **Dashboards:** Fix Mobile support dashboard issues on new iOS 16.3. [#65542](https://github.com/grafana/grafana/pull/65542), [@axelavargas](https://github.com/axelavargas)
+- **Dashboards:** Fix broken internal data links. [#66567](https://github.com/grafana/grafana/pull/66567), [@ifrost](https://github.com/ifrost)
+- **Database:** Don't sleep 10ms before every request. [#64832](https://github.com/grafana/grafana/pull/64832), [@bboreham](https://github.com/bboreham)
+- **Elasticsearch:** Fix processing of response with multiple group by for alerting. [#65165](https://github.com/grafana/grafana/pull/65165), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Elasticsearch:** Handle multiple annotation structures. [#66762](https://github.com/grafana/grafana/pull/66762), [@gabor](https://github.com/gabor)
+- **Email:** Mark HTML comments as "safe" in email templates. [#64546](https://github.com/grafana/grafana/pull/64546), [@gillesdemey](https://github.com/gillesdemey)
+- **Emails:** Preserve HTML comments. (Enterprise)
+- **ErrorHandling:** Fixes issues with bad error messages. [#63775](https://github.com/grafana/grafana/pull/63775), [@torkelo](https://github.com/torkelo)
+- **ErrorView:** Better detection of no-data responses. [#65477](https://github.com/grafana/grafana/pull/65477), [@leeoniya](https://github.com/leeoniya)
+- **Explore:** Make `DataSourcePicker` visible on small screens. [#65149](https://github.com/grafana/grafana/pull/65149), [@abdulhdr1](https://github.com/abdulhdr1)
+- **Fix:** DataLinks from data sources override user defined data link. [#65996](https://github.com/grafana/grafana/pull/65996), [@axelavargas](https://github.com/axelavargas)
+- **Fix:** Top table rendering and update docs. [#64497](https://github.com/grafana/grafana/pull/64497), [@joey-grafana](https://github.com/joey-grafana)
+- **Frontend:** Fix broken links in /plugins when pathname has a trailing slash. [#64348](https://github.com/grafana/grafana/pull/64348), [@gassiss](https://github.com/gassiss)
+- **Geomap:** Fix route layer zoom behavior. [#63409](https://github.com/grafana/grafana/pull/63409), [@drew08t](https://github.com/drew08t)
+- **Google Cloud Monitoring:** Fix project variable. [#66524](https://github.com/grafana/grafana/pull/66524), [@asimpson](https://github.com/asimpson)
+- **HeatMap:** Sort y buckets when all bucket names are numeric. [#65322](https://github.com/grafana/grafana/pull/65322), [@leeoniya](https://github.com/leeoniya)
+- **InfluxDB:** Fix querying with hardcoded retention policy. [#66466](https://github.com/grafana/grafana/pull/66466), [@itsmylife](https://github.com/itsmylife)
+- **InfluxDB:** Fix sending retention policy with InfluxQL queries. [#63820](https://github.com/grafana/grafana/pull/63820), [@itsmylife](https://github.com/itsmylife)
+- **KVStore:** Include database field in migration. [#62790](https://github.com/grafana/grafana/pull/62790), [@zoltanbedi](https://github.com/zoltanbedi)
+- **LDAP:** Always synchronize Server Admin role through role sync if role sync is enabled. [#58820](https://github.com/grafana/grafana/pull/58820), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Library panels:** Ensure pagination controls are always correctly displayed. [#65283](https://github.com/grafana/grafana/pull/65283), [@ashharrison90](https://github.com/ashharrison90)
+- **Loki:** Fix autocomplete situations with multiple escaped quotes. [#65520](https://github.com/grafana/grafana/pull/65520), [@svennergr](https://github.com/svennergr)
+- **MegaMenu:** Fixes mega menu showing scroll indicator when it shouldn't. [#65452](https://github.com/grafana/grafana/pull/65452), [@torkelo](https://github.com/torkelo)
+- **Navigation:** Redirect to root page when switching organization. [#66655](https://github.com/grafana/grafana/pull/66655), [@ashharrison90](https://github.com/ashharrison90)
+- **Navigation:** Scrolled hamburger menu links now navigate correctly in Safari. [#66261](https://github.com/grafana/grafana/pull/66261), [@ashharrison90](https://github.com/ashharrison90)
+- **NestedFolders:** Fix nested folder deletion. [#63572](https://github.com/grafana/grafana/pull/63572), [@ying-jeanne](https://github.com/ying-jeanne)
+- **New Panel Header:** Fix when clicking submenu item the parent menu item onClick get's triggered. [#65691](https://github.com/grafana/grafana/pull/65691), [@axelavargas](https://github.com/axelavargas)
+- **Phlare:** Fix error when there are no profileTypes to send from backend. [#65455](https://github.com/grafana/grafana/pull/65455), [@aocenas](https://github.com/aocenas)
+- **PieChart:** Show long labels properly. [#65699](https://github.com/grafana/grafana/pull/65699), [@mdvictor](https://github.com/mdvictor)
+- **PluginExtensions:** Fixed issue with incorrect type being exposed when configuring an extension. [#65910](https://github.com/grafana/grafana/pull/65910), [@mckn](https://github.com/mckn)
+- **Plugins:** Ensure proxy route bodies are valid JSON. [#61771](https://github.com/grafana/grafana/pull/61771), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Fix width for README pages with tables. [#66872](https://github.com/grafana/grafana/pull/66872), [@andresmgot](https://github.com/andresmgot)
+- **Plugins:** Markdown fetch retry with lowercase. [#65384](https://github.com/grafana/grafana/pull/65384), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Skip instrumenting plugin build info for core and bundled plugins. [#66105](https://github.com/grafana/grafana/pull/66105), [@wbrowne](https://github.com/wbrowne)
+- **PublicDashboards:** Query collapsed panels inside rows. [#64779](https://github.com/grafana/grafana/pull/64779), [@evictorero](https://github.com/evictorero)
+- **Query Splitting:** Fix for handling queries with no requestId. [#66161](https://github.com/grafana/grafana/pull/66161), [@domasx2](https://github.com/domasx2)
+- **SQL Datasources:** Fix variable throwing error if query returns no data. [#65937](https://github.com/grafana/grafana/pull/65937), [@mdvictor](https://github.com/mdvictor)
+- **SQL Datasources:** Prevent Call Stack Overflows with Large Numbers of Values for Variable. [#64937](https://github.com/grafana/grafana/pull/64937), [@codeincarnate](https://github.com/codeincarnate)
+- **SQLStore:** Fix SQLite error propagation if query retries are disabled. [#64904](https://github.com/grafana/grafana/pull/64904), [@papagian](https://github.com/papagian)
+- **Stat Panel:** Fix issue with clipping text values. [#64300](https://github.com/grafana/grafana/pull/64300), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Table Panel:** Fix panel migration for options cell type. [#66305](https://github.com/grafana/grafana/pull/66305), [@ryantxu](https://github.com/ryantxu)
+- **Table:** Fix migrations from old angular table for cell color modes. [#65760](https://github.com/grafana/grafana/pull/65760), [@torkelo](https://github.com/torkelo)
+- **Table:** Fixes issue with pagination summary causing scrollbar. [#65189](https://github.com/grafana/grafana/pull/65189), [@torkelo](https://github.com/torkelo)
+- **Table:** Fixes table panel gauge alignment. [#64994](https://github.com/grafana/grafana/pull/64994), [@torkelo](https://github.com/torkelo)
+- **TablePanel:** Fix table cells overflowing when there are multiple data links. [#65711](https://github.com/grafana/grafana/pull/65711), [@oscarkilhed](https://github.com/oscarkilhed)
+- **TablePanel:** fix footer bug; no footer calculated values after "hidden" column override. [#64269](https://github.com/grafana/grafana/pull/64269), [@baldm0mma](https://github.com/baldm0mma)
+- **Team sync:** Fix apply query string instead of param. (Enterprise)
+- **Templating:** Allow percent encoding of variable with custom all. [#65266](https://github.com/grafana/grafana/pull/65266), [@dprokop](https://github.com/dprokop)
+- **Tempo:** Set default limit if none is provided for traceql queries. [#65039](https://github.com/grafana/grafana/pull/65039), [@domasx2](https://github.com/domasx2)
+- **TimeSeries:** Don't extend stepped interpolation to graph edges. [#65657](https://github.com/grafana/grafana/pull/65657), [@leeoniya](https://github.com/leeoniya)
+- **TimeSeries:** Improve stacking direction heuristic. [#65499](https://github.com/grafana/grafana/pull/65499), [@leeoniya](https://github.com/leeoniya)
+- **Trace View:** Update the queryType to traceql for checking if same trace when clicking span link. [#66645](https://github.com/grafana/grafana/pull/66645), [@ericmustin](https://github.com/ericmustin)
+- **TraceView:** Don't require preferredVisualisationType to render. [#64920](https://github.com/grafana/grafana/pull/64920), [@aocenas](https://github.com/aocenas)
+- **Utils:** Reimplement util.GetRandomString to avoid modulo bias. [#64481](https://github.com/grafana/grafana/pull/64481), [@DanCech](https://github.com/DanCech)
+- **XYChart:** Add all dataset columns in tooltip. [#65027](https://github.com/grafana/grafana/pull/65027), [@mdvictor](https://github.com/mdvictor)
+
+### Breaking changes
+
+`default` named retention policies won't be used to query. Users who have a `default` named retention policy in their `influxdb` database, have to rename it to something else. Having `default` named retention policy is not breaking anything. We will make sure to use the actual default retention policy under the hood. To change the hardcoded retention policy in the `dashboard.json`, users must they select the right retention policy from dropdown and save the panel/dashboard. Issue [#66466](https://github.com/grafana/grafana/issues/66466)
+
+Grafana Alerting rules with `NoDataState` configuration set to `Alerting` will now respect "For" duration. Issue [#65574](https://github.com/grafana/grafana/issues/65574)
+
+Users who use LDAP role sync to only sync Viewer, Editor and Admin roles, but grant Grafana Server Admin role manually will not be able to do that anymore. After this change, LDAP role sync will override any manual changes to Grafana Server Admin role assignments. If `grafana_admin` is left unset in [LDAP role mapping configuration](https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-authentication/ldap/#group-mappings), it will default to false. Issue [#58820](https://github.com/grafana/grafana/issues/58820)
+
+### Plugin development fixes & changes
+
+- **DateTimePicker:** Can now select time correctly. [#65428](https://github.com/grafana/grafana/pull/65428), [@eledobleefe](https://github.com/eledobleefe)
+- **Grafana UI:** Fix tooltip prop of button component. [#64765](https://github.com/grafana/grafana/pull/64765), [@suleymanbariseser](https://github.com/suleymanbariseser)
+- **DateTimePicker:** Add min date support to calendar. [#64632](https://github.com/grafana/grafana/pull/64632), [@nevermind89x](https://github.com/nevermind89x)
+- **GrafanaUI:** Implement new component Toggletip. [#64459](https://github.com/grafana/grafana/pull/64459), [@yduartep](https://github.com/yduartep)
+- **ContextMenu:** Fix padding and show border based on items. [#63948](https://github.com/grafana/grafana/pull/63948), [@aocenas](https://github.com/aocenas)
+
+<!-- 9.5.0 END -->
+<!-- 9.4.17 START -->
+
+# 9.4.17 (2023-10-11)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.10. [#76370](https://github.com/grafana/grafana/issues/76370), [@zerok](https://github.com/zerok)
+- **SSE:** DSNode to update result with names to make each value identifiable by labels (only Graphite and TestData). [#74615](https://github.com/grafana/grafana/issues/74615), [@yuri-tceretian](https://github.com/yuri-tceretian)
+
+### Bug fixes
+
+- **BrowseDashboards:** Only remember the most recent expanded folder. [#74812](https://github.com/grafana/grafana/issues/74812), [@joshhunt](https://github.com/joshhunt)
+- **SQL Datasources:** Fix variable throwing error if query returns no data. [#74609](https://github.com/grafana/grafana/issues/74609), [@mdvictor](https://github.com/mdvictor)
+- **RBAC:** Chore fix hasPermissionInOrg. (Enterprise)
+
+<!-- 9.4.17 END -->
+<!-- 9.4.15 START -->
+
+# 9.4.15 (2023-09-18)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Alpine base image to 3.18.3. [#74996](https://github.com/grafana/grafana/issues/74996), [@zerok](https://github.com/zerok)
+- **Chore:** Upgrade Go to 1.20.8. [#74981](https://github.com/grafana/grafana/issues/74981), [@zerok](https://github.com/zerok)
+
+<!-- 9.4.15 END -->
+<!-- 9.4.14 START -->
+
+# 9.4.14 (2023-09-05)
+
+### Features and enhancements
+
+- **Prometheus:** Add present_over_time syntax highlighting. [#72366](https://github.com/grafana/grafana/issues/72366), [@arnaudlemaignen](https://github.com/arnaudlemaignen)
+
+### Bug fixes
+
+- **LDAP:** Fix user disabling. [#74318](https://github.com/grafana/grafana/issues/74318), [@gamab](https://github.com/gamab)
+- **Plugins:** Only configure plugin proxy transport once. [#71740](https://github.com/grafana/grafana/issues/71740), [@wbrowne](https://github.com/wbrowne)
+- **InfluxDB:** Interpolate retention policies. [#71202](https://github.com/grafana/grafana/issues/71202), [@itsmylife](https://github.com/itsmylife)
+- **Azure Monitor:** Fix bug that did not show alert rule preview. [#68561](https://github.com/grafana/grafana/issues/68561), [@alyssabull](https://github.com/alyssabull)
+
+<!-- 9.4.14 END -->
+<!-- 9.4.13 START -->
+
+# 9.4.13 (2023-06-22)
+
+### Bug fixes
+
+- **Auth:** Fixed CVE-2023-3128. [#70579](https://github.com/grafana/grafana/issues/70579), [@zerok](https://github.com/zerok)
+
+<!-- 9.4.13 END -->
 <!-- 9.4.12 START -->

 # 9.4.12 (2023-06-06)
@@ -414,6 +968,35 @@ Sentry frontend logging provider will be removed with next major version. Issue
 - **Toolkit:** Deprecate all plugin related commands. [#60290](https://github.com/grafana/grafana/pull/60290), [@academo](https://github.com/academo)
 - **Grafana UI:** Add experimental InteractiveTable component. [#58223](https://github.com/grafana/grafana/pull/58223), [@Elfo404](https://github.com/Elfo404)

+<!-- 9.4.0-beta1 END -->
+<!-- 9.3.16 START -->
+
+# 9.3.16 (2023-06-22)
+
+### Bug fixes
+
+- **Auth:** Fixed CVE-2023-3128. [#70578](https://github.com/grafana/grafana/issues/70578), [@zerok](https://github.com/zerok)
+
+<!-- 9.3.16 END -->
+<!-- 9.3.15 START -->
+
+# 9.3.15 (2023-06-06)
+
+### Bug fixes
+
+- **Alerting:** Require alert.notifications:write permissions to test receivers and templates
+- **Auth:** Remove the session cookie only if it's invalid or revoked. [#68796](https://github.com/grafana/grafana/issues/68796), [@mgyongyosi](https://github.com/mgyongyosi)
+
+<!-- 9.3.15 END -->
+<!-- 9.3.14 START -->
+
+# 9.3.14 (2023-05-08)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.4. [#67762](https://github.com/grafana/grafana/issues/67762), [@papagian](https://github.com/papagian)
+
+<!-- 9.3.14 END -->
 <!-- 9.3.11 START -->

 # 9.3.11 (2023-03-22)
@@ -444,26 +1027,6 @@ Sentry frontend logging provider will be removed with next major version. Issue
 - **Time Series Panel:** Fix legend text selection in Firefox. [#60809](https://github.com/grafana/grafana/pull/60809), [@codeincarnate](https://github.com/codeincarnate)

 <!-- 9.3.7 END -->
-<!-- 9.4.0-beta1 END -->
-<!-- 9.3.15 START -->
-
-# 9.3.15 (2023-06-06)
-
-### Bug fixes
-
- **Alerting:** Require alert.notifications:write permissions to test receivers and templates
- **Auth:** Remove the session cookie only if it's invalid or revoked. [#68796](https://github.com/grafana/grafana/issues/68796), [@mgyongyosi](https://github.com/mgyongyosi)
-
-<!-- 9.3.15 END -->
-<!-- 9.3.14 START -->
-
-# 9.3.14 (2023-05-08)
-
-### Features and enhancements
-
- **Chore:** Upgrade Go to 1.20.4. [#67762](https://github.com/grafana/grafana/issues/67762), [@papagian](https://github.com/papagian)
-
-<!-- 9.3.14 END -->
 <!-- 9.3.6 START -->

 # 9.3.6 (2023-01-26)
@@ -790,6 +1353,16 @@ 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.3.0-beta1 END -->
+<!-- 9.2.20 START -->
+
+# 9.2.20 (2023-06-22)
+
+### Bug fixes
+
+- **Auth:** Fixed CVE-2023-3128. [#70577](https://github.com/grafana/grafana/issues/70577), [@zerok](https://github.com/zerok)
+
+<!-- 9.2.20 END -->
 <!-- 9.2.15 START -->

 # 9.2.15 (2023-03-22)
@@ -1243,7 +1243,6 @@ steps:
  environment:
    AM_TENANT_ID: test
    AM_URL: http://mimir_backend:8080
-  failure: ignore
  image: golang:1.23.1-alpine
  name: remote-alertmanager-integration-tests
 trigger:
@@ -2798,7 +2797,6 @@ steps:
  environment:
    AM_TENANT_ID: test
    AM_URL: http://mimir_backend:8080
-  failure: ignore
  image: golang:1.23.1-alpine
  name: remote-alertmanager-integration-tests
 trigger:
@@ -3383,7 +3381,6 @@ steps:
  environment:
    AM_TENANT_ID: test
    AM_URL: http://mimir_backend:8080
-  failure: ignore
  image: golang:1.23.1-alpine
  name: remote-alertmanager-integration-tests
 trigger:
@@ -5128,7 +5125,6 @@ steps:
  environment:
    AM_TENANT_ID: test
    AM_URL: http://mimir_backend:8080
-  failure: ignore
  image: golang:1.23.1-alpine
  name: remote-alertmanager-integration-tests
 trigger:
@@ -5744,6 +5740,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: f95877e361fe41e54412a7abbdf81897d58d9da26e7681b8d50bcb994e2f7909
+hmac: e97f7a0c3923b506dad6bf861bb1ea440a8f072ee3744742eec35e7278c3581c

 ...
@@ -1338,8 +1338,8 @@ execute_alerts = true
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
-max_attempts = 1
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 3.
+max_attempts = 3

 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1322,8 +1322,8 @@
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
-;max_attempts = 1
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 3.
+;max_attempts = 3

 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -62,7 +62,15 @@ You have the option to customize the display of logs and choose which columns to

 ### Download log lines

-Click **Download** to download log results in either `TXT` or `JSON` format. This feature allows you to save log data for further analysis or to share it with others in a convenient and accessible format.
+This feature lets you save log data for further analysis or to share it with others in a convenient and accessible format.
+
+In Explore there are three export options:
+
+- **TXT** - will export the data as visible on the screen, meaning it will take into account formatting, like `line_format`.
+- **JSON** - will export the raw data, regardless of the formatting, like `line_format`.
+- **CSV** - will export the raw data, regardless of the formatting, like `line_format`.
+
+Click **Download** and select `TXT`, `JSON` or `CSV` to download log results.

 ### Log result meta information

@@ -49,7 +49,7 @@ are not installed in your system:

 ```bash
 cd <grafana-image-render plugin directory>
-ldd chrome-linux/chrome
+ldd chrome-headless-shell/linux-132.0.6781.0/chrome-headless-shell-linux64/chrome-headless-shell
      linux-vdso.so.1 (0x00007fff1bf65000)
      libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2047945000)
      libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2047924000)
@@ -0,0 +1,22 @@
+---
+description: Guide for upgrading to Grafana v11.4
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+  - '11.4'
+title: Upgrade to Grafana v11.4
+menuTitle: Upgrade to v11.4
+weight: 800
+---
+
+# Upgrade to Grafana v11.4
+
+{{< docs/shared lookup="upgrade/intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
+
+{{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Technical notes
@@ -76,6 +76,7 @@ For a complete list of every change, with links to pull requests and related iss

 ## Grafana 11

+- [What's new in 11.4](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-4/)
 - [What's new in 11.3](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-3/)
 - [What's new in 11.2](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-2/)
 - [What's new in 11.1](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-1/)
@@ -0,0 +1,45 @@
+---
+description: Feature and improvement highlights for Grafana v11.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '11.4'
+  - release notes
+labels:
+products:
+  - cloud
+  - enterprise
+  - oss
+title: What's new in Grafana v11.4
+weight: -46
+---
+
+<!-- vale GoogleWe = NO -->
+<!-- vale We = NO -->
+
+# What’s new in Grafana v11.4
+
+Welcome to Grafana 11.4! This is a special release with one new feature, created in partnership with AWS. We’ve made improvements to Cloudwatch so you can query your logs using two additional query languages: Opensearch PPL and Opensearch SQL. We’ve also updated the querying experience by providing a sample of commonly-used queries, syntax highlighting in the query editor, and auto-completion suggestions for complex queries. Read on to learn more about this new feature.
+
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v11.4, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v11.4/).
+
+## Query Cloudwatch Logs Insights with PPL and SQL
+
+<!-- Ida Štambuk, Zoe Chou -->
+
+_Generally available in all editions of Grafana_
+
+The AWS CloudWatch data source plugin now offers two new query languages for searching through logs: OpenSearch PPL and OpenSearch SQL. You now have increased flexibility to choose a more familiar query language and to take advantage of their unique features (like the SQL JOIN command) when querying AWS CloudWatch Logs Insights. In addition to the already supported **Logs Insights QL** option, you can find the added query language options in the new **Query language** drop-down list.
+
+![CloudWatch logs explore query languages drop-down list opened](/media/docs/grafana/data-sources/screenshot-awscw-query-languages-v11.4.png)
+
+We’ve also updated the query editor to support syntax highlighting and to provide suggestions while you type, which simplifies writing complex queries. When you select log groups, the suggestions also include [discovered fields](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_AnalyzeLogData-discoverable-fields.html).
+
+Not sure where to start? We’ve also updated our **CloudWatch Logs cheat sheet** with the most commonly used queries so you can paste and customize to fit exactly what you need. Clicking on any of the example queries prefills the query input field.
+
+![CloudWatch Logs cheat sheet with help icon highlighted](/media/docs/grafana/data-sources/screenshot-cwl-cheat-sheet-v11.4.png)
+
+For the complete list of commands supported for OpenSearch PPL and SQL, refer to the [Cloudwatch Logs Insights documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_AnalyzeLogData_Languages.html).
+
+{{< youtube id="g1BfokyzF4Q" >}}
@@ -1,6 +1,6 @@
 {
  "name": "@test-plugins/extensions-test-app",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "private": true,
  "scripts": {
    "build": "webpack -c ./webpack.config.ts --env production",
@@ -11,7 +11,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/plugin-configs": "workspace:*",
    "@types/lodash": "4.17.7",
    "@types/node": "20.14.14",
    "@types/prismjs": "1.26.4",
@@ -1,6 +1,6 @@
 {
  "name": "@test-plugins/grafana-e2etest-datasource",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "private": true,
  "scripts": {
    "build": "webpack -c ./webpack.config.ts --env production",
@@ -11,7 +11,7 @@
  "author": "Grafana",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@types/lodash": "4.17.7",
    "@types/node": "20.14.14",
    "@types/prismjs": "1.26.4",
@@ -1,5 +1,5 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "npmClient": "yarn",
-  "version": "11.4.0-pre"
+  "version": "11.5.0-pre"
 }
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "grafana",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "repository": "github:grafana/grafana",
  "scripts": {
    "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js --progress",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/data",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
@@ -36,7 +36,7 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.0.1",
-    "@grafana/schema": "11.4.0-pre",
+    "@grafana/schema": "11.5.0-pre",
    "@types/d3-interpolate": "^3.0.0",
    "@types/string-hash": "1.1.3",
    "d3-interpolate": "3.0.1",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e-selectors",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana End-to-End Test Selectors Library",
  "keywords": [
    "cli",
@@ -1,7 +1,7 @@
 {
  "name": "@grafana/eslint-plugin",
  "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "main": "./index.cjs",
  "author": "Grafana Labs",
  "license": "Apache-2.0",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/flamegraph",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana flamegraph visualization component",
  "keywords": [
    "grafana",
@@ -44,8 +44,8 @@
  ],
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "@leeoniya/ufuzzy": "1.0.17",
    "d3": "^7.8.5",
    "lodash": "4.17.21",
@@ -1,6 +1,6 @@
 {
  "name": "@grafana/saga-icons",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "private": true,
  "description": "Icons for Grafana",
  "author": "Grafana Labs",
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "name": "@grafana/o11y-ds-frontend",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Library to manage traces in Grafana.",
  "sideEffects": false,
  "repository": {
@@ -18,12 +18,12 @@
  },
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/e2e-selectors": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "react-select": "5.8.3",
    "react-use": "17.5.1",
    "rxjs": "7.8.1",
@@ -2,7 +2,7 @@
  "name": "@grafana/plugin-configs",
  "description": "Shared dependencies and files for core plugins",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "tslib": "2.7.0"
  },
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "AGPL-3.0-only",
  "name": "@grafana/prometheus",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana Prometheus Library",
  "keywords": [
    "typescript"
@@ -38,12 +38,12 @@
  "dependencies": {
    "@emotion/css": "11.13.5",
    "@floating-ui/react": "0.26.28",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
    "@grafana/faro-web-sdk": "1.12.2",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "@hello-pangea/dnd": "17.0.0",
    "@leeoniya/ufuzzy": "1.0.17",
    "@lezer/common": "1.2.3",
@@ -76,7 +76,7 @@
  },
  "devDependencies": {
    "@emotion/eslint-plugin": "11.12.0",
-    "@grafana/e2e-selectors": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
    "@grafana/tsconfig": "^2.0.0",
    "@rollup/plugin-image": "3.0.3",
    "@rollup/plugin-node-resolve": "15.3.0",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/runtime",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana Runtime Library",
  "keywords": [
    "grafana",
@@ -37,11 +37,11 @@
    "postpack": "mv package.json.bak package.json"
  },
  "dependencies": {
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/e2e-selectors": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
    "@grafana/faro-web-sdk": "^1.3.6",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "history": "4.10.1",
    "lodash": "4.17.21",
    "react-use": "17.5.1",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/schema",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana Schema Library",
  "keywords": [
    "typescript"
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  limit: number;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
  /**
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends common.OptionsWithLegend, common.SingleStatBaseOptions {
  displayMode: common.BarGaugeDisplayMode;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export enum VizDisplayMode {
  Candles = 'candles',
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export enum HorizontalConstraint {
  Center = 'center',
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface MetricStat {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  selectedSeries: number;
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export type UpdateConfig = {
  render: boolean,
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);

@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends common.SingleStatBaseOptions {
  minVizHeight: number;
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  basemap: ui.MapLayerOptions;
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 /**
 * Controls the color mode of the heatmap
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
  /**
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  dedupStrategy: common.LogsDedupStrategy;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export enum QueryEditorMode {
  Builder = 'builder',
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface ArcOption {
  /**
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 /**
 * Select the pie chart display style.
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends common.SingleStatBaseOptions {
  colorMode: common.BigValueColorMode;
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
  /**
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
  /**
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export enum TextMode {
  Code = 'code',
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export interface Options extends common.OptionsWithTimezones {
  legend: common.VizLegendOptions;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 /**
 * Identical to timeseries... except it does not have timezone settings
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "11.4.0-pre";
+export const pluginVersion = "11.5.0-pre";

 export enum PointShape {
  Circle = 'circle',
@@ -22,7 +22,91 @@ export const handyTestingSchema: DashboardV2Spec = {
    to: 'now',
    weekStart: 'monday',
  },
-  annotations: [],
+  annotations: [
+    {
+      kind: 'AnnotationQuery',
+      spec: {
+        builtIn: true,
+        query: {
+          kind: 'prometheus',
+          spec: {
+            expr: 'test-query',
+          },
+        },
+        datasource: {
+          type: 'prometheus',
+          uid: 'uid',
+        },
+        filter: { ids: [] },
+        enable: true,
+        hide: false,
+        iconColor: 'rgba(0, 211, 255, 1)',
+        name: 'Annotations & Alerts',
+      },
+    },
+    {
+      kind: 'AnnotationQuery',
+      spec: {
+        datasource: {
+          type: 'grafana-testdata-datasource',
+          uid: 'uid',
+        },
+        enable: true,
+        iconColor: 'red',
+        name: 'Enabled',
+        query: {
+          kind: 'grafana-testdata-datasource',
+          spec: {
+            lines: 4,
+            refId: 'Anno',
+            scenarioId: 'annotations',
+          },
+        },
+        filter: { ids: [] },
+        hide: true,
+      },
+    },
+    {
+      kind: 'AnnotationQuery',
+      spec: {
+        datasource: {
+          type: 'grafana-testdata-datasource',
+          uid: 'uid',
+        },
+        filter: { ids: [] },
+        enable: false,
+        iconColor: 'yellow',
+        name: 'Disabled',
+        query: {
+          kind: 'grafana-testdata-datasource',
+          spec: { lines: 5, refId: 'Anno', scenarioId: 'annotations' },
+        },
+        hide: false,
+      },
+    },
+    {
+      kind: 'AnnotationQuery',
+      spec: {
+        datasource: {
+          type: 'grafana-testdata-datasource',
+          uid: 'uid',
+        },
+        filter: { ids: [] },
+        enable: true,
+        hide: true,
+        iconColor: 'dark-purple',
+        name: 'Hidden',
+        query: {
+          kind: 'grafana-testdata-datasource',
+          spec: {
+            lines: 6,
+            refId: 'Anno',
+            scenarioId: 'annotations',
+          },
+        },
+      },
+    },
+  ],
  elements: {
    'test-panel-uid': {
      kind: 'Panel',
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "@grafana/sql",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git",
@@ -15,11 +15,11 @@
  },
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/e2e-selectors": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "@react-awesome-query-builder/ui": "6.6.4",
    "immutable": "4.3.7",
    "lodash": "4.17.21",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/ui",
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "description": "Grafana Components Library",
  "keywords": [
    "grafana",
@@ -51,10 +51,10 @@
    "@emotion/react": "11.13.5",
    "@emotion/serialize": "1.3.3",
    "@floating-ui/react": "0.26.28",
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/e2e-selectors": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
    "@grafana/faro-web-sdk": "^1.3.6",
-    "@grafana/schema": "11.4.0-pre",
+    "@grafana/schema": "11.5.0-pre",
    "@hello-pangea/dnd": "17.0.0",
    "@leeoniya/ufuzzy": "1.0.17",
    "@monaco-editor/react": "4.6.0",
@@ -1,11 +1,14 @@
 package metricutil

 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
+	"time"

 	"github.com/prometheus/client_golang/prometheus"
+	"go.opentelemetry.io/otel/trace"
 )

 // SanitizeLabelName removes all invalid chars from the label name.
@@ -84,3 +87,35 @@ func copyLabelSet(ls prometheus.Labels) prometheus.Labels {
 	}
 	return newLs
 }
+
+// wraps prometheus.NewHistogram, adding a central native histogram config
+func NewHistogramVec(opts prometheus.HistogramOpts, labels []string) *prometheus.HistogramVec {
+	if opts.NativeHistogramBucketFactor == 0 {
+		// Enable native histograms, with the factor suggested in the docs
+		opts.NativeHistogramBucketFactor = 1.1
+	}
+	if opts.NativeHistogramMaxBucketNumber == 0 {
+		// OTel default
+		opts.NativeHistogramMaxBucketNumber = 160
+	}
+	if opts.NativeHistogramMinResetDuration == 0 {
+		// Reset buckets every hour by default - override this if you want to
+		// keep buckets around for longer
+		opts.NativeHistogramMinResetDuration = 1 * time.Hour
+	}
+
+	return prometheus.NewHistogramVec(opts, labels)
+}
+
+func ObserveWithExemplar(ctx context.Context, histogram prometheus.Observer, value float64) {
+	traceID := trace.SpanContextFromContext(ctx).TraceID()
+	if traceID.IsValid() {
+		histogram.(prometheus.ExemplarObserver).ObserveWithExemplar(
+			value,
+			prometheus.Labels{"traceID": traceID.String()},
+		)
+		return
+	}
+
+	histogram.Observe(value)
+}
@@ -5,8 +5,9 @@ import (
 	"os"
 	"strings"

-	"github.com/grafana/grafana/pkg/setting"
 	"go.opentelemetry.io/otel/attribute"
+
+	"github.com/grafana/grafana/pkg/setting"
 )

 type TracingConfig struct {
@@ -1,6 +1,7 @@
 package migrator

 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"
@@ -9,10 +10,17 @@ import (
 	"github.com/golang-migrate/migrate/v4/database"
 	_ "github.com/lib/pq"
 	"github.com/mattn/go-sqlite3"
+	"github.com/prometheus/client_golang/prometheus"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/atomic"
 	"xorm.io/xorm"

 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/setting"
 )

@@ -21,6 +29,8 @@ var (
 	ErrMigratorIsUnlocked = fmt.Errorf("migrator is unlocked")
 )

+var tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/sqlstore/migrator")
+
 type Migrator struct {
 	DBEngine     *xorm.Engine
 	Dialect      Dialect
@@ -31,6 +41,8 @@ type Migrator struct {
 	isLocked     atomic.Bool
 	logMap       map[string]MigrationLog
 	tableName    string
+
+	metrics migratorMetrics
 }

 type MigrationLog struct {
@@ -42,6 +54,12 @@ type MigrationLog struct {
 	Timestamp   time.Time
 }

+type migratorMetrics struct {
+	migCount         *prometheus.CounterVec
+	migDuration      *prometheus.HistogramVec
+	totalMigDuration *prometheus.HistogramVec
+}
+
 func NewMigrator(engine *xorm.Engine, cfg *setting.Cfg) *Migrator {
 	return NewScopedMigrator(engine, cfg, "")
 }
@@ -54,6 +72,26 @@ func NewScopedMigrator(engine *xorm.Engine, cfg *setting.Cfg, scope string) *Mig
 		migrations:   make([]Migration, 0),
 		migrationIds: make(map[string]struct{}),
 		Dialect:      NewDialect(engine.DriverName()),
+		metrics: migratorMetrics{
+			migCount: prometheus.NewCounterVec(prometheus.CounterOpts{
+				Namespace: "grafana_database",
+				Subsystem: scope,
+				Name:      "migrations_total",
+				Help:      "Total number of SQL migrations",
+			}, []string{"success"}),
+			migDuration: metricutil.NewHistogramVec(prometheus.HistogramOpts{
+				Namespace: "grafana_database",
+				Subsystem: scope,
+				Name:      "migration_duration_seconds",
+				Help:      "Individual SQL migration duration in seconds",
+			}, []string{"success"}),
+			totalMigDuration: metricutil.NewHistogramVec(prometheus.HistogramOpts{
+				Namespace: "grafana_database",
+				Subsystem: scope,
+				Name:      "all_migrations_duration_seconds",
+				Help:      "Duration of the entire SQL migration process in seconds",
+			}, []string{"success"}),
+		},
 	}
 	if scope == "" {
 		mg.tableName = "migration_log"
@@ -65,6 +103,20 @@ func NewScopedMigrator(engine *xorm.Engine, cfg *setting.Cfg, scope string) *Mig
 	return mg
 }

+// Collect implements Prometheus.Collector.
+func (mg *Migrator) Collect(ch chan<- prometheus.Metric) {
+	mg.metrics.migCount.Collect(ch)
+	mg.metrics.migDuration.Collect(ch)
+	mg.metrics.totalMigDuration.Collect(ch)
+}
+
+// Describe implements Prometheus.Collector.
+func (mg *Migrator) Describe(ch chan<- *prometheus.Desc) {
+	mg.metrics.migCount.Describe(ch)
+	mg.metrics.migDuration.Describe(ch)
+	mg.metrics.totalMigDuration.Describe(ch)
+}
+
 // AddCreateMigration adds the initial migration log table -- this should likely be
 // automatic and first, but enough tests exists that do not expect that we can keep it explicit
 func (mg *Migrator) AddCreateMigration() {
@@ -139,9 +191,14 @@ func (mg *Migrator) RemoveMigrationLogs(migrationsIDs ...string) {
 	}
 }

+// soft-deprecated: use RunMigrations instead (will be fully deprecated later)
 func (mg *Migrator) Start(isDatabaseLockingEnabled bool, lockAttemptTimeout int) (err error) {
+	return mg.RunMigrations(context.Background(), isDatabaseLockingEnabled, lockAttemptTimeout)
+}
+
+func (mg *Migrator) RunMigrations(ctx context.Context, isDatabaseLockingEnabled bool, lockAttemptTimeout int) (err error) {
 	if !isDatabaseLockingEnabled {
-		return mg.run()
+		return mg.run(ctx)
 	}

 	dbName, err := mg.Dialect.GetDBName(mg.DBEngine.DataSourceName())
@@ -153,8 +210,10 @@ func (mg *Migrator) Start(isDatabaseLockingEnabled bool, lockAttemptTimeout int)
 		return err
 	}

+	logger := mg.Logger.FromContext(ctx)
+
 	return mg.InTransaction(func(sess *xorm.Session) error {
-		mg.Logger.Info("Locking database")
+		logger.Info("Locking database")
 		lockCfg := LockCfg{
 			Session: sess,
 			Key:     key,
@@ -162,110 +221,154 @@ func (mg *Migrator) Start(isDatabaseLockingEnabled bool, lockAttemptTimeout int)
 		}

 		if err := casRestoreOnErr(&mg.isLocked, false, true, ErrMigratorIsLocked, mg.Dialect.Lock, lockCfg); err != nil {
-			mg.Logger.Error("Failed to lock database", "error", err)
+			logger.Error("Failed to lock database", "error", err)
 			return err
 		}

 		defer func() {
-			mg.Logger.Info("Unlocking database")
+			logger.Info("Unlocking database")
 			unlockErr := casRestoreOnErr(&mg.isLocked, true, false, ErrMigratorIsUnlocked, mg.Dialect.Unlock, lockCfg)
 			if unlockErr != nil {
-				mg.Logger.Error("Failed to unlock database", "error", unlockErr)
+				logger.Error("Failed to unlock database", "error", unlockErr)
 			}
 		}()

 		// migration will run inside a nested transaction
-		return mg.run()
+		return mg.run(ctx)
 	})
 }

-func (mg *Migrator) run() (err error) {
-	mg.Logger.Info("Starting DB migrations")
+func (mg *Migrator) run(ctx context.Context) (err error) {
+	ctx, span := tracer.Start(ctx, "Migrator.run")
+	defer span.End()
+
+	logger := mg.Logger.FromContext(ctx)
+
+	logger.Info("Starting DB migrations")

 	_, err = mg.GetMigrationLog()
 	if err != nil {
 		return err
 	}

+	successLabel := prometheus.Labels{"success": "true"}
+
 	migrationsPerformed := 0
 	migrationsSkipped := 0
 	start := time.Now()
 	for _, m := range mg.migrations {
-		m := m
 		_, exists := mg.logMap[m.Id()]
 		if exists {
-			mg.Logger.Debug("Skipping migration: Already executed", "id", m.Id())
+			logger.Debug("Skipping migration: Already executed", "id", m.Id())
+			span.AddEvent("Skipping migration: Already executed",
+				trace.WithAttributes(attribute.String("migration_id", m.Id())),
+			)
 			migrationsSkipped++
 			continue
 		}

-		sql := m.SQL(mg.Dialect)
+		migStart := time.Now()

-		record := MigrationLog{
-			MigrationID: m.Id(),
-			SQL:         sql,
-			Timestamp:   time.Now(),
-		}
-
-		err := mg.InTransaction(func(sess *xorm.Session) error {
-			err := mg.exec(m, sess)
-			// if we get an sqlite busy/locked error, sleep 100ms and try again
-			cnt := 0
-			for cnt < 3 && (errors.Is(err, sqlite3.ErrLocked) || errors.Is(err, sqlite3.ErrBusy)) {
-				cnt++
-				mg.Logger.Debug("Database locked, sleeping then retrying", "error", err, "sql", sql)
-				time.Sleep(100 * time.Millisecond)
-				err = mg.exec(m, sess)
-			}
-
-			if err != nil {
-				mg.Logger.Error("Exec failed", "error", err, "sql", sql)
-				record.Error = err.Error()
-				if !m.SkipMigrationLog() {
-					if _, err := sess.Table(mg.tableName).Insert(&record); err != nil {
-						return err
-					}
-				}
-				return err
-			}
-			record.Success = true
-			if !m.SkipMigrationLog() {
-				_, err = sess.Table(mg.tableName).Insert(&record)
-			}
-			if err == nil {
-				migrationsPerformed++
-			}
+		if err := mg.doMigration(ctx, m); err != nil {
+			failLabel := prometheus.Labels{"success": "false"}
+			metricutil.ObserveWithExemplar(ctx, mg.metrics.migDuration.With(failLabel), time.Since(migStart).Seconds())
+			mg.metrics.migCount.With(failLabel).Inc()
 			return err
-		})
-		if err != nil {
-			return fmt.Errorf("%v: %w", fmt.Sprintf("migration failed (id = %s)", m.Id()), err)
 		}
+
+		metricutil.ObserveWithExemplar(ctx, mg.metrics.migDuration.With(successLabel), time.Since(migStart).Seconds())
+		mg.metrics.migCount.With(successLabel).Inc()
+
+		migrationsPerformed++
 	}

-	mg.Logger.Info("migrations completed", "performed", migrationsPerformed, "skipped", migrationsSkipped, "duration", time.Since(start))
+	metricutil.ObserveWithExemplar(ctx, mg.metrics.totalMigDuration.With(successLabel), time.Since(start).Seconds())
+
+	logger.Info("migrations completed", "performed", migrationsPerformed, "skipped", migrationsSkipped, "duration", time.Since(start))

 	// Make sure migrations are synced
 	return mg.DBEngine.Sync2()
 }

-func (mg *Migrator) exec(m Migration, sess *xorm.Session) error {
+func (mg *Migrator) doMigration(ctx context.Context, m Migration) error {
+	ctx, span := tracer.Start(ctx, "Migrator.doMigration", trace.WithAttributes(
+		attribute.String("migration_id", m.Id()),
+	))
+	defer span.End()
+
+	logger := mg.Logger.FromContext(ctx)
+
+	sql := m.SQL(mg.Dialect)
+
+	record := MigrationLog{
+		MigrationID: m.Id(),
+		SQL:         sql,
+		Timestamp:   time.Now(),
+	}
+
+	err := mg.InTransaction(func(sess *xorm.Session) error {
+		// propagate context
+		sess = sess.Context(ctx)
+
+		err := mg.exec(ctx, m, sess)
+		// if we get an sqlite busy/locked error, sleep 100ms and try again
+		cnt := 0
+		for cnt < 3 && (errors.Is(err, sqlite3.ErrLocked) || errors.Is(err, sqlite3.ErrBusy)) {
+			cnt++
+			logger.Debug("Database locked, sleeping then retrying", "error", err, "sql", sql)
+			span.AddEvent("Database locked, sleeping then retrying",
+				trace.WithAttributes(attribute.String("error", err.Error())),
+				trace.WithAttributes(attribute.String("sql", sql)),
+			)
+			time.Sleep(100 * time.Millisecond)
+			err = mg.exec(ctx, m, sess)
+		}
+
+		if err != nil {
+			logger.Error("Exec failed", "error", err, "sql", sql)
+			record.Error = err.Error()
+			if !m.SkipMigrationLog() {
+				if _, err := sess.Table(mg.tableName).Insert(&record); err != nil {
+					return err
+				}
+			}
+			return err
+		}
+		record.Success = true
+		if !m.SkipMigrationLog() {
+			_, err = sess.Table(mg.tableName).Insert(&record)
+		}
+		return err
+	})
+	if err != nil {
+		return tracing.Errorf(span, "migration failed (id = %s): %w", m.Id(), err)
+	}
+
+	span.SetStatus(codes.Ok, "")
+
+	return nil
+}
+
+func (mg *Migrator) exec(ctx context.Context, m Migration, sess *xorm.Session) error {
+	logger := mg.Logger.FromContext(ctx)
+
 	start := time.Now()
-	mg.Logger.Info("Executing migration", "id", m.Id())
+	logger.Info("Executing migration", "id", m.Id())

 	condition := m.GetCondition()
 	if condition != nil {
 		sql, args := condition.SQL(mg.Dialect)

 		if sql != "" {
-			mg.Logger.Debug("Executing migration condition SQL", "id", m.Id(), "sql", sql, "args", args)
+			logger.Debug("Executing migration condition SQL", "id", m.Id(), "sql", sql, "args", args)
 			results, err := sess.SQL(sql, args...).Query()
 			if err != nil {
-				mg.Logger.Error("Executing migration condition failed", "id", m.Id(), "error", err)
+				logger.Error("Executing migration condition failed", "id", m.Id(), "error", err)
 				return err
 			}

 			if !condition.IsFulfilled(results) {
-				mg.Logger.Warn("Skipping migration: Already executed, but not recorded in migration log", "id", m.Id())
+				logger.Warn("Skipping migration: Already executed, but not recorded in migration log", "id", m.Id())
 				return nil
 			}
 		}
@@ -273,20 +376,20 @@ func (mg *Migrator) exec(m Migration, sess *xorm.Session) error {

 	var err error
 	if codeMigration, ok := m.(CodeMigration); ok {
-		mg.Logger.Debug("Executing code migration", "id", m.Id())
+		logger.Debug("Executing code migration", "id", m.Id())
 		err = codeMigration.Exec(sess, mg)
 	} else {
 		sql := m.SQL(mg.Dialect)
-		mg.Logger.Debug("Executing sql migration", "id", m.Id(), "sql", sql)
+		logger.Debug("Executing sql migration", "id", m.Id(), "sql", sql)
 		_, err = sess.Exec(sql)
 	}

 	if err != nil {
-		mg.Logger.Error("Executing migration failed", "id", m.Id(), "error", err, "duration", time.Since(start))
+		logger.Error("Executing migration failed", "id", m.Id(), "error", err, "duration", time.Since(start))
 		return err
 	}

-	mg.Logger.Info("Migration successfully executed", "id", m.Id(), "duration", time.Since(start))
+	logger.Info("Migration successfully executed", "id", m.Id(), "duration", time.Since(start))

 	return nil
 }
@@ -75,18 +75,6 @@ func ProvideService(cfg *setting.Cfg,
 	}
 	s.tracer = tracer

-	// initialize and register metrics wrapper around the *sql.DB
-	db := s.engine.DB().DB
-
-	// register the go_sql_stats_connections_* metrics
-	if err := prometheus.Register(sqlstats.NewStatsCollector("grafana", db)); err != nil {
-		s.log.Warn("Failed to register sqlstore stats collector", "error", err)
-	}
-	// TODO: deprecate/remove these metrics
-	if err := prometheus.Register(newSQLStoreMetrics(db)); err != nil {
-		s.log.Warn("Failed to register sqlstore metrics", "error", err)
-	}
-
 	return s, nil
 }

@@ -150,7 +138,14 @@ func (ss *SQLStore) Migrate(isDatabaseLockingEnabled bool) error {
 	migrator := migrator.NewMigrator(ss.engine, ss.cfg)
 	ss.migrations.AddMigration(migrator)

-	return migrator.Start(isDatabaseLockingEnabled, ss.dbCfg.MigrationLockAttemptTimeout)
+	if err := prometheus.Register(migrator); err != nil {
+		ss.log.Warn("Failed to register migrator metrics", "error", err)
+	}
+
+	ctx, span := ss.tracer.Start(context.Background(), "SQLStore.Migrate")
+	defer span.End()
+
+	return migrator.RunMigrations(ctx, isDatabaseLockingEnabled, ss.dbCfg.MigrationLockAttemptTimeout)
 }

 // Reset resets database state.
@@ -327,6 +322,19 @@ func (ss *SQLStore) initEngine(engine *xorm.Engine) error {
 		engine.ShowExecTime(true)
 	}

+	// initialize and register metrics wrapper around the *sql.DB
+	db := engine.DB().DB
+
+	// register the go_sql_stats_connections_* metrics
+	if err := prometheus.Register(sqlstats.NewStatsCollector("grafana", db)); err != nil {
+		ss.log.Warn("Failed to register sqlstore stats collector", "error", err)
+	}
+
+	// TODO: deprecate/remove these metrics
+	if err := prometheus.Register(newSQLStoreMetrics(db)); err != nil {
+		ss.log.Warn("Failed to register sqlstore metrics", "error", err)
+	}
+
 	ss.engine = engine
 	return nil
 }
@@ -49,7 +49,7 @@ const (
 	evaluatorDefaultEvaluationTimeout       = 30 * time.Second
 	schedulerDefaultAdminConfigPollInterval = time.Minute
 	schedulerDefaultExecuteAlerts           = true
-	schedulerDefaultMaxAttempts             = 1
+	schedulerDefaultMaxAttempts             = 3
 	schedulerDefaultLegacyMinInterval       = 1
 	screenshotsDefaultCapture               = false
 	screenshotsDefaultCaptureTimeout        = 10 * time.Second
@@ -120,14 +120,14 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 				"evaluation_timeout":         evaluatorDefaultEvaluationTimeout.String(),
 			},
 			alertingOptions: map[string]string{
-				"max_attempts":               "1",
+				"max_attempts":               "1", // Note: Ignored, setting does not exist.
 				"min_interval_seconds":       "120",
 				"execute_alerts":             "true",
 				"evaluation_timeout_seconds": "160",
 			},
 			verifyCfg: func(t *testing.T, cfg Cfg) {
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval)
-				require.Equal(t, int64(1), cfg.UnifiedAlerting.MaxAttempts)
+				require.Equal(t, int64(3), cfg.UnifiedAlerting.MaxAttempts)
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.MinInterval)
 				require.Equal(t, true, cfg.UnifiedAlerting.ExecuteAlerts)
 				require.Equal(t, 160*time.Second, cfg.UnifiedAlerting.EvaluationTimeout)
@@ -168,14 +168,14 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 				"evaluation_timeout": "invalid",
 			},
 			alertingOptions: map[string]string{
-				"max_attempts":               "1",
+				"max_attempts":               "1", // Note: Ignored, setting does not exist.
 				"min_interval_seconds":       "120",
 				"execute_alerts":             "false",
 				"evaluation_timeout_seconds": "160",
 			},
 			verifyCfg: func(t *testing.T, cfg Cfg) {
 				require.Equal(t, alertmanagerDefaultConfigPollInterval, cfg.UnifiedAlerting.AdminConfigPollInterval)
-				require.Equal(t, int64(1), cfg.UnifiedAlerting.MaxAttempts)
+				require.Equal(t, int64(3), cfg.UnifiedAlerting.MaxAttempts)
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.MinInterval)
 				require.Equal(t, false, cfg.UnifiedAlerting.ExecuteAlerts)
 				require.Equal(t, 160*time.Second, cfg.UnifiedAlerting.EvaluationTimeout)
@@ -355,6 +355,10 @@ func (s *searchSupport) build(ctx context.Context, nsr NamespacedResource, size
 		return rv, err
 	})

+	if err != nil {
+		return nil, 0, err
+	}
+
 	// Record the number of objects indexed for the kind/resource
 	docCount, err := index.DocCount()
 	if err != nil {
@@ -364,10 +368,6 @@ func (s *searchSupport) build(ctx context.Context, nsr NamespacedResource, size
 		IndexMetrics.IndexedKinds.WithLabelValues(key.Resource).Add(float64(docCount))
 	}

-	if err != nil {
-		return nil, 0, err
-	}
-
 	if err == nil {
 		err = index.Flush()
 	}
@@ -71,6 +71,11 @@ func ProvideUnifiedStorageGrpcService(
 		return nil, err
 	}

+	// reg can be nil when running unified storage in standalone mode
+	if reg == nil {
+		reg = prometheus.DefaultRegisterer
+	}
+
 	// FIXME: This is a temporary solution while we are migrating to the new authn interceptor
 	// grpcutils.NewGrpcAuthenticator should be used instead.
 	authn, err := grpcutils.NewGrpcAuthenticatorWithFallback(cfg, prometheus.DefaultRegisterer, tracing, &grpc.Authenticator{})
@@ -443,7 +443,7 @@ func (s *Service) buildQueryExecutors(logger log.Logger, req *backend.QueryDataR
 			}
 			queryInterface = cmp
 		default:
-			return nil, fmt.Errorf("unrecognized query type %q", query.QueryType)
+			return nil, backend.DownstreamError(fmt.Errorf("unrecognized query type %q", query.QueryType))
 		}

 		cloudMonitoringQueryExecutors = append(cloudMonitoringQueryExecutors, queryInterface)
@@ -23,8 +23,8 @@ type Options struct {
 	Dataplane bool
 }

-func rspErr(e error) backend.DataResponse {
-	return backend.DataResponse{Error: e}
+func rspDownstreamErr(e error) backend.DataResponse {
+	return backend.DataResponse{Error: e, ErrorSource: backend.ErrorSourceDownstream}
 }

 // ReadPrometheusStyleResult will read results from a prometheus or loki server and return data frames
@@ -39,38 +39,38 @@ func ReadPrometheusStyleResult(jIter *jsoniter.Iterator, opt Options) backend.Da
 l1Fields:
 	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
 		if err != nil {
-			return rspErr(err)
+			return rspDownstreamErr(err)
 		}
 		switch l1Field {
 		case "status":
 			if status, err = iter.ReadString(); err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}

 		case "data":
 			rsp = readPrometheusData(iter, opt)
 			if rsp.Error != nil {
-				return rsp
+				return rspDownstreamErr(err)
 			}

 		case "error":
 			if promErrString, err = iter.ReadString(); err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}

 		case "errorType":
 			if errorType, err = iter.ReadString(); err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}

 		case "warnings":
 			if warnings, err = readWarnings(iter); err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}

 		case "":
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			break l1Fields

@@ -86,7 +86,8 @@ l1Fields:

 	if status == "error" {
 		return backend.DataResponse{
-			Error: fmt.Errorf("%s: %s", errorType, promErrString),
+			Error:       fmt.Errorf("%s: %s", errorType, promErrString),
+			ErrorSource: backend.ErrorSourceDownstream,
 		}
 	}

@@ -141,7 +142,7 @@ func readPrometheusData(iter *sdkjsoniter.Iterator, opt Options) backend.DataRes
 	var rsp backend.DataResponse
 	t, err := iter.WhatIsNext()
 	if err != nil {
-		return rspErr(err)
+		return rspDownstreamErr(err)
 	}

 	if t == sdkjsoniter.ArrayValue {
@@ -163,27 +164,27 @@ func readPrometheusData(iter *sdkjsoniter.Iterator, opt Options) backend.DataRes
 l1Fields:
 	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
 		if err != nil {
-			return rspErr(err)
+			return rspDownstreamErr(err)
 		}
 		switch l1Field {
 		case "encodingFlags":
 			for ok, err := iter.ReadArray(); ok; ok, err = iter.ReadArray() {
 				if err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}
 				encodingFlag, err := iter.ReadString()
 				if err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}
 				encodingFlags = append(encodingFlags, encodingFlag)
 			}
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 		case "resultType":
 			resultType, err = iter.ReadString()
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			resultTypeFound = true

@@ -206,7 +207,7 @@ l1Fields:
 		case "stats":
 			v, err := iter.Read()
 			if err != nil {
-				rspErr(err)
+				rspDownstreamErr(err)
 			}
 			if len(rsp.Frames) > 0 {
 				meta := rsp.Frames[0].Meta
@@ -221,17 +222,17 @@ l1Fields:

 		case "":
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			if !resultTypeFound {
-				return rspErr(fmt.Errorf("no resultType found"))
+				return rspDownstreamErr(fmt.Errorf("no resultType found"))
 			}
 			break l1Fields

 		default:
 			v, err := iter.Read()
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			logf("[data] TODO, support key: %s / %v\n", l1Field, v)
 		}
@@ -269,7 +270,7 @@ func readResult(resultType string, rsp backend.DataResponse, iter *sdkjsoniter.I
 		}
 	default:
 		if err := iter.Skip(); err != nil {
-			return rspErr(err)
+			return rspDownstreamErr(err)
 		}
 		rsp = backend.DataResponse{
 			Error: fmt.Errorf("unknown result type: %s", resultType),
@@ -289,19 +290,19 @@ func readArrayData(iter *sdkjsoniter.Iterator) backend.DataResponse {
 	stringField.Name = "Value"
 	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
 		if err != nil {
-			rspErr(err)
+			rspDownstreamErr(err)
 		}

 		next, err := iter.WhatIsNext()
 		if err != nil {
-			return rspErr(err)
+			return rspDownstreamErr(err)
 		}

 		switch next {
 		case sdkjsoniter.StringValue:
 			s, err := iter.ReadString()
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			stringField.Append(s)

@@ -309,7 +310,7 @@ func readArrayData(iter *sdkjsoniter.Iterator) backend.DataResponse {
 		case sdkjsoniter.ObjectValue:
 			exemplar, labelPairs, err := readLabelsOrExemplars(iter)
 			if err != nil {
-				rspErr(err)
+				rspDownstreamErr(err)
 			}
 			if exemplar != nil {
 				rsp.Frames = append(rsp.Frames, exemplar)
@@ -349,7 +350,7 @@ func readArrayData(iter *sdkjsoniter.Iterator) backend.DataResponse {
 			{
 				ext, err := iter.ReadAny()
 				if err != nil {
-					rspErr(err)
+					rspDownstreamErr(err)
 				}
 				v := fmt.Sprintf("%v", ext)
 				stringField.Append(v)
@@ -505,25 +506,25 @@ func readString(iter *sdkjsoniter.Iterator) backend.DataResponse {

 	_, err := iter.ReadArray()
 	if err != nil {
-		return rspErr(err)
+		return rspDownstreamErr(err)
 	}

 	var t float64
 	if t, err = iter.ReadFloat64(); err != nil {
-		return rspErr(err)
+		return rspDownstreamErr(err)
 	}

 	if _, err = iter.ReadArray(); err != nil {
-		return rspErr(err)
+		return rspDownstreamErr(err)
 	}

 	var v string
 	if v, err = iter.ReadString(); err != nil {
-		return rspErr(err)
+		return rspDownstreamErr(err)
 	}

 	if _, err = iter.ReadArray(); err != nil {
-		return rspErr(err)
+		return rspDownstreamErr(err)
 	}

 	tt := timeFromFloat(t)
@@ -578,7 +579,7 @@ func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt

 	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
 		if err != nil {
-			return rspErr(err)
+			return rspDownstreamErr(err)
 		}
 		timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
 		timeField.Name = data.TimeSeriesTimeFieldName
@@ -590,18 +591,18 @@ func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt

 		for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			switch l1Field {
 			case "metric":
 				if err = iter.ReadVal(&valueField.Labels); err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}

 			case "value":
 				t, v, err := readTimeValuePair(iter)
 				if err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}
 				timeField.Append(t)
 				valueField.Append(v)
@@ -610,11 +611,11 @@ func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt
 			case "values":
 				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}
 					t, v, err := readTimeValuePair(iter)
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}
 					timeField.Append(t)
 					valueField.Append(v)
@@ -626,7 +627,7 @@ func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt
 				}
 				err = readHistogram(iter, histogram)
 				if err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}

 			case "histograms":
@@ -635,16 +636,16 @@ func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt
 				}
 				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}
 					if err = readHistogram(iter, histogram); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}
 				}

 			default:
 				if err = iter.Skip(); err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}
 				logf("readMatrixOrVector: %s\n", l1Field)
 			}
@@ -874,13 +875,13 @@ func readStream(iter *sdkjsoniter.Iterator) backend.DataResponse {

 	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
 		if err != nil {
-			rspErr(err)
+			rspDownstreamErr(err)
 		}

 	l1Fields:
 		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			switch l1Field {
 			case "stream":
@@ -888,11 +889,11 @@ func readStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
 				// only appends to it
 				labels := data.Labels{}
 				if err = iter.ReadVal(&labels); err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}

 				if labelJson, err = labelsToRawJson(labels); err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}

 			case "values":
@@ -903,30 +904,30 @@ func readStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					ts, err := iter.ReadString()
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					line, err := iter.ReadString()
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					t, err := timeFromLokiString(ts)
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					labelsField.Append(labelJson)
@@ -936,7 +937,7 @@ func readStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
 				}
 			case "":
 				if err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}
 				break l1Fields
 			}
@@ -973,13 +974,13 @@ func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {

 	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
 		if err != nil {
-			rspErr(err)
+			rspDownstreamErr(err)
 		}

 	l1Fields:
 		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
 			if err != nil {
-				return rspErr(err)
+				return rspDownstreamErr(err)
 			}
 			switch l1Field {
 			case "stream":
@@ -987,7 +988,7 @@ func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
 				// only appends to it
 				indexedLabels = data.Labels{}
 				if err = iter.ReadVal(&indexedLabels); err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}

 			case "values":
@@ -998,39 +999,39 @@ func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					ts, err := iter.ReadString()
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					line, err := iter.ReadString()
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					parsedLabelsMap, structuredMetadataMap, err := readCategorizedStreamField(iter)
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					t, err := timeFromLokiString(ts)
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					typeMap := data.Labels{}
@@ -1054,12 +1055,12 @@ func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {

 					labelJson, err := labelsToRawJson(clonedLabels)
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					labelTypesJson, err := labelsToRawJson(typeMap)
 					if err != nil {
-						return rspErr(err)
+						return rspDownstreamErr(err)
 					}

 					labelsField.Append(labelJson)
@@ -1070,7 +1071,7 @@ func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
 				}
 			case "":
 				if err != nil {
-					return rspErr(err)
+					return rspDownstreamErr(err)
 				}
 				break l1Fields
 			}
@@ -183,7 +183,8 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
    expressionQueries
  );

-  const simplifiedQueryStep = isSwitchModeEnabled ? getValues('editorSettings.simplifiedQueryEditor') : false;
+  const simplifiedQueryStep =
+    isSwitchModeEnabled && isGrafanaAlertingType ? getValues('editorSettings.simplifiedQueryEditor') : false;

  // If we switch to simple mode we need to update the simple condition with the data in the queries reducer
  useEffect(() => {
@@ -95,9 +95,9 @@ export const PANEL_STYLES = { minHeight: 300 };

 const THIS_WEEK_TIME_RANGE = new SceneTimeRange({ from: 'now-1w', to: 'now' });

-const namespace = config.bootData.settings.namespace;
+const namespace = config.namespace;

-export const INSTANCE_ID = namespace.includes('stack-') ? namespace.replace('stack-', '') : undefined;
+export const INSTANCE_ID = namespace.includes('stacks-') ? namespace.replace('stacks-', '') : undefined;

 const getInsightsDataSources = () => {
  const dataSourceSrv = getDataSourceSrv();
@@ -1,15 +1,38 @@
 import { cloneDeep } from 'lodash';

 import { config } from '@grafana/runtime';
-import { behaviors, sceneGraph, SceneQueryRunner } from '@grafana/scenes';
-import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/dashboard.gen';
+import {
+  behaviors,
+  ConstantVariable,
+  CustomVariable,
+  DataSourceVariable,
+  IntervalVariable,
+  QueryVariable,
+  TextBoxVariable,
+  sceneGraph,
+  GroupByVariable,
+  AdHocFiltersVariable,
+} from '@grafana/scenes';
+import {
+  AdhocVariableKind,
+  ConstantVariableKind,
+  CustomVariableKind,
+  DashboardV2Spec,
+  DatasourceVariableKind,
+  GroupByVariableKind,
+  IntervalVariableKind,
+  QueryVariableKind,
+  TextVariableKind,
+} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/dashboard.gen';
 import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/examples';
 import { DashboardWithAccessInfo } from 'app/features/dashboard/api/dashboard_api';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';

+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
 import { DashboardLayoutManager } from '../scene/types';
 import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
 import { getQueryRunnerFor } from '../utils/utils';
+import { validateVariable, validateVizPanel } from '../v2schema/test-helpers';

 import { transformSaveModelSchemaV2ToScene } from './transformSaveModelSchemaV2ToScene';
 import { transformCursorSynctoEnum } from './transformToV2TypesUtils';
@@ -85,14 +108,96 @@ describe('transformSaveModelSchemaV2ToScene', () => {
    expect(dashboardControls.state.refreshPicker.state.intervals).toEqual(time.autoRefreshIntervals);
    expect(dashboardControls.state.hideTimeControls).toBe(time.hideTimepicker);

-    // TODO: Variables
-    // expect(scene.state?.$variables?.state.variables).toHaveLength(dash.variables.length);
-    // expect(scene.state?.$variables?.getByName(dash.variables[0].spec.name)).toBeInstanceOf(QueryVariable);
-    // expect(scene.state?.$variables?.getByName(dash.variables[1].spec.name)).toBeInstanceOf(TextBoxVariable); ...
+    // Variables
+    const variables = scene.state?.$variables;
+    expect(variables?.state.variables).toHaveLength(dash.variables.length);
+    validateVariable({
+      sceneVariable: variables?.state.variables[0],
+      variableKind: dash.variables[0] as QueryVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: QueryVariable,
+      index: 0,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[1],
+      variableKind: dash.variables[1] as CustomVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: CustomVariable,
+      index: 1,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[2],
+      variableKind: dash.variables[2] as DatasourceVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: DataSourceVariable,
+      index: 2,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[3],
+      variableKind: dash.variables[3] as ConstantVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: ConstantVariable,
+      index: 3,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[4],
+      variableKind: dash.variables[4] as IntervalVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: IntervalVariable,
+      index: 4,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[5],
+      variableKind: dash.variables[5] as TextVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: TextBoxVariable,
+      index: 5,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[6],
+      variableKind: dash.variables[6] as GroupByVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: GroupByVariable,
+      index: 6,
+    });
+    validateVariable({
+      sceneVariable: variables?.state.variables[7],
+      variableKind: dash.variables[7] as AdhocVariableKind,
+      scene: scene,
+      dashSpec: dash,
+      sceneVariableClass: AdHocFiltersVariable,
+      index: 7,
+    });

-    // TODO: Annotations
-    // expect(scene.state.annotations).toHaveLength(dash.annotations.length);
-    // expect(scene.state.annotations[0].text).toBe(dash.annotations[0].text); ...
+    // Annotations
+    expect(scene.state.$data).toBeInstanceOf(DashboardDataLayerSet);
+    const dataLayers = scene.state.$data as DashboardDataLayerSet;
+    expect(dataLayers.state.annotationLayers).toHaveLength(dash.annotations.length);
+    expect(dataLayers.state.annotationLayers[0].state.name).toBe(dash.annotations[0].spec.name);
+    expect(dataLayers.state.annotationLayers[0].state.isEnabled).toBe(dash.annotations[0].spec.enable);
+    expect(dataLayers.state.annotationLayers[0].state.isHidden).toBe(dash.annotations[0].spec.hide);
+
+    // Enabled
+    expect(dataLayers.state.annotationLayers[1].state.name).toBe(dash.annotations[1].spec.name);
+    expect(dataLayers.state.annotationLayers[1].state.isEnabled).toBe(dash.annotations[1].spec.enable);
+    expect(dataLayers.state.annotationLayers[1].state.isHidden).toBe(dash.annotations[1].spec.hide);
+
+    // Disabled
+    expect(dataLayers.state.annotationLayers[2].state.name).toBe(dash.annotations[2].spec.name);
+    expect(dataLayers.state.annotationLayers[2].state.isEnabled).toBe(dash.annotations[2].spec.enable);
+    expect(dataLayers.state.annotationLayers[2].state.isHidden).toBe(dash.annotations[2].spec.hide);
+
+    // Hidden
+    expect(dataLayers.state.annotationLayers[3].state.name).toBe(dash.annotations[3].spec.name);
+    expect(dataLayers.state.annotationLayers[3].state.isEnabled).toBe(dash.annotations[3].spec.enable);
+    expect(dataLayers.state.annotationLayers[3].state.isHidden).toBe(dash.annotations[3].spec.hide);

    // To be implemented
    // expect(timePicker.state.ranges).toEqual(dash.timeSettings.quickRanges);
@@ -101,31 +206,7 @@ describe('transformSaveModelSchemaV2ToScene', () => {
    const vizPanels = (scene.state.body as DashboardLayoutManager).getVizPanels();
    expect(vizPanels).toHaveLength(1);
    const vizPanel = vizPanels[0];
-    expect(vizPanel.state.title).toBe(dash.elements['test-panel-uid'].spec.title);
-    expect(vizPanel.state.description).toBe(dash.elements['test-panel-uid'].spec.description);
-    expect(vizPanel.state.pluginId).toBe(dash.elements['test-panel-uid'].spec.vizConfig.kind);
-    expect(vizPanel.state.pluginVersion).toBe(dash.elements['test-panel-uid'].spec.vizConfig.spec.pluginVersion);
-    expect(vizPanel.state.options).toEqual(dash.elements['test-panel-uid'].spec.vizConfig.spec.options);
-    expect(vizPanel.state.fieldConfig).toEqual(dash.elements['test-panel-uid'].spec.vizConfig.spec.fieldConfig);
-
-    // FIXME: There is an error of data being undefined
-    // expect(vizPanel.state.$data).toBeInstanceOf(SceneDataTransformer);
-    // const dataTransformer = vizPanel.state.$data as SceneDataTransformer;
-    // expect(dataTransformer.state.transformations).toEqual([{ id: 'transform1', options: {} }]);
-
-    // expect(dataTransformer.state.$data).toBeInstanceOf(SceneQueryRunner);
-    const queryRunner = getQueryRunnerFor(vizPanel);
-    expect(queryRunner).toBeInstanceOf(SceneQueryRunner);
-    expect(queryRunner?.state.datasource).toBeUndefined();
-    // expect(queryRunner.state.queries).toEqual([{ query: 'test-query', datasource: { uid: 'datasource1', type: 'prometheus' } }]);
-    // expect(queryRunner.state.maxDataPoints).toBe(100);
-    // expect(queryRunner.state.cacheTimeout).toBe('1m');
-    // expect(queryRunner.state.queryCachingTTL).toBe(60);
-    // expect(queryRunner.state.minInterval).toBe('1m');
-    // expect(queryRunner.state.dataLayerFilter?.panelId).toBe(1);
-
-    // FIXME: Fix the key incompatibility since panel is not numeric anymore
-    // expect(vizPanel.state.key).toBe(dash.elements['test-panel-uid'].spec.uid);
+    validateVizPanel(vizPanel, dash);

    // FIXME: Tests for layout
  });
@@ -85,7 +85,7 @@ import {

 const DEFAULT_DATASOURCE = 'default';

-type TypedVariableModelv2 =
+export type TypedVariableModelV2 =
  | QueryVariableKind
  | TextVariableKind
  | ConstantVariableKind
@@ -396,7 +396,7 @@ function createVariablesForDashboard(dashboard: DashboardV2Spec) {
  });
 }

-function createSceneVariableFromVariableModel(variable: TypedVariableModelv2): SceneVariable {
+function createSceneVariableFromVariableModel(variable: TypedVariableModelV2): SceneVariable {
  const commonProperties = {
    name: variable.spec.name,
    label: variable.spec.label,
@@ -593,7 +593,7 @@ export function createVariablesForSnapshot(dashboard: DashboardV2Spec): SceneVar
 }

 /** Snapshots variables are read-only and should not be updated */
-export function createSnapshotVariable(variable: TypedVariableModelv2): SceneVariable {
+export function createSnapshotVariable(variable: TypedVariableModelV2): SceneVariable {
  let snapshotVariable: SnapshotVariable;
  let current: { value: string | string[]; text: string | string[] };
  if (variable.kind === 'IntervalVariable') {
@@ -0,0 +1,88 @@
+import {
+  AdHocFiltersVariable,
+  DataSourceVariable,
+  GroupByVariable,
+  QueryVariable,
+  SceneDataTransformer,
+  SceneQueryRunner,
+  SceneVariable,
+  SceneVariableState,
+  VizPanel,
+} from '@grafana/scenes';
+import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/dashboard.gen';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { TypedVariableModelV2 } from '../serialization/transformSaveModelSchemaV2ToScene';
+import { getQueryRunnerFor } from '../utils/utils';
+
+type SceneVariableConstructor<T extends SceneVariableState, V extends SceneVariable<T>> = new (
+  initialState: Partial<T>
+) => V;
+
+interface VariableValidation<T extends TypedVariableModelV2, S extends SceneVariableState, V extends SceneVariable<S>> {
+  sceneVariable: SceneVariable<SceneVariableState> | undefined;
+  variableKind: T;
+  scene: DashboardScene;
+  dashSpec: DashboardV2Spec;
+  sceneVariableClass: SceneVariableConstructor<S, V>;
+  index: number;
+}
+
+export function validateVariable<
+  T extends TypedVariableModelV2,
+  S extends SceneVariableState,
+  V extends SceneVariable<S>,
+>({ sceneVariable, variableKind, scene, dashSpec, sceneVariableClass, index }: VariableValidation<T, S, V>) {
+  if (variableKind.kind === 'AdhocVariable' && sceneVariable instanceof AdHocFiltersVariable) {
+    expect(sceneVariable).toBeInstanceOf(AdHocFiltersVariable);
+    expect(scene.state?.$variables?.getByName(dashSpec.variables[index].spec.name)?.getValue()).toBe(
+      `${variableKind.spec.filters[0].key}="${variableKind.spec.filters[0].value}"`
+    );
+    expect(sceneVariable?.state.datasource).toEqual(variableKind.spec.datasource);
+  } else if (variableKind.kind !== 'AdhocVariable') {
+    expect(sceneVariable).toBeInstanceOf(sceneVariableClass);
+    expect(scene.state?.$variables?.getByName(dashSpec.variables[index].spec.name)?.getValue()).toBe(
+      variableKind.spec.current.value
+    );
+  }
+  if (sceneVariable instanceof DataSourceVariable && variableKind.kind === 'DatasourceVariable') {
+    expect(sceneVariable?.state.pluginId).toBe(variableKind.spec.pluginId);
+  }
+  if (sceneVariable instanceof QueryVariable && variableKind.kind === 'QueryVariable') {
+    expect(sceneVariable?.state.datasource).toBe(variableKind.spec.datasource);
+    expect(sceneVariable?.state.query).toBe(variableKind.spec.query);
+  }
+  if (sceneVariable instanceof GroupByVariable && variableKind.kind === 'CustomVariable') {
+    expect(sceneVariable?.state.datasource).toBe(variableKind.spec.query);
+  }
+}
+
+export function validateVizPanel(vizPanel: VizPanel, dash: DashboardV2Spec) {
+  expect(vizPanel.state.title).toBe(dash.elements['test-panel-uid'].spec.title);
+  expect(vizPanel.state.description).toBe(dash.elements['test-panel-uid'].spec.description);
+  expect(vizPanel.state.pluginId).toBe(dash.elements['test-panel-uid'].spec.vizConfig.kind);
+  expect(vizPanel.state.pluginVersion).toBe(dash.elements['test-panel-uid'].spec.vizConfig.spec.pluginVersion);
+  expect(vizPanel.state.options).toEqual(dash.elements['test-panel-uid'].spec.vizConfig.spec.options);
+  expect(vizPanel.state.fieldConfig).toEqual(dash.elements['test-panel-uid'].spec.vizConfig.spec.fieldConfig);
+  expect(vizPanel.state.key).toBe(dash.elements['test-panel-uid'].spec.uid);
+
+  expect(vizPanel.state.$data).toBeInstanceOf(SceneDataTransformer);
+  const dataTransformer = vizPanel.state.$data as SceneDataTransformer;
+  expect(dataTransformer.state.transformations[0]).toEqual(
+    dash.elements['test-panel-uid'].spec.data.spec.transformations[0].spec
+  );
+
+  expect(dataTransformer.state.$data).toBeInstanceOf(SceneQueryRunner);
+  const queryRunner = getQueryRunnerFor(vizPanel)!;
+  expect(queryRunner).toBeInstanceOf(SceneQueryRunner);
+  expect(queryRunner.state.queries).toEqual([
+    { datasource: { type: 'prometheus', uid: 'datasource1' }, expr: 'test-query', hide: false, refId: 'A' },
+  ]);
+  expect(queryRunner.state.maxDataPoints).toBe(100);
+  expect(queryRunner.state.cacheTimeout).toBe('1m');
+  expect(queryRunner.state.queryCachingTTL).toBe(60);
+  expect(queryRunner.state.minInterval).toBe('1m');
+  // FIXME: This is asking for a number as panel ID but here the uid of a panel is string
+  // will be fixed once scenes package is updated to support string panel ID
+  // expect(queryRunner.state.dataLayerFilter?.panelId).toBe(0);
+}
@@ -2,14 +2,14 @@
  "name": "@grafana-plugins/grafana-azure-monitor-datasource",
  "description": "Grafana data source for Azure Monitor",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "@kusto/monaco-kusto": "^10.0.0",
    "fast-deep-equal": "^3.1.3",
    "i18next": "^23.0.0",
@@ -25,8 +25,8 @@
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/e2e-selectors": "11.4.0-pre",
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/jest-dom": "6.6.3",
    "@testing-library/react": "16.0.1",
@@ -2,15 +2,15 @@
  "name": "@grafana-plugins/stackdriver",
  "description": "Grafana data source for Google Cloud Monitoring",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
    "@grafana/google-sdk": "0.1.2",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "debounce-promise": "3.1.2",
    "fast-deep-equal": "^3.1.3",
    "i18next": "^23.0.0",
@@ -26,8 +26,8 @@
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/e2e-selectors": "11.4.0-pre",
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/jest-dom": "6.6.3",
    "@testing-library/react": "16.0.1",
@@ -2,22 +2,22 @@
  "name": "@grafana-plugins/grafana-postgresql-datasource",
  "description": "PostgreSQL data source plugin",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/sql": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/sql": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "lodash": "4.17.21",
    "react": "18.2.0",
    "rxjs": "7.8.1",
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/e2e-selectors": "11.4.0-pre",
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/react": "16.0.1",
    "@testing-library/user-event": "14.5.2",
@@ -2,13 +2,13 @@
  "name": "@grafana-plugins/grafana-pyroscope-datasource",
  "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "fast-deep-equal": "^3.1.3",
    "lodash": "4.17.21",
    "monaco-editor": "0.34.1",
@@ -20,7 +20,7 @@
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/jest-dom": "6.6.3",
    "@testing-library/react": "16.0.1",
@@ -2,14 +2,14 @@
  "name": "@grafana-plugins/grafana-testdata-datasource",
  "description": "Generates test data in different forms",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "d3-random": "^3.0.1",
    "lodash": "4.17.21",
    "micro-memoize": "^4.1.2",
@@ -22,8 +22,8 @@
    "uuid": "9.0.1"
  },
  "devDependencies": {
-    "@grafana/e2e-selectors": "11.4.0-pre",
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/react": "16.0.1",
    "@testing-library/user-event": "14.5.2",
@@ -2,7 +2,7 @@
  "name": "@grafana-plugins/jaeger",
  "description": "Jaeger plugin for Grafana",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
    "@grafana/data": "workspace:*",
@@ -2,22 +2,22 @@
  "name": "@grafana-plugins/mssql",
  "description": "MSSQL data source plugin",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/sql": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/sql": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "lodash": "4.17.21",
    "react": "18.2.0",
    "rxjs": "7.8.1",
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/e2e-selectors": "11.4.0-pre",
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/react": "16.0.1",
    "@testing-library/user-event": "14.5.2",
@@ -2,22 +2,22 @@
  "name": "@grafana-plugins/mysql",
  "description": "MySQL data source plugin",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
    "@grafana/experimental": "2.1.4",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/sql": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/sql": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "lodash": "4.17.21",
    "react": "18.2.0",
    "rxjs": "7.8.1",
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/e2e-selectors": "11.4.0-pre",
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/e2e-selectors": "11.5.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/react": "16.0.1",
    "@testing-library/user-event": "14.5.2",
@@ -2,13 +2,13 @@
  "name": "@grafana-plugins/parca",
  "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "11.4.0-pre",
-    "@grafana/runtime": "11.4.0-pre",
-    "@grafana/schema": "11.4.0-pre",
-    "@grafana/ui": "11.4.0-pre",
+    "@grafana/data": "11.5.0-pre",
+    "@grafana/runtime": "11.5.0-pre",
+    "@grafana/schema": "11.5.0-pre",
+    "@grafana/ui": "11.5.0-pre",
    "lodash": "4.17.21",
    "monaco-editor": "0.34.1",
    "react": "18.2.0",
@@ -18,7 +18,7 @@
    "tslib": "2.7.0"
  },
  "devDependencies": {
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/react": "16.0.1",
    "@testing-library/user-event": "14.5.2",
@@ -2,7 +2,7 @@
  "name": "@grafana-plugins/tempo",
  "description": "Grafana plugin for the Tempo data source.",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
    "@grafana/data": "workspace:*",
@@ -39,7 +39,7 @@
    "uuid": "9.0.1"
  },
  "devDependencies": {
-    "@grafana/plugin-configs": "11.4.0-pre",
+    "@grafana/plugin-configs": "11.5.0-pre",
    "@testing-library/dom": "10.4.0",
    "@testing-library/jest-dom": "6.6.3",
    "@testing-library/react": "16.0.1",
@@ -2,7 +2,7 @@
  "name": "@grafana-plugins/zipkin",
  "description": "Zipkin plugin for Grafana",
  "private": true,
-  "version": "11.4.0-pre",
+  "version": "11.5.0-pre",
  "dependencies": {
    "@emotion/css": "11.13.5",
    "@grafana/data": "workspace:*",
@@ -1111,7 +1111,7 @@ def remote_alertmanager_integration_tests_steps():
        "AM_URL": "http://mimir_backend:8080",
    }

-    return integration_tests_steps("remote-alertmanager", cmds, "mimir_backend", "8080", environment = environment, canFail = True)
+    return integration_tests_steps("remote-alertmanager", cmds, "mimir_backend", "8080", environment = environment)

 def memcached_integration_tests_steps():
    cmds = [
@@ -2764,13 +2764,13 @@ __metadata:
  resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@kusto/monaco-kusto": "npm:^10.0.0"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/jest-dom": "npm:6.6.3"
@@ -2808,13 +2808,13 @@ __metadata:
  resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/sql": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/sql": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/react": "npm:16.0.1"
    "@testing-library/user-event": "npm:14.5.2"
@@ -2839,11 +2839,11 @@ __metadata:
  resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/jest-dom": "npm:6.6.3"
    "@testing-library/react": "npm:16.0.1"
@@ -2879,13 +2879,13 @@ __metadata:
  resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/react": "npm:16.0.1"
    "@testing-library/user-event": "npm:14.5.2"
@@ -2961,13 +2961,13 @@ __metadata:
  resolution: "@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/sql": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/sql": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/react": "npm:16.0.1"
    "@testing-library/user-event": "npm:14.5.2"
@@ -2992,13 +2992,13 @@ __metadata:
  resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/sql": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/sql": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/react": "npm:16.0.1"
    "@testing-library/user-event": "npm:14.5.2"
@@ -3023,11 +3023,11 @@ __metadata:
  resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/react": "npm:16.0.1"
    "@testing-library/user-event": "npm:14.5.2"
@@ -3055,14 +3055,14 @@ __metadata:
  resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
    "@grafana/google-sdk": "npm:0.1.2"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/jest-dom": "npm:6.6.3"
    "@testing-library/react": "npm:16.0.1"
@@ -3110,7 +3110,7 @@ __metadata:
    "@grafana/lezer-traceql": "npm:0.0.20"
    "@grafana/monaco-logql": "npm:^0.0.7"
    "@grafana/o11y-ds-frontend": "workspace:*"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
    "@grafana/runtime": "workspace:*"
    "@grafana/schema": "workspace:*"
    "@grafana/ui": "workspace:*"
@@ -3222,12 +3222,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/data@npm:11.4.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@npm:11.5.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
  version: 0.0.0-use.local
  resolution: "@grafana/data@workspace:packages/grafana-data"
  dependencies:
    "@braintree/sanitize-url": "npm:7.0.1"
-    "@grafana/schema": "npm:11.4.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
    "@rollup/plugin-node-resolve": "npm:15.3.0"
    "@types/d3-interpolate": "npm:^3.0.0"
@@ -3275,7 +3275,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/e2e-selectors@npm:11.4.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@npm:11.5.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
  version: 0.0.0-use.local
  resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
  dependencies:
@@ -3430,9 +3430,9 @@ __metadata:
    "@babel/preset-env": "npm:7.26.0"
    "@babel/preset-react": "npm:7.25.9"
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@leeoniya/ufuzzy": "npm:1.0.17"
    "@rollup/plugin-node-resolve": "npm:15.3.0"
    "@testing-library/dom": "npm:10.4.0"
@@ -3514,13 +3514,13 @@ __metadata:
  resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/jest-dom": "npm:^6.1.2"
    "@testing-library/react": "npm:16.0.1"
@@ -3544,7 +3544,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/plugin-configs@npm:11.4.0-pre, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
+"@grafana/plugin-configs@npm:11.5.0-pre, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
  version: 0.0.0-use.local
  resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs"
  dependencies:
@@ -3587,14 +3587,14 @@ __metadata:
    "@emotion/css": "npm:11.13.5"
    "@emotion/eslint-plugin": "npm:11.12.0"
    "@floating-ui/react": "npm:0.26.28"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
    "@grafana/faro-web-sdk": "npm:1.12.2"
-    "@grafana/runtime": "npm:11.4.0-pre"
-    "@grafana/schema": "npm:11.4.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@hello-pangea/dnd": "npm:17.0.0"
    "@leeoniya/ufuzzy": "npm:1.0.17"
    "@lezer/common": "npm:1.2.3"
@@ -3690,16 +3690,16 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/runtime@npm:11.4.0-pre, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
+"@grafana/runtime@npm:11.5.0-pre, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
  version: 0.0.0-use.local
  resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
  dependencies:
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/faro-web-sdk": "npm:^1.3.6"
-    "@grafana/schema": "npm:11.4.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@rollup/plugin-node-resolve": "npm:15.3.0"
    "@rollup/plugin-terser": "npm:0.4.4"
    "@testing-library/dom": "npm:10.4.0"
@@ -3810,7 +3810,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/schema@npm:11.4.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@npm:11.5.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
  version: 0.0.0-use.local
  resolution: "@grafana/schema@workspace:packages/grafana-schema"
  dependencies:
@@ -3828,17 +3828,17 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/sql@npm:11.4.0-pre, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
+"@grafana/sql@npm:11.5.0-pre, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
  version: 0.0.0-use.local
  resolution: "@grafana/sql@workspace:packages/grafana-sql"
  dependencies:
    "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/experimental": "npm:2.1.4"
-    "@grafana/runtime": "npm:11.4.0-pre"
+    "@grafana/runtime": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:11.4.0-pre"
+    "@grafana/ui": "npm:11.5.0-pre"
    "@react-awesome-query-builder/ui": "npm:6.6.4"
    "@testing-library/dom": "npm:10.4.0"
    "@testing-library/jest-dom": "npm:^6.1.2"
@@ -3880,7 +3880,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/ui@npm:11.4.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@npm:11.5.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
  version: 0.0.0-use.local
  resolution: "@grafana/ui@workspace:packages/grafana-ui"
  dependencies:
@@ -3890,10 +3890,10 @@ __metadata:
    "@emotion/serialize": "npm:1.3.3"
    "@faker-js/faker": "npm:^9.0.0"
    "@floating-ui/react": "npm:0.26.28"
-    "@grafana/data": "npm:11.4.0-pre"
-    "@grafana/e2e-selectors": "npm:11.4.0-pre"
+    "@grafana/data": "npm:11.5.0-pre"
+    "@grafana/e2e-selectors": "npm:11.5.0-pre"
    "@grafana/faro-web-sdk": "npm:^1.3.6"
-    "@grafana/schema": "npm:11.4.0-pre"
+    "@grafana/schema": "npm:11.5.0-pre"
    "@grafana/tsconfig": "npm:^2.0.0"
    "@hello-pangea/dnd": "npm:17.0.0"
    "@leeoniya/ufuzzy": "npm:1.0.17"
@@ -8260,7 +8260,7 @@ __metadata:
  dependencies:
    "@emotion/css": "npm:11.11.2"
    "@grafana/data": "workspace:*"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "workspace:*"
    "@grafana/runtime": "workspace:*"
    "@grafana/schema": "workspace:*"
    "@grafana/ui": "workspace:*"
@@ -8292,7 +8292,7 @@ __metadata:
  dependencies:
    "@emotion/css": "npm:11.11.2"
    "@grafana/data": "workspace:*"
-    "@grafana/plugin-configs": "npm:11.4.0-pre"
+    "@grafana/plugin-configs": "npm:11.5.0-pre"
    "@grafana/runtime": "workspace:*"
    "@grafana/schema": "workspace:*"
    "@grafana/ui": "workspace:*"