Commit Graph
284 Commits
Author SHA1 Message Date
Clarity-89 c6a4ca4d41 Merge branch 'main' into grafana-git-ui-sync
# Conflicts:
#	public/app/features/folders/api/baseAPI.ts
#	public/app/features/folders/api/index.ts
#	public/app/store/configureStore.ts
2025-03-10 12:20:32 +01:00
Karl Persson 9a3864e603 Auth: Update to authlib (#101863)
Update to latest authlib
2025-03-10 11:08:40 +01:00
Ryan McKinley a8ee76264b Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-10 10:03:17 +03:00
Ezequiel Victorero 1c7f9d4333 Chore: Bump gofpdf (#101823) 2025-03-07 17:40:22 -03:00
Ryan McKinley 67eff1e898 fix go.mod 2025-03-07 11:31:38 +03:00
Ryan McKinley 1b607facf4 merge main 2025-03-07 11:23:53 +03:00
Ryan McKinleyandClarity-89 f52b6a5a42 Provisioning: Update spec and dependencies (#101746)
Co-authored-by: Clarity-89 <homes89@ukr.net>
2025-03-07 10:57:13 +03:00
Ryan McKinley aecf06dff3 merge main 2025-03-07 00:52:53 +03:00
TaniaandDave Henderson c9ab1142e1 Add OpenFeature providers (#101071)
* Add OpenFeature provider

* Simplify static provider

* Linting

* Apply review feedback

* Codeowner for deps

* Update pkg/services/featuremgmt/openfeature.go

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>

* Apply review comments part2

* Remove from sample.ini for now

* fixup! Apply review comments part2

* Add example of context config

* Resolve conflict

* Run update workspaces

---------

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
2025-03-06 15:09:26 +01:00
Ryan McKinley c6f04b2033 merge main 2025-03-06 12:55:42 +03:00
Matheus Macabu caabb06cd8 Chore: Bump dependencies to address security issues (#101620)
* Chore: Bump golang.org/x/net to v0.36.0

* Chore: Use github.com/moby/moby version 27.5.1 instead of 26.0.0

* Chore: Bump github.com/ua-parser/uap-go to v0.0.0-20250213224047-9c035f085b90

* Chore: Bump github.com/grpc-ecosystem/go-grpc-middleware/v2 to fix 32-bit overflow issue
2025-03-06 10:12:05 +01:00
Ryan McKinley 66b137ddba merge main 2025-03-06 08:45:47 +03:00
Ryan McKinley 59188569f0 merge main 2025-03-05 20:15:43 +03:00
Matheus Macabu 7426ddff94 Chore: Downgrade go-grpc-middleware to fix build in 32-bit systems (#101615) 2025-03-05 14:04:55 +01:00
Alexander Zobnin 01899d761e Zanzana: Upgrade to OpenFGA v1.8.6 (#101553)
* Zanzana: Upgrade to OpenFGA v1.8.6

* upgrade openfga
2025-03-05 11:58:31 +01:00
Ryan McKinley bf5427e24c merge main 2025-03-03 23:08:19 +03:00
Serge ZaitsevandPeter Štibraný 165bca6417 Chore: Add initial/experimental xorm spanner driver (#101398)
* make it build and start

* run some migrations

* add build tags, remove log

* remove unused code

* revert go.mod changes

* move initialisation into dialect file

* update workspace

* update workspace once again

* clean up dependencies

* further cleanup

* Address some review feedback.

* Fix go.sum.

---------

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
2025-03-03 17:02:10 +01:00
Ryan McKinley f082f01d43 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-01 16:15:01 +03:00
Will AssisandJean-Philippe Quéméner f5e5824bab fix (unified-storage): stop registering unified storage metrics in global state (#101322)
* move prometheus.register for unified storage metrics into metrics.go and do most of the plumbing to get it to work

* convert StorageApiMetrics to pointer and check for nil before using it

* rename type and variables to something more sensible

---------

Co-authored-by: Jean-Philippe Quéméner <jeanphilippe.quemener@grafana.com>
2025-02-28 07:39:39 -05:00
Ryan McKinley b94e192c0a merge main 2025-02-28 09:18:17 +03:00
ismail simsek b16904651f Chore: Bump grafana-plugin-sdk-go to v0.267.0 (#101376)
* bump grafana-plugin-sdk-go to v0.267.0

* make update-workspace
2025-02-27 11:13:58 +01:00
Ryan McKinley 2b882229ec merge main 2025-02-26 08:44:56 +03:00
Matheus Macabu 3aedb9159e Chore: Update golang.org/x/crypto and golang.org/x/ouath2 to address security issues (#101268)
- CVE-2025-22869 and Go issue https://go.dev/issue/71931.
- CVE-2025-22868 and Go issue https://go.dev/issue/71490.
2025-02-25 11:15:41 +01:00
Ryan McKinley 9d250f8a85 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-22 08:39:36 +03:00
William Wernert c33e908baf Alerting: Update alerting package to include SNS fix (#101177)
* Update alerting package to include sns fix

* Update workspace
2025-02-21 16:02:39 -05:00
Ryan McKinley 39166bfc5c Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-21 16:36:39 +03:00
Matheus Macabu 35b218fe10 Chore: Bump glog in pkg/codegen to v1.2.4 to fix vulnerability (#101126)
Chore: Bump glog pkg/codegen to v1.2.4 to fix vulnerability
2025-02-21 14:28:21 +01:00
Ryan McKinley cfa4923fca Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-21 13:29:41 +03:00
Carl Bergquist 79c0e5e3ec scopes: moves scopes to enterprise (#100746)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
2025-02-21 08:51:34 +01:00
Ryan McKinley 2c8a761213 merge main 2025-02-20 23:35:18 +03:00
Todd Treece 2313eca636 Chore: Update local go dependencies (#101088) 2025-02-20 12:55:28 -05:00
Ryan McKinley 18597b1096 v69 2025-02-19 22:18:39 +03:00
Ryan McKinley cf05abc4e9 merge main 2025-02-19 22:08:23 +03:00
Ryan McKinley 8c21a49c35 Chore: Update go-github dependencies (#100994) 2025-02-19 21:06:46 +02:00
Ryan McKinley e6d3834096 github v69 2025-02-19 22:06:42 +03:00
Matthew Jacobson 75c4c5ca0f Alerting: Upgrade grafana/alerting to 92d5f29 (#100982)
* Alerting: Upgrade grafana/alerting to 92d5f29

Includes:
- Add more context to log in PipelineAndStateTimestampCoordinationStage (#277)
- Update Alertmanager fork to latest commit (#279)
- Copy http client from Grafana (#281)

* Satisfy signature change from grafana/alerting #281 (http client)
2025-02-19 18:49:46 +02:00
Mariell Hoversholm 43df78669d Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-19 13:25:58 +01:00
Karl Persson a897ec3426 Authn: grpc errors (#100951)
* update authlib

* Map to grpc status
2025-02-19 11:46:48 +01:00
Mariell Hoversholm 77a11efe0c Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-18 14:09:31 +01:00
Mariell Hoversholm 64f5e34ed6 Provisioning: Test the GitHub client directly (#100808)
* Provisioning: Test the GitHub client directly

Instead of mocking the abstracted client, test it as well by mocking the underlying GitHub client. This also lets us
remove the mock for the abstracted client.

* refactor: move out helpers

* chore: set dependency owner
2025-02-18 08:46:08 +01:00
Matheus Macabu aceda85a4d Chore: Regenerate go.work.sum (#100816) 2025-02-17 22:44:02 +02:00
Mat RyerandSven Grossmann ff7ba54cbc Investigations: Add experimental app platform backend (#100584)
* add investigations group?

* Investigations: Add experimental app platform backend

* change `grafana-app-sdk/logging` version

* investigations: add feature flag to test

---------

Co-authored-by: Sven Grossmann <svennergr@gmail.com>
2025-02-17 19:19:22 +01:00
Clarity-89 843281315b Merge branch 'main' into grafana-git-ui-sync
# Conflicts:
#	pkg/server/wire.go
#	pkg/services/apiserver/service.go
#	pkg/tests/apis/openapi_test.go
#	public/app/core/reducers/root.ts
#	scripts/generate-rtk-apis.ts
2025-02-17 09:00:14 +02:00
Agnès Toulet 37ee1c427d Plugins: Upgrade grafana-plugin-sdk to 0.266.0 (#100727) 2025-02-14 16:33:45 +01:00
Ryan McKinley ebeb0c67be merge main 2025-02-13 17:17:46 +03:00
Tito Lins ae9837b793 Alerting: Add alertmanager integration tests (#100106) 2025-02-13 11:36:45 +01: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 da4b2e1534 Merge branch 'main' into grafana-git-ui-sync
# Conflicts:
#	pkg/storage/unified/resource/go.sum
2025-02-11 07:33:55 +02:00