Commit Graph
3770 Commits
Author SHA1 Message Date
Ryan McKinley e2eeba7bb4 resolve conflicts 2025-01-13 09:04:41 +03:00
Selene 9e5fd78b52 Codegen: Remove pfs codegen dependency from Grafana codebase (#98840)
* Remove pfs dependency for IAM struct to avoid to import codegen code in main go.mod

* Remove pointer

* Remove dependency cycle

* Update tests
2025-01-10 22:43:40 +02:00
xavi 345757c3ae Auth: Fix SAML user IsExternallySynced not being set correctly (#98487) 2025-01-10 17:37:37 +01:00
Mariell Hoversholm 417875cf78 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-10 17:01:50 +01:00
Matheus MacabuandLarissa Wandzura 4e398bf2bd Datasources: Add toggle to control default behaviour of 'Manage alerts via Alerts UI' toggle (#98441)
* Datasources: Add toggle to control default behaviour of 'Manage alerts via Alerts UI' toggle

* Update documentation with suggestions

Co-authored-by: Larissa Wandzura <126723338+lwandz13@users.noreply.github.com>
2025-01-10 15:20:09 +01:00
Selene 0501ff9079 Codegen: Isolate schema generation code (#98742)
* Create go.mod files for plugins and core kinds

* Update go work and main go.mod dependencies

* Update pfs import

* Missing update of pfs dependency

* Remove fixed cuelang dependency

* Update codeowners

* Update workspace

* Update Dockerfile

* Missing go.mod codeowner

* Use intermediate kin-openapi dependency to make all workspaces to work
2025-01-10 13:33:51 +01:00
Karl PerssonandMisi bdb4725768 UserDisplay: Handle both service accounts and user names when resolving "createdBy" (#98719)
* Handle both user and service accounts when resolving identity name for dashboards and folders

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2025-01-10 10:06:59 +01:00
Mariell Hoversholm 5547a04616 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-10 08:39:53 +01:00
Stephanie Hingtgen 9488bf2915 Dashboards: use service for quotas (#98756) 2025-01-09 22:21:21 -07:00
4581a82ac4 Auth: disable passwordless auth if any SAML/OAuth is enabled (#98227)
* Auth: disable passwordless auth if any SAML/OAuth is enabled

* Update pkg/services/authn/authnimpl/registration.go

Co-authored-by: Victor Cinaglia <victor@grafana.com>

* simplify check if any auth providers are enabled

* add accidentally removed break statement, use IsEnabled with empty context to check if PasswordlessMagicLinkAuth enabled

* use IsClientEnabled

* Update pkg/api/frontendsettings.go

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

---------

Co-authored-by: Victor Cinaglia <victor@grafana.com>
Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2025-01-09 11:44:16 -05:00
Mariell Hoversholm 0d315b6cbe Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-09 08:28:24 +01:00
Matheus Macabu 3958fb9e0a CloudMigrations: Introduce RBAC role for migration assistant (#98588)
* CloudMigrations: delete unused code

* CloudMigrations: add access control and protect API + navtree with action

* CloudMigrations: register access control roles

* CloudMigrations: gate frontend based with access control

* CloudMigrations: fix api tests

* CloudMigrations: add docs on new actions and roles

* CloudMigrations: dont interpolate vars to make it more greppable

* CloudMigrations: run prettier
2025-01-09 06:03:42 +02:00
Mariell Hoversholm f0aed104fb Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-08 11:22:26 +01:00
Syerikjan Kh b7809b7350 Fix: Double encoding of URLs when using data proxy (#98494)
fix: unescape raw path and set to req path
2025-01-07 10:27:34 -05:00
Mariell Hoversholm 6724f7bfe4 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-07 10:33:38 +01:00
Arati R. 6957e1f7b7 Folders: Replace sql query with folder service call when collecting folder tree (#98443)
* Replace sql query with folder service call when collecting folder tree
* Update provider for folder service implementation for wire
* Refactor provisioning of oss service in folder permissions test util
2025-01-07 09:53:09 +01:00
Ryan McKinley d3f5640343 merge main 2025-01-07 07:55:20 +03:00
Stephanie Hingtgen 3797779989 K8s: Dashbaords: Ensure backwards compatibility (#98565) 2025-01-07 01:35:02 +02:00
Stephanie Hingtgen 68479d844b Orgs: Remove dependency on dashboard table for deletion (#98501) 2025-01-06 19:05:22 +02:00
Ryan McKinley 6683cdc082 K8s: Update from v0.31.3 to v0.32.0 (#98507) 2025-01-06 18:20:35 +03:00
Leonor Oliveira 937e8dea2d Folder/parent subresource (#98392)
* Expose get folder parents endpoint

* Add tests
2025-01-03 10:43:56 +01:00
Stephanie Hingtgen 03f7a7d89d K8s: Dashboards: Add search to dashboard service (#98395) 2025-01-02 09:39:45 -06:00
Mariell Hoversholm 658bda1b78 100pxMerge remote-tracking branch 'origin/main' into grafana-git-ui-syng 2025-01-02 09:05:43 +01:00
maicon d2639f6080 Ensure all internal Services are using FolderService and not FolderStore (#98370)
* Ensure all internal Services are using FolderService and not FolderStore

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
2024-12-30 13:48:35 -03:00
Leonor Oliveira df36e77cd3 [Folders] Put move and counts behid a feature flag (#98317)
* Put move and counts behid a feature flag

* Gen toggles

* Generate feature flag

* Make feature name more explicit

* Remove unused code

* Update toggle  name
2024-12-27 18:10:44 +01:00
Leonor Oliveira fec5c0ec19 Make sure annotations are kept when updating a folder (#98321)
* Make sure annotations are kept when updating a folder

* Remove pointer

* Mock get on update tests
2024-12-27 13:51:10 +01:00
Ryan McKinley c9701c37bf merge main 2024-12-21 11:32:17 +03:00
Leonor Oliveira f5d44ff51d Folders move (#98100) 2024-12-19 09:59:14 +01:00
maicon 2e08092a34 UniStore: Get Folder Handler return Root Folder (general) (#98127)
Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
2024-12-18 22:31:55 -03:00
Ryan McKinley b322f65243 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-18 08:39:03 +03:00
Stephanie Hingtgen b3985a4d37 k8s: Dashboards: allow querying of unistore (#97995) 2024-12-17 10:35:46 -06:00
Ryan McKinley e4837d452e Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-16 19:07:54 +03:00
Andres Martinez Gotor 95dea152b6 Plugins Admin: Avoid disabling auto-enabled apps (#97800) 2024-12-16 14:51:04 +01:00
Leonor OliveiraandBruno Abrantes 62c1735a61 Implement k8s count handler (#97955)
* Implement k8s count handler

* Fix endpoint

* Fix type converstions

* Add tests for foldercounts

* Add more tests

* Only use sql-fallback if no values in unistore

* Update gomod

* Fix test

* Update pkg/api/folder_test.go

Co-authored-by: Bruno Abrantes <bruno.abrantes@grafana.com>

* Go.mod

---------

Co-authored-by: Bruno Abrantes <bruno.abrantes@grafana.com>
2024-12-16 14:08:29 +01:00
Ryan McKinley 16db278a8b Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-14 12:30:12 +03:00
Stephanie Hingtgen 8f6e9f8ed0 Restores in app platform (#97582) 2024-12-13 16:55:43 -06:00
Jo 40d3b02648 Auth: Separate anonymous settings to its own struct (#97791)
separate anonymous settings to its own struct
2024-12-13 10:46:27 +01:00
Ryan McKinley 06a3297669 merge magin 2024-12-10 08:09:36 +03:00
Sofia Papagiannaki d1027bf7b1 Swagger: Fix sync issue with enterprise (#97696)
* Swagger: Fix sync issue with enterprise

* Update swagger guidelines for enterprise endpoints
2024-12-09 21:21:22 +02:00
Ryan McKinley b8923200c7 fix folder test 2024-12-06 07:38:03 +03:00
Ryan McKinley 6c83756539 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-04 16:18:55 +03:00
maicon 7fd8877439 Unistore: Update Folders Endpoint (#97317)
* Add route for update folders via apiserver

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
2024-12-03 15:33:01 -03:00
Jean-Philippe Quéméner 5bf0872d14 fix(short-url): redirect to main page if not found (#97347) 2024-12-03 16:32:53 +01:00
Karl Persson 3a17d0c927 IAM: align AuthInfo interface (#97228)
* Update to use updated interface
2024-12-03 15:11:17 +01:00
Ryan McKinley e9df325760 merge main 2024-12-02 23:15:49 +03:00
Hugo Kiyodi Oshiro 5e91984f31 Plugins: Use grafana-com sso_api_token (#97096) 2024-12-02 16:04:05 +01:00
Ryan McKinley b041520ffa POC/Provisioning: wire rendering example (#96963) 2024-12-02 11:43:07 +01:00
Ryan McKinley 78dcc75de3 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-02 07:34:54 +03:00
Andres Martinez Gotor e0935246a3 Preinstall: Allow to set a download URL (#96535) 2024-11-29 16:02:33 +01:00
Mariell Hoversholm ea8d46dfd3 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-11-28 15:31:03 +01:00