public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,929 Commits 655 Branches 650 Tags
beaebcf60609c8ef73ddc6d9be88805c5d171cb2
Commit Graph
689 Commits
Author SHA1 Message Date
Ryan McKinley beaebcf606 Provisioning: Move openapi setup to core (#99701) 2025-01-29 08:47:04 +03:00
Clarity-89 b1f5a5fafc Update FE API 2025-01-28 15:18:46 +02:00
Mariell Hoversholm 848216053b Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-28 09:15:57 +01:00
Ryan McKinley 4e703576b0 K8s/OpenAPI: Render openapi into a static file (#99561) 2025-01-28 10:30:53 +03:00
Moustafa Baiou 82f457495a Alerting: Correctly escape provisioning API exports (#99039) 
When exporting contact-points, mute-timings, and notification policies in the provisioning API, we need to escape the `$` character which is used in interpolation by file provisioning.

Follow up to #97985
 2025-01-27 14:59:50 -05:00
Yuri Tseretyan d71904cb27 Alerting: Expose updated_by in rules GET APIs (#99525) 
---------

Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
 2025-01-27 14:31:40 -05:00
Ryan McKinley f205407e36 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-25 07:29:56 +03:00
Yuri Tseretyan af663dadc7 Alerting: Refactor integration tests (#99519) 
---------

Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
 2025-01-24 14:49:05 -05:00
Ryan McKinley 5cdaf77bc9 POC/Provisioning/Jobs: Move PR options to their own object and add resource summary (#99489) 2025-01-24 14:55:45 +03:00
Ryan McKinley 1420e059d8 merge main 2025-01-24 09:02:04 +03:00
Ryan McKinleyandJack Baldry a037c6f344 K8s/Folders: Remove kubernetesFolders flag and full path metadata (#99256) 
* remove full path

* remove more

* remove KubernetesFolders tests

* remove feature toggles

* remove feature toggles

* skip permissions test

* skip permissions test

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
 2025-01-23 17:25:03 +03:00
Mariell Hoversholm 93fa0b1aed Provisioning: Only support YAML (#99421) 
* Spec: Remove PreferYaml option

* Spec: Regenerate code from spec

* Provisioning: Only export YAML

* chore: remove last preferYaml refs
 2025-01-23 14:30:19 +01:00
Mariell Hoversholm 0231c9bd6b Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-23 13:31:12 +01:00
Ryan McKinleyandClarity-89 f32d108810 POC/Provisioning: Export API stub (#99298) 
Co-authored-by: Clarity-89 <homes89@ukr.net>
 2025-01-22 16:24:08 +03:00
Matthew Jacobson 20d25c6ad9 Alerting: Use rule uid in silenceURL template instead of alertname and folder (#99221) 
* Update grafana/alerting to a5e8136407d4

Includes:
- Alerting: Use rule uid in silenceURL template instead of alertname and folder (#266)

* Fix tests
 2025-01-21 18:11:22 -05:00
Roberto Jimenez Sanchez 5f34f0aa14 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-21 13:58:25 +01:00
Ryan McKinley d8b6ded101 K8s: use deprecatedInternalID label rather than SQL annotation (#99263) 2025-01-21 12:38:14 +03:00
Ryan McKinley b2d0359e72 K8s/Folders: Remove slow/redundant folder integration tests (#99291) 2025-01-21 11:14:31 +03:00
Mariell Hoversholm 48c53f9228 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-20 16:28:59 +01:00
Karl Persson 7329d2c34b Authz: Account for fixed roles when running oss and using authz service (#99244) 
* Extract "PermissionStore" from general store interface

* Add static and union permission stores

* Add GetStaticRoles

* Use accesscontrol.Service for inproc to provide static permissions
 2025-01-20 16:00:36 +01:00
Mariell Hoversholm 40c1b3a7a9 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-20 09:55:31 +01:00
Ryan McKinley 7c04247d6f K8s/Dashboard: Set generation from version (#99142) 2025-01-17 13:52:01 +02:00
Mariell Hoversholm f06b5a5933 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-17 10:26:39 +01:00
maicon b4ec11e150 Unistore: Ensure deprecated Folder ID gets stored on all modes (#99043) 
* Unistore: Ensure deprecated Folder ID gets stored on all modes

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
 2025-01-16 15:01:00 -03:00
Ryan McKinley f7639f4520 merge main 2025-01-15 19:38:09 +03:00
Syerikjan KhandGiuseppe Guerra dfe0712955 feat: pass gcom sso_api_token to repo created from install command (#98973) 
* feat: pass gcom sso_api_token to repo created from install command

* fix

* fix: extract gcom section to a func

* Update pkg/cmd/grafana-cli/utils/command_line.go

Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>

* fix: only set gcom token when the request is to GCOM

---------

Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
 2025-01-15 08:15:18 -05:00
Konrad Lalikfayzal-gTom Ratcliffe
 		5aeaccadff Alerting: Add read-only GMA rules to the new list view (#98116) 
* Reuse prom groups generator between GMA, external DS and list view

* Improve generators, add initial support for GMA in grouped view components

* Improve handling of GMA rules

* Split componentes into files

* Improve error handling, simplify groups grouping

* Extract grafana rules component

* Reset yarn.lock

* Reset yarn.lock 2

* Update filters, adjust file names, add folder display name to GMA rules

* Re-enable filtering for cloud rules

* Rename AlertRuleLoader

* Add missing translations, fix lint errors

* Remove unused imports, update translations

* Fix responses in BE tests

* Update backend tests

* Update integration test

* Tidy up group page size constants

* Add error throwing to getGroups endpoint to prevent grafana usage

* Refactor FilterView to remove exhaustive check

* Refactor common props for grafana rule rendering

* Unify identifiers' discriminators, add comments, minor refactor

* Update translations

* Remove unnecessary prev page condition, add a few explanations

---------

Co-authored-by: fayzal-g <fayzal.ghantiwala@grafana.com>
Co-authored-by: Tom Ratcliffe <tom.ratcliffe@grafana.com>
 2025-01-15 11:36:32 +01:00
Karl Persson 3f71a72c1a Authz: Remove "wrapper" interface and only check feature toggle for grpc mode (#98933) 
* Remove "wrapper" interface and only check feature toggle for grpc and cloud mode

* Only set name for update checks

* Set dashboard permissions for admin user
 2025-01-15 09:23:56 +01:00
Mariell Hoversholm c8f85b04a9 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-14 13:11:03 +01:00
Will BrowneandAndres Martinez Gotor 70fb7b9545 Plugins: Remove bundled plugins feature (#96490) 
* remove bundled plugins

* Add echo to command

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>

* remove folder entirely

* remove folder from CODEOWNERS

---------

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2025-01-14 12:04:01 +00:00
Ryan McKinley 4f67536ff3 merge main 2025-01-14 13:33:22 +03:00
Ryan McKinleyandAlex Khomenko 75ac7acb91 POC/Provisioning: List objects from storage (#98874) 
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
 2025-01-14 13:29:07 +03:00
Alexander Zobnin cbb688e910 Zanzana: Remove usage from legacy access control (#98883) 
* Zanzana: Remove usage from legacy access control

* remove unused

* remove zanzana client from services where it's not used

* remove unused metrics

* fix linter
 2025-01-14 10:26:15 +01:00
maiconandStephanie Hingtgen 766d645d82 Filewalkwithme/unistore refactor folder service to hit folder apiserver (#98409) 
Refactor folder service to use Unified Storage

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
 2025-01-13 18:15:35 -03:00
Ryan McKinley e2eeba7bb4 resolve conflicts 2025-01-13 09:04:41 +03:00
Matthew Jacobson ad1417b732 Alerting: Return default builtin templates in k8s templategroup API and UI (#96330) 
* Alerting: PoC - default template in k8s templategroup API

* Move code to grafana/alerting

* Move validation to admission validation abstraction

* Testing

* Linting

* Workspace update

* Update grafana/alerting hash to the merged commit

* More user-friendly name and remove need for CREATE/UPDATE validation

Use __default__ for k8s object name and UID so that we don't need to restrict
CREATE/UPDATE for similarly named user-owned templates.
 2025-01-10 19:53:18 -05:00
Ryan McKinley d165a0851b merge main + fix lint 2025-01-09 14:12:17 +03:00
Mariell Hoversholm 0d315b6cbe Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-09 08:28:24 +01:00
Yuri Tseretyan 3e68731600 Alerting: Enable flag alertingApiServer by default (#98282) 
* enable flag alertingApiServer by default
* remove feature flag toggle in integration tests
* disable flag for old API tests
 2025-01-08 14:31:35 -05:00
Alex Khomenko c0a0c7bb3d POC/Provisioning: Use PUT endpoints for updates (#98674) 2025-01-08 18:46:15 +03:00
Mariell Hoversholm 2763efba12 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-08 15:11:13 +01:00
Ryan McKinleyandMariell Hoversholm d0caf1135b POC/Provisioning: Update webhook test and constant (#98669) 
* chore: regen openapi spec

* test: fix existing tests

* chore: pushing for Matheus

* test: ensure GH repository syncs successfully

* chore: ptr is not necessary

* chore: delete unnecessary function

* fix: use assert in require.Eventually blocks

* update webhook test

* fix: ensure deleting works

---------

Co-authored-by: Mariell Hoversholm <mariell.hoversholm@grafana.com>
 2025-01-08 15:01:55 +01:00
Mariell Hoversholm 654387e357 POC/Provisioning: Test happy-path syncing with GitHub (#98663) 
* chore: regen openapi spec

* test: fix existing tests

* chore: pushing for Matheus

* test: ensure GH repository syncs successfully

* chore: ptr is not necessary

* chore: delete unnecessary function

* fix: use assert in require.Eventually blocks
 2025-01-08 14:48:43 +01:00
Stephanie Hingtgen 5ed2a4c624 K8s: Dashboards: Add deletion validation for provisioned dashboards (#98504) 2025-01-08 06:58:21 -06:00
Mariell Hoversholm f0aed104fb Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-08 11:22:26 +01:00
Moustafa Baiou 25538bcfdf Alerting: Fix label escaping in rule export (#97985) 2025-01-07 17:09:27 -05:00
Ryan McKinley bd0f148110 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2025-01-07 13:46:31 +03:00
Ryan McKinley f97fa5e5e9 Provisioning: Update OpenAPI and k8s codegen (#98568) 
* revert folder changes

* update snapshots

* openapi cleanup

* update codegen
 2025-01-07 13:43:19 +03:00
Ryan McKinley b506fcb11c K8s: Fix the gitVersion response (required for kubectl) (#98571) 2025-01-07 11:43:19 +02:00
Ryan McKinley c9701c37bf merge main 2024-12-21 11:32:17 +03:00