Commit Graph

5133 Commits

Author SHA1 Message Date
grafana-delivery-bot[bot] 62eccdd789 [v10.0.x] Docs: fixes broken alias redirect (#71737)
Docs: fixes broken alias redirect (#71730)

(cherry picked from commit 7738a9846c)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-07-17 13:33:03 +02:00
grafana-delivery-bot[bot] ab36f46900 [v10.0.x] Remove empty main block at the end (#71669)
Remove empty main block at the end (#71574)

Removed empty block at the end of the page

(cherry picked from commit f924fc2b8d)

Co-authored-by: bojankezele <79632099+bojankezele@users.noreply.github.com>
2023-07-14 10:43:18 -05:00
grafana-delivery-bot[bot] 7d49783c1d [v10.0.x] Docs: Add reference to Grafana Cloud doc (#71668)
Docs: Add reference to Grafana Cloud doc (#71653)

Add reference to Grafana Cloud doc

(cherry picked from commit 6b40fe75f5)

Co-authored-by: Fabrizio <135109076+fabrizio-grafana@users.noreply.github.com>
2023-07-14 10:21:38 -05:00
grafana-delivery-bot[bot] b23c25cedc [v10.0.x] [DOC] Fix tracing links in explore/tracing (#71389)
[DOC] Fix tracing links in explore/tracing (#71383)

Fix tracing links

(cherry picked from commit 41def2e346)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2023-07-13 15:44:04 -05:00
grafana-delivery-bot[bot] 4ee6677ca4 [v10.0.x] docs: update references to deprecated plugins (#71592) 2023-07-13 19:19:03 +01:00
lwandz13 7fdfc4d609 docs: fixed data source mgmt file for 10.0.x (#71503)
* fixed data source mgmt file for 10.0.x

* fixed query caching relrefs

* fix anchor refs

---------

Co-authored-by: Michael Mandrus <michael.mandrus@grafana.com>
2023-07-12 20:58:04 -05:00
grafana-delivery-bot[bot] dfc5d22ebf [v10.0.x] docs: add alphaPanels feature toggle information (#71506)
docs: add alphaPanels feature toggle information (#71480)

* add feature toggle information

* fix typo

* fixed config information

(cherry picked from commit c3a0207615)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-07-12 18:10:06 -04:00
grafana-delivery-bot[bot] 800f54b0ee [v10.0.x] docs: update nodejs required version (#71483)
docs: update nodejs required version (#71469)

* docs: update nodejs required version

* docs: update nodejs version in plugin tutorials

* docs: update to LTS guidance

(cherry picked from commit 3a45f02ef3)

Co-authored-by: David Harris <david.harris@grafana.com>
2023-07-12 16:55:29 +01:00
grafana-delivery-bot[bot] 5d9e63c654 [v10.0.x] docs: restructure dashboard annotations page (#71481) 2023-07-12 18:42:10 +03:00
grafana-delivery-bot[bot] a264594473 [v10.0.x] Docs: Adding alias to package a plugin (#71479)
Docs: Adding alias to package a plugin (#71478)

Adding alias to package a plugin

(cherry picked from commit 471c858e67)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
2023-07-12 18:30:44 +03:00
grafana-delivery-bot[bot] b0e887153e [v10.0.x] Update info for the Support Bundle (#71452)
Update info for the Support Bundle (#69419)

* Update info for the Support Bundle

Add in a note that access to the Support Bundle requires Grafana 9.5 and above.

* Make the user/permission restriction more visible since it gets lost a little in the code block

* Run prettier

* Move the new content to Before you begin section

This is the pattern that we're following with other doc topics as well.

* fix a typo

* linting

---------

Co-authored-by: Vardan Torosyan <vardants@gmail.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
(cherry picked from commit 7f865f627a)

Co-authored-by: Zach Day <zachary.day@grafana.com>
2023-07-12 16:24:54 +02:00
grafana-delivery-bot[bot] 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
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] 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] 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] 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] 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] 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] 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] 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] 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] 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] 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
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] 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] 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] 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] 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] 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
grafana-delivery-bot[bot] b2d43decb3 [v10.0.x] Alerting: Convert 'Both' type Prometheus queries to 'Range' in migration (#70854)
Alerting: Convert 'Both' type Prometheus queries to 'Range' in migration (#70781)

* Alerting: Convert 'Both' type Prometheus queries to 'Range' in migration

(cherry picked from commit 00d5f7fed7)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2023-06-28 16:31:57 -04:00
grafana-delivery-bot[bot] 1f2276e6d0 [v10.0.x] Docs: Added new configure prometheus file, update index file (#70847)
Docs:  Added new configure prometheus file, update index file (#70845)

* added config prometheus doc

* updated index file

* updated fundamentals exemplars doc validator issue

(cherry picked from commit 0cd56627db)

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
2023-06-28 12:36:49 -07:00
grafana-delivery-bot[bot] c69f7d1ec4 [v10.0.x] docs: typo in migration guide (#70861)
docs: typo in migration guide (#70858)

(cherry picked from commit 7f8fe45a06)

Co-authored-by: David Harris <david.harris@grafana.com>
2023-06-28 20:23:04 +01:00
grafana-delivery-bot[bot] c81813a9a2 [v10.0.x] standardize docs copyright (#70835)
standardize docs copyright (#70732)

(cherry picked from commit 3e3bcf510b)

Co-authored-by: Robby Milo <robbymilo@fastmail.com>
2023-06-28 09:45:59 -04:00
grafana-delivery-bot[bot] 646b840924 [v10.0.x] Docs: adds evaluation doc (#70797)
Docs: adds evaluation doc (#70757)

* Docs: adds evaluation doc

* Adds note on classic condition

* fixes link

* fixes link

* fixes link

* fixes data source

* link fix

* fixes rbac link

* adds aliases

(cherry picked from commit 5159317ee7)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-28 04:11:04 -05:00
grafana-delivery-bot[bot] 93c2e36d07 [v10.0.x] Update to docs - index.md (#70753)
Update to docs -  index.md (#70699)

Update index.md

Minor correction.

(cherry picked from commit b32cea7929)

Co-authored-by: marybelvargas <107340764+marybelvargas@users.noreply.github.com>
2023-06-27 17:05:33 -05:00
Nathan Marrs 61afe6ed0f [v10.0.x] Candlestick: Migrate to schema (#70410)
* Candlestick: Migrate to schema (#62113)

Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
(cherry picked from commit 39433b5b9a)

* Revert to old schema structure for 10.0.x to fix build

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
2023-06-27 09:10:12 -07:00
grafana-delivery-bot[bot] 8fe1ba23e5 [v10.0.x] docs: fix admonition type capitalization (#70716)
docs: fix admonition type capitalization (#70713)

fixed admonition type

(cherry picked from commit 85a8315920)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-06-26 14:27:08 -04:00
grafana-delivery-bot[bot] 1732aa42ef [v10.0.x] docs: fix broken links in Configure legend (#70711)
docs: fix broken links in Configure legend (#70696)

* fix broken links

* fix remaining broken links

(cherry picked from commit 2d261e7aef)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-06-26 13:53:58 -04:00
grafana-delivery-bot[bot] 095d8fd66e [v10.0.x] Docs: Update notice on angular deprecations (#70704)
* Docs: Update notice on angular deprecations (#70663)

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

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-06-26 10:50:20 -07:00
Nathan Marrs db22d545ba [v10.0.x] Canvas: Migrate to schema (#70409)
* Canvas: Migrate to schema (#70205)

(cherry picked from commit d7a8892f3a)

* Revert to old schema structure for 10.0.x to fix build
2023-06-26 11:29:11 -05:00
grafana-delivery-bot[bot] ab087d2a02 [v10.0.x] Docs: adds queries and conditions doc (#70689)
Docs: adds queries and conditions doc (#70674)

* Docs: adds queries and conditions doc

* fixes link

* fixes link

* fix link

* fixes typo

* corrects relref

---------

Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit f436364f9b)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-26 16:41:51 +02:00
Joseph Perez 4f42ce8755 [v10.0.x] Docs: Backport of plugins chunk 9 doc review (#70109)
* Docs: Plugin migration guide - chunk 9 (#69420)

* Initial commit

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Prettier fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fixes from doc review

---------

Signed-off-by: Joe Perez <joseph.perez@grafana.com>
(cherry picked from commit 1a9bc9ca1a)

* Delete extraneous file
2023-06-23 15:34:15 -05:00
grafana-delivery-bot[bot] 77f06f29f9 [v10.0.x] Docs: removes-yum (#70642)
Docs: removes-yum (#70634)

* removes-yum

* 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/redhat-rhel-fedora/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>

* incorporates feedback

* adds GPG key step

* removes duplicate addrepo command

---------

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

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-06-23 14:38:29 -05:00
grafana-delivery-bot[bot] cb535a406a [v10.0.x] Docs: removes references to Redhat, adds import GPG key step (#70632)
Docs: removes references to Redhat, adds import GPG key step (#70625)

removes references to Redhat, adds import GPG key step

(cherry picked from commit 06b1b6f552)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-06-23 12:48:16 -05:00
grafana-delivery-bot[bot] 2341b66209 [v10.0.x] docs: clarifies that only OSS or Enterprise are installed (#70628)
docs: clarifies that only OSS or Enterprise are installed (#70619)

* clarifies that only OSS or Enterprise are installed,  not both

* Apply suggestions from code review

(cherry picked from commit f77a886f0e)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-06-23 12:40:57 -05:00
grafana-delivery-bot[bot] b97ae61d93 [v10.0.x] formatting fix for line 72 (#70623)
formatting fix for line 72 (#70618)

(cherry picked from commit cbf4fe9d23)

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
2023-06-23 10:01:18 -07:00
grafana-delivery-bot[bot] 02336ed796 [v10.0.x] docs: table panel: modified support section regarding alerts (#70534)
table panel: modified support section regarding alerts (#70421)

* modified support section

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

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

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

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* fixing linting error

---------

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
(cherry picked from commit 8079c1456f)

Co-authored-by: tonypowa <45235678+tonypowa@users.noreply.github.com>
2023-06-23 10:25:41 -04:00
Grot (@grafanabot) 780df38cd4 [v10.0.x] Auth: Add auth.azure_ad security improvements (#920)
Auth: Add auth.azure_ad security improvements (#912)

* security improvements id_token

* add audience validation

* add allowOrganizations

* add allowOrganizations tests and documentation

* add log warn on no configuration

* anonymize tenant id

* Apply suggestions from code review

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

* Update docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update pkg/login/social/azuread_oauth_test.go

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update pkg/login/social/azuread_oauth_test.go

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* optimize key validation and add mising fields

* fix missing key_id

* lint

* Update docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md

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

* lint docs

---------

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
(cherry picked from commit 8bdc83ccb134daedb55578cc99fc8d18eb5e5162)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2023-06-23 09:01:04 +02:00
Grot (@grafanabot) 10415ed301 [v10.0.x] Add and document option for enabling email lookup (#914)
Add and document option for enabling email lookup (#913)

* Docs: Document option for enabling email lookup

* Add the new config in the config files

* Apply suggestions from code review

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Don't capitalize identity providers

* Apply suggestions from code review

Co-authored-by: Jo <joao.guerreiro@grafana.com>

* Apply suggestions from code review

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

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
Co-authored-by: Jo <joao.guerreiro@grafana.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 8380bc7d6a79794cc260bf1c427e2b4e849adbf6)

Co-authored-by: Vardan Torosyan <vardants@gmail.com>
2023-06-23 09:01:03 +02:00
grafana-delivery-bot[bot] d63243cba6 [v10.0.x] Docs: changes link text and adds link to the download page (#70509)
Docs: changes link text and adds link to the download page (#70477)

achanges link text and add link to the download page

(cherry picked from commit 5426d519c6)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-06-22 06:58:44 -05:00