13838 Commits
Author SHA1 Message Date
grafana-delivery-bot[bot]andMatthew Jacobson 6418dab0d6 [v11.2.x] Alerting: Fix incorrect 500 code on missing alert rule dashboardUID / panelID (#96774)
Alerting: Fix incorrect 500 code on missing alert rule dashboardUID / panelID (#96491)

(cherry picked from commit 64c93217ff)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2024-12-02 09:15:46 -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
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]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]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
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
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
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
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)
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
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]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]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
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]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]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
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
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]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]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
grafana-delivery-bot[bot]andAlexander Zobnin 7a59b2e420 [v11.2.x] Annotations: Optimize search by tags (#93611)
Annotations: Optimize search by tags (#93547)

* Annotations: Optimize search on large number of dashboards

* refactor

* fix batch size

* Return early if no annotations found

* revert go.mod

* return nil in case of error

* Move default limit to the API package

* fix empty access control filter

* Set default limit to 100

* optimize query when number of annotations is less than limit

* Update pkg/services/annotations/annotationsimpl/annotations.go

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

* remove limit from store since it's set in API

* set default limit in Find method (do not break tests)

* Only add limit to the query if it's set

* use limit trick for all searches without dashboard filter

* set default page if not provided

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
(cherry picked from commit 5e713673e1)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
2024-09-23 17:57:33 +02:00
grafana-delivery-bot[bot]andIsabella Siu 028d42a074 [v11.2.x] CloudWatch: Fix segfault when migrating legacy queries (#93544)
CloudWatch: Fix segfault when migrating legacy queries (#93543)

(cherry picked from commit 2ad558d046)

Co-authored-by: Isabella Siu <Isabella.siu@grafana.com>
2024-09-20 14:37:40 -04:00
grafana-delivery-bot[bot]andWill Browne 7ca022d2a7 [v11.2.x] Plugins: Avoid returning 404 for AutoEnabled apps (#93488)
Plugins: Avoid returning 404 for `AutoEnabled` apps (#93436)

avoid errors for autoenabled apps

(cherry picked from commit 362ffff591)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2024-09-19 16:21:10 +03:00
Dave Henderson 986a6365b0 [v11.2.x] Chore: Bump Go to 1.22.7 (#93353)
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
2024-09-17 12:41:26 -04:00
grafana-delivery-bot[bot]andkay delaney 7573fc4152 [v11.2.x] LibraryPanels: Fix folderUid nil pointer dereference (#93401)
LibraryPanels: Fix folderUid nil pointer dereference (#93400)

(cherry picked from commit cbf2aa993e)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2024-09-17 16:23:02 +03:00
grafana-delivery-bot[bot]andMatheus Macabu fa8f24152b [v11.2.x] CloudMigrations: improve nil handling (#93382)
CloudMigrations: improve nil handling (#93257)

* CloudMigrations: fail token decryption if session is not found or without a token

* CloudMigrations: do not report event if session is nil

(cherry picked from commit 4f21ecf982)

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
2024-09-17 11:52:45 +03:00
grafana-delivery-bot[bot]andBruno a1b8d25f79 [v11.2.x] Cloud migrations: GetSnapshotList only returns snapshots that belong to a session that exists (#93380)
Cloud migrations: GetSnapshotList only returns snapshots that belong to a session that exists (#91798)

* Cloud migrations: GetSnapshotList only returns snapshots that belong to a session that exists

* Cloud migrations: test GetSnapshotList

* add one more test case for GetSnapshotList

* fix test

* store encryption key for testing

(cherry picked from commit 90b44fdcbf)

Co-authored-by: Bruno <brunotj2015@hotmail.com>
2024-09-17 10:02:06 +02:00
Andreas ChristouandAlyssa Joyner 5abb9a8632 [v11.2.x] Add basic logs enabled check (#93158)
Add basic logs enabled check (#92324)

(cherry picked from commit 0049e4f997)

# Conflicts:
#	pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
#	pkg/tsdb/azuremonitor/loganalytics/utils.go

Co-authored-by: Alyssa (Bull) Joyner <58453566+alyssabull@users.noreply.github.com>
2024-09-12 07:51:08 -06:00
grafana-delivery-bot[bot]andMatheus Macabu 4c78ce50fc [v11.2.x] CloudMigrations: Fix snapshot creation on Windows systems (#92981)
CloudMigrations: Fix snapshot creation on Windows systems (#92941)

* cloudmigration: improve error logging stringify body

* deps: update migration snapshot library to v1.3.0 (fix to Windows)

(cherry picked from commit 95ef2a1eb2)

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
2024-09-05 17:06:43 +03:00
grafana-delivery-bot[bot]andIeva fc2d84152d [v11.2.x] RBAC: Always store action sets (#92855)
RBAC: Always store action sets (#92833)

always store action sets, even if FT is disabled

(cherry picked from commit 46e81e98cf)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-09-03 13:51:45 +03:00
Pepe Cano f7749c0e9a [v11.2.x] IAM docs: Transform API keys to Migrate API keys docs (#92843)
IAM docs: Transform `API keys` to `Migrate API keys` docs (#92380)

* IAM docs: Transform `API keys` to `Migrate API keys` docs

* Update links to `API keys` in other doc pages

* Grafana UI: update help button link

* Update OpenAPI/Swagger links

* Update docs/sources/administration/service-accounts/migrate-api-keys.md

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* Update `relref` links to the new URL

* fix space before em dash

spaces before or after em dashes are not recommended (https://developers.google.com/style/dashes)

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
(cherry picked from commit 6a29e4aecf)
2024-09-03 11:13:01 +02:00
Karl Persson 9cad6743f7 [v11.2.x] Authn: No longer hash service account token twice during authentication (#92639)
Authn: No longer hash service account token twice during authentication (#92598)

* APIKey: Only decode and hash token once during authentication

* Only update last used every 5 minutes

(cherry picked from commit 56487d37db)
2024-08-29 10:21:09 +02:00
grafana-delivery-bot[bot]andAndreas Christou d7ce7fd2d9 [v11.2.x] CI: Run prettier in bump-version workflow (#92531)
CI: Run prettier in bump-version workflow (#92195)

Run prettier

(cherry picked from commit 931d64b8fc)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-08-27 22:43:12 +03:00
grafana-delivery-bot[bot]andMichael Mandrus a259af31b1 [v11.2.x] CloudMigrations: Misc cleanup before codefreeze (#92310)
CloudMigrations: Misc cleanup before codefreeze (#91725)

* fix retry logic

* slight adjustments

* fix disconnect and connect events

* Update pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>

---------

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
(cherry picked from commit eee3a75b8b)

Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
2024-08-22 11:21:26 -04:00
Yuri TseretyanandTodd Treece d79822db37 [v11.2.x] Chore: Add go workspace scripts (#92297)
Chore: Add go workspace scripts (#91707)

(cherry picked from commit 7f155b2b6f)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-08-22 10:51:46 -04:00
grafana-delivery-bot[bot]andKarl Persson 38db7f80c0 [v11.2.x] Annotations: only set userID if caller is a user or service account (#92291)
Annotations: only set userID if caller is a user or service account (#91898)

* Ignore errors when extracting current user id

* Only set userID if caller is user or service account

* Fix patch api

(cherry picked from commit e9bb3b4d73)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-08-22 17:14:04 +03:00
Yuri Tseretyan 8c1926a422 Revert "update open API"
This reverts commit 00ff74cc96.
2024-08-22 10:05:40 -04:00
Todd Treece 00ff74cc96 update open API 2024-08-22 10:02:46 -04:00
grafana-delivery-bot[bot]andKarl Persson 811307c46b [v11.2.x] Identity: remove GetTypedID (#92256)
Identity: remove GetTypedID (#91745)

(cherry picked from commit bcfb66b416)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-08-22 15:53:59 +02:00
grafana-delivery-bot[bot]andTodd Treece 7a25060fa6 [v11.2.x] Semconv: Add k8s.dataplaneservice.name (#92286)
Semconv: Add k8s.dataplaneservice.name (#91714)

(cherry picked from commit c5c206d8a6)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-08-22 09:36:33 -04:00
grafana-delivery-bot[bot]andTodd Treece 5b5d067df0 [v11.2.x] Chore: Remove depguard rule skip in apiserver (#92287)
Chore: Remove depguard rule skip in apiserver (#91705)

(cherry picked from commit f463d622d0)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-08-22 16:25:09 +03:00
grafana-delivery-bot[bot]andKristin Laemmert 1247fba905 [v11.2.x] QuotaService: refactor to use ReplDB for Get queries (#92285)
QuotaService: refactor to use ReplDB for Get queries (#91333)

* Feature (quota service): Use ReplDB for quota service Gets

This adds the replDB to the quota service, as well as some more test helper functions to simplify updating tests. My intent is that the helper functions can be removed when this is fully rolled out (or not) and we're consistently using the ReplDB interface (or not!)

* test updates

(cherry picked from commit 299c142f6a)

Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>
2024-08-22 08:55:54 -04:00