53186 Commits
Author SHA1 Message Date
Kevin MinehartandKonrad Lalik 6649ad3795 [v11.2.x] Alerting: Add useReturnTo hook to safely handle returnTo parameter (#96480)
Add useReturnTo hook to safely handle returnTo parameter

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
v11.2.4
2024-11-14 17:35:05 +01:00
14043ae8f4 [v11.2.x] Docs: Add canvas custom images and icon guidance (#96469)
Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-11-14 11:02:30 -05:00
grafana-delivery-bot[bot]andIsabel Matwawana 5cc4535338 [v11.2.x] Docs: Add auth entries to what's new 11.2 (#96393)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-11-14 10:21:23 -05:00
lean.dev b10a2dc68c [v11.2.x] MigrationAssistant: Restrict dashboards, folders and datasources by the org id of the signed in user (#96344)
apply security patch: v11.2.x/195-202410172117.patch
2024-11-12 16:33:06 -03:00
21679c7c25 Release: 11.2.3+security-01 (#96265)
* Update changelog

* baldm0mma/update changelog with cve

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: jev forsberg <jev.forsberg@grafana.com>
Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
2024-11-12 16:00:58 +00:00
grafana-delivery-bot[bot] 40c4f15f2c [v11.2.x] docs: Fixed title wording from bar gauge to canvas (#96318)
Co-authored-by: Señor Performo - Leandro Melendez <54183040+srperf@users.noreply.github.com>
Fixed title wording from bar gauge to canvas (#96312)
2024-11-12 10:06:33 -05:00
grafana-delivery-bot[bot]andSeñor Performo - Leandro Melendez d54516f7b1 [v11.2.x] docs: Update CanvasDoc adding video link (#95993)
docs: Update CanvasDoc adding video link (#95953)

Update CanvasDoc adding video link

(cherry picked from commit cd3a71e7cb)

Co-authored-by: Señor Performo - Leandro Melendez <54183040+srperf@users.noreply.github.com>
2024-11-11 15:14:31 +01:00
Fayzal Ghantiwala 7080ba2ae5 [v11.2.x] Alerting: Make context deadline on AlertNG service startup configurable (#96133)
Alerting: Make context deadline on AlertNG service startup configurable (#96053)

* Make alerting context deadline configurable

* Remove debug logs

* Change default timeout

* Update tests

(cherry picked from commit 1fdc48faba)
2024-11-08 16:46:47 +00:00
grafana-delivery-bot[bot]andSonia Aguilar 8e91bdea7a [v11.2.x] Alerting: Force refetch prom rules when refreshing panel (#96124)
Alerting: Force refetch prom rules when refreshing panel (#96120)

Force refetch prom rules when refreshing panel

(cherry picked from commit ea0a6a1f7f)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2024-11-08 16:36:22 +01:00
grafana-delivery-bot[bot]andMisi d4b779e16c [v11.2.x] ServerLock: Fix pg concurrency/locking issue (#95934)
ServerLock: Fix pg concurrency/locking issue (#95916)

Fix pg unique constraint validation in serverlock

(cherry picked from commit ab974ddf14)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2024-11-06 11:08:45 +02:00
grafana-delivery-bot[bot]andKim Nylander fbf07aee1a [v11.2.x] [DOC] Add Pyroscope to list of products (#95910)
[DOC] Add Pyroscope to list of products (#95884)

* Add Pyroscope to list of products

* Update docs/sources/shared/basics/what-is-grafana.md

* Apply suggestions from code review

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

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Bryan Huhta <32787160+bryanhuhta@users.noreply.github.com>
(cherry picked from commit 78c5fe61df)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2024-11-05 14:59:51 -05:00
grafana-delivery-bot[bot]andAndreas Christou 6b970d811e [v11.2.x] Azure: Handle namespace request rejection (#95908)
Azure: Handle namespace request rejection (#95574)

Handle rejection and add test

(cherry picked from commit da1a5426d0)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-11-05 20:05:15 +01:00
grafana-delivery-bot[bot]andKristina 270004097c [v11.2.x] Timeseries: Utilize min/max on stacking percentage (#95792)
Timeseries: Utilize min/max on stacking percentage (#95581)

* Bring in defined min/max into stacking range

* simplify logic

* different approach

---------

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit 68aefc73b6)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2024-11-04 15:09:07 -06:00
grafana-delivery-bot[bot]andJack Baldry 2ac79897ee [v11.2.x] Remove second aliases section (#95594)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2024-10-30 10:00:14 +00:00
2ee784d59a [v11.2.x] Replace myself with Irene who oversees Grafana documentation (#95495)
Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2024-10-28 15:33:58 +02:00
grafana-delivery-bot[bot]andMisi a971ad3a22 [v11.2.x] User: Check SignedInUser OrgID in RevokeInvite (#95489)
User: Check SignedInUser OrgID in RevokeInvite (#95476)

Check SignedInUser OrgID in RevokeInvite

(cherry picked from commit fedcf47702)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2024-10-28 14:41:42 +02:00
5cc7981d06 [v11.2.x] Update _index.md (#95474)
Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>
Co-authored-by: Jay <92761481+JayEkin@users.noreply.github.com>
2024-10-28 12:01:30 +02:00
5e9024a42e [v11.2.x] Update _index.md (#95469)
Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>
Co-authored-by: Jay <92761481+JayEkin@users.noreply.github.com>
2024-10-28 11:28:33 +02:00
Eric Leijonmarck b58db36814 [v11.2.x] Folders: Add admin permissions upon creation of a folder w. SA (#95416)
Folders: Add admin permissions upon creation of a folder w. SA (#95072)

* add admin permissions upon creation of a folder w. SA

* Update pkg/services/folder/folderimpl/folder.go

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

* Grant service account permissions for creation of dashboards

* Grant service account admin permissions upon creating a datasource

* fetch user using the userservice with the userid

* Revert "fetch user using the userservice with the userid"

This reverts commit 23cba78752.

* revert back to original datasource creation

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
(cherry picked from commit 9ab064bfc5)
2024-10-28 09:14:19 +00:00
Kevin Minehart b91bd951a6 [v11.2.x] CI: Remove drone steps for building windows because its done in grafana-… (#95412)
CI: Remove drone steps for building windows because it's done in grafana-… (#95373)

Remove drone steps for building windows because it's done in grafana-build now

(cherry picked from commit 67b3848fd9)
2024-10-25 07:53:32 -06:00
grafana-delivery-bot[bot]andJack Baldry 6a66c96e8a [v11.2.x] Remove doc-validator requirement to run on all pull requests (#95318)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2024-10-24 11:38:07 +03:00
Kevin Minehart 9fe9778d53 [v11.2.x] CI: use linux to build msi installers (#95298)
CI: use linux to build msi installers (#95215)

* Build the MSI installers using Linux and wine

(cherry picked from commit 66c728d26b)
2024-10-23 14:12:24 -06:00
5ffd30075d [v11.2.x] Docs: Table visualization update (#95285)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-10-23 15:01:31 -04:00
grafana-delivery-bot[bot]andismail simsek bfbf8d6b9c [v11.2.x] Prometheus: Fix passing query timeout to upstream queries (#95263)
Prometheus: Fix passing query timeout to upstream queries (#95104)

* remove queryTimeout from constructor

* use queryTimeout for range and instant queries

* remove comment

* remove default query timeout

* fix linting

(cherry picked from commit 78a00d09cd)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-10-23 16:49:16 +02:00
grafana-delivery-bot[bot]andGabriel MABILLE ea458d3a15 [v11.2.x] Fix: Deduplicate OrgID in SA logins (#94393)
* Fix: Deduplicate OrgID in SA logins (#94378)

* Fix: Deduplicate OrgID in SA logins

(cherry picked from commit b90e09e966)

* Fix: Actually call the DedupOrgInLogin migration (#94520)

* Fix: Account for conflicting logins in dedupOrgInlogin migration (#94669)

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2024-10-23 15:34:56 +02:00
grafana-delivery-bot[bot]andAndreas Christou 3576d41ef9 [v11.2.x] Azure: Fix duplicated traces in multi-resource trace query (#95246)
Azure: Fix duplicated traces in multi-resource trace query (#95156)

Use first resource as base resource for query

(cherry picked from commit 8bb7475e4f)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-10-23 15:24:26 +03:00
grafana-delivery-bot[bot]andKarl Persson 6926deae8d [v11.2.x] Migration: Remove table aliasing in delete statement to make it work for mariadb (#95231)
Migration: Remove table aliasing in delete statement to make it work for mariadb (#95226)

Migration: remove table aliasing in delete statement to make it work in mariadb
(cherry picked from commit 6f7528f896)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-10-23 11:21:55 +02:00
96948d560e [v11.2.x] format datasources list with columns (#95225)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Robby Milo <robbymilo@fastmail.com>
2024-10-23 09:24:14 +01:00
grafana-delivery-bot[bot]andlean.dev d76e4c51d6 [v11.2.x] Anonymous User: Adds validator service for anonymous users (#94993)
Anonymous User: Adds validator service for anonymous users (#94700)

(cherry picked from commit 3438196010)

Co-authored-by: lean.dev <34773040+leandro-deveikis@users.noreply.github.com>
2024-10-22 13:41:22 -03:00
github-actions[bot]andgithub-actions[bot] 70c7e8f82c Release: 11.2.3 (#95177)
* Update changelog

* Update version to 11.2.3

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-10-22 09:27:38 -07:00
grafana-delivery-bot[bot]andAndreas Christou 2b425f803c [v11.2.x] Azure Monitor: Support metric namespaces fallback (#95154)
Azure Monitor: Support metric namespaces fallback (#94722)

* Update display names

* Update multi-resource types

* Update default metric namespace list

* Initialise namespace list with fallback namespaces

* Add test

* Update test

(cherry picked from commit 986bd2f9f8)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-10-22 15:44:13 +03:00
grafana-delivery-bot[bot]andJara Suárez de Puga García 1cd87ca64f [v11.2.x] Docs note on Cross-account observability permissions for CW datasource (#95124)
Co-authored-by: Jara Suárez de Puga García <jara.suarezdepuga@grafana.com>
2024-10-22 10:06:19 +01:00
grafana-delivery-bot[bot] 9957e99294 [v11.2.x] [docs] fix provisioning folder name (#95100)
Co-authored-by: Scott Lepper <scott.lepper@gmail.com>
fix provisioning folder name (#95099)
2024-10-21 23:44:04 +03:00
Adela AlmasanandJmdane 3a68ba5699 [v11.2.x] Transformations: Add 'transpose' transform (#95076)
Transformations: Add 'transpose' transform (#88963)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit 8bb548e17b)

Co-authored-by: Jmdane <70574656+jmdane@users.noreply.github.com>
2024-10-21 13:09:22 -05:00
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