public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph
5628 Commits
Author SHA1 Message Date
Karl Persson 2324597d8d AuthN: Perform login with authn.Service (#61466) 
* AuthN: Create password client wrapper and use that on in basic auth
client

* AuthN: fix basic auth client test

* AuthN: Add tests for form authentication

* API: Inject authn service

* Login: If authnService feature flag is enabled use authn login

* Login: Handle token creation errors
 2023-01-17 09:11:45 +01:00
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
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
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
gotjoshandbrendamuir 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
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
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
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
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
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
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
Levente Balogh 6b2394eff1 Connections: Make "Connect data" a section title (#61144) 
* Wip

* Fix: change tests to cater for the new scenario

* feat(Connections): redirect to "Your connections / Datasources" if cannot admin plugins
 2023-01-11 11:40:21 +01:00
Matthew Jacobson 63ba3ccb58 Alerting: Improve legacy migration to include send reminder & frequency (#60275) 
* Alerting: Improve legacy migration to include send reminder & frequency

Legacy channel frequency is migrated to the channel's migrated route's
repeat interval if send reminder is true. If send reminder is false, we
pseudo-disable the repeat interval by setting it to a large value (1y).

If there were no default channels, the root notification policy is still
created with the default 4h repeat interval.
 2023-01-10 23:01:43 -05:00
Yuri Tseretyan 86b5fbbf60 Alerting: Introduce state manager config structure (#61249) 2023-01-10 16:26:15 -05:00
George Robinson 2a291afbae Alerting: Use consts from alerting package (#61241) 2023-01-10 19:59:13 +00:00
juanicabanasandTorkel Ödegaard 2505f112f5 PublicDashboards: A unique page for public dashboards (#60744) 
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2023-01-10 14:50:37 -03:00
George Robinson d19d8c6625 Alerting: Update Alerting and Alertmanager to v0.25.1 (#61233) 
Update Alerting and Alertmanager to v0.25.1
 2023-01-10 16:17:07 +00:00
Kat Yang 9a14a7db03 Chore: Remove star model duplicates (#61191) 2023-01-10 09:56:33 -05:00
JoKalle PerssonMihály Gyöngyösi
 		0c8ad80575 Authn: JWT client (#61157) 
* add jwt client

* alias JWT verifier

* debug implementation

* add tests for jwt client

* add constant for JWT module

* Feedback

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com>

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com>
 2023-01-10 15:08:52 +01:00
Karl Persson 2de72c1c39 AuthN: Login (#61225) 
* AuthN: Add function to login auth request
 2023-01-10 14:55:27 +01:00
Karl Persson c5f77b6a46 AuthN: Set LookupTokenErr and fall through in case of error (#61217) 
ContextHandler: Set LookupTokenErr and fall through in case of error
during authentication
 2023-01-10 14:36:02 +01:00
Ashley Harrison 4e00fbbd7f Navigation: Allow overriding icons in nav settings (#61160) 
expose k6 icon, allow overriding icon in nav settings, override connections + k6
 2023-01-10 10:29:07 +00:00
Yuri Tseretyan da18c89e91 Alerting: Scheduler to call DeleteAlertRule once when it stops deleted rules (#61189) 
scheduler to call DeleteAlertRule once when it stops deleted rules
 2023-01-09 14:39:32 -05:00
Karl Persson a49892c9ac AuthN: Refactor basic auth client to support multiple password auth (#61153) 
* AuthN: add interface for password clients

* AuthN: Extract grafana password client

* AuthN: Rewrite basic client tests

* AuthN: Add Ldap client and rename method of PasswordClient

* AuthN: Configure multiple password clients

* AuthN: create ldap service and add tests
 2023-01-09 16:40:29 +01:00
Yuri Tseretyan 9f503a261a Traces: Create span when a new session is opened (#61115) 2023-01-09 09:41:15 -05:00
Yuri Tseretyan e7b17cde47 Traces: Fix timestamp for database query traces (#61109) 2023-01-09 09:40:55 -05:00
idafurjes 7dcb502b33 Chore: Remove org model duplicates (#61025) 
Remove org model duplicates
 2023-01-09 14:39:53 +01:00
Karl Persson 68b43a24e2 RBAC: dashboard permission filter (#60582) 
* PermissionFilter: Handle all search type and only check one action for dashboards

* PermissionFilter: Still handle multiple action but take short cut when
only one action is required
 2023-01-09 14:38:57 +01:00