43002 Commits
Author SHA1 Message Date
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
SantiagoandGeorge Robinson 30255fd4bd [v10.0.x] Alerting: Support concurrent queries for saving alert instances (#70869)
* Alerting: Support concurrent queries for saving alert instances (#70525)

This commit adds support for concurrent queries when saving alert
instances to the database. This is an experimental feature in
response to some customers experiencing delays between rule evaluation
and sending alerts to Alertmanager, resulting in flapping. It is
disabled by default.

(cherry picked from commit 7edbe72483)

* remove changes in api_testing.go

---------

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-28 21:38:17 -03:00
grafana-delivery-bot[bot]andMatthew Jacobson 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]andAlexander Weaver bf80197015 [v10.0.x] Alerting: Add limit query parameter to Loki-based ASH api, drop default limit from 5000 to 1000, extend visible time range for new ASH UI (#70857)
Alerting: Add limit query parameter to Loki-based ASH api, drop default limit from 5000 to 1000, extend visible time range for new ASH UI (#70769)

* Add limit query parameter

* Drop copy paste comment

* Extend history query limit to 30 days and 250 entries

* Fix history log entries ordering

* Update no history message, add empty history test

---------

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
(cherry picked from commit f94fb765b5)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-06-28 15:11:17 -05:00
Matthew Jacobson 05154b8d06 Chore: run make gen-cue to fix CI (#70860) 2023-06-28 22:47:35 +03:00
grafana-delivery-bot[bot]andlwandz13 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]andDavid Harris 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
Selene e250d51857 [v10.0.x] Chore: Generate plugin version and remove lineage version (#70735)
* Chore: Generate plugin version and remove lineage version (#69781)

* Generate plugin version and remove lineage version

* Generate version for each major

* Remove pluginVersion from core plugins

* Remove code version generation

* Generate cue files

* Move grafana version into jenny

* fix go import

(cherry picked from commit b0893c29a7)

* Update versions
2023-06-28 17:55:47 +02:00
grafana-delivery-bot[bot]andRobby Milo 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]andJaryk 8e218bbac4 [v10.0.x] Variables: Detect a name for duplicated variable (#70823)
Variables: Detect a name for duplicated variable (#68110)

* Variables: Detect a name for duplicated variable

* Variables: create copies of copies

(cherry picked from commit db478ced45)

Co-authored-by: Jaryk <ugzuzg@gmail.com>
2023-06-28 15:02:54 +02:00
grafana-delivery-bot[bot]andHorst Gutmann 7b8ae9f476 [v10.0.x] CI: Ignore .pr-body.txt file (#70808)
CI: Ignore .pr-body.txt file (#70798)

This file is used during the backporting process but should never be
committed.

(cherry picked from commit 2b10d31bac)

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
2023-06-28 12:20:52 +03:00
Sven Grossmann 2501cbbf9d Logs: Fix wrong before and after texts in log context (#70802)
fix log context before/after text
2023-06-28 11:20:15 +02:00
grafana-delivery-bot[bot]andbrendamuir 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
Dimitris Sotirakis ead5e970db [v10.0.x] CI: Cleanup - Remove security related steps (#70795)
CI: Cleanup - Remove security related steps (#70788)

* Remove security related steps

* More cleanup

(cherry picked from commit 7f55ba9c6e)
2023-06-28 11:38:39 +03:00
grafana-delivery-bot[bot]andmarybelvargas 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
grafana-delivery-bot[bot]andSerge Zaitsev d90b80d993 [v10.0.x] Fix: Create store only once in cli mode (#70755)
Fix: Create store only once in cli mode (#70391)

fix: create store only once in cli mode
(cherry picked from commit 47b2e7f1d7)

Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
2023-06-27 18:12:27 +02:00
Nathan MarrsandZoltán Bedi 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]andKristina 7f268e8823 [v10.0.x] Correlations: Account for restricted datasource (#70746)
Correlations: Account for restricted datasource (#70717)

* Account for restricted datasource

* Allow for fetching datasource to return undefined and beef up filtering after to remove invalid datasources

* Revert "Account for restricted datasource"

This reverts commit 1087159b93.

* Empty-Commit

(cherry picked from commit 2738a3a6da)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2023-06-27 07:43:09 -05:00
Gábor Farkas 7499db7060 [v10.0.x] Elasticsearch: Make it compatible with the new log context functionality (#70748)
Elasticsearch: Make it compatible with the new log context functionality (#70697)

(cherry picked from commit 8e9ec9dcef)
2023-06-27 14:31:42 +02:00
grafana-delivery-bot[bot] b78a4d7d39 [v10.0.x] Grafana UI: Fix behaviour regression on Tooltip component (#70742) 2023-06-27 14:28:19 +03:00
grafana-delivery-bot[bot]andIsabel 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]andIsabel 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
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
grafana-delivery-bot[bot]andJoão Calisto ca2d7d521c [v10.0.x] Alerting: Fix HA alerting membership sync (#70700)
Alerting: Fix HA alerting membership sync (#70607)

* Alerting: Fix HA alerting membership sync

* Added comment about filtering duplicates

(cherry picked from commit 1d68f5ba77)

Co-authored-by: João Calisto <joao.calisto@grafana.com>
2023-06-26 19:45:41 +03: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]andbrendamuir 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
grafana-delivery-bot[bot]andWilliam Wernert 83cd2900a7 [v10.0.x] Alerting: Move rule UID from Loki stream labels into log lines (#70686)
Alerting: Move rule UID from Loki stream labels into log lines (#70637)

Move rule uid into log line to reduce cardinality

(cherry picked from commit 4aa477f48f)

Co-authored-by: William Wernert <william.wernert@gmail.com>
2023-06-26 10:13:43 -04: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
Virginia Cepeda 5e42db4703 [v10.0.x] Alerting: Display correct results when using different filters on alerting panels (#70639)
Alerting: Display correct results when using different filters on alerting panels (#70482)

* Trigger separate rules request for each alerting panel in a dashboard

* Add RTK method to fetch prom rules

* Use RTKQuery to get prom rules in UnifiedAlertList

* Fix lint

* Mock promRules call

* Address PR comments

* Fix tests

(cherry picked from commit f17c49e632)
2023-06-23 17:03:19 -03:00
grafana-delivery-bot[bot]andChristopher Moyer 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]andChristopher Moyer 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]andChristopher Moyer 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]andEve Meelan 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]andLeon Sorokin a398f79757 [v10.0.x] XYChart: Fix axis range and scale overrides (#70614)
XYChart: Fix axis range and scale overrides (#70605)

(cherry picked from commit fe45dc9f27)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-06-23 19:02:32 +03:00
grafana-delivery-bot[bot]andtonypowa 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
grafana-delivery-bot[bot] 8c181bfb5f [v10.0.x] Changelog: Updated changelog for 10.0.1 (#70603)
Changelog: Updated changelog for 10.0.1 (#70601)

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

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
2023-06-23 12:51:20 +00:00
Horst GutmannandMisi 5f0e2a592e [v10.0.x] Auth: Fixed CVE-2023-3128 (#70581)
Auth: Fixed CVE-2023-3128 (#70571)

Fixed CVE-2023-3128

(cherry picked from commit 789ee2121e)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2023-06-23 12:10:40 +02:00
grafana-delivery-bot[bot]andIvan Ortega Alba 3568a0cf05 [v10.0.x] DS Picker: Add missing props and improve autoheight logic (#70568)
DS Picker: Add missing props and improve autoheight logic (#70393)

* DS Picker: Add `inputId` and `noDefault` options

* DS Picker: Add `disabled` state

* Add tests for `disabled`

* Select default DS if `current` is not provided

* Remove `width` from style

* Move types next to components

* Only calculate height when opening

(cherry picked from commit 3bf8dc1397)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2023-06-23 11:45:09 +02:00
Sven Grossmann b129045679 [v10.0.x] LogContext: Fix filtering out log lines with the same entry (#70569)
LogContext: Fix filtering out log lines with the same entry (#70538)

* fix bug with filtering out too many log lines

* fix acts

* remove unused line

(cherry picked from commit 9cf685cfda)
2023-06-23 11:25:06 +02:00
grafana-delivery-bot[bot] f06c6ea694 [v10.0.x] Dashboard: Fix issue where a panel with a description and a cached response displays 2 info icons (#70566)
Co-authored-by: Alexa V <239999+axelavargas@users.noreply.github.com>
Fix issue where a panel with a description and a cached response displays 2 info icons (#70513)
2023-06-23 11:25:34 +03:00
grafana-delivery-bot[bot]andAshley Harrison 5a11b456a5 [v10.0.x] Navigation: Fix toolbar actions flickering on mobile (#70564)
Navigation: Fix toolbar actions flickering on mobile (#70524)

* fix flickering overflow

* set everything to hidden by default

* extend intersectionobserver mock

(cherry picked from commit ff429c9af5)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-06-23 11:01:21 +03:00
Grot (@grafanabot)andJo 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)andVardan Torosyan 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
Ieva c179225efe Auth: Remove Email Lookup from oauth integrations 10.0 (#900)
backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.5.x
2023-06-23 09:01:02 +02:00