public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,019 Commits 655 Branches 650 Tags
f44aa05b2008aa67854621080543b3495efe2249
Commit Graph
418 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
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 e51c5796df Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-05 09:54:51 +03:00
Ryan McKinleyandStephanie Hingtgen dc2defd84f K8s/Annotations: Use manager/source annotations rather than repo (#101313) 
Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
 2025-03-05 08:54:20 +02:00
Ryan McKinley 301e727f82 merge dashboard changes 2025-03-04 07:50:04 +03:00
Ryan McKinley c1b48cc488 Dashboards: Add apiVersion to dashboard table (#100845) 2025-03-04 07:47:45 +03:00
Ryan McKinley 5d830e84b8 update openapi snapshot 2025-03-04 07:34:35 +03: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
linoman b7a0aeeb0d SCIM: Disable auto assign organization if the user has been provisioned (#101307) 
* Add isProvisioned field to model

* Add new isProvisioned column to migration

* Disable auto assignment to organization if the user is provisioned

* add annotation to user model

* add annotation to user models

* Remove IsProvisioned field from Identity

* Move new field assignenment and add default value

* Update annotations for user query results

* Remove isProvisioned from identity

* Add new column to test

* Resolve user from identity at SyncOrgHook
 2025-03-03 17:51:23 +01: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 e6209656ba Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-03-03 10:13:17 +03:00
Ryan McKinley 0764ecb98d K8s/DualWriter: Use dualwriter package for all dual writers (#101393) 2025-03-01 21:26:14 +03: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
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
Ryan McKinley 806c043e45 UnifiedStorage: Rename Batch processing to Bulk (#101413) 2025-02-28 08:41:08 +03:00
Ryan McKinley 58457d41d3 K8s/DualWriter: Remove legacy interface (#101395) 2025-02-27 13:27:28 +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
Clarity-89 4672e27663 Merge branch 'main' into grafana-git-ui-sync 2025-02-27 10:49:36 +02:00
Georges Chaudy 8c935c8f4a [unistore] Add benchmark for write throughput (#101345) 
* Add generic benchmark

* address comments
 2025-02-26 17:17:35 +02:00
Ryan McKinley 6198ea001e merge main 2025-02-26 17:48:48 +03:00
Ryan McKinley 8f37822050 Unified/Blob: Allow direct access to UIDs (#101339) 2025-02-26 16:18:59 +02:00
Ryan McKinley c35ac53ded Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-26 11:40:24 +03:00
Ryan McKinley 6e3c95abc8 Provisioning: Use blob storage rather than local file system to save images (#101298) 2025-02-26 11:29:00 +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
Georges Chaudy 53e91fd5e8 unistore: close event stream on context cancelation (#101293) 
* add tests for broacaster

* fix sql notifier not closing the stream

* fix sql notifier not closing the stream

* close sub

* fix broadcaster test

* fix broadcaster test

* suggestion
 2025-02-25 08:28:31 -08: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
Jean-Philippe Quéméner 9282e4cad4 fix(unified-storage): don't use in-process if db type is not set (#101254) 2025-02-24 21:44:42 +01:00
Ryan McKinley 479c8fa978 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-24 21:16:55 +03:00
Georges Chaudy e13bd52da6 unistore: move continue to the resource package (#101206) 
* minor improvements to tests

* move continue token

* update sql backend
 2025-02-24 18:02:30 +02: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
Yuri Tseretyan d1dfa0576b Alerting: Support Jira Integration (#100480) 2025-02-21 12:51:38 -05:00
Georges Chaudy 40d1677265 unistore: improve storage backend integration tests (#101134) 
* Add Stats tests

* Add integration tests for getstats

* fix signature
 2025-02-21 15:06:23 +01:00
Ryan McKinley 33621faf0a Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-21 15:53:08 +03:00
Todd Treece 3992ac2ac1 Dashboard: Multi-version builder (#100305) 2025-02-21 06:50:29 -05:00
Jean-Philippe Quéméner 7be1fd953a fix(unified-storage): enable in-process events for single-instance (#100807) 2025-02-21 12:25:35 +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
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