public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,693 Commits 655 Branches 650 Tags
2c8a76121336773b93d8a098796bcc0e2d39bad2
Commit Graph
764 Commits
Author SHA1 Message Date
Ryan McKinley 2c8a761213 merge main 2025-02-20 23:35:18 +03: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
Roberto Jiménez Sánchez d10200c5ad [Provisioning] Fix issue with last ref (#101056) 
* Fix issue with last ref

* Update frontend code

* Fix the local tmp test

* Use lastRef
 2025-02-20 16:03:51 +01:00
Ryan McKinleyMariell HoversholmAlex Khomenko
 		842f68f91b Provisioning: Workflows as write access (#101031) 
* workflow as write access

* workflow as write access

* workflow as write access

* Update pkg/registry/apis/provisioning/repository/test.go

Co-authored-by: Mariell Hoversholm <mariell.hoversholm@grafana.com>

* POC/Provisioning: Add wizard (#100596)

* update refs

* update refs

* lint fix

* lint fix

* lint fix

* default everythign to read only

* reuse form components

* remove main

---------

Co-authored-by: Mariell Hoversholm <mariell.hoversholm@grafana.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
 2025-02-20 11:01:03 +01:00
Mariell Hoversholm d9e42df9d8 Chore: Fix lints (#101039) 2025-02-20 12:47:10 +03:00
Ryan McKinley e6d3834096 github v69 2025-02-19 22:06:42 +03:00
Ryan McKinley 61d901a10c Provisioning: Move legacy export/import into a single migrate job (#100865) 2025-02-19 18:59:52 +03:00
Ryan McKinley adced54841 fix lint 2025-02-19 18:26:55 +03:00
Ryan McKinley 5a40c84568 DualWriter: Support managed DualWriter (#100881) 2025-02-19 17:50:39 +03:00
Mariell Hoversholm 43df78669d Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-19 13:25:58 +01:00
Stephanie Hingtgen 3e6f40c873 K8s: Move to one feature toggle for folders and dashboards (#100911) 2025-02-19 01:11:26 +02: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
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
Mariell Hoversholm 23e08778c9 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-17 13:20:19 +01:00
Mariell HoversholmRyan McKinleyAlex KhomenkoRoberto Jiménez Sánchez
 		f535a7804f Provisioning: Update types (#100722) 
* Provisioning: Remove S3

* Provisioning: Use URL for GitHub

Co-Authored-By: Ryan McKinley <ryantxu@gmail.com>
Co-Authored-By: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Provisioning: Use workflow list

Co-Authored-By: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?= <roberto.jimenez@grafana.com>

* Provisioning: Model secrets

* Provisioning: Define a total in the job summary

* Provisioning: Generate code

* Provisioning: Update testdata

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?= <roberto.jimenez@grafana.com>
 2025-02-17 12:45:23 +01:00
Karl Persson 6eeb28e312 Authn: use authenticator for grpc (#99573) 
* Remove usage of grpc-authenticator

* Cleanup client construction code
 2025-02-17 10:58:59 +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
Andrej Ocenas eff847e31f Query Library: Move backend to enterprise (#100371) 2025-02-17 08:56:55 +02:00
Tito Lins e343cb5ac9 Alerting: Stop running AM integration tests on CI (#100702) 2025-02-14 16:55:20 +01:00
Andrej Ocenas d092998927 Query Library: Move backend to enterprise (#100371) 
* Move files to enterprise

* Remove last parts of QL api

* Fix CODEOWNERS
 2025-02-14 11:05:03 +00:00
Ryan McKinley e99c72cacc Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-13 21:22:26 +03:00
linoman 19777ba3e9 Skip flaky test that's breaking the CI pipelines (#100640) 2025-02-13 17:49:21 +01:00
Roberto Jiménez Sánchez 18a938cf03 [Provisioning] Remove S3 Option (#100638) 
Remove S3 option
 2025-02-13 17:10:10 +01:00
Mariell Hoversholm 1f36907481 Provisioning: Encrypt webhook secret (#100612) 
* feat: encrypt webhook secret

* chore: regen code
 2025-02-13 16:27:55 +01: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
Mariell Hoversholm 45a586c725 feat: regen openapi 2025-02-13 13:25:21 +01:00
Tito Lins ae9837b793 Alerting: Add alertmanager integration tests (#100106) 2025-02-13 11:36:45 +01:00
Ryan McKinley f2911bdebb Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-13 09:45:28 +03:00
Sergej-Vlasov d1dee968c3 Schema V2: Adjust quick_ranges in time settings and remove time_options (#100135) 
* adjut quickRanges type in v2

* clean up unused time_options property

* remove deprecated time_options property on time picker

* add schema migration for time_options

* adjust test
 2025-02-12 19:23:09 +00:00
Alex KhomenkoandRyan McKinley ecca6d32af POC/Provisioning: Combine owner/repo into URL field (#100397) 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2025-02-11 16:34:57 +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
Moustafa Baiou 7dee4d1808 Alerting: Allow specifying uid for new rules added to groups (#99858) 
When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected.

This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups. 

Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group.

Context: https://github.com/grafana/terraform-provider-grafana/pull/1971#issuecomment-2599223897
Relates to: https://github.com/grafana/terraform-provider-grafana/issues/1928

Fixes: #98283
 2025-02-10 10:28:34 -05:00
Roberto Jiménez SánchezandClarity-89 2a220b530d [Prototyping] Github Spec to allow push to main or force to use pull requests (#97001) 
* Change to have workflows

* Update Frontend

* Run generation

* Add openapi file

* Revert unexpected changes

* Add enum

* Add description to workflows

* Add mapper function to please ESLint

* Remove pull request option

* Remove leftovers

* Configure sync interval in frontend

* Address most comments

* Regenerate client

* Fix compile issue

* Update WorkflowOption type

---------

Co-authored-by: Clarity-89 <homes89@ukr.net>
 2025-02-10 15:23:49 +01:00
Ryan McKinley ea38dfcbdc Provisioning: Refactor export to simplify loading from legacy storage (#100335) 2025-02-10 14:21:14 +03:00
Sam Jewell 45775dd6ad Skip flakey test (#100251) 2025-02-10 07:40:32 +00:00
Ryan McKinley 24cfb93ef6 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-07 23:28:21 +03:00
Fayzal Ghantiwala 7ae8058c8b Alerting: Return 404 when /api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname} does not exist (#100264) 
* Return a 404 when rule group doesn't exist

* Update tests

* Update swagger doc and tests
 2025-02-07 16:24:28 +00:00
Mariell Hoversholm bd261794b2 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-07 15:39:00 +01:00
Mariell Hoversholm dfaa12b800 Provisioning: Sync API with current feature branch (#100252) 
* Provisioning: Jobs: Define repository name field

* Provisioning: Jobs: Separate options per job type

* Provisioning: Define a sanitised settings resource

* Provisioning: Jobs: Define a job summary

* Provisioning: Remove linting

* Provisioning: Update docs for a few fields

* Provisioning: Remove HelloWorld

* Provisioning: Replace Repository with Message in job info

* Provisioning: Remove YAML support

* Provisioning: Remove custom folder specification

* Provisioning: Support read-only repositories

* Provisioning: Remove edit options

* Provisioning: Add sync options for repositories

* Provisioning: Add resource statistics

* Provisioning: Make slices atomic lists

* Provisioning: Message list needs to exist even if empty

If we don't do this, we can't clear the messages field, leading to buggy UX.

* Provisioning: Support incremental syncing

* Provisioning: Remove the 'items' subresource workaround

* Provisioning: Add resource list

* Provisioning: Reformat

* Provisioning: Declare new types

* OpenAPI: Generate openapi JSON spec from generated code

* Codegen: Generate OpenAPI spec

* Provisioning: Support generating frontend API

* Codegen: Generate Go code

* Provisioning: Define the base API

* Codegen: Generate frontend endpoints for provisioning

* Refactor: yarn prettier:write

* Provisioning: Tiger team takes ownership

* Chore: Remove dir we haven't added yet

* Provisioning: Remove frontend

* Test: Update example repositories
 2025-02-07 15:35:55 +01:00
Mariell Hoversholm 4d732cb005 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-07 14:14:54 +01:00
Mariell Hoversholm e815a2850e Provisioning: Integration test that Repository resources work (#100197) 
* Provisioning: Set up server in practice

* Provisioning: Integration test that Repository resources work
 2025-02-07 12:04:58 +01:00
Ryan McKinleyandRoberto Jiménez Sánchez 13b607875b POC/Provisioning/Syncer: keep progress while running a sync job (#100017) 
* same replicate

* with feedback

* one pass

* so close... but delete error

* fix api

* keep hash

* incremental works

* cleanup

* cleanup

* UID cleanup

* err style

* split the two changes

* openapi

* fix timestamps

* sort deletes first

* changes

* make sure to keep folders

* cleanup

* cleanup

* tested complete

* incremental

* Update pkg/apis/provisioning/v0alpha1/jobs.go

Co-authored-by: Roberto Jiménez Sánchez <roberto.jimenez@grafana.com>

* incremental

* complete

* lint fix

* use constant

* Update pkg/registry/apis/provisioning/jobs/syncer.go

Co-authored-by: Roberto Jiménez Sánchez <roberto.jimenez@grafana.com>

* Update pkg/registry/apis/provisioning/jobs/syncer.go

* use currentRef

---------

Co-authored-by: Roberto Jiménez Sánchez <roberto.jimenez@grafana.com>
 2025-02-07 09:23:07 +01:00
Clarity-89 4dfaebc5f3 Update codegen 2025-02-07 08:08:11 +02: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
Yuri Tseretyan f7d476e408 Alerting: Remove id and org_id from grafana alert rule API model (#100139) 2025-02-05 23:13:22 +02:00
Todd Treece 69e4d8468b Dashboard: Add v1alpha1 test coverage (#100149) 2025-02-05 23:01:51 +02:00
Ryan McKinley e1f075bdde Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-02-04 12:42:22 +03:00
Ryan McKinleyandClarity-89 ca3db84d99 POC/Provisioning: Use RepositoryViewList for /settings endpoing (#99978) 
* frontend settings as list

* frontend settings as list

* remove weird comment

* remove metadata

* lint

* Add hooks back

---------

Co-authored-by: Clarity-89 <homes89@ukr.net>
 2025-02-04 07:53:11 +02:00