153 Commits (d54fa569ec0460eec319930c94e56eb4ce401049)

Author	SHA1	Message	Date
Jean-Philippe Quéméner	42cdec369d	Datasources: provide generic function to extract custom headers (#66738)	3 years ago
Michael Mandrus	5626461b3c	Caching: Refactor enterprise query caching middleware to a wire service (#65616) ... * define initial service and add to wire * update caching service interface * add skipQueryCache header handler and update metrics query function to use it * add caching service as a dependency to query service * working caching impl * propagate cache status to frontend in response * beginning of improvements suggested by Lean - separate caching logic from query logic. * more changes to simplify query function * Decided to revert renaming of function * Remove error status from cache request * add extra documentation * Move query caching duration metric to query package * add a little bit of documentation * wip: convert resource caching * Change return type of query service QueryData to a QueryDataResponse with Headers * update codeowners * change X-Cache value to const * use resource caching in endpoint handlers * write resource headers to response even if it's not a cache hit * fix panic caused by lack of nil check * update unit test * remove NONE header - shouldn't show up in OSS * Convert everything to use the plugin middleware * revert a few more things * clean up unused vars * start reverting resource caching, start to implement in plugin middleware * revert more, fix typo * Update caching interfaces - resource caching now has a separate cache method * continue wiring up new resource caching conventions - still in progress * add more safety to implementation * remove some unused objects * remove some code that I left in by accident * add some comments, fix codeowners, fix duplicate registration * fix source of panic in resource middleware * Update client decorator test to provide an empty response object * create tests for caching middleware * fix unit test * Update pkg/services/caching/service.go Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> * improve error message in error log * quick docs update * Remove use of mockery. Update return signature to return an explicit hit/miss bool * create unit test for empty request context * rename caching metrics to make it clear they pertain to caching * Update pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add clarifying comments to cache skip middleware func * Add comment pointing to the resource cache update call * fix unit tests (missing dependency) * try to fix mystery syntax error * fix a panic * Caching: Introduce feature toggle to caching service refactor (#66323) * introduce new feature toggle * hide calls to new service behind a feature flag * remove licensing flag from toggle (misunderstood what it was for) * fix unit tests * rerun toggle gen --------- Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
Will Browne	94f39e69a3	Plugins: Migrate `plugincontext`, `adapters` and `pluginsettings` to pkg/services/pluginsintegration package (#64154) ... * migrate plugincontext, adapter and pluginsettings * add to CODEOWNERS * fix imports * fix CODEOWNERS * take pluginsettings * migrate wire stuff	3 years ago
suntala	49b3027049	Chore: Remove Result field from datasources (#63048) ... * Remove Result field from AddDataSourceCommand * Remove DatasourcesPermissionFilterQuery Result * Remove GetDataSourceQuery Result * Remove GetDataSourcesByTypeQuery Result * Remove GetDataSourcesQuery Result * Remove GetDefaultDataSourceQuery Result * Remove UpdateDataSourceCommand Result	3 years ago
idafurjes	23c27cffb3	Chore: Rename Id to ID in alerting models (#62777) ... * Chore: Rename Id to ID in alerting models * Add xorm tags for datasource * Add xorm tag for uid	3 years ago
idafurjes	6c5a573772	Chore: Move ReqContext to contexthandler service (#62102) ... * Chore: Move ReqContext to contexthandler service * Rename package to contextmodel * Generate ngalert files * Remove unused imports	3 years ago
Marcus Efraimsson	6dbe3b555f	Plugins: Refactor forward of cookies, OAuth token and header modifications by introducing client middlewares (#58132) ... Adding support for backend plugin client middlewares. This allows headers in outgoing backend plugin and HTTP requests to be modified using client middlewares. The following client middlewares added: Forward cookies: Will forward incoming HTTP request Cookies to outgoing plugins.Client and HTTP requests if the datasource has enabled forwarding of cookies (keepCookies). Forward OAuth token: Will set OAuth token headers on outgoing plugins.Client and HTTP requests if the datasource has enabled Forward OAuth Identity (oauthPassThru). Clear auth headers: Will clear any outgoing HTTP headers that was part of the incoming HTTP request and used when authenticating to Grafana. The current suggested way to register client middlewares is to have a separate package, pluginsintegration, responsible for bootstrap/instantiate the backend plugin client with middlewares and/or longer term bootstrap/instantiate plugin management. Fixes #54135 Related to #47734 Related to #57870 Related to #41623 Related to #57065	3 years ago
Ieva	a8bae3f0b0	Access Control: Clear user's permission cache after resource creation (#59101) ... * refresh user's permission cache after resource creation * clear the cache instead of reloading the permissions * don't error if can't clear cache * fix tests * fix tests again	3 years ago
Marcus Efraimsson	6f8fcae01b	[main] Plugin fixes (#57399) ... * Plugins: Remove support for V1 manifests * Plugins: Make proxy endpoints not leak sensitive HTTP headers * Security: Fix do not forward login cookie in outgoing requests (cherry picked from commit 4539c33fce) Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	3 years ago
Ieva	6d5bdf12e8	resolve merge conflicts (#55503)	3 years ago
Sofia Papagiannaki	950715b255	API: Do not expose user input in datasource error responses (#53483)	3 years ago
idafurjes	a14621fff6	Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343) ... * Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields	3 years ago
idafurjes	6afad51761	Move SignedInUser to user service and RoleType and Roles to org (#53445) ... * Move SignedInUser to user service and RoleType and Roles to org * Use go naming convention for roles * Fix some imports and leftovers * Fix ldap debug test * Fix lint * Fix lint 2 * Fix lint 3 * Fix type and not needed conversion * Clean up messages in api tests * Clean up api tests 2	3 years ago
Sofia Papagiannaki	87004cc22d	API: Do not expose user input in datasource error responses (#52992)	3 years ago
Sofia Papagiannaki	7ba076de10	Chore: Move swagger definitions to the handlers (#52643)	3 years ago
Michael Mandrus	9aa6ce2a50	Datasource: Propagate datasource secret decryption errors to the frontend (#52068) ... * update decrypt secrets function signature and add secrets error handling * remove a couple instances of unnecessary logging since errors are properly handled now * add unit test * fix linting issues	3 years ago
Kristin Laemmert	945f015770	backend/datasources: move datasources models into the datasources service package (#51267) ... * backend/datasources: move datasources models into the datasources service pkg	4 years ago
Michael Mandrus	c043a8818a	Secrets: add better error handling for secret plugin failures when updating datasources (#50542) ... * Add protobuf config and generated code, and client wrapper * wire up loading of secretsmanager plugin, using renderer plugin as a model * update kvstore provider to check if we should use the grpc plugin. return false always in OSS * add OSS remote plugin check * refactor wire gen file * log which secrets manager is being used * Fix argument types for remote checker * Turns out if err != nil, then the result is always nil. Return empty values if there is an error. * remove duplicate import * ensure atomicity by adding secret management as a step to sql operations and rolling back if necessary * Update pkg/services/secrets/kvstore/kvstore.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Update pkg/services/secrets/kvstore/kvstore.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * refactor RemotePluginCheck interface to just return the Plugin client directly * rename struct to something less silly * add special error handling for remote secrets management * switch to errors.as instead of type inference * remove unnecessary rollback call * just declare error once * refactor .proto file according to prior PR suggestions * re-generate protobuf files and fix compilation errors * only wrap (ergo display in the front end) errors that are user friendly from the plugin * rename error type to suggest user friendly only * rename plugin functions to be more descriptive * change delete message name * Revert "change delete message name" This reverts commit 8ca978301e. * Revert "rename plugin functions to be more descriptive" This reverts commit 4355c9b9ff. * fix pointer to pointer problem * change plugin user error to just hold a string * fix sequencing problem with datasource updates * clean up some return statements * need to wrap multiple transactions with the InTransaction() func in order to keep the lock * make linter happy * revert input var name Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	4 years ago
Karl Persson	7fad8d6171	RBAC: Move datasource access check to middleware (#50430) ... * Add datasource scopes to auth middleware * Remove filter call from handlers, permission check is done by auth middleware	4 years ago
Marcus Efraimsson	36c3398c6d	Datasource: Remove support for unencrypted passwords (#49987) ... * Datasource: Remove support for unencrypted passwords * regenerate swagger * [WIP] Remove references to datasource password and basic auth password fields (#50015) * try delete moar tings * delete provisioning stuff * remove from yaml * update snapshots * remove lingering snapshot fields * fix ds http settings * Re-generate swagger and fix swagger-api-spec make target Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	4 years ago
Marcus Efraimsson	a7813275a5	Plugins: Support headers field for check health (#49930)	4 years ago
Sofia Papagiannaki	be0d043673	API: Add endpoint for updating a data source by its UID (#49396) ... * API: Add endpoint for updating a data source by UID * Update docs markdown * Update swagger * Apply suggestions from code review Co-authored-by: Selene <selenepinillos@gmail.com>	4 years ago
Sofia Papagiannaki	6bb843bd0e	API: Introduce health and resources data source endpoints using the data source UID (#48676) ... * API: introduce health and resources datasource endpoints with UID * Document endpoints * Update swagger	4 years ago
Will Browne	f135a5c8a4	Plugins: Refactor plugin resource call with and without data source (#48754) ... * refactor plugin resource call with/without ds * check err * fix imports * only validate req on ds path * Update warn log Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	4 years ago
Guilherme Caulada	2533f21015	DataSource: Fix secure json data reset on datasource update (#48557) ... * Fix secure json data reset on datasource update * Update fillWithSecureJSONData to use DecryptedValues * Remove unecessary conversion * Move fillWithSecureJsonData logic to datasource service * Add sanity check for nil secure json data	4 years ago
Guilherme Caulada	53e9bf47db	Secrets: Implement tests and debug log improvements on unified secrets (#48213) ... * Add test for decrypted values on datasource service * Add debug log when fail to parse secure json fields * Fix minor import issue * Refactor encJson to json and simplejson to sjson on tests	4 years ago
Guilherme Caulada	a367ad730c	Secrets: Implement basic unified secret store service (#45804) ... * wip: Implement kvstore for secrets * wip: Refactor kvstore for secrets * wip: Add format key function to secrets kvstore sql * wip: Add migration for secrets kvstore * Remove unused Key field from secrets kvstore * Remove secret values from debug logs * Integrate unified secrets with datasources * Fix minor issues and tests for kvstore * Create test service helper for secret store * Remove encryption tests from datasources * Move secret operations after datasources * Fix datasource proxy tests * Fix legacy data tests * Add Name to all delete data source commands * Implement decryption cache on sql secret store * Fix minor issue with cache and tests * Use secret type on secret store datasource operations * Add comments to make create and update clear * Rename itemFound variable to isFound * Improve secret deletion and cache management * Add base64 encoding to sql secret store * Move secret retrieval to decrypted values function * Refactor decrypt secure json data functions * Fix expr tests * Fix datasource tests * Fix plugin proxy tests * Fix query tests * Fix metrics api tests * Remove unused fake secrets service from query tests * Add rename function to secret store * Add check for error renaming secret * Remove bus from tests to fix merge conflicts * Add background secrets migration to datasources * Get datasource secure json fields from secrets * Move migration to secret store * Revert "Move migration to secret store" This reverts commit 7c3f872072. * Add secret service to datasource service on tests * Fix datasource tests * Remove merge conflict on wire * Add ctx to data source http transport on prometheus stats collector * Add ctx to data source http transport on stats collector test	4 years ago
ying-jeanne	7ddae870e7	fix status code 200 (#47818)	4 years ago
Karl Persson	cac6936015	Access control: Change data source permissions to be based on UID (#46741) ... * Add ResourceAttribute * Add ResourceAttribute option * Set ResourceAttribute option * Change resolvers to return uid based scopes * update swagger to correct scope * use ResourceAttribute for endpoint scope * bump role version * Add support for different attributes for access control metadata * evaluate data source metadata based on uid * Fix test * uncomment benchmarks * Use resourceID * use evaluator for access control metadata * update comment * Set default permissions based on uid * Add attribute to accesscontrol filter * validate that scopes has correct attribute * lint * Update comment * remove attribute parameter and extend prefix * refactor to use scope prefix * Get metadata with prefix * fix test * fix comparision * remove unused type * fix attribute index * fix typo * restructure logic * Get metadata by uid * fix imports Co-authored-by: jguer <joao.guerreiro@grafana.com>	4 years ago
Gabriel MABILLE	3440e7c8f7	AccessControl: Fix locked role picker in orgs/edit page (#46539) ... * AccessControl: Fix locked role picker in orgs/edit page * Use correct org when computing metadata	4 years ago
Karl Persson	7ab1ef8d6e	Access Control: Support other attributes than id for resource permissions (#46727) ... * Add option to set ResourceAttribute for a permissions service * Use prefix in access control sql filter to parse scopes * Use prefix in access control metadata to check access	4 years ago
Emil Tullstedt	0e5ac29763	Data sources: Grant creator edit permissions to data source by default (#46168) ... * Data sources: Sent user ID when creating data source * Data sources: Grant a data source creator edit permissions * Use edit permisison and only append if user id is in command Co-authored-by: Karl Persson <kalle.persson@grafana.com>	4 years ago
Selene	5eaf6509c0	Dashboard Extractor: Don't fail when using default OSS implementation (#46024) ... * Don't fail when using default OSS implementation * Check correct error	4 years ago
Gabriel MABILLE	14bee49f9a	AccessControl: Compute metadata from context permissions (#45578) ... * AccessControl: Compute metadata from context permissions * Remove nil Co-authored-by: Jguer <joao.guerreiro@grafana.com> * Check user permissions are set Co-authored-by: Jguer <joao.guerreiro@grafana.com>	4 years ago
Gabriel MABILLE	6fbf346747	AccessControl: Add endpoint to get user permissions (#45309) ... * AccessControl: Add endpoint to get user permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * Fix SA tests * Linter is wrong :p * Wait I was wrong * Adding the route for teams:creator too Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>	4 years ago
Marcus Efraimsson	6a776c78d4	Datasource: Fixes storing of secureJSONData when creating/updating datasource (#45290) ... Fixes an issue introduced by #44987 where bus dispatch was replaced by calling sqlstore directly instead of the datasource service. Fixes #45273	4 years ago
idafurjes	df282a42cb	Remove bus from datasource api (#44987) ... * Remove bus from datasource api * Add DatasourcePermissionService and use it in api * Fix wire and rename * Fix import in wire * Fix bug * Rename Service to OSS service * Roll back fix	4 years ago
Karl Persson	e93e1bdd2b	Access control: Enable data source view for partial permissions (#44695) ... * Return correct value * Remove scope all requirement * Only add dashboard sub nav if user is admin	4 years ago
Santiago	7ed82ac049	Check for empty URLs when creating/updating a data source (#42837) ... * checks for empty URLs added * check for TimeSeriesTypeNot to fix InfluxDB alerts * log a warning when a data frame is ignored * fix: add brittle Prometheus URL input selector needs a proper aria-label or test-data-id selector * test: add URL input aria-label needs to use the grafana/e2e-selectors package * test: run ci * add URL validation for specific data sources, e2e tests * Update pkg/api/datasource/validation.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * delete duplicated logs * delete unnecessary leading newline Co-authored-by: gillesdemey <gilles.de.mey@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	4 years ago
Will Browne	b5dd4842d0	Plugins: Make manager more easily composable (#44467) ... * make more easily composable * fix build	4 years ago
Jeff Levin	c8154b9fe2	Datasource API: #32556 resolve readonly datasources can be modified (#44186) ... * Check if datasource is read-only when making an update * Standardize api returning a 404 if datasource is not found while making an update Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>, Jesse Weaver<pianohacker@gmail.com>	4 years ago
Karl Persson	f75e4d1a4f	Access Control: Allow signed in users access to GET data sources endpoints (#43338) ... * remove scopes from endpoints and add datasources:read without scope to the compatibility role	4 years ago
ying-jeanne	7422789ec7	Remove Macaron ParamsInt64 function from code base (#43810) ... * draft commit * change all calls * Compilation errors	4 years ago
Gabriel MABILLE	92c568e9f7	AccessControl: Remove unused error from `GetResourcesMetadata` (#43710) ... * AccessControl: Remove unused error from GetResourcesMetadata Co-authored-by: J Guerreiro <joao.guerreiro@grafana.com>	4 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563)	4 years ago
idafurjes	b8852ef6a3	Chore: Remove context.TODO() (#43409) ... * Remove context.TODO() from services * Fix live test * Remove context.TODO	4 years ago
Gabriel MABILLE	c7cabdfd6f	AccessControl: Add accesscontrol metadata to datasources DTOs (#42675) ... * AccessControl: Provide scope to frontend * Covering datasources with accesscontrol metadata * Write benchmark tests for GetResourcesMetadata * Add accesscontrol util and interface * Add the hasPermissionInMetadata function in the frontend access control code * Use IsDisabled rather that performing a feature toggle check Co-authored-by: Karl Persson <kalle.persson@grafana.com>	4 years ago
Will Browne	6c4555265a	Plugins: Update client to use SDK resource contract (#42888) ... * client uses sdk resource handler * apply pr feedback	4 years ago
Serge Zaitsev	d9cdcb550e	Chore: Refactor api handlers to use web.Bind (#42199) ... * Chore: Refactor api handlers to use web.Bind * fix comments * fix comment * trying to fix most of the tests and force routing.Wrap type check * fix library panels tests * fix frontend logging tests * allow passing nil as a response to skip writing * return nil instead of the response * rewrite login handler function types * remove handlerFuncCtx * make linter happy * remove old bindings from the libraryelements * restore comments	4 years ago
idafurjes	725dbf8d95	Chore: Add context to datasource service (#42294) ... * Add context to datasource service * Adjust wire for ShouldBeReported method * Replace inTransactionCtx	4 years ago