public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,146 Commits 655 Branches 650 Tags
0d70eb18ac2d92ded4084f808877c2d4cf202c8f
Commit Graph

9765 Commits

Author SHA1 Message Date
Selene 0d70eb18ac Dashboards: Add org_id in dashboards query (#61542) 
* Add org_id in dashboards query

* Update OrgID

* Remove unused orgid
 2023-01-16 21:59:43 +01:00
Jo 6fec8fda39 AuthN: Clean errors in user/org sync (#61560) 
* clean errors in user/org sync

* lower logging level for non 5xx errors
 2023-01-16 16:37:04 +00:00
idafurjes 7c2522c477 Chore: Move dashboard models to dashboard pkg (#61458) 
* Copy dashboard models to dashboard pkg

* Use some models from current pkg instead of models

* Adjust api pkg

* Adjust pkg services

* Fix lint
 2023-01-16 16:33:55 +01:00
Eric Leijonmarck 07bbc0716c Auth: Fix correct error for updateapikey in context handler (#61544) 
* fix: correct error for updateapikey

* refactor: send the correct err forward

* update: based on review
 2023-01-16 15:16:06 +01:00
Alexander Zobnin 997105c20d Config: Support JSON list syntax (#61288) 
* Config: Separate lists either by spaces or by commas.

* Simplify space separation

* use separate function for the config strings

* Change behavior only if string contains quotes

* add test for invalid string

* Use JSON list syntax

* ignore leading spaces when process list

* Add notes about using JSON lists into the docs

* Fix typo

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2023-01-16 16:03:20 +03:00
Tania 045a12047f Codegen: Generate per-kind reference docs (#60416) 
* Add docs generator

* Add json-to-md conversion

* Fix lint issues

* Remove check for kind type

* Disable prettier for generated docs

* Use schema ref names as identifiers for links & headers

* Display the default value (if so) in the description

* Undo 'draft:false' introduced by mistake

* Update pkg/codegen/jenny_docs.go

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* Undraft and unlist kinds documentation  (#61476)

* Support running containers without root daemon

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Use section shortcode to automatically list child pages

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Undraft and unlist kinds documentation

This page and child pages are directly accessible but are not listed
in the table of contents.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add docs-preview to browse drafted pages

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Replace end of line and pipe characters in table codegen

* Remove draft status from generated docs

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Robert Horvath <robert.horvath@grafana.com>
 2023-01-16 13:55:40 +01:00
Eric Leijonmarck c5e74ee607 Auth: Add skip_org_role_sync for AzureAD OAuth (#60322) 
* [WIP] Auth: add backend skipOrgRoleSync to AzureAD OAuth

- add: skipOrgRoleSync
- rename: skipOrgRoleSync to skipOrgRoleSyncBase (to make it clear that
  it is the base version of SocialBase)
- add: tests for skipOrgRoleSync in AzureAD

TODO:
- [ ] frontend changes

* add: docs

* refactor: remove role from basicinfo

* add: settings for grafanacom

* add: settigns for frontend

* add: logic for azureAD user skip org role

* add: docs for skip_org_role_sync

* refactor: docs a bit

* add: tests for userinfo

* refactor: to only extract if skiporgrolesync false

* refactor: based on review comments

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2023-01-16 13:16:01 +01:00
Serge Zaitsev 7e51eac740 Chore: Remove unused models (#61533) 
* Chore: Remove unused models

* put AuthModuleConversion back
 2023-01-16 12:52:55 +01:00
Jo be3b81fecd AuthN: Readd user protection service to user sync (#61534) 
* add user protection service to user sync

* fix tests
 2023-01-16 11:15:14 +00:00
Jo dcfeab2c73 AuthN: User Quota (#61540) 
* remove reqContext from quota checks in login

* add guards for nil ScopeParams
 2023-01-16 11:54:15 +01:00
Misi b8b08ea292 Auth: Add sub claim check to JWT Auth pre-checks (#61417) 
* Auth: Add sub claim check to JWT Auth pre-checks

* Add #nosec annotation to the test tokens
 2023-01-16 10:50:34 +01:00
Yuri Tseretyan 9d57b1c72e Alerting: Do not persist noop transition from Normal state. (#61201) 
* add feature flag `alertingNoNormalState`
* update instance database to support exclusion of state in list operation
* do not save normal state and delete transitions to normal
* update get methods to filter out normal state
 2023-01-13 18:29:29 -05:00
Ghazanfar d553a016cc Alerting: UI changes required to support v3 and Auth in Kafka Contact Point (#61123) 2023-01-13 17:45:43 -05:00
Alexander Weaver b289b8ac6e Alerting: Set error annotation on EvaluationError regardless of underlying error type (#61506) 
Set error annotation regardless of underlying error type
 2023-01-13 13:58:02 -06:00
Erik Sundell 432cdbade4 Cloudwatch: Add support for template variables in new log group picker (#61243) 2023-01-13 14:03:08 -05:00
gotjosh e7cd6eb13c Alerting: Use alerting.GrafanaAlertmanager instead of initialising Alertmanager components directly (#61230) 
* Alerting: Use `alerting.GrafanaAlertmanager` instead of initialising Alertmanager components directly
 2023-01-13 12:54:38 -04:00
Alex Khomenko 3569045dfc Admin: Update the order of nav items (#61497) 
* Admin: Change order of the nav items

* Admin: Update order
 2023-01-13 17:27:26 +02:00
Michael Mandrus 9dc081e629 SMTP: Update SMTP TemplatesPatterns to do an 'or' filter instead of 'and' (#61421) 
update template path parsing to use 'or' logic instead of 'and'
 2023-01-13 10:24:22 -05:00
gotjosh 8f72893076 Alerting: Document not supporting inhibition rules (#61313) 
* Alerting: Document not supporting inhibition rules

* Update docs/sources/alerting/manage-notifications/create-silence.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update docs/sources/alerting/manage-notifications/alertmanager.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
 2023-01-13 15:06:06 +01:00
Jan Garaj 28dbbe9f5f CloudWatch: Add CloudWatchSynthetics dimension (#60832) 2023-01-13 14:56:29 +01:00
Andres Martinez Gotor f6e735cd29 AzureMonitor: Keep resource in the URL for single requests (#61414) 2023-01-13 12:30:45 +01:00
Ieva e543c10e25 RBAC: Remove RBAC mock from plugin installation tests (#61416) 
remove ac mock from plugin installation tests
 2023-01-13 09:34:20 +00:00
Karl Persson 0d572ff2ce AuthN: Add check for disabled identities (#61382) 
* AuthN: return error if identity is disabled

* AuthN: Remove isDisabled check in client

* AuthN: Format imports
 2023-01-13 10:28:50 +01:00
Karl Persson b5255ebfdf RBAC: Update org rbac tests to not use mocked access control (#61211) 
* API: Rewrite legacy access control and rbac tests for current org
endpoint

* API: Rewrite legacy and rbac endpoint tests for update current and
target org

* API: rewrite access control tests for create org

* API: Rewrite delete org api access control tests

* API: rewrite search org access control tests to not use mocked access
control

* API: Rewrite get org and get org by name access control tests to not use
mocked access control


Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2023-01-13 10:22:32 +01:00
idafurjes 490a787d9d Chore: Move tem member models to team pkg (#61294) 
* Chore: Move tem member models to team pkg

* Fix test lint
 2023-01-13 09:43:38 +01:00
KonH 4421b31b66 Loki/Prometheus: Change signature - return non-reference from ReadPrometheusStyleResult (#57209) 
* Change signature - return non-reference from ReadPrometheusStyleResult

Related to https://github.com/grafana/grafana/issues/52430

* Fix invalid reference usage

* Potential fix for test data

* Remove additional ref usage

* Revert "Potential fix for test data"

This reverts commit 94ed588ab3.

* Commit changed test data

* Revert unwanted conflict resolution

* Add additional condition to track empty responses

* Setup valid empty response

* Re-introduce changes reverted by merge
 2023-01-13 09:00:39 +01:00
Alex Khomenko 078f2d4481 Admin: Remove navigation subheaders (#61344) 
* Admin: Remove navigation subheaders

* Admin: Fix tests
 2023-01-13 08:32:09 +02:00
Ryan McKinley 0c20fe0ac9 EntityAPI: Include folder support and watch API stubs (#61338) 2023-01-13 00:39:36 +00:00
gotjosh 49ae1bbe63 Introduce AlertingConfiguration that implements alerting.Configuration (#61427) 
* Introduce `AlertingConfiguration` that implements `alerting.Configuration`
 2023-01-12 16:03:07 -04:00
gotjosh fd6f107ded Alerting Unification: Use the errors from grafana/alerting in Alerts (#61425) 2023-01-12 15:23:34 -04:00
gotjosh ddb85ad6ad Use the ClusterPeer interface from grafana/alerting (#61409) 
* Use the Cluster interface from grafana/alerting
 2023-01-12 14:47:22 -04:00
gotjosh 2d1faae0b5 Alerting Unification: Use alerting.MaintenanceOptions to configure silences and nflog (#61384) 2023-01-12 12:31:38 -04:00
Andres Martinez Gotor 9055e1993d AzureMonitor: API support for multiple resources (#61315) 2023-01-12 17:25:13 +01:00
Gábor Farkas 57425234c9 elastic: backend: removed unused time-field (#61362) 
* elastic: backend: removed unused time-field

* improve comment formatting

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2023-01-12 15:52:32 +00:00
Eric Leijonmarck 91322bebb5 Auth: Add skip_org_role_sync setting for GrafanaCom (#60553) 
* add frontend settings and setting for grafanacom

* removed println

* add skip-org-role-sync on login

* add deprecation notice for this field

* remove println

* remove newline

* change and renamed variables

* fix for reconfiguring the settings for grafanacom

* add documentationf or grafanacom setup

* WIP tests

* added tests

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* updated steps

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* doc: updated the docs to reflect what happens to grafana.com users

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Jo <joao.guerreiro@grafana.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Jo <joao.guerreiro@grafana.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md

Co-authored-by: Jo <joao.guerreiro@grafana.com>

* add blankline

* rephrase of doc improvements for explaing of the settings

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Jo <joao.guerreiro@grafana.com>

* add frontend setting for grafanacom.

* WIP tests

* refactor docs

* frontend to adhere to skipping org role sync for GrafanaCom users

* update docs to reflect desired behavior

* tests: added test for skip and nonskip

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Jo <joao.guerreiro@grafana.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2023-01-12 16:44:08 +01:00
malcolmholmes 3a1cf11055 Schema: Fix iterator for MajorsOrX (#61363) 2023-01-12 09:39:23 -05:00
gotjosh 39e429a14b Alerting Unification: Use the errors from grafana/alerting in Silences (#61334) 2023-01-12 10:03:49 -04:00
Karl Persson 3e8857acb8 AuthN: Post login hooks (#61287) 
* AuthN: add the ability to register post login hooks

* AuthN: add a guard for the user id

* AuthN: Add helper to create external user info from identity

* AuthN: Pass auth request to password clients

* AuthN: set auth module and username in metadata
 2023-01-12 15:02:04 +01:00
Jan Garaj d5da42bbbc CloudWatch: Add RDS dimension (#61027) 2023-01-12 11:47:12 +01:00
Jan Garaj 056d5df285 CloudWatch: Add MaxProvisionedTableReadCapacityUtilization AWS/DynamoDB metric name (#60829) 2023-01-12 11:07:25 +01:00
ying-jeanne 7339dbc090 Chore: Refectory of shorturl service, move models into service (#61295) 
Chore: refectory of shorturl service, move models into service
 2023-01-12 17:13:47 +08:00
gotjosh f85a948214 Alerting Unification: Use the State interface from the alerting package (#61333) 2023-01-11 19:50:45 -04:00
Ezequiel Victorero 34a865ebf0 PublicDashboards: remove publicDashboardUID from insights event request (#60649) 2023-01-11 18:25:18 -03:00
Denis Limarev 90badc8729 Performance: Add preallocation for some slices (#59593) 2023-01-11 18:03:37 +01:00
Yuri Tseretyan b4e1e1871f Alerting: Fix evaluation timeout (#61303) 2023-01-11 10:52:54 -05:00
Guilherme Caulada 1a9b6873e6 Store: Add mock for system users to be used in tests (#61245) 
Add mock for system users to be used in tests
 2023-01-11 11:50:22 -03:00
ying-jeanne 6c6a970f56 [Chore] Remove health check that is not used (#61283) 2023-01-11 22:07:28 +08:00
Todd Treece 19ca93d5ce Prometheus: Fix concurrency issue with exemplar sampler initialization (#61281) 2023-01-11 08:27:47 -05:00
idafurjes f2ffce4351 Chore: Move team models to models pkg (#61262) 
* Chore: Move team models to models pkg

* Fix ACL tests

* More ACL tests

* Change Id to ID in conflict user command test

* Remove team from models

* Fix ac test lint
 2023-01-11 14:20:09 +01:00
Carl Bergquist 672b1711b0 Instrumentation: measure time until plugin request (#61279) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2023-01-11 13:19:06 +00:00