50530 Commits
Author SHA1 Message Date
Kevin MinehartandKonrad Lalik 14063e8706 [v11.0.x] Alerting: Add useReturnTo hook to safely handle returnTo parameter (#96478)
Add useReturnTo hook to safely handle returnTo parameter

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
v11.0.8
2024-11-14 17:33:10 +01:00
0a4794bea7 [v11.0.x] Docs: Add canvas custom images and icon guidance (#96467)
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:01:46 -05:00
Erik Sundell 58fcfd9c76 NPM Releases: Make e2e package private (#96323)
make package private
2024-11-13 07:15:37 +01:00
grafana-delivery-bot[bot] a13581a343 [v11.0.x] docs: Fixed title wording from bar gauge to canvas (#96316)
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:04:43 -05:00
grafana-delivery-bot[bot]andSeñor Performo - Leandro Melendez 6da6f8b2e1 [v11.0.x] docs: Update CanvasDoc adding video link (#95991)
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:15:17 +01:00
Fayzal Ghantiwala a41db29261 [v11.0.x] Alerting: Make context deadline on AlertNG service startup configurable (#96131)
* 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)

* Update test

* No cyclo lint
2024-11-08 16:46:36 +00:00
ismail simsekandStéphane Cazeaux 6a3b84ebd2 [v11.0.x] Prometheus: Fix interpolating adhoc filters with template variables (#95986)
* Prometheus: Fix interpolating adhoc filters with template variables (#88626)

* Prometheus: replace variables on adhoc filters

Fixes #87979

Signed-off-by: Stéphane Cazeaux <stephane.cazeaux@orange.com>

* Prometheus: replace variable filters on adhoc variables also when promQLScope=true

Signed-off-by: Stéphane Cazeaux <stephane.cazeaux@orange.com>

---------

Signed-off-by: Stéphane Cazeaux <stephane.cazeaux@orange.com>
(cherry picked from commit 6b876f1e38)

* fix unit test

* revert

* revert some unnecessary changes

* remove unnecessary promqlscope ft checks

* linting

---------

Co-authored-by: Stéphane Cazeaux <stephane.cazeaux@casper-online.net>
2024-11-07 08:39:29 +01:00
Erik Sundell 1f0aa2a1af NPM releases: Stop publishing the e2e package (#95350)
remove e2e from list of packages
2024-11-06 13:38:50 +01:00
grafana-delivery-bot[bot]andMisi aba1c37d27 [v11.0.x] ServerLock: Fix pg concurrency/locking issue (#95932)
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:07:55 +02:00
grafana-delivery-bot[bot]andAndreas Christou 86488ae49c [v11.0.x] Azure: Handle namespace request rejection (#95906)
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 21:06:59 +02:00
grafana-delivery-bot[bot]andMisi b2ba2ea616 [v11.0.x] User: Check SignedInUser OrgID in RevokeInvite (#95487)
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:11 +02:00
Kevin Minehart 4ef9fb7607 [v11.0.x] CI: Remove drone steps for building windows because its done in grafana-… (#95410)
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 17:04:01 +03:00
Kevin Minehart 9d9ab65fea [v11.0.x] CI: use linux to build msi installers (#95296)
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:08 -06:00
747a82bcd0 [v11.0.x] Docs: Table visualization update (#95283)
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 14:37:39 -04:00
Diego Augusto Molina 786151d4e3 [v11.0.x] Chore: Bump pyroscope go godeltaprof (#94741)
bump to github.com/grafana/pyroscope-go/godeltaprof@v0.1.8
2024-10-23 12:57:21 -03:00
grafana-delivery-bot[bot]andismail simsek f4eb00952d [v11.0.x] Prometheus: Fix passing query timeout to upstream queries (#95261)
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:23 +02:00
grafana-delivery-bot[bot]andGabriel MABILLE 829e425b4d [v11.0.x] Fix: Deduplicate OrgID in SA logins (#94400)
* 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:47:42 +02:00
grafana-delivery-bot[bot]andAndreas Christou 10e0b16e42 [v11.0.x] Azure: Fix duplicated traces in multi-resource trace query (#95244)
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 14:49:01 +03:00
grafana-delivery-bot[bot]andKarl Persson 41152036d5 [v11.0.x] Migration: Remove table aliasing in delete statement to make it work for mariadb (#95229)
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:46 +02:00
lean.dev 7c7a4401b3 [v11.0.x] Anonymous User: Adds validator service for anonymous users (#95151)
* Anonymous User: Adds validator service for anonymous users (#94700)

(cherry picked from commit 3438196010)
2024-10-22 14:29:19 -03:00
github-actions[bot]andgithub-actions[bot] 4669757e52 Release: 11.0.7 (#95158)
* Update changelog

* Update version to 11.0.7

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-10-22 15:05:54 +02:00
grafana-delivery-bot[bot]andAndreas Christou 6dd0f19508 [v11.0.x] Azure Monitor: Support metric namespaces fallback (#95152)
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:43:28 +03:00
Sam Jewell ceff188b35 [v11.0.x] ServerSideExpressions: Disable SQL Expressions to prevent RCE and LFI vulnerability (#94971)
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.0.7
2024-10-18 09:48:48 -04:00
Diego Augusto MolinaandJosh Hunt 10ea008462 [v11.0.x] CI: Additional changes for +security versions (#94927)
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:20 -03:00
f5a2695590 Release: 11.0.6+security-01 (#94902)
* Update changelog

* Update version to 11.0.6+security-01

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

This reverts commit d078536ba6.

* add cve to changelog

* yarn run prettier:write

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
2024-10-17 12:16:54 -05:00
bffd24a35c Release: 11.0.5+security-01 (#94891)
* Update changelog

* Update version to 11.0.5+security-01

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

This reverts commit 9f3c59c1e3.

* add cve to changelog

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: joshhunt <josh@trtr.co>
2024-10-17 17:44:41 +01:00
Kevin Minehart b9574d6698 [v11.0.x] CI: Support more version formats in publishing (#94747)
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:24:16 -05:00
Diego Augusto Molinaandknuzhdin c03cd22431 [v11.0.x] Dashboard: Make dashboard search faster (#94702)
* Dashboard: Make dashboard search faster (#88019)

(cherry picked from commit 28992f0488)

* fix cherry-pick leftover

---------

Co-authored-by: knuzhdin <32521427+knuzhdin@users.noreply.github.com>
2024-10-15 10:07:56 -03:00
grafana-delivery-bot[bot] 62201abe1b [v11.0.x] Fix list indentation to ensure continuous numbering (#94693)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Fix list indentation to ensure continuous numbering (#94692)
2024-10-14 19:27:13 +01:00
b7118163f2 [v11.0.x] docs: added configure structure and youtube video link (#94626)
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:21:41 -04:00
grafana-delivery-bot[bot]andAndreas Christou ecda40e78a [v11.0.x] GCM: Time field naming (#94604)
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 13:51:21 +03:00
Misi f88f9199a5 [v11.0.x] OrgSync: Do not set default Organization for a user to a non-existent Organization (#94552)
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)
2024-10-10 17:30:33 +03:00
grafana-delivery-bot[bot]andJo 0de3ec2903 [v11.0.x] Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (#94397)
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:34 +02:00
Andreas Christou db354f2d71 [v11.0.x] AzureMonitor: Fix App Insights portal URL for multi-resource trace queries (#94489)
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)

# Conflicts:
#	pkg/tsdb/azuremonitor/loganalytics/traces.go
#	pkg/tsdb/azuremonitor/loganalytics/traces_test.go
2024-10-09 16:40:38 +01:00
grafana-delivery-bot[bot]andKarl Persson 225b47165d [v11.0.x] ServiceAccounts: Run migration in batches (#94434)
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 21:04:51 +02:00
Karl Persson dbc1b646cb [v11.0.x] ServiceAccounts: Remove permissions to service account when it is deleted (#94370)
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
2024-10-08 14:33:46 +02:00
grafana-delivery-bot[bot]andIrene Rodriguez 3adcf92c1e [v11.0.x] Update CODEOWNERS (#94337)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
2024-10-08 08:49:08 +01:00
Jev Forsberg 6a9f1532ea [v11.0.x] CI: Remove redundant FE and BE tests from release pipeline (#94354)
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:38:47 -06:00
Alexander Zobnin 84f806b573 [v11.0.x] Annotations: Fix composite store read (#94180)
* Annotations: Fix composite store read (#94158)

* Annotations: Fix composite store read

* Add test

* check error

(cherry picked from commit bd1741653d)

* remove unused file

* re-format
2024-10-03 18:33:13 +03:00
Yuri Tseretyan 8801d0a781 Move CVE-2024-8118 to changelog of 11.0.5 (#94165) 2024-10-02 17:25:17 -04:00
d859de6a9a [v11.0.x] Docs: Geomap visualization refactor (#94160)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-10-02 11:44:17 -04:00
Kevin Minehart 01a7e5dc9a [v11.0.x] CI: upgrade grabpl v3.0.53 (#94123)
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:36 +01:00
2520d54e25 Release: 11.0.6 (#94099)
* Update changelog

* Update version to 11.0.6

* add alerting cve fix note

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
2024-10-01 19:08:38 +01:00
5c51966ac6 [v11.0.x] Docs - direction param for Loki in Explore (#94017)
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:45 +01:00
grafana-delivery-bot[bot]andDai Nguyen f435ea0f72 [v11.0.x] Update Image Render Dependencies (#93986)
Co-authored-by: Dai Nguyen <88277570+ej25a@users.noreply.github.com>
2024-09-30 10:42:00 +01:00
grafana-delivery-bot[bot]andDai Nguyen 355161aac7 [v11.0.x] Update Okta SAML attributes documentation (#93973)
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:50 +02:00
grafana-delivery-bot[bot]andAlexander Weaver be023a10fd [v11.0.x] Alerting: Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] (#93949)
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:20 -05:00
Stephanie HingtgenandTodd Treece 12dd28d04d [v11.0.x]: Live: Add ha_prefix (#93759) (#93926)
---------

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-09-27 14:20:43 -05:00
grafana-delivery-bot[bot]andIrene Rodriguez f107b0db60 [v11.0.x] update minimum supported version for MySQL (#93882)
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
2024-09-27 09:14:31 +01:00
Jev Forsberg 0acbcd2c81 [v11.0.x] CI: Bump alpine version (#93873)
CI: Bump alpine version (#93865)

* baldm0mma/up_alpine/ update alpine

* baldm0mma/resolve commits

(cherry picked from commit dc1670ed9a)
2024-09-26 20:54:23 -06:00