IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
40,521 Commits 5,454 Branches 554 Tags 1.9 GiB
5531e22f46
Commit Graph

4927 Commits

Author SHA1 Message Date
Joan López de la Franca Beltran
2b0de82aa9
SQLStore: Add test for nested transactions events (#60500) 
* SQLStore: Add test for nested transactions events

* Replace fmt.Print* with t.Log*

* Add different test cases
 2023-01-23 14:17:56 +01:00
Sofia Papagiannaki
c7a7ebd3e0
Chore: Drop search service dependency from folder service (#61789) 
* Chore: Drop search service dependency from folder service
 2023-01-23 14:09:09 +02:00
Karl Persson
50608db59a
AuthN: Add interface and function to operate on clients that supports redirects (#61905) 2023-01-23 11:54:38 +01:00
gotjosh
0be920e61c
Alerting: Remove unused code after importing from grafana/alerting (#61869) 
* Alerting: Remove unused code after importing from grafana/alerting
 2023-01-23 10:30:10 +00:00
Torkel Ödegaard
97fc6c4eb4
Apps: Use plugin description as nav node subtitle (#61549) 2023-01-23 11:02:05 +01:00
Ryan McKinley
624e5dbed2
EntityAPI: Save nested summary info in the SQL database (#61732) 2023-01-21 00:00:17 +00:00
Kristin Laemmert
cd08f2575a
chore: move jwt models into auth/jwt (#61862) 
* chore: move jwt models into auth/jwt
 2023-01-20 13:11:06 -05:00
Jo
7a9793ec0e
SupportBundles: Fix collector typos and change defaults (#61850) 
fix collector typos and change defaults
 2023-01-20 16:33:29 +00:00
Andres Martinez Gotor
b1efd911c1
AzureMonitor: Fix feature flag (#61863) 2023-01-20 15:29:23 +00:00
idafurjes
68445a7c77
Chore: Remove dashboard ACL from models (#61749) 
* Remove dashboard ACL from models

* Remove unused comment
 2023-01-20 14:58:47 +01:00
Jo
caae4fd034
SupportBundles: Add config enablement (#61776) 
* wip

* implement role middleware drop

* remove not implement feature

* change grants based on config

* Update pkg/services/supportbundles/supportbundlesimpl/models.go

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

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2023-01-20 08:59:15 +00:00
gotjosh
511dab3b4b
Update grafana/alerting to the latest main (#61810) 
* Update `grafana/alerting` to the latest main

Also updates prometheus-alertmanager since we use that one directly for some structs.
 2023-01-19 20:44:49 +00:00
Jo
e2ec219f6a
SecretScan: Remove placeholder image and polish errors (#61785) 
* remove placeholder image

* improve http client options

* add http clients options for webhook notifier

* ensure http is only used in dev mode

* cleanup errors
 2023-01-19 18:33:27 +01:00
idafurjes
8cbcdf1c26
Remove live.go from models (#61742) 
* Remove live.go from models

* Change Id to ID

* Add xorm tags
 2023-01-19 18:10:40 +01:00
Sofia Papagiannaki
c104cc7020
Chore: Split folder store and dashboard store interfaces (#61655) 
* update folder store mock

* Split folder store and dashboard store interfaces
 2023-01-19 18:38:07 +02:00
Stephanie Hingtgen
3b718a3e8f
Plugins: enable the plugin sdk to get the json data for all datasources (#61729) 2023-01-19 08:49:45 -07:00
linoman
56c2755b3b
Fix JWT claims request (#61650) 
* Fix JWT claims request

* Add test scenarios for missing config options
 2023-01-19 16:03:09 +01:00
Alexander Weaver
c10713ea76
Alerting: Create query interface for state history along with annotation-based implementation (#61646) 2023-01-19 10:45:31 +01:00
idafurjes
cacc55ba06
Chore: Remove live from models (#61711) 2023-01-19 10:03:14 +01:00
Yuri Tseretyan
2c46f46d37
Alerting: Rule evaluator to get cached data source info (#61305) 
do not skip cache when get data source info
 2023-01-18 14:25:11 -05:00
Jean-Philippe Quéméner
44b11d3228
Alerting: support basic auth for the state history loki client (#61696) 2023-01-18 20:24:40 +01:00
George Robinson
d4256b352d
Docs: Rename Message templates to Notification templates (#59477) 
This commit renames "Message templates" to "Notification templates"
in the user interface as it suggests that these templates cannot
be used to template anything other than the message. However, message
templates are much more general and can be used to template other fields
too such as the subject of an email, or the title of a Slack message.
 2023-01-18 17:26:34 +00:00
Will Browne
c54aa18cd8
Plugins: Add tailored interface for plugins licensing needs (#61045) 
* tailored licensing service

* appease linter

* fix

* retrigger
 2023-01-18 18:02:54 +01:00
Ezequiel Victorero
5fb4a7f3b6
PublicDashboards: add timeSettingsEnabled on saving a public dashboard (#61701) 2023-01-18 16:03:41 +00:00
Sofia Papagiannaki
b80c9bb974
Chore: Drop dashboard service dependency from folder service (#61614) 
* Chore: Drop dashboard dependency from folder service
 2023-01-18 17:47:59 +02:00
Eric Leijonmarck
bedd2304d1
Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61675) 
* fix: remove metrics from duplicate user entries

* fix: disable metrics collection for authinfo

* fix: initifine goroutine loop that happened

* removed: metrics
 2023-01-18 16:01:47 +01:00
Serge Zaitsev
fa36591380
Chore: Remove mockstore and use dbtest instead (#61629) 
* remove mockstore and use dbtest instead

* fix wire

* remove unused expected fields

* fix more tests in alerting

* fix api tests
 2023-01-18 16:01:25 +01:00
Levente Balogh
4ef82dc73f
Connections: Show a "No access" modal if the user has no permissions (#61397) 
* feat: add a new modal for displaying no-access info

* feat(CardGrid): add an onClick handler for items

* feat: open a no-access modal when clicking on a connection in the catlog

* feat: update permissions

Open a "No access" modal when the user clicks a connection type but has no permissions creating a datasource out of it

* test: add tests for opening the No Access modal

* test: fix the user permissions in tests

* Wip

* Revert "Wip"

This reverts commit 7f080c7f77.
 2023-01-18 15:34:23 +01:00
Karl Persson
1454b1b40a
Reqcontext: Add methods to write responses bases on errutil.Error (#60889) 
* ReqContext: Add methods to reqcontext used to handle errutil.Error

* ReqContext: Pass all public field in response from errutil.Error
 2023-01-18 14:29:23 +01:00
linoman
4d095547f8
Auth: Implement skip org role sync for jwt (#61647) 
* Add new config option

* Add frontend control

* Condition new auth broker with config option

* Condition old auth broker with config option

Co-authored-by: Jo <joao.guerreiro@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2023-01-18 13:59:50 +01:00
idafurjes
b573b19ca3
Chore: Remove dashboards from models pkg (#61578) 
* Copy dashboard models to dashboard pkg

* Use some models from current pkg instead of models

* Adjust api pkg

* Adjust pkg services

* Fix lint

* Chore: Remove dashboards models

* Remove dashboards from models pkg

* Fix lint in tests

* Fix lint in tests 2

* Fix for import in auth

* Remove newline

* Revert unused fix
 2023-01-18 13:52:41 +01:00
Karl Persson
db0be6bc95
RBAC: fix wildcard check (#61666) 
RBAC: break correct loop
 2023-01-18 13:19:09 +01:00
Jo
ecafb4dd15
Auth forwarding: Pass tokens without refresh (#61634) 
* return only tokens from oauth

* feedback
 2023-01-18 10:50:35 +00:00
Sofia Papagiannaki
f25d5199c5
Chore: Fix folder service tests (#61659) 
* Chore: Fix folder service tests
 2023-01-18 12:22:23 +02:00
Karl Persson
412d80b498
AuthN: Add post auth hook for oauth token refresh (#61608) 
* AuthN: rename package to sync

* AuthN: rename sync files

* Ouath: Add mock for OauthTokenService

* AuthN: Implement access token refresh hook

* AuthN: remove feature check from hook

* AuthN: register post auth hook for oauth token refresh
 2023-01-18 10:47:09 +01:00
Santiago
b5fa9e3501
Chore: Fix "manger" typo (#61649) 
fix mangers -> managers
 2023-01-17 23:13:27 +00:00
Karl Persson
05a683d462
SupportBundles: Fix list response when we don't have any bundles yet (#61619) 
* SupportBundles: Return empty slice instead of nil when there are no
support bundles
 2023-01-17 21:04:12 +01:00
Alexander Weaver
1ac89ea040
Alerting: Add client configuration for remote Loki historian backend and test connection (#61114) 
* Create loki client type and ping method

* Expose TestConnection on client

* Configure and ping Loki URL

* Close response body reader if present

* Add 30 second timeout

* Remove duplicate close
 2023-01-17 13:58:52 -06:00
Kristin Laemmert
f6e3252c00
chore: move notifications models into notifications service (#61638) 2023-01-17 14:47:31 -05:00
Matthew Jacobson
23e05373a7
Alerting: Fix flaky TestIntegrationUpdateAlertRules (#61641) 
Prevents random OrgID=0 in test alert generation causing invalid alert rule.
 2023-01-17 19:09:46 +00:00
owensmallwood
3fe81b3c3f
PublicDashboards: Add share column to public dashboards table (#61102) 
Adds share column to public dashboards table
 2023-01-17 12:18:12 -06:00
Alexander Weaver
4f1bdc0607
Alerting: Skip flaky test in TestIntegrationUpdateAlertRules (#61627) 
* Skip flaky test

* Add comment
 2023-01-17 10:39:16 -06:00
ismail simsek
67c02f660a
Influxdb: Remove backend migration feature toggle (#61308) 
* Remove influxdbBackendMigration feature toggle

* Remove code blocks related to influxdbBackendMigration feature toggle

* Fix annotations

* Remove commented lines

* Fix unit tests
 2023-01-17 15:11:26 +01:00
Serge Zaitsev
efed0151f8
Chore: Remove pkg/models/stats.go (#61613) 
* remove pkg/models/stats.go

* rename models package in tests
 2023-01-17 14:17:54 +01:00
Karl Persson
766fa4e7d5
AuthN: Add last seen sync hooks for user and api keys (#61571) 
* AUthN: Add last seen sync hooks for user / service account and move api
key last seen to own hook

* ContextHandler: only run sync for last seen if auth.Service is not
enabled
 2023-01-17 13:50:58 +01:00
Denis Limarev
e6dee8a723
Perfomance: Preallocate slices (#61580) 2023-01-17 11:50:17 +00:00
Jo
9e097c531d
SupportBundles: Build tars in memory (#61581) 
* build tar in memory

* match tag
 2023-01-17 11:39:59 +01:00
Ieva
f44bc0dd6b
RBAC: use scope reduction for user permission listing (#61583) 
use scope reduction for user permission listing
 2023-01-17 09:58:40 +00:00
Karl Persson
b44b6fc5c6
AuthN: Add auth proxy client (#61555) 
* AuthN: set up boilerplate for proxy client

* AuthN: Implement Test for proxy client

* AuthN: parse accept list in constructor

* AuthN: add proxy client interface

* AuthN: handle error

* AuthN: Implement the proxy client interface for ldap

* AuthN: change reciever name

* AuthN: add grafana as a proxy client

* AuthN: for error returned

* AuthN: add tests for grafana proxy auth

* AuthN: swap order of grafan and ldap auth

* AuthN: Parse additional proxy headers in proxy client and pass down
 2023-01-17 10:07:46 +01:00
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
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
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
juanicabanas
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
Jo
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
Alexander Zobnin
f1b5014efd
Preferences: Add pagination to org configuration page (#60896) 
* Add auth labels and access control metadata to org users search results

* Fix search result JSON model

* Org users: Use API for pagination

* Fix default page size

* Refactor: UsersListPage to functional component

* Refactor: update UsersTable component code style

* Add pagination to the /orgs/{org_id}/users endpoint

* Use pagination on the AdminEditOrgPage

* Add /orgs/{org_id}/users/search endpoint to prevent breaking API

* Use existing search store method

* Remove unnecessary error

* Remove unused

* Add query param to search endpoint

* Fix endpoint docs

* Minor refactor

* Fix number of pages calculation

* Use SearchOrgUsers for all org users methods

* Refactor: GetOrgUsers as a service method

* Minor refactor: rename orgId => orgID

* Fix integration tests

* Fix tests
 2023-01-09 11:54:33 +03:00