Commit Graph
1053 Commits
Author SHA1 Message Date
Ryan McKinley f44aa05b20 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-06 08:45:30 +03:00
alerting-team[bot]andgrobinson-grafana 8ef37ea5c1 Alerting: Update alerting module to aae4827ec0610058810f2bbc69800ce377a33376 (#101623)
[create-pull-request] automated change

Co-authored-by: grobinson-grafana <85952834+grobinson-grafana@users.noreply.github.com>
2025-03-05 16:45:20 -05:00
Ryan McKinley 59188569f0 merge main 2025-03-05 20:15:43 +03:00
Matheus Macabu 61eb837dd6 Chore: Bump Go to 1.23.7 (#101576) 2025-03-05 14:55:36 +01: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 0bd4053924 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-04 07:28:26 +03:00
alerting-team[bot]andyuri-tceretian d9538fd5dc Alerting: Update alerting module to bb85a58ec8975d91b49d746dbd11d312f0485ecc (#101537)
[create-pull-request] automated change

Co-authored-by: yuri-tceretian <25988953+yuri-tceretian@users.noreply.github.com>
2025-03-03 18:10:15 -05:00
Ryan McKinley bf5427e24c merge main 2025-03-03 23:08:19 +03:00
Charandas cedb4ef9c1 fix: testutil blocking PR checks from passing (#101527) 2025-03-03 10:56:30 -08: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
dependabot[bot]andgithub-actions[bot] d1b20c652d Bump github.com/go-jose/go-jose/v3 from 3.0.3 to 3.0.4 (#101385)
* Bump github.com/go-jose/go-jose/v3 from 3.0.3 to 3.0.4

Bumps [github.com/go-jose/go-jose/v3](https://github.com/go-jose/go-jose) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/go-jose/go-jose/releases)
- [Changelog](https://github.com/go-jose/go-jose/blob/main/CHANGELOG.md)
- [Commits](https://github.com/go-jose/go-jose/compare/v3.0.3...v3.0.4)

---
updated-dependencies:
- dependency-name: github.com/go-jose/go-jose/v3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* update workspace

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-03-03 12:11:08 +01:00
Ryan McKinley f082f01d43 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-01 16:15:01 +03:00
Matthew Jacobson 2466685a41 Alerting: Improve template testing by trying non-root scopes (#101471)
Expand template testing to try additional scopes if the root scope fails.
This mitigates errors for definitions like pagerduty.default.instances,
which require the .Alerts scope. Added support for .Alerts and .Alert
scopes.
2025-02-28 20:27:27 +02: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 6198ea001e merge main 2025-02-26 17:48:48 +03:00
Georges ChaudyandPeter Štibraný 4391fac135 unistore: add spanner to go.mod (#101143)
* Add spanner dependency
* Update go.mod, go.sum.
* Assign owner to spanner dependency, clean up directives.
* Rerun go mod tidy.

---------

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
2025-02-26 13:34:50 +02:00
Ryan McKinley c35ac53ded Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-26 11:40:24 +03:00
Karl Persson fa74d1c36d Authn: Sync authlib and update how we construct authn client interceptor (#101124)
* Sync authlib and update how we construct authn client interceptor

* Remove namespace from checker
2025-02-26 09:22:09 +01:00
Ryan McKinley 2b882229ec merge main 2025-02-26 08:44:56 +03:00
Alexander Akhmetov 03e94e7a3e Alerting: Update grafana/alerting (#101215)
* Update grafana/alerting from 9d7e00921e44 to 2acbeef29642

* Change the package for the TLSClient

* Fix TestContactPointFromContactPointExports test
2025-02-25 11:32:28 +01: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
Dave Henderson 9f9c248766 chore(deps): Remove unreferenced goavro dependency (#101171)
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
2025-02-21 21:10:38 +02:00
dependabot[bot] bfc2347799 Bump github.com/go-sourcemap/sourcemap from 2.1.3+incompatible to 2.1.4+incompatible (#98639)
Bump github.com/go-sourcemap/sourcemap

Bumps [github.com/go-sourcemap/sourcemap](https://github.com/go-sourcemap/sourcemap) from 2.1.3+incompatible to 2.1.4+incompatible.
- [Commits](https://github.com/go-sourcemap/sourcemap/compare/v2.1.3...v2.1.4)

---
updated-dependencies:
- dependency-name: github.com/go-sourcemap/sourcemap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-21 13:04:21 -05:00
Yuri Tseretyan d1dfa0576b Alerting: Support Jira Integration (#100480) 2025-02-21 12:51:38 -05: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
Matthew Jacobson b78a63b0ad Alerting: Use new image TokenProvider and send image url in annotation (#99989)
* Send new annotation containing image url

* Use new image TokenProvider with TokenStore

New abstraction GetImage no longer needs to support parsing both token and
url from annotations, as remote AM will use the new URLProvider. Instead, we
use the new generic TokenProvider and give it a TokenStore backed by the
grafana database.

That means we revert back to always using token simplifying code and security
considerations.

* Upgrade grafana/alerting to merged commit SHA
2025-02-20 12:47:40 -05:00
Matthew Jacobson b1b5b4766c Alerting: Sanitize Slack image upload comment labels (#101084)
* Alerting: Sanitize Slack image upload comment labels

upgrades grafana/alerting to d43046
2025-02-20 12:22:04 -05:00
Jean-Philippe Quéméner e83f4fca1e feat(unified-storage): add some basic retry logic for the grpc client (#101001) 2025-02-20 16:17:50 +01:00
Matthew Jacobson 68ce949fff Alerting: Fix token-based Slack image upload to work with channel names (#100988)
Upgrades grafana/alerting to 00d6703 which includes the fix.
2025-02-20 09:17:52 -05:00
Jean-Philippe Quéméner 5897024dfe feat(unified-storage): enhance gRPC client with dskit (#101035) 2025-02-20 12:34:52 +01:00
Mariell Hoversholm 5e1eca9886 Chore: make update-workspace 2025-02-20 10:23:18 +01: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 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
Ieva e93ff154df Chore: bump authlib version (#100879)
* bump authlib version

* update other authlib deps
2025-02-19 08:37:32 +00:00
Robert Goltz 8577958edb Bump github.com/crewjam/saml from 0.4.13 to 0.4.14 (#100784)
chore: bump github.com/crewjam/saml from 0.4.13 to 0.4.14
2025-02-19 09:28:31 +01:00
Mariell Hoversholm 77a11efe0c Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-18 14:09:31 +01:00
Karl Persson 4df398c084 Authz: Sync authlib and update authz client setup code (#100817)
* Sync authlib and update setup code for authz client
2025-02-18 09:09:20 +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