Commit Graph
332 Commits
Author SHA1 Message Date
Ryan McKinley e99c72cacc Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-13 21:22:26 +03:00
Will Assis 155492c8a5 search: handle "permission" query param in search (#100607)
handle "permission" query param in search
2025-02-13 11:35:53 -05:00
Ryan McKinley ebeb0c67be merge main 2025-02-13 17:17:46 +03:00
Ryan McKinley 06de4c0041 Provisioning: legacy → git → unified (#100481) 2025-02-13 17:13:32 +03:00
Karl Persson a58564a35e Unified Storage: Register metrics (#100600)
use seperate once struct
2025-02-13 14:24:59 +01:00
Karl Perssonandgamab 1b1954de28 Authz: add support to use folder api to fetch folder tree (#100038)
* Add FolderStore interface

* Authz: add implementation to use folders api and use it inproc with loopback config

* Add tracing and add rest.Config for talking with folder api using access tokens

* Restructure test to get rid of circular dependencies in tests

* use correct group version kind

---------

Co-authored-by: gamab <gabriel.mabille@grafana.com>
2025-02-13 11:59:59 +01:00
Ryan McKinley 7051c5389c merge main with sprinkles stats commeted out 2025-02-13 09:53:51 +03:00
Ryan McKinley f2911bdebb Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-13 09:45:28 +03:00
owensmallwood a34e7e176d Unified Storage: Sprinkles latency metric (#100542)
* add sprinkles latency metric

* fixes failing tests - forgot to register metric only once
2025-02-12 16:22:18 -06:00
Clarity-89 0f382ea04f Merge branch 'main' into grafana-git-ui-sync 2025-02-12 17:00:53 +02:00
Misi ee0a1391df Auth: Add OrgRole to ID token (#100383)
* Changes for Users and ServiceAccounts

* Align tests
2025-02-12 05:51:29 -08:00
Ryan McKinley befa028784 Storage: Add ManagedDualWriter mode (#100231) 2025-02-12 15:51:37 +03:00
Mariell Hoversholm 0910a0420e Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-12 08:32:26 +01:00
Stephanie Hingtgen df84d928e2 K8s: Folders: Fix legacy search (#100393) 2025-02-11 13:14:25 -06:00
Ryan McKinley 459240e9a8 merge main 2025-02-11 21:01:39 +03:00
Ryan McKinley a5355fd66c Storage: Add command line tool to migrate legacy dashboards (and folders) to unified storage (#99199) 2025-02-11 19:57:46 +02:00
Mariell Hoversholm 4cee0520e5 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-11 14:42:49 +01:00
Alexander Zobnin 5118e82e8c Zanzana: Run reconciliation in its own service (#100361)
* Zanzana: Start reconciliation in its own service

* cleanup

* update go workspaces

* refactor

* remove unused code

* move func definition
2025-02-11 14:09:39 +01:00
Ryan McKinley f464dc79e0 Provisioning: Use go-git wrapper for export (#100333) 2025-02-11 13:51:15 +03:00
Clarity-89 6d969ca833 Update workspace 2025-02-11 08:20:09 +02:00
Clarity-89 da4b2e1534 Merge branch 'main' into grafana-git-ui-sync
# Conflicts:
#	pkg/storage/unified/resource/go.sum
2025-02-11 07:33:55 +02:00
Gábor Farkas 390b5eb6d4 go.mod: updated grafana-plugin-sdk-go (#100342)
* go.mod: update grafana-plugin-sdk-go

* make update-workspace
2025-02-10 11:38:30 +01:00
Ryan McKinley 24cfb93ef6 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-07 23:28:21 +03:00
owensmallwood 196029f287 Unified Storage: Adds more spans to handleEvent (#100304)
adds more spans to handleEvent
2025-02-07 19:43:02 +01:00
Alexander Akhmetov 97109b36e3 Update grafana/alerting package from 995709fe8d64 to 04c87cf39038 (#100293) 2025-02-07 18:38:22 +02:00
Clarity-89 42d7ca0c53 Merge branch 'main' into grafana-git-ui-sync
# Conflicts:
#	go.work.sum
2025-02-07 07:56:40 +02:00
Sam Jewell f4426e22bf SQL Expressions: Bump go-mysql-server dependency to main (#100222)
Bump go-mysql-server dependency to `main`

This is so we receive a few bug fixes - fixes to these issues:

- https://github.com/dolthub/dolt/issues/8807
- https://github.com/dolthub/dolt/issues/8735
- https://github.com/dolthub/dolt/issues/8724
2025-02-06 17:34:35 +00:00
Will AssisandStephanie Hingtgen 1467d4b3e3 [search] Legacy search fallback support legacy query params (#99765)
* add support for deleted query param

* support tag query param in modes 2 and below

* handle dashboardIds

* hhandle dashboardUIDs

* handle folderUIDs query param

* handle page query param when hitting legacy storage

* handle sort query param

* handle type query param

* re-enable search fallback

* remove folder search workaround and fix /api/search to return both folders and dashboards when no title or type is provided

---------

Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
2025-02-06 11:30:47 -05:00
Matthew Jacobson ccb0e9222a Alerting: Upgrade grafana/alerting to use EmbeddedContents (#99983)
* Upgrade grafana/alerting to include EmbeddedContents for email images
2025-02-06 11:29:43 -05:00
Kyle BrandtandSam Jewell d64f41afdc SQL Expressions: Re-implement feature using go-mysql-server (#99521)
* Under feature flag `sqlExpressions` and is experimental
* Excluded from arm32
* Will not work with the Query Service yet
* Does not have limits in place yet
* Does not working with alerting yet
* Currently requires "prepare time series" Transform for time series viz
 
---------

Co-authored-by: Sam Jewell <sam.jewell@grafana.com>
2025-02-06 07:27:28 -05:00
Clarity-89 8d041bb8ba Merge branch 'main' into grafana-git-ui-sync
# Conflicts:
#	.betterer.results
#	public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
2025-02-06 08:04:13 +02:00
Karl Persson 39d94eabcd Auth: Fix function name (#100122)
Fix spelling
2025-02-05 15:32:22 +01:00
owensmallwood f9c4d3edce Unified Storage: Updates index latency logging (#100085)
updates index latency logging
2025-02-04 13:33:44 -06:00
Ryan McKinley 0c2dd6c9f7 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-04 21:57:13 +03:00
Karl Persson 958d6e5e3a Auth: Update authlib (#100041)
Bump authlib
2025-02-04 14:36:48 +01:00
Ryan McKinley b70219b345 update config form+better 2025-02-03 00:10:38 +03:00
Yuri TseretyanandSantiago 0be6e1bb86 Alerting: Extra dedup stage in Grafana Alertmanager (#99825)
* add feature flags

* update alerting module

* update grafana alertmanager to configure the extra dedup stage

---------

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
2025-01-31 11:12:38 -05:00
Ryan McKinley d52dd7d660 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-31 08:14:55 +03:00
owensmallwood 58df80e542 Unified Storage: Fix panic from log (#99850)
evt.Object can be nil, so use the key instead
2025-01-30 19:29:51 -05:00
Ryan McKinley 861939f395 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-30 21:00:36 +03:00
Igor Suleymanov b683724bec Upgrade grafana-app-sdk to 0.31.0 (#99739)
* Upgrade grafana-app-sdk to 0.31.0

What

This commit upgrades the app SDK to 0.31.0 and re-generates codegen files.
It doesn't touch alerting schemas, because those are quite old and
should be upgraded separately.

This commit slightly alters the schemas for the investigations app,
because the codegen is not happy with the current syntax, for some
reason (probably has to do with CUE upgrades in `cog`).

Why

To make sure we use up-to-date SDK version and remove the workaround for
the `defencoding=none` bug that required us to clean up generated CRD
files.

Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>

* Revert changes to golden file for store tests

Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>

---------

Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>
2025-01-30 16:10:42 +02:00
Mariell Hoversholm 69027482b7 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-30 08:35:14 +01:00
Yuri Tseretyan 7007342704 Alerting: k8s receivers api encrypt existing unencrypted secureFields on update (#99784)
* apply security patch: v11.5.x/305-202501232115.patch

commit 874ce8d12caad3742857ca86d2da7d5f81f3f825
Author: Matt Jacobson <matthew.jacobson@grafana.com>
Date:   Thu Jan 23 16:14:28 2025 -0500

    linting

commit c4b6d9194cc8b79e252e562a27a2d09a42d7a5e8
Author: Matt Jacobson <matthew.jacobson@grafana.com>
Date:   Thu Jan 23 14:56:35 2025 -0500

    CVE-2024-11741 - victorops url
2025-01-30 00:48:26 +02:00
Scott Lepper 8e9e3b8362 [search] title phrase (#99753)
[search] rename title_sort to title_phrase
2025-01-29 17:31:59 -05:00
Garret Wyman cf177776bf Alerting: Adding color option for slack receiver (#99615) 2025-01-30 00:12:16 +02:00
Ryan McKinley 496209c1ad Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-29 17:11:59 +03:00
Mariell Hoversholm baaff6296f Logging: Use slog adapter for go-kit/log with App SDK logger (#99740)
* feat: use slog adapter for go-kit/log

The adapter library is Apache-2.0, which is compatible with AGPL-3.0 as a dependency.

The adapter library outputs a little more info than we'd like, but rather a couple fields too many than it outputting
ERROR logs as INFO.

* feat: update dependencies

* chore: attribute ownership of dependency

* refactor: move require

* chore: make update-workspace
2025-01-29 14:59:37 +01:00
Mariell Hoversholm cd2ad22c06 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-29 09:33:02 +01:00
Stephanie Hingtgen c7f83b7311 K8s: Fix internal id setting in mode4 (#99720) 2025-01-29 08:17:17 +03:00
maicon 20f02ec12f Unistore: refactor provisioning to work with folder service (#99473) 2025-01-29 05:19:38 +02:00