53152 Commits
Author SHA1 Message Date
Sam Jewell ecc4799abc [v11.2.x] ServerSideExpressions: Disable SQL Expressions to prevent RCE and LFI vulnerability (#94959)
ServerSideExpressions: Disable SQL Expressions to prevent RCE and LFI vulnerability (#94942)

* disable sql expressions

remove duckdb ref

* Run `make update-workspace`

---------

Co-authored-by: Scott Lepper <scott.lepper@gmail.com>
(cherry picked from commit ea71201ddc)
v11.2.3
2024-10-18 13:56:35 +01:00
Diego Augusto MolinaandJosh Hunt 17012180c7 [v11.2.x] CI: Additional changes for +security versions (#94929)
CI: Additional changes for +security versions (#94854)

* Build: Fix docker manifest create not using correct IMAGE_TAG

* Support publishing security versions of NPM packages

---------

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Diego Augusto Molina <diegoaugustomolina@gmail.com>
(cherry picked from commit 8f7352e862)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
2024-10-17 17:20:29 -03:00
742c101ba4 Release: 11.2.2+security-01 (#94917)
* Update changelog

* Update version to 11.2.2+security-01

* Revert "Update version to 11.2.2+security-01"

This reverts commit 0a4da88872bc681f65211c9e4ef4c9b9bc864664.

* update changelog

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
2024-10-17 21:16:21 +03:00
0968388f88 Release: 11.2.1+security-01 (#94910)
* Update changelog

* Update version to 11.2.1+security-01

* Revert "Update version to 11.2.1+security-01"

This reverts commit ca98ca183d.

* Update changelog

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
2024-10-17 13:07:53 -05:00
grafana-delivery-bot[bot]andKim Nylander 6a5aeba21c [v11.2.x] Update Pyroscope data source for Exlore Profiles (#94831)
Update Pyroscope data source for Exlore Profiles (#94825)

* Update Pyroscope data source for Exlore Profiles

* Update docs/sources/datasources/pyroscope/query-profile-data.md

* Update docs/sources/datasources/pyroscope/query-profile-data.md

(cherry picked from commit e8f23bb2cf)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2024-10-16 20:56:47 -04:00
Kevin Minehart 39d9542f7f [v11.2.x] CI: Support more version formats in publishing (#94749)
CI: Support more version formats in publishing (#94575)

* cleanup dead code
* add tests and rewrite publish grafanacom steps to reuse
* add pkg/build tests; don't upload CDN assets on grafana releases

(cherry picked from commit 7a2edd35d5)
2024-10-15 13:26:56 -05:00
grafana-delivery-bot[bot]andWill Browne 3965e68c8d [v11.2.x] Plugins: Skip install errors if dependency plugin already exists (#94717)
Plugins: Skip install errors if dependency plugin already exists (#94710)

* skip install errors if dependency plugin already exists

* add test

(cherry picked from commit f97f489c2c)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2024-10-15 13:54:47 +03:00
grafana-delivery-bot[bot]andIeva da025b1bd3 [v11.2.x] Folders: Correctly show new folder button under root folder (#94712)
Folders: Correctly show new folder button under root folder (#94687)

show new folder button under root folder if nested folders are disabled and user has the right perms

(cherry picked from commit 284c2d6f71)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-10-15 13:03:43 +03:00
grafana-delivery-bot[bot] 7db056f19b [v11.2.x] Fix list indentation to ensure continuous numbering (#94695)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Fix list indentation to ensure continuous numbering (#94692)
2024-10-14 19:27:37 +01:00
74c59a7ab3 [v11.2.x] Create strategies-for-upgrading-grafana (#94637)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
2024-10-11 12:07:19 -04:00
a0819a1f33 [v11.2.x] docs: added configure structure and youtube video link (#94628)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Señor Performo - Leandro Melendez <54183040+srperf@users.noreply.github.com>
2024-10-11 10:30:15 -04:00
grafana-delivery-bot[bot]andAndreas Christou 09cfd78a21 [v11.2.x] GCM: Time field naming (#94606)
GCM: Time field naming (#94548)

* Name time field correctly

* Update tests

* Lint

(cherry picked from commit 7c79f8f7a5)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-10-11 14:03:50 +03:00
grafana-delivery-bot[bot]andMisi 65fd818f9e [v11.2.x] OrgSync: Do not set default Organization for a user to a non-existent Organization (#94549)
OrgSync: Do not set default Organization for a user to a non-existent Organization (#94537)

Do not set default org for a user to a missing org

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
(cherry picked from commit c872cad879)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2024-10-10 17:02:19 +03:00
grafana-delivery-bot[bot]andBradley 56cf32e5eb [v11.2.x] Docs: Added instructions for configuring a private CA in Helm installs (#94547)
Docs: Added instructions for configuring a private CA in Helm installs (#93249)

* Docs: Added instructions for configuring a private CA in Helm installs

Signed-off-by: Bradley Pettit <12028233+bradleypettit@users.noreply.github.com>

* Docs: linted new instructions for private CA cert

Signed-off-by: Bradley Pettit <12028233+bradleypettit@users.noreply.github.com>

* Expanded to gem/gel/get

Originally, it just referred to GEM

---------

Signed-off-by: Bradley Pettit <12028233+bradleypettit@users.noreply.github.com>
Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>
(cherry picked from commit 747cdf938e)

Co-authored-by: Bradley <12028233+bradleypettit@users.noreply.github.com>
2024-10-10 08:45:34 -05:00
grafana-delivery-bot[bot]andJo dd1d25e21d [v11.2.x] Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (#94392)
Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (#94347)

* ensure mig doesn't hit migrated SAs if rerun

* Fix small issue with the test

---------

Co-authored-by: gamab <gabriel.mabille@grafana.com>
(cherry picked from commit 945dd052b1)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2024-10-10 11:35:49 +02:00
Leon Sorokin ed33d8c6de [v11.2.x] Chore: uPlot v1.6.31 (#94414)
Chore: uPlot v1.6.31 (#93952)

(cherry picked from commit 165ca3b4e8)
2024-10-09 17:25:00 -05:00
b014f56c1c Release: 11.2.2 (#94116)
* Update changelog

* Update version to 11.2.2

* add cve to 11.2.1

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2024-10-09 21:38:33 +03:00
grafana-delivery-bot[bot]andAndreas Christou c6652ff5e1 [v11.2.x] AzureMonitor: Fix App Insights portal URL for multi-resource trace queries (#94475)
AzureMonitor: Fix App Insights portal URL for multi-resource trace queries (#94119)

* Retrieve the resource in the query

* Appropriately construct url

* Update tests

(cherry picked from commit 97a90591ca)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-10-09 16:40:44 +01:00
grafana-delivery-bot[bot] 29bba2362b [v11.2.x] fix missing hyperlink to permissions page in docs (#94483)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Vishal N <vnaccounts@tutanota.com>
fix missing hyperlink to permissions page in docs (#94077)
2024-10-09 11:14:35 -04:00
grafana-delivery-bot[bot]andKarl Persson db61b04c40 [v11.2.x] ServiceAccounts: Run migration in batches (#94436)
ServiceAccounts: Run migration in batches (#94429)

* ServiceAccounts: Run migration in batches

(cherry picked from commit 2d0ea60017)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-10-08 20:17:48 +02:00
Karl Persson b500645bfe [v11.2.x] ServiceAccounts: Remove permissions to service account when it is deleted (#94373)
ServiceAccounts: Remove permissions to service account when it is deleted (#93877)

* Service account: clean up permissions related to service accounts when deleted

* Add migration for deleting orphaned service account permissions

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
(cherry picked from commit c7ca2bfcf5)
2024-10-08 14:33:52 +02:00
grafana-delivery-bot[bot]andIrene Rodriguez 422b1ef402 [v11.2.x] Update CODEOWNERS (#94338)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
2024-10-08 08:49:13 +01:00
grafana-delivery-bot[bot]andVictor Marin 1833377202 [v11.2.x] DashboardScene: Fix dependencies on field overrides (#94365)
DashboardScene: Fix dependencies on field overrides (#94335)

fix deps on field overrides

(cherry picked from commit f70fefc67c)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2024-10-08 08:46:18 +03:00
Jev Forsberg 86e3ac0021 [v11.2.x] CI: Remove redundant FE and BE tests from release pipeline (#94357)
CI: Remove redundant FE and BE tests from release pipeline (#94173)

baldm0mma/remove_tests/ remove fe and be tests

(cherry picked from commit 0e8fa1f5f8)
2024-10-07 15:39:08 -06:00
grafana-delivery-bot[bot]andJo ba1d98e1d8 [v11.2.x] Anonymous: Fix anonymous cache ignoring device limit evaluation (#94256)
Anonymous: Fix anonymous cache ignoring device limit evaluation (#94218)

* ensure cache contains the evaluation result for device limit

* add device limit errors and warnings

* fix lint

(cherry picked from commit 544b5f905c)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2024-10-07 09:31:15 +02:00
Alexander Zobnin d0df683dd5 [v11.2.x] Annotations: Fix composite store read (#94182)
Annotations: Fix composite store read (#94158)

* Annotations: Fix composite store read

* Add test

* check error

(cherry picked from commit bd1741653d)
2024-10-03 17:12:27 +02:00
2e16baaa96 [v11.2.x] Docs: Geomap visualization refactor (#94162)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-10-02 11:53:37 -04:00
grafana-delivery-bot[bot]andAdela Almasan c4b8303799 [v11.2.x] Canvas: Allow API calls to grafana origin (#94129)
Canvas: Allow API calls to grafana origin  (#91822)

* allow post URL
* check for config
* allow relative paths
* add allowed internal pattern; add checks for method
* update defaults.ini
* add custom header
* update config comment
* use globbing, switch to older middleware - deprecated call
* add codeowner
* update to use current api, add test
* update fall through logic

* Update pkg/middleware/validate_action_url.go

Co-authored-by: Dan Cech <dcech@grafana.com>

* Update pkg/middleware/validate_action_url.go

Co-authored-by: Dan Cech <dcech@grafana.com>

* add more tests

* Update pkg/middleware/validate_action_url_test.go

Co-authored-by: Dan Cech <dcech@grafana.com>

* fix request headers

* add additional tests for all verbs

* fix request headers++

* throw error when method is unknown

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: Brian Gann <bkgann@gmail.com>
Co-authored-by: Brian Gann <briangann@users.noreply.github.com>
Co-authored-by: Dan Cech <dcech@grafana.com>
(cherry picked from commit f64b121ddb)

Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
2024-10-01 23:21:23 -04:00
grafana-delivery-bot[bot]andBrian Gann 35b3075d06 [v11.2.x] area/configuration: adds docs for actions_allow_post_url security option (#94128)
area/configuration: adds docs for actions_allow_post_url security option (#93629)

adds docs for actions_allow_post_url security option

(cherry picked from commit 5c9486afbc)

Co-authored-by: Brian Gann <briangann@users.noreply.github.com>
2024-10-01 22:59:43 -04:00
Kevin Minehart c7307f997d [v11.2.x] CI: upgrade grabpl v3.0.53 (#94125)
CI: upgrade grabpl v3.0.53 (#94112)

* upgrade grabpl to v3.0.53

* upgrade grabpl to v3.0.53

(cherry picked from commit 26c3ed89a3)
2024-10-01 23:29:58 +01:00
Jev ForsbergandMichael Mandrus ce8db62c7b [v11.2.x] Chore: Fix flaky cloud migration test (#94115)
Chore: Fix flaky cloud migration test (#94035)

* attempt to fix flaky test

* remove skip from test

(cherry picked from commit 1c648fd010)

Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
2024-10-01 14:26:49 -06:00
grafana-delivery-bot[bot]andkay delaney c9170b1435 [v11.2.x] UI/AutoSizeInput: Fixes issue where controlledValue being null caused crash (#94089)
UI/AutoSizeInput: Fixes issue where controlledValue being null caused crash (#94078)

(cherry picked from commit 1b82595251)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2024-10-01 16:21:35 +01:00
grafana-delivery-bot[bot]andPepe Cano f61a60f54b [v11.2.x] Alerting docs: relocate Intro>Notifications>Templates (#94059)
Alerting docs: relocate `Intro>Notifications>Templates` (#94057)

* Alerting docs: relocate `Intro>Notifications>Templates`

* Rename to `Templates`

(cherry picked from commit 38ad0d3ebf)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-10-01 12:22:58 +02:00
7621bd81b1 [v11.2.x] Docs - direction param for Loki in Explore (#94019)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Steven Dungan <114922977+stevendungan@users.noreply.github.com>
2024-09-30 16:57:17 +01:00
32e5641d57 [v11.2.x] Update MySQL example dashboard (#93996)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Ronald McCollam <mccollam@gmail.com>
2024-09-30 11:59:48 +01:00
8e6a4a89cc [v11.2.x] Add PostgreSQL example dashboard link (#93994)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Ronald McCollam <mccollam@gmail.com>
2024-09-30 11:59:04 +01:00
grafana-delivery-bot[bot]andPepe Cano ba97691498 [v11.2.x] Alerting Docs: Update the introduction to Templates (#93985)
Alerting Docs: Update the introduction to Templates (#93935)

* Intro/Templates: update Intro and Template annotations sections

* Template labels section + adjustements

* Template notifications

* Use diagram for `meta_image`

(cherry picked from commit 405887eebf)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-09-30 11:46:32 +02:00
grafana-delivery-bot[bot] 9282416f04 [v11.2.x] Update Image Render Dependencies (#93980) 2024-09-30 10:40:02 +02:00
grafana-delivery-bot[bot]andDai Nguyen 5d7c632d09 [v11.2.x] Update Okta SAML attributes documentation (#93975)
Update Okta SAML attributes documentation (#93966)

Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
(cherry picked from commit fb9e12c106)

Co-authored-by: Dai Nguyen <88277570+ej25a@users.noreply.github.com>
2024-09-30 09:44:36 +02:00
grafana-delivery-bot[bot]andAlexander Weaver 46e36d9cf9 [v11.2.x] Alerting: Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] (#93947)
Alerting: Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] (#93940)

Fix endpoint permission on rule write endpoint

(cherry picked from commit c2799b4901)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2024-09-27 14:53:51 -05:00
Stephanie HingtgenandTodd Treece e3a857e995 [v11.2.x]: Live: Add ha_prefix (#93759) (#93924)
---------

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-09-27 14:20:48 -05:00
grafana-delivery-bot[bot]andMatias Chomicki e763dc131a [v11.2.x] Loki language provider: don't cache empty array while querying (#93931)
Loki language provider: don't cache empty array while querying (#92092)

* Loki language provider: don't cache empty array while querying

* Prettier

* Unfocus test

* chore: add extra assertion

(cherry picked from commit 1b6db3da22)

Co-authored-by: Matias Chomicki <matyax@gmail.com>
2024-09-27 18:57:35 +02:00
grafana-delivery-bot[bot] 30a453daa1 [v11.2.x] Bookmarks: Do not query preferences if no user logged in (#93893) 2024-09-27 10:41:02 +01:00
grafana-delivery-bot[bot]andIrene Rodriguez 4257f271b9 [v11.2.x] update minimum supported version for MySQL (#93879)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
2024-09-27 09:15:16 +01:00
Jev Forsberg 2cb798867c [v11.2.x] CI: Bump alpine version (#93875)
CI: Bump alpine version (#93865)

* baldm0mma/up_alpine/ update alpine

* baldm0mma/resolve commits

(cherry picked from commit dc1670ed9a)
2024-09-26 21:46:25 -06:00
Jev Forsberg a3b88d9acc [v11.2.x] CI: Update retry_command function (#93870)
* CI: Update retry_command function (#93863)

* baldm0mma/update args

* baldm0mma/update_args/ conflict

(cherry picked from commit b17b98aeb9)

* make drone
2024-09-26 19:46:55 -06:00
grafana-delivery-bot[bot]andKim Nylander b97bb8c00e [v11.2.x] [DOC] Add videos to Explore docs (#93855)
[DOC] Add videos to Explore docs (#93847)

* Add videos to Explore docs

* Apply suggestions from code review

(cherry picked from commit 6951feff88)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2024-09-26 15:54:12 -05:00
github-actions[bot]andgithub-actions[bot] a38d360c14 Release: 11.2.1 (#93836)
* Update changelog

* Update version to 11.2.1

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-09-26 16:06:34 +01:00
grafana-delivery-bot[bot]andkay delaney 7a5cbfe63f [v11.2.x] Dashboards: Fix issue with percentage difference formatting (#93796)
Dashboards: Fix issue with percentage difference formatting (#93389)

* Dashboards: Fix issue with percentage difference formatting

---------

Co-authored-by: Ihor Yeromin <yeryomin.igor@gmail.com>
(cherry picked from commit 6c8f24adc9)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2024-09-26 12:52:29 +01:00
grafana-delivery-bot[bot]andPiotr Jamróz 3cadd8a08b Correlations: Limit access to correlations page to users who can access Explore (#93676)
Correlations: Limit access to correlations page to users who can access Explore (#93519)

Correlations: Limit access to correlations page to users who can access Explore
(cherry picked from commit 813e1c1364)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
2024-09-26 09:57:28 +02:00