grafana

Commit Graph

Author	SHA1	Message	Date
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	4 years ago
Michael Mandrus	dfc7a98d87	add comments (#52124 )	4 years ago
Guilherme Caulada	2d8a91a846	Secrets: Improve unified secrets migration and implement compatibility flag (#50463 ) * Implement disableSecretsCompatibility flag * Allow secret deletion right after migration * Use dialect.Quote for secure_json_data on secret deletion Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Set secure_json_data to NULL instead of empty json * Run toggles_gen_test and use generated flag variable * Add ID to delete data source secrets command on function call Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Remove extra query to get datasource on secret deletion * Fix linting issues with CHANGELOG.md * Use empty json string when deleting secure json data * Implement secret migration as a background process * Refactor secret migration as a background service * Refactor migration to be inside secret store * Re-add secret deletion function removed on merge * Try using transaction to fix db lock during tests * Disable migration for pipeline debugging * Try adding sleep to fix database lock * Remove unecessary time sleep from migration * Fix merge issue, replace models with datasources * Try event listener approach * Fix merge issue, replace models with datasources * Fix linting issues with unchecked error * Remove unecessary trainling new line * Increase wait interval on background secret migration * Rename secret store migration folder for consistency * Convert background migration to blocking * Fix number of arguments on server tests * Check error value of secret migration provider * Fix linting issue with method varaible * Revert unintended change on background services * Move secret migration service provider to wire.go * Remove unecessary else from datasource service * Move transaction inside loop on secret migration * Remove unecessary GetServices function * Remove unecessary interface after method removal * Rename Run to Migrate on secret migration interface * Rename secret migrations service variable on server * Use MustBool on datasource secret migration * Revert changes to GetDataSources * Implement GetAllDataSources function * Remove DeleteDataSourceSecrets function * Move datasource secret migration to datasource service * Remove unecessary properties from datasource secret migration * Make DecryptLegacySecrets a private method * Remove context canceled check on secret migrator * Log error when fail to unmarshal datasource secret * Add necessary fields to update command on migration * Handle high availability on secret migration * Use kvstore for datasource secret migration status * Add error check for migration status set on kvstore * Remove NewSecretMigrationService from server tests * Use const for strings on datasource secrets migration * Test all cases for datasources secret migrations Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	4 years ago
Ryan McKinley	4fa606c600	Export: save all dashboards to git (#48233 )	4 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
Sergey Kostrukov	2d3cc26aa8	Prometheus: Remove Azure code from datasource service (#50737 ) Ref #35857	4 years ago
Kevin Lewin	5aab95885f	Alertmanager: Adding SigV4 Authentication to Alertmanager Datasource (#49718 ) * adding sigv4 alertmanager * adding sigv4 alertmanager * ConfigEditor: Adding Render Prop	4 years ago
Tania	4f8111e24e	Encryption: Fix multiple data keys migration (#49848 ) * Add migration * Migrator: Extend support to rename columns * Fix getting current key * Fix column name in migration * Fix deks reencryption * Fix caching * Add back separate caches for byName and byPrefix * Do not concatenate prefix with uid * Rename DataKey struc fields * SQLStore: Add deprecation comments for breaking migrations * Add comment * Minor corrections Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>	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
Guilherme Caulada	470be98588	Secrets: Fix unified secrets backwards compatibility (#49719 ) * Fix unified secrets backwards compatibility * Add compatibility fix to AddDataSource function * Allow updating password on fail to decrypt secrets * If unified secret is corrupt try migrating	4 years ago
Sergey Kostrukov	2b83cf4618	Prometheus: Predefined scopes for Azure authentication (#49557 ) * Predefined scopes for Azure Prometheus * Allow override of audience	4 years ago
Karl Persson	60bc3e4e5c	AccessControl: Let users with data source create permissions list non-core plugins (#48897 ) * Only require create and permissions for new data source page * Let users with permissions to create data sources list non-core plugins * Keep the admin check as fallback when using rbac as well	4 years ago
Karl Persson	61772a66b6	AccessControl: Create own interface and impl for each permission service (#48871 ) * Create own interfaces for team, folder, dashboard and data source permissions services * Remove service container and inject them individually	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
Karl Persson	de50f39c12	Access Control: Refactor scope resolvers with support to resolve into several scopes (#48202 ) * Refactor Scope resolver to support resolving into several scopes * Change permission evaluator to match at least one of passed scopes	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
Ieva	68ca5b2e05	Access control: refactor RBAC checks (#48107 ) * refactor RBAC checks * fix a test * another test fix * and another	4 years ago
Serge Zaitsev	e86b6662a1	Chore: Remove bus.Bus field (#47695 ) * Chore: Remove bus.Bus field * fix integration test	4 years ago
Serge Zaitsev	18e93c7077	Chore: Remove bus (#47511 ) * Chore: Remove bus * remove unused const	4 years ago
Sergey Kostrukov	5675496f6b	Migrate to Grafana Azure SDK (#47232 )	4 years ago
Yuriy Tseretyan	e94d0c1b96	Alerting: update rule test endpoints to respect data source permissions (#47169 ) * make eval.Evaluator an interface * inject Evaluator to TestingApiSrv * move conditionEval to RouteTestGrafanaRuleConfig because it is the only place where it is used * update rule test api to check data source permissions	4 years ago
Sergey Kostrukov	656ade9884	Shared Azure middleware between Azure Monitor and Prometheus datasources (#46002 ) * Scopes in Azure middleware * Enable Azure middleware without feature flag * Use common Azure middleware in Azure Monitor * Apply feature flag to JsonData configuration of Azure auth * Enforce feature flag in Prometheus datasource * Prometheus provider tests * Datasource service tests * Fix http client provider tests * Pass sdkhttpclient.Options by reference * Add middleware to httpclient.Options * Remove dependency on Grafana settings * Unit-tests updated * Fix ds_proxy_test * Fix service_test	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
Ezequiel Victorero	c717320942	Adding FGAC annotations validation for creation and deletion (#46736 ) Access Control: Adding FGAC annotations validation for creation and deletion Co-authored-by: IevaVasiljeva <ieva.vasiljeva@grafana.com>	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
Karl Persson	d27ff42376	Access control: Move data source actions and scopes to datasource package (#46594 ) * Add permission actions and id scope * Remove scope and actions variable prefix * Move page evaluators and rename them	4 years ago
Gabriel MABILLE	bd918927b4	Accesscontrol: fix data source name resolver and add uid name resolver (#46409 ) * Fix data source scope resolver * Adding ds UID scope resolver * Register UID resolver * use package full name * even if it cannot be empty as of now and is also checked by store, better safe than sorry	4 years ago
Yuriy Tseretyan	314be36a7c	Move datasource scopes and actions to access control package (#46334 ) * create scope provider * move datasource actions and scopes to datasource package + add provider * change usages to use datasource scopes and update data source name resolver to use provider * move folder permissions to dashboard package and update usages	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
Selene	2c90dcf3c0	Dashboard Alert Extractor: Create service for dashboard extractor and remove bus (#45518 ) * Create DashAlertService service * Remove no used dashboard service from plugin's manager that generates dependency cycle in Enterprise * Remove bus for dashboard permissions * Remove bus from dashboard extractor service * Add missing argument * Fix wire * Fix lint * More goimports * Use datasource service instead sql calls * Fix integration test	4 years ago
Karl Persson	cdc08105c2	Access control: Set default permissions for data sources when using access control (#45482 ) * Rename interfaces and use then with wire injection * Set default permissions when creating new data source	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
Sergey Kostrukov	cb09162cde	Datasources: Simplify the AzureCredentials structure in datasource config (#39209 ) Related #35857 Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	4 years ago
Gabriel MABILLE	54280fc9d7	AccessControl: Resolve `attribute` based scopes to `id` based scopes (#40742 ) * AccessControl: POC scope attribute resolution Refactor based on ScopeMutators test errors and calls to cache Add comments to tests Rename logger Create keywordMutator only once * AccessControl: Add AttributeScopeResolver registration Co-authored-by: gamab <gabriel.mabille@grafana.com> * AccessControl: Add AttributeScopeResolver to datasources Co-authored-by: gamab <gabriel.mabille@grafana.com> * Test evaluation with translation * fix imports * AccessControl: Test attribute resolver * Fix trailing white space * Make ScopeResolver public for enterprise redefine * Handle wildcard Co-authored-by: Jguer <joao.guerreiro@grafana.com> Co-authored-by: jguer <joao.guerreiro@grafana.com>	4 years ago
idafurjes	7936c4c522	Rename AddHandlerCtx to AddHandler (#43557 )	4 years ago
idafurjes	b8852ef6a3	Chore: Remove context.TODO() (#43409 ) * Remove context.TODO() from services * Fix live test * Remove context.TODO	4 years ago
idafurjes	ff3cf94b56	Chore: Remove context.TODO() from services (#42555 ) * Remove context.TODO() from services * Fix live test	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
Tania B	5652bde447	Encryption: Use secrets service (#40251 ) * Use secrets service in pluginproxy * Use secrets service in pluginxontext * Use secrets service in pluginsettings * Use secrets service in provisioning * Use secrets service in authinfoservice * Use secrets service in api * Use secrets service in sqlstore * Use secrets service in dashboardshapshots * Use secrets service in tsdb * Use secrets service in datasources * Use secrets service in alerting * Use secrets service in ngalert * Break cyclic dependancy * Refactor service * Break cyclic dependancy * Add FakeSecretsStore * Setup Secrets Service in sqlstore * Fix * Continue secrets service refactoring * Fix cyclic dependancy in sqlstore tests * Fix secrets service references * Fix linter errors * Add fake secrets service for tests * Refactor SetupTestSecretsService * Update setting up secret service in tests * Fix missing secrets service in multiorg_alertmanager_test * Use fake db in tests and sort imports * Use fake db in datasources tests * Fix more tests * Fix linter issues * Attempt to fix plugin proxy tests * Pass secrets service to getPluginProxiedRequest in pluginproxy tests * Fix pluginproxy tests * Revert using secrets service in alerting and provisioning * Update decryptFn in alerting migration * Rename defaultProvider to currentProvider * Use fake secrets service in alert channels tests * Refactor secrets service test helper * Update setting up secrets service in tests * Revert alerting changes in api * Add comments * Remove secrets service from background services * Convert global encryption functions into vars * Revert "Convert global encryption functions into vars" This reverts commit `498eb19859`. * Add feature toggle for envelope encryption * Rename toggle Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>	4 years ago
Will Browne	e4297006f6	Chore: Propagate context for data source provisioning (#40235 ) * context all the things * apply feedback * rollback some alerting changes * rollback some alerting changes #2 * more rollbacks * more rollbacks #2 * more rollbacks #3 * more rollbacks #4 * fix integration test * add missing context * add missing and remove incorrect dispatch	4 years ago
Giordano Ricci	24af3593a2	AWS: add OpenSearch to AWS services (#40290 )	4 years ago
Joan López de la Franca Beltran	722c414fef	Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865 ) * Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289 ) Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Kyle Brandt	1c1a800bc0	API: Add by UID routes for data sources (#29884 ) - also add Get by UID+OrgID to datasource cache - Refactor backend commands for Delete and Get to be unified	5 years ago
Arve Knudsen	b5379c5335	Chore: Fix SQL related Go variable naming (#28887 ) * Chore: Fix variable naming Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	45adfe7732	Data sources: Use SQL store directly, not via bus (#27000 ) * Server: Make it possible to avoid getting SQL store via bus Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
Carl Bergquist	f9962eabff	chore: avoid aliasing imports in services (#22499 )	6 years ago
Carl Bergquist	6809d2bb29	codestyle: moves cache to infra (#17519 )	7 years ago

1 2

52 Commits (ab6cf9e94de7e1a0811bf2eb48cdbde6136448d9)