Commit Graph
43045 Commits
Author SHA1 Message Date
grafana-delivery-bot[bot] d85be0bb96 Release: Bump version to 10.0.3 (#71344)
"Release: Updated versions in package to 10.0.3"

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
2023-07-11 17:28:15 +03:00
grafana-delivery-bot[bot]andRobby Milo 34c621dddf [v10.0.x] fix shortcode usage (#71359)
fix shortcode usage (#71353)

(cherry picked from commit c3a8819ed2)

Co-authored-by: Robby Milo <robbymilo@fastmail.com>
2023-07-11 13:25:08 +01:00
Emil Tullstedt eeca760e94 [v10.0.x] CI: Provide a Drone promotion to build the build-container (#71352)
CI: Provide a Drone promotion to build the build-container (#71133)

(cherry picked from commit 7a9847e196)
2023-07-11 14:03:50 +02:00
grafana-delivery-bot[bot] 111ddb9bad [v10.0.x] Changelog: Updated changelog for 10.0.2 (#71339)
Changelog: Updated changelog for 10.0.2 (#71338)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit b18b4895a4)

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
2023-07-11 13:19:13 +03:00
grafana-delivery-bot[bot]andKyle Brandt bc1e8a7c9e [v10.0.x] Alerting: (Chore/Instrumentation) Add traceID to logs with contextual logger (#71333)
Alerting: (Chore/Instrumentation) Add traceID to logs with contextual logger (#71289)

Alerting: (Chore) Add traceID to logs with contextual logger
(cherry picked from commit f6a28cadbc)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2023-07-11 12:11:47 +03:00
grafana-delivery-bot[bot]andMatthew Jacobson f767a3e27f [v10.0.x] Alerting: Fix Alertmanager change detection for receivers with secure settings (#71320)
Alerting: Fix Alertmanager change detection for receivers with secure settings (#71307)

* Alerting: Make ApplyAlertmanagerConfiguration only decrypt/encrypt new/changed secure settings

Previously, ApplyAlertmanagerConfiguration would decrypt and re-encrypt all secure settings. However, this caused re-encrypted secure settings to be included in the raw configuration when applied to the embedded alertmanager, resulting in changes to the hash. Consequently, even if no actual modifications were made, saving any alertmanager configuration triggered an apply/restart and created a new historical entry in the database.

To address the issue, this modifies ApplyAlertmanagerConfiguration, which is called by POST `api/alertmanager/grafana/config/api/v1/alerts`, to decrypt and re-encrypt only new and updated secure settings. Unchanged secure settings are loaded directly from the database without alteration.

We determine whether secure settings have changed based on the following (already in-use) assumption: Only new or updated secure settings are provided via the POST `api/alertmanager/grafana/config/api/v1/alerts` request, while existing unchanged settings are omitted.

* Ensure saving a grafana-managed contact point will only send new/changed secure settings

Previously, when saving a grafana-managed contact point, empty string values were transmitted for all unset secure settings. This led to potential backend issues, as it assumed that only newly added or updated secure settings would be provided.

To address this, we now exclude empty ('', null, undefined) secure settings, unless there was a pre-existing entry in secureFields for that specific setting. In essence, this means we only transmit an empty secure setting if a previously configured value was cleared.

* Fix linting

* refactor omitEmptyUnlessExisting

* fixup

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
(cherry picked from commit e3787de470)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2023-07-11 10:58:06 +02:00
grafana-delivery-bot[bot]andGábor Farkas b8e2990579 [v10.0.x] Elasticsearch: Fix using multiple indexes with comma separated string (#71322)
Elasticsearch: Fix using multiple indexes with comma separated string (#71284)

* Revert "Elasticsearch: Use array of strings as index in backend queries (#67276)"

This reverts commit d0ced39847.

* updated tests

(cherry picked from commit e17540bdcd)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2023-07-11 10:59:27 +03:00
Joseph Perez eeba36e435 [v10.0.x] Fix merge error in index.md (#71312)
* Fix merge error in index.md

Fixes glitch reported here: https://raintank-corp.slack.com/archives/C5PG2JK8W/p1689019056173919

* Prettier fix
2023-07-10 16:25:09 -05:00
grafana-delivery-bot[bot]andmatt abrams 25f498c76f [v10.0.x] Docs: Fix broken links to play (#71295)
Docs: Fix broken links to play (#71112)

* fix broken links to play

* Update docs/sources/dashboards/variables/_index.md

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>

---------

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
(cherry picked from commit 69d8e3d8dc)

Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
2023-07-10 14:49:04 -04:00
grafana-delivery-bot[bot]andJosh Hunt da6aeb83ab [v10.0.x] Update Public Dashboards documentation (#71293)
Update Public Dashboards documentation (#71276)

The documentation for how to support public dashboards is slightly incorrect.

(cherry picked from commit 899de865fc)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
2023-07-10 18:56:47 +03:00
grafana-delivery-bot[bot]andJuan Cabanas 84594e2fba [v10.0.x] PanelInspect: Download CSV without extra blank rows (#71290)
PanelInspect: Download CSV without extra blank rows (#71248)

(cherry picked from commit 8a6c6c3285)

Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com>
2023-07-10 12:28:31 -03:00
grafana-delivery-bot[bot] c7031f48d4 [v10.0.x] Docs: fix incorrect alias for sign-a-plugin.md (#71270)
Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
fix incorrect alias for sign-a-plugin.md (#71255)
2023-07-10 11:08:40 +02:00
grafana-delivery-bot[bot]andSven Grossmann 67a6f6261f [v10.0.x] Transformations: Fix extractFields throwing Error if one value is undefined or null (#71267)
Transformations: Fix `extractFields` throwing Error if one value is undefined or null (#71070)

* fix extract fields with null values

* rename test

* check for null values

* revert changes

* improve position

(cherry picked from commit b05cc2d651)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2023-07-10 11:00:26 +03:00
grafana-delivery-bot[bot]andIhor Yeromin dca52d575e [v10.0.x] XYChart: Point size editor should reflect correct default (5) (#71229)
XYChart: Point size editor should reflect correct default (5) (#71126)

fix(xychart): reconcile point size editors

(cherry picked from commit d92d3ede79)

Co-authored-by: Ihor Yeromin <yeryomin.igor@gmail.com>
2023-07-07 13:39:52 -07:00
Kevin Minehart d147af2281 [v10.0.x] CI: Add GPG keys to rgm, don't clone RGM just use the docker image (#71234)
* CI: Add rgm to drone (#66991)

* add drone stub that build grafana using 'grafana/build' (dagger)

---------

Co-authored-by: Ricky Whitaker <ricky.whitaker@grafana.com>
(cherry picked from commit 768efe9748)

* Add dagger token to rgm builds (#68651)

(cherry picked from commit a870b227db)

* CI: Add GPG keys to rgm, don't clone RGM just use the docker image (#71143)

* Add GPG keys to rgm, dont' clone RGM just use the docker image

* remove the cd command

* forgot to make drone :(

* idk

* reference script more specifically

* i guess we'll just cd /src

* Only show not found artifacts

(cherry picked from commit d5a4c81fa1)
2023-07-07 12:47:34 -05:00
grafana-delivery-bot[bot]andArmand Grillet e17bb5b937 [v10.0.x] Clarify external AM limitation (#71218)
Clarify external AM limitation (#71179)

(cherry picked from commit 3ec0558204)

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
2023-07-07 18:18:00 +03:00
grafana-delivery-bot[bot]andGalen Kistler 23fbded473 [v10.0.x] Prometheus: Version detect bug (#71213)
Prometheus: Version detect bug (#71198)

* remove redundant request copy in backend, add more versions to semver lists

(cherry picked from commit 7dc071f46b)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2023-07-07 10:10:09 -05:00
grafana-delivery-bot[bot]andMitch Seaman 49fa587932 [v10.0.x] Docs: update the word "integration" in Okta config (#71209)
Docs: update the word "integration" in Okta config (#71181)

(cherry picked from commit ac78146091)

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
2023-07-07 09:16:01 -05:00
grafana-delivery-bot[bot]andIvan Ortega Alba a5aa8a3c70 [v10.0.x] AsyncSegment: Display no-options placeholder for no items status (#71127)
AsyncSegment: Display no-options placeholder for no items status (#70995)

AsyncSegment: Display no options dropdown placeholder for no items status
(cherry picked from commit ad5a36e7a3)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2023-07-07 15:12:49 +02:00
grafana-delivery-bot[bot]andLeanna Shippy be34911395 [v10.0.x] Docs: Updates Grafana alerting link text on Panel Editor Overview page (#71197)
Docs: Updates Grafana alerting link text on Panel Editor Overview page (#71146)

* Updates Grafana alerting link text on panel editor overview page

* fixed wording of link text

---------

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
(cherry picked from commit 217265baee)

Co-authored-by: Leanna Shippy <11079957+lshippy@users.noreply.github.com>
2023-07-07 08:24:21 -04:00
grafana-delivery-bot[bot]andDavid Harris 889b153a6b [v10.0.x] docs: remove kentik from angular plugins (#71192)
docs: remove kentik from angular plugins (#71191)

As of v1.7.0 this plugin no longer uses Angular

(cherry picked from commit a9368aab7a)

Co-authored-by: David Harris <david.harris@grafana.com>
2023-07-07 14:31:36 +03:00
grafana-delivery-bot[bot]andKristina afcf9520e2 [v10.0.x] Explore: Remove duplicate decorator (#70778)
Explore: Remove duplicate decorator (#70775)

Remove duplicate decorator

(cherry picked from commit c0b64612f8)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2023-07-07 06:14:15 -05:00
Andreas Christou 03baf95b8e [v10.0.x] AzureMonitor: Correctly build multi-resource queries for Application Insights components (#71039)
AzureMonitor: Correctly build multi-resource queries for Application Insights components (#70344)

Correctly build multi-resource queries for AI components

- Add additional query property
- Validate resource URI matches correct namespace
- Set applications property if needed
- Update tests

(cherry picked from commit 20b6ae96a3)

# Conflicts:
#	pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
2023-07-07 10:35:24 +01:00
grafana-delivery-bot[bot]andGilles De Mey e70b6476e7 [v10.0.x] Docs: Adding the right syntax highlighting in a few places (#71169)
Docs: Adding the right syntax highlighting in a few places (#71141)

Adding the right syntax highlighting in a few places

(cherry picked from commit 536146de5f)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-07-07 10:07:13 +02:00
grafana-delivery-bot[bot] dcf0730f0b [v10.0.x] BarChart: Check by displayName (#71165) 2023-07-07 05:09:10 +03:00
Grot (@grafanabot)andDrew Slobodnjak 8d179e6079 [v10.0.x] Prometheus: Heatmap Format with No Data (#69097)
Prometheus: Heatmap Format with No Data (#68938)

* Prometheus: Heatmap Format with No Data

* Simplify conditional logic

(cherry picked from commit 0fa991a4b9)

Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
2023-07-06 13:37:34 -05:00
grafana-delivery-bot[bot]andRicky Whitaker 6f780152c3 [v10.0.x] Added security patch delivery workflows (#71139)
Added security patch delivery workflows (#71101)

* adding security patch workflows

* adding grafana-delivery as codeowners for new pr-security-check workflows

* adding release branch triggers to PR security patch github action

* joined security patching mirror and apply jobs

* remove temp files

(cherry picked from commit d88046d3d4)

Co-authored-by: Ricky Whitaker <ricky.whitaker@grafana.com>
2023-07-06 10:40:40 -05:00
grafana-delivery-bot[bot]andGilles De Mey d42e6fdf59 [v10.0.x] Docs: Set up alert state history (#71140)
Docs: Set up alert state history (#71123)

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
(cherry picked from commit 6af12b1953)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-07-06 17:15:09 +02:00
grafana-delivery-bot[bot]andTorkel Ödegaard 2f674f5a51 [v10.0.x] Docs: Fix scenes what's new in Grafana 10 entry (#71132)
Docs:  Fix scenes what's new in Grafana 10 entry  (#71128)

Fix scenes release note

(cherry picked from commit 0fb7369a79)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2023-07-06 17:25:22 +03:00
grafana-delivery-bot[bot]andkay delaney 6f4bedda34 [v10.0.x] Variables: Remount query editor when datasource changed (#70745)
Variables: Remount query editor when datasource changed (#70615)

(cherry picked from commit 6c900b84bd)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2023-07-06 12:41:51 +01:00
grafana-delivery-bot[bot]andIvan Ortega Alba 7f62b1dab0 [v10.0.x] DS Picker: Filter available DS based on component props (#71115)
DS Picker: Filter available DS based on component props (#70613)

* Apply filters consistently to every list in the picker

* Display all built-in DS when editing a panel

* Add `uploadFile` prop to toggle the CSV file DS

(cherry picked from commit 6ad9e386ad)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2023-07-06 12:59:03 +03:00
Joseph Perez b4d89dd9d4 [v10.0.x] Docs: Backport of 69864 - Plugins reorganization (#71100)
* Docs: Plugins doc reorganization, part 1  (#69864)

* Initial commit

* Prettier fixes

* Doc-validator fixes part 1

* Doc-validator fixes part 2

* More doc-validator fixes

* More doc-validator fixes

* Test

* link test

* Linnk test

* Link test

* More fixes

* More fixes

* Doc-validator fixes

* Doc-validator fixes

* fix broken link

* Fix

* Testing

* Doc fixes

* Link fixes

* Fix links

* Update docs/sources/developers/plugins/create-a-grafana-plugin/_index.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Testing

* Testing

* Testing

* Testing

* Doc-validator fixes

* Doc-validator fixes

* Doc-validator fixes

* Fix broken links for plugins reorganization project

* Prettier fixes

* Prettier fixes

* Incorporate reviewer feedback

* Link fixes

* Link fixes

* Link fixes

* Link fix

* Deleted space

* Codeowners fix

* Change grafana.com links to absolute URLs for Hugo

---------

Co-authored-by: David Harris <david.harris@grafana.com>
(cherry picked from commit f9df1f3051)

* Prettier fix
2023-07-05 15:42:56 -05:00
grafana-delivery-bot[bot] eac9cc7f6c [v10.0.x] BarChart: Fix legend for fields with labels (#71099) 2023-07-05 23:02:45 +03:00
grafana-delivery-bot[bot]andprenzlern 63257b2133 [v10.0.x] Docs: update heatmap panel options (#71097)
Docs: update heatmap panel options (#71058)

Added some heatmap panel configuration options which were missing from the docs

(cherry picked from commit bdf60d69de)

Co-authored-by: prenzlern <88067634+prenzlern@users.noreply.github.com>
2023-07-05 13:52:12 -04:00
grafana-delivery-bot[bot]andAshley Harrison 2527d65121 [v10.0.x] TimePicker: Fix issue with previous fiscal quarter not parsing correctly (#71093)
TimePicker: Fix issue with previous fiscal quarter not parsing correctly (#71083)

* fix issue with previous fiscal quarter not parsing correctly

* add comment

(cherry picked from commit ab09c9efc7)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-07-05 19:12:35 +03:00
grafana-delivery-bot[bot]andChristopher Moyer 627e690c36 [v10.0.x] Docs: adds uninstall instructions to debian/ubuntu (#71078)
Docs: adds uninstall instructions to debian/ubuntu (#70841)

* adds uninstall to debian/ubuntu

* updates based on SME feedback

* Update docs/sources/setup-grafana/installation/debian/index.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Moved remove grafana repo as separate step

* adds uninstall docs to remaining linux topics

* Update docs/sources/setup-grafana/installation/debian/index.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Update docs/sources/setup-grafana/installation/suse-opensuse/index.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Update docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Update docs/sources/setup-grafana/installation/suse-opensuse/index.md

* corrects punctuation

* makes prettier

---------

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
(cherry picked from commit 971058919f)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-07-05 08:42:16 -05:00
grafana-delivery-bot[bot]andEmil Tullstedt f48cc869be [v10.0.x] Docs: Provide absolute paths for set-up-https.md (#71046)
Docs: Provide absolute paths for set-up-https.md (#70681)

Fixes #69664

(cherry picked from commit f2bb9fd92a)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2023-07-04 16:43:31 +02:00
grafana-delivery-bot[bot]andGalen Kistler 90411d4c31 [v10.0.x] Graphite: Fix infinite loop in text editor when using graphite in a Mixed datasource (#71003)
Graphite: Fix infinite loop in text editor when using graphite in a Mixed datasource (#70970)

Fix infinite react state loop exhibited in mixed datasource by stringifying objects in useEffect dependencies

(cherry picked from commit 4217c8057b)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2023-06-30 22:13:24 +03:00
grafana-delivery-bot[bot]andGalen Kistler ca96a750cb [v10.0.x] Prometheus: Remove duplicate definition in docs (#71002)
Prometheus: Remove duplicate definition in docs (#70916)

remove duplicate lines

(cherry picked from commit 0817ee00f9)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2023-06-30 14:00:54 -05:00
grafana-delivery-bot[bot]andAdam Simpson df3e56aedb [v10.0.x] AzureMonitor: Fix metric names for multi-resources. (#70994)
AzureMonitor: Fix metric names for multi-resources. (#70864)

When building a query for multiple resources only a subset of metrics
are valid and that selection is only available via the API version `2017-12-01-preview`.

fixes #68603

(cherry picked from commit f32f1859a0)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
2023-06-30 19:01:03 +03:00
grafana-delivery-bot[bot]andFrederic Hemberger 47ac8e353c [v10.0.x] docs/serviceaccount.md - Incorrect key "role" for creating token (#70991)
docs/serviceaccount.md - Incorrect key "role" for creating token (#68809)

The key "role" in the JSON body doesn't make sense for creating service account *tokens* (and the method will happily create one without it). It is only required for creating the service account itself.

(cherry picked from commit ad8211cce7)

Co-authored-by: Frederic Hemberger <mail@frederic-hemberger.de>
2023-06-30 16:25:50 +01:00
Gábor Farkas e486eaa3b2 [v10.0.x] Logs: Do not insert log-line into log-fields in json download (#70954)
Logs: Do not insert log-line into log-fields in json download (#70901)

* logs: do not insert log-line into log-fields in json download

* fixed test after merge

(cherry picked from commit 2084cc9955)
2023-06-30 13:53:28 +02:00
grafana-delivery-bot[bot]andSven Grossmann 0e092ba6a1 [v10.0.x] Loki: Fix wrong query expression with inline comments (#70948)
Loki: Fix wrong query expression with inline comments (#70947)

fix remove comments from query

(cherry picked from commit 13dd821961)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2023-06-30 12:44:48 +03:00
grafana-delivery-bot[bot]andJoao Silva b2bbe10fbc [v10.0.x] Library Panels: Fix issue when deleting library panels from folder view (#70942)
Library Panels: Fix issue when deleting library panels from folder view (#70413)

(cherry picked from commit a83a040f35)

Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
v10.0.2
2023-06-30 11:34:22 +03:00
grafana-delivery-bot[bot]andKat Yang ff35f2efcf [v10.0.x] Fix: Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug (#70936)
Fix: Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug (#70723)

* Fix: Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug

* test: add tests for get dashboard with existing name, get dashboard with non existing name, get dashboard with existing name in a folder

* Update pkg/services/dashboards/database/database_test.go

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>

* require specific error for Should be able to get dashboard with existing name

* Update pkg/services/dashboards/database/database_test.go

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>

* implement sofia suggestions to check for specific err, remove logs

* give test more specific name

* implement daniel suggestion of formatting documentation comment in safe way

* fix test title to refer to root directory not specific folder

---------

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
(cherry picked from commit 67cdae4b7d)

Co-authored-by: Kat Yang <69819079+yangkb09@users.noreply.github.com>
2023-06-29 16:38:27 -04:00
grafana-delivery-bot[bot] a8dfb05e27 [v10.0.x] Export: Templateize datasource uid when it's a library panel (#70913) 2023-06-29 14:56:36 -03:00
grafana-delivery-bot[bot]andAshley Harrison 1ffe379129 [v10.0.x] Permissions: Fix incorrect navId in permissions page (#70912)
Permissions: Fix incorrect `navId` in permissions page (#70906)

fix navId in permissions page

(cherry picked from commit ebd6aa5034)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-06-29 18:48:39 +03:00
Josh Hunt 3354d196fb [v10.0.x] Login: Fix footer from displaying under the login box (#70909)
Login: Fix footer from displaying under the login box (#70897)

(cherry picked from commit ae2378395b)
2023-06-29 15:37:27 +00:00
Andrew Hackmann bde576f3e5 AzureMonitor: Remove subscriptions map backport (#70904)
backport changes
2023-06-29 09:33:49 -05:00
SantiagoandGeorge Robinson ad5ffd7ed3 [v10.0.x] Alerting: Add duration to saving alert states done (#70875)
Alerting: Add duration to saving alert states done (#70844)

(cherry picked from commit 594c851d4b)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-28 23:20:33 -03:00