public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,759 Commits 655 Branches 650 Tags
93fa0b1aedfdff5db16e88b303c75dbd5ff0fd3d
Commit Graph
678 Commits
Author SHA1 Message Date
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
Ryan McKinleyStephanie HingtgenTodd Treece
 		1a46039037 K8s/Dashboards: Pass the legacy internal ID into labels (#98311) 
---------

Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
 2024-12-20 21:33:49 +02:00
owensmallwood 4837585cab Unified Storage Search: Add sprinkles (#97820) 
* Wire up sprinkles to oss and enterprise. Fetching sprinkles not implemented yet.

* Adds wireset for initializing document builders. Had to init it when creating the service to avoid cyclical imports.

* updates to int64 for stats

* adds config for sprinklesApiServer and gets sprinkles from there when its present

* add comment for later

* adds feature toggle for sprinkles. returns empty results when flag not enabled.

* adds unified storage config setting for sprinkles apiserver page limit

* fixes bug where dashboard uid was not getting set

* when creating dashboard summary, use metadata.name as the dashboard uid

* cleans up wire. use existing oss and enterprise sets to generate doc builders

* remove old wireset

* fix linter - adds missing arg for doc builders

* update dashboard stats in tests

* updates test-data dashboards

* log a warning instead of returning an error if we can't get sprinkles for a namespace

* dont read uid from dashboard json
 2024-12-18 11:00:54 -06:00
Ryan McKinley f0dc718a67 POC/Provisioning: Use cards layout to show more status info (#98155) 2024-12-18 12:37:45 +03:00
Ryan McKinley b322f65243 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-18 08:39:03 +03:00
Adam Simpson 57d94ed01f ds-querier: return error if failed to get ds client (#97698) 
* ds-querier: return error if failed to get ds client

* add log line

* no empty ref

* fix test
 2024-12-17 10:38:44 -05:00
Mariell Hoversholm 0ad2f2ac47 Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync 2024-12-17 15:11:35 +01:00
Ryan McKinley a01878332a K8s/Storage: Deprecate StorageTypeLegacy (#98096) 2024-12-17 17:00:35 +03:00
Ryan McKinley bb20d128f0 POC/Provisioning: Minor cleanups (#98089) 2024-12-17 16:27:40 +03:00
Ryan McKinleyandMariell Hoversholm 4e90c34b64 POC/Provisioning: Use healthy repositories (#97999) 
Co-authored-by: Mariell Hoversholm <mariell.hoversholm@grafana.com>
 2024-12-17 11:13:30 +03:00
Ryan McKinley efc0b6802f fix test 2024-12-17 09:30:41 +03:00
Ryan McKinley 751b11b5bd fix test 2024-12-17 08:00:55 +03:00