7519 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
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]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]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
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]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
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]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
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
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]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
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]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
grafana-delivery-bot[bot]andIeva 278681f173 [v11.2.x] RBAC: Fix an issue with server admins not being able to manage users in orgs that they don't belong to (#92274)
* RBAC: Fix an issue with server admins not being able to manage users in orgs that they don't belong to (#92024)

* look at global perms if user is not a part of the target org

* use constant

* update tests

(cherry picked from commit 41ac5b5ae7)

* fix tests

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-08-22 13:30:50 +03:00
grafana-delivery-bot[bot]andTodd Treece e23f74f1c7 [v11.2.x] Chore: Add dataplaneAggregator feature toggle (#92252)
Chore: Add dataplaneAggregator feature toggle (#91715)

(cherry picked from commit 122e291134)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-08-21 17:55:31 -04:00
grafana-delivery-bot[bot]andlean.dev a37d107c58 [v11.2.x] CloudMigration: Removes snapshot and resources when deleting a session (#92250)
CloudMigration: Removes snapshot and resources when deleting a session (#91548)

(cherry picked from commit e20c7342a9)

Co-authored-by: lean.dev <34773040+leandro-deveikis@users.noreply.github.com>
2024-08-21 17:55:03 -04:00
grafana-delivery-bot[bot]andAlexander Zobnin 4115a67a42 [v11.2.x] Zanzana: Evaluate dashboard and folder permissions (#92253)
Zanzana: Evaluate dashboard and folder permissions (#91539)

* Zanzana: basic folder permissions checks

* Fix managed permissions for teams

* fix sync batch size

* add dashboards actions translations

* migrate folder tree

* migrate dashboard folders

* remove action sets from schema

* Adding more dashboard and folder-related permissions

* refactor

* Correctly translate dashboard permissions in folders

* fix dashboard parent permissions

(cherry picked from commit 1cc438a56c)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
2024-08-21 17:54:50 -04:00
grafana-delivery-bot[bot]andYuri Tseretyan 25c9b9d58e [v11.2.x] Alerting: Support for optimistic concurrency in priovisioning Tempate API (#92251)
Alerting: Support for optimistic concurrency in priovisioning Tempate API (#91195)

* support optimistic concurrency in template service

* update request handler to get version from query parameter

* return not found if a new template is set with version

* update PUT api to set version

* update documentation + for mute timings

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 1108a00668)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2024-08-21 17:54:28 -04:00
grafana-delivery-bot[bot]andKristin Laemmert f8f30409e0 [v11.2.x] experiment: use read replica for Get and Find Dashboards (#92246)
experiment: use read replica for Get and Find Dashboards (#91706)

(cherry picked from commit 54177ca619)

Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>
2024-08-21 17:09:17 -04:00
grafana-delivery-bot[bot] 59476ab8f8 [v11.2.x] Bookmarks: Move building logic to the Frontend (#91954) 2024-08-15 15:39:03 +01:00
Todd Treece b4126d3bce Chore: Update k8s.io dependencies (#91692) 2024-08-08 18:39:44 +03:00
Alexander Zobnin 0e5d7633f7 Access Control: Make it possible to exclude role grants (#91647) 2024-08-08 14:11:17 +02:00
Joey Orlando cb540a28bd Plugins: add IRM plugin to "Alerts & IRM" left-hand navigation group (#91423)
add IRM plugin to "Alerts & IRM" left-hand navigation group
2024-08-07 09:44:43 -04:00
Kristin Laemmert a117b090cf chore: preallocate slices where we have a good idea of requirements (#91596)
* chore: preallocate slices where we have a good idea of requirements

* pr feedback
2024-08-07 08:34:52 -04:00
Andre Pereira d84fd94936 Tempo: Add migration to enable TraceQL streaming for Tempo datasources (#91340)
* Add migration to enable TraceQL streaming for Tempo datasources

* lint

* Always run migration but exit early if feature flag is disabled

* Require feature toggle OR datasource config to enable streaming
2024-08-06 18:09:06 +01:00
Michael Mandrus 6cd0971dc6 CloudMigration: Show warning message for successfully migrated non-core data sources (#91545)
* minor performance improvement

* apply a warning to any non-core plugins that successfully migrate

* commit frontend wip while I refactor some stuff

* update api

* repurpose error dialog to be a generic details dialog

* whitespace

* add unit test

* fixes from testing

* fix migration summary

* add comment

* fix localization stuff

* fix backend test

* reduce number of queries to the db

* some PR feedback

* whitespace
2024-08-06 19:35:10 +03:00
Yuri Tseretyan ee78bb653f Alerting: Log rule evaluation error in scheduler (#91585) 2024-08-06 19:27:02 +03:00
owensmallwood 2387798719 Unified Storage: Propagate traces from the apiserver grpc client (#91226) 2024-08-06 09:52:11 -06:00
Jeff LevinandDave Henderson d4916207a0 chore(tracing): add tracing for frontend and db session (#91509)
This PR adds instrumentation for loading frontend SPA along with select methods in the dashboard service, and cleans up span handling in sqlstore.

---------

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
2024-08-05 17:17:39 -08:00
Kristin Laemmert b6de9e9d3c search v2: pre-allocate dashboardQueryResult slice capacity for performance (#91536)
* search v2: pre-allocate dashboardQueryResult slice for performance
* use limit parameter for starting slice size
2024-08-05 13:54:57 -04:00
Matthew Jacobson 53cfdf0ef8 Alerting: Remove option to return settings from api/v1/receivers and restrict provisioning action access (#90861)
* Remove provisioning action access to v1/receivers api

* Separate ListOnly functionality to its own method without decryption
2024-08-05 11:49:23 -04:00
Michael Mandrus 4d23382497 Caching: Handle memcached reconnects (#91498)
* update library version

* update tls memcached feature toggle

* update to latest version

* updae gomemcache version
2024-08-05 11:21:11 -04:00
AvivGuiser 93aa5a56ad Alerting: Use stable identifier of a group,contact point,mute timing when export to HCL (#90917)
---------

Signed-off-by: Aviv Guiser <avivguiser@gmail.com>
2024-08-05 09:56:17 -04:00
Ryan McKinley a223c46506 APIServer: Make TableConverter part of ResourceInfo (#91520) 2024-08-05 15:38:12 +03:00
Matthew Jacobson a397bca02e Alerting: Fix panic with nil annotations & Nodata=alerting/ok/keep (#91506) 2024-08-02 22:15:57 +03:00
Vardan Torosyan 1747cd1747 [Auth] Enable cloudRBACRoles feature toggle for self-serve (#91036)
Enable cloudRBACRoles feature toggle for self-serve
2024-08-02 16:47:00 +02:00