77 Commits (719f6bc5200402a12448af93a9e39e19bec4186d)

Author	SHA1	Message	Date
Joan López de la Franca Beltran	9826a694a8	Encryption: Add Prometheus metrics (#48603)	3 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	3 years ago
Joan López de la Franca Beltran	2081f37e95	Encryption: Make DEKs cache TTL & cleanup interval configurable (#46042) ... * Make DEKs cache TTL & cleanup interval configurable * Improve 'data_keys_cache_ttl' setting description * Fix test	3 years ago
Joan López de la Franca Beltran	e6a85826e9	Encryption: Refine secrets-related commands (#45201) ... * CLI: Adjust 're-encrypt-data-keys' command * CLI: Adjust 're-encrypt' command * Multiple improvements on re-encrypt secrets migration * Another bunch of code improvements * Lint fixes	3 years ago
Joan López de la Franca Beltran	b2655750e8	Encryption: Add support for data keys re-encryption (#43548) ... * Encryption: Add support for data keys re-encryption * Add tests for data keys re-encryption * Update code after refactorings Co-authored-by: Leonard Gram <leo@xlson.com>	3 years ago
Joan López de la Franca Beltran	3b4e812449	Encryption: Keep legacy default provider id on providers map (#44721) ... * Encryption: Keep legacy default provider id on providers map * Minor fixes * Refactor	3 years ago
Ryan McKinley	7ee38af95a	FeatureToggls: remove IsFeatureToggleEnabled from SettingsProvider (#44574)	3 years ago
Tania B	ca24b95b49	Encryption: Handle encryption key provider being a background service (#44007) ... * Encryption: Handle encryption key provider being a background service * Sort imports * Cleanup accidental changes * Add proper error handling * Apply review feedback	3 years ago
Ryan McKinley	5d66194ec5	FeatureFlags: define features outside settings.Cfg (take 3) (#44443)	3 years ago
Agnès Toulet	65bdb3a899	FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382) ... * Revert "FeatureToggles: register all enterprise feature toggles (#44336)" This reverts commit f53b3fb007. * Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)" This reverts commit f94c0decbd.	3 years ago
Ryan McKinley	f94c0decbd	FeatureFlags: manage feature flags outside of settings.Cfg (#43692)	3 years ago
Joan López de la Franca Beltran	532e71554f	Usage Stats: Add metrics to count enabled kms providers per kind (#43640) ... * Usage Insights: Add metrics to count enabled kms providers per kind * Add backwards compatibility	3 years ago
Joan López de la Franca Beltran	80e0dd74d2	Encryption: Increase context timeout on flaky test (#43553)	3 years ago
Joan López de la Franca Beltran	83bc445d3e	Encryption: Fix DEKs cache (#43129) ... * Encryption: Fix DEKs cache * Clarify tests	3 years ago
Tania B	0dc86bf7f4	Chore: Move default encryption provider to kmsproviders package (#43331)	3 years ago
Tania B	58978dcf96	Encryption: Add usage stats to secrets service (#42437) ... * Encryption: Add usage stats to secrets service * Sort imports	4 years ago
Tania B	4014891971	Encryption: Cleanup and add logging (#42084) ... * Encryption: Add more logs * Add logging and checks * Removed unused methods from secrets service * Refactor and update tests * Address review feedback	4 years ago
Joan López de la Franca Beltran	d49230d291	Grafana CLI Wire Runner (#41012) ... * Set up Wire build graph * Remove enterprise Wire set * Move runner package outside commands * Update Makefile (gen-go path) * Minor prettier fix * Include new Wire enterprise file into .gitignore * Update Wire deps * Update the grabpl version Co-authored-by: Dan Cech <dcech@grafana.com>	4 years ago
Tania B	bc60ae3c66	Encryption: Refactor secrets service (#41771) ... * Refactor kmsproviders pkg * Update tests * Fix linting Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>	4 years ago
Joan López de la Franca Beltran	d3e19b1b3b	Encryption: Improve the DX of encryption operations within database transactions (#41654) ... * Move user oauth info encryption away from db transaction * Add encryption methods with support for db session reusability	4 years ago
Joan López de la Franca Beltran	44837fc592	Replace encryption.Service usages by secrets.Service (#41625) ... * Replace encryption.Service by secrets.Service on expr.Service * Replace encryption.Service by secrets.Service on live pkg * Rename encryption.Service to encryption.Internal to clarify it must be not used	4 years ago
Tania B	f6545ab8f4	Chore: Add current provider test for secrets service (#41387) ... * Chore: Add current provider test for secrets service * Refactor the test * Fix linting issue	4 years ago
Tania B	e81d434edf	Encryption: Extend secrets service to support registering key providers (#40626) ... * Draft adding kms providers * Rename defaultProvider to currentProvider * Add getting current provider from config * Remove comments * Make current provider service struct field * Add methods to secrets service * Test getting current provider * Implements missing methods for fake secrets service * Remove accidental changes * Fix linter issue * Update configuration examples * Rename CurrentProvider method * Split service interface * Update wire Co-authored-by: spinillos <selenepinillos@gmail.com>	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
Tania B	f59aabbd3b	Chore: Refactor secrets service (#40331)	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
Tania B	62689ec804	Security: Add secrets service (#39418) ... * Add secrets service * Revert accidental changes in util encryption * Make minor changes Move functional options to models Revert renaming types to models * Add context * Minor change in GetDataKey * Use CreateDataKeyWithDBSession in CreateDataKey * Handle empty DEK name in DeleteDataKey * Rename defaultProvider * Remove secrets store service	4 years ago