grafana

Commit Graph

Author	SHA1	Message	Date
Joan López de la Franca Beltran	cc65b4d46a	Secrets: Make the Migrator extensible (#67307 ) * [Chore] Remove setting provider from secret service Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com> * Add a ShouldBeRedacted func Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com> * Secrets: Make Migrator extensible Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Tania B <yalyna.ts@gmail.com> * Alerting: Fix tests after refactor Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Tania B <yalyna.ts@gmail.com> * Remove commented code no longer used * Fix Wire bindings Co-authored-by: Tania B <yalyna.ts@gmail.com> * Add constructors to secrets * Linting * Undo undesired change --------- Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	2 years ago
Serge Zaitsev	126c4a106e	Chore: Remove result field from remaining datasources queries (#65054 ) remove result field from datasources	2 years ago
Emil Tullstedt	10ee900beb	Errors: Remove direct dependencies on github.com/pkg/errors (#64026 ) Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	2 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	2 years ago
Zoltán Bedi	b0213a4877	KVStore: Include database field in migration (#62790 )	2 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	2 years ago
Serge Zaitsev	bc2813ef06	Chore: Fix goimports grouping in pkg/services (#62420 ) * fix goimports * fix goimports order	2 years ago
Joan López de la Franca Beltran	c4e067d49d	Encryption: Cache new DEKs (only) after a caution period (#60664 ) * Encryption: Cache new DEKs (only) after commit * Fix typo * Update secrets manager tests with new failing case * Update secrets manager tests with new clarifications (comments) * Correct broken method calls * Unify methods * Cache data keys only after a caution period * Caution period for data keys caching only for encrypt ops	2 years ago
Denis Limarev	e6dee8a723	Perfomance: Preallocate slices (#61580 )	2 years ago
Sofia Papagiannaki	9855e74b92	Chore: Refactor quota service (#58643 ) Chore: Refactor quota service (#57586) * Chore: refactore quota service * Apply suggestions from code review	3 years ago
Sofia Papagiannaki	96cdf77995	Revert "Chore: Refactor quota service (#57586 )" (#58394 ) This reverts commit `326ea86a57`.	3 years ago
Sofia Papagiannaki	326ea86a57	Chore: Refactor quota service (#57586 ) * Chore: refactore quota service * Apply suggestions from code review	3 years ago
Kristin Laemmert	05709ce411	chore: remove sqlstore & mockstore dependencies from (most) packages (#57087 ) * chore: add alias for InitTestDB and Session Adds an alias for the sqlstore InitTestDB and Session, and updates tests using these to reduce dependencies on the sqlstore.Store. * next pass of removing sqlstore imports * last little bit * remove mockstore where possible	3 years ago
Kristin Laemmert	c61b5e85b4	chore: replace sqlstore.Store with db.DB (#57010 ) * chore: replace sqlstore.SQLStore with db.DB * more post-sqlstore.SQLStore cleanup	3 years ago
Sofia Papagiannaki	8b77ee2734	SQLStore: Ensure that sessions are always closed (#55864 ) * SQLStore: Ensure that sessions are always closed Delete `NewSession()` in favour of `WithDbSession()` * Add WithDbSessionForceNewSession to the interface * Apply suggestions from code review	3 years ago
Guilherme Caulada	942be4215a	Secrets: Improve error handling for secrets manager plugin (#54811 ) * Improve error handling for secrets manager plugin * Update sever lock log for secret migration to Error * Move plugin started check to a separate function * Fix nil pointer exception on HasPluginStarted	3 years ago
Guilherme Caulada	20589f76f4	Secrets: Convert secret migration to a background service (#54676 ) * Convert secret migration to a background service * Fix merge conflicts * Return concrete type for secret migration provider	3 years ago
George Robinson	c4d32dd687	Fix nil logger in SqlStore (#54726 )	3 years ago
Guilherme Caulada	f4a35a4645	Secrets: Implement secrets manager plugin fallback store (#54496 ) * Refactor fallback to be isolated to plugin secret store * Check for error value on replace fallback test helper * Move ResetPlugin from test_helpers.go to plugin.go * Add check to GetUnwrappedStoreFromCache * Add fallback GetAll query to WithFallbackEnabled * Add mutex lock to WithFallbackEnabled * Add cache to fallback store * Fix linter issues * Fix linter issues * Fix linter issues	3 years ago
Will Browne	ecdcafb258	manager exposes renderer + secrets manager (#54629 )	3 years ago
Michael Mandrus	39c31416a4	improve log in plugin check (#54599 )	3 years ago
ying-jeanne	6227528ea0	Chore: SQL Store Split of datasource (#54262 ) * refectory datasource * fix linter	3 years ago
Guilherme Caulada	f25c7f6ddd	Chore: Refactor secrets kvstore to organize testing and migrations (#54249 ) * Refactor migrations and tests for secrets kvstore * Use fake secrets store as a shortcut on tests * Update wire * Use global migration logger * Fix ds proxy tests * Fix linting issues * Rename data source test setup function	3 years ago
Michael Mandrus	8deababa50	Chore: Refactor secrets plugin unit tests code (#54231 ) * refactor test setup to return struct rather than many values * changes to code style from review * apply diff from Leandro for logging	3 years ago
Michael Mandrus	277ea836b6	Secrets: Implement migration of secrets from plugin back to unified secrets (#53561 ) * initial cut at migration from plugin * create new migration from plugin * only migrate to or from, not both * remove cfg check from plugin migration itself * update comments, clean up secret after migration * add better error handling * hook up REST API with migrations * Minor fixes * fix wire injection issue * modify migrator to access plugin calls directly. create unit tests * change pre-migration checks in admin api * stop plugin after migrating from it * fix compile issues after merge * add comment about migration * fix linting issue * bleh, fix unit test * fix another unit test * update plugin error fatal flag after a migration from the plugin * add extra logging to migration * make linter happy Co-authored-by: Leandro Deveikis <leandro.deveikis@gmail.com>	3 years ago
Guilherme Caulada	d90600c454	Secrets: Add fallback to secrets kvstore plugin (#54056 ) * Add fallback to secrets kvstore plugin * Fix linter issues * Fix linter issues * Add deletion error to bool to fake secrets kvstore * Add fallback to fake secrets kvstore * Fix fake secrets kvstore fallback setter * Use Key on Item message for secrets manager protobuf * Add clarifying comment about fallback	3 years ago
Guilherme Caulada	2e9edf4592	Secrets: Refactor code duplicity on secrets sql kvstore (#54032 )	3 years ago
Guilherme Caulada	7924d3b3b5	Secrets: Move license check to secret store plugin (#53185 ) * Move license check to secret store plugin * Use shouldUseRemoteSecretsPlugin for migration * Encapsulate plugin startup logic in sync.Once * Remove global logger from startup functions * Fix issues with wire and secrets plugin check * Remove todo for plugin fatal error * Rename fatalErr variable to be less confusing * Fix merge conflicts * Fix issue with grafana-cli wire and opentsdb * Remove duplicated import on remote plugin * Rename plugin check in favor of error return value * Remove unnecessary import on grafana-cli wireexts_oss * Remove unnecessary import on grafana wireexts_oss * Reset sync.Once during test setup * Remove unrelated opentsdb change on grafana-cli wire * Readd opentsdb change on grafana-cli wire	3 years ago
lean.dev	92d0420a45	Adding logs during migration of secrets to plugin (#53426 )	3 years ago
Joan López de la Franca Beltran	28e27e1365	Encryption: De-duplicate encryption code with extensible service (#52472 ) * Encryption: De-duplicate encryption code with extensible service * Fix Wire injections * Fix tests * Register reload handler	3 years ago
lean.dev	3395981d35	Chaging log level when secret is not found (#53007 )	3 years ago
Michael Mandrus	72d9de3a0f	Secrets: Implement Secret Plugin required flag and fatal crash on startup (#52552 ) * add special handling on the plugin gathering side to check whether secrets manager plugins are enabled or not * show disabled badge in front end if the plugin is not enabled * Only show error in disabled badge hover if one is present (otherwise it shows "undefined") * refactor to make use of fields already available in the DTO * fix typo * if there is no error returned for the plugin, just show 'disabled' * fix typo * Update public/app/features/plugins/admin/components/Badges/PluginDisabledBadge.tsx Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> * Update frontendsettings.go add clarifying comment * fix unit test * rework task to use new frontend property combined with plugin type to determine if the plugin should be disabled * Update helpers.test.ts revert test change * fix unit test * show custom uninstall message if the plugin is a secrets manager * bogus commit to trigger precommit * undo commit * run precommit manually * add some consts * refactor a bit to pull plugin error management up a level * re-add code squashed in merge * fix compile issues * add code to set plugin error fatal flag after secret migration * refactor to move plugin startup out of Should Check func * re-add important check * make plugin startup errors fatal the first time we set a secret on the plugin * rename func to make intent clearler * remove unnecessary duplicate code from plugin mig * fix compile error * fix more compile errors * add some extra logging to secrets migration * have remote_plugin secret service managed plugin error fatal flag directly * add blank file for eventual unit tests * fix linting issues * changes from PR review * quick bit of cleanup * add comment explaining design decision * move more common test helpers to file * slightly update to first time Get secret call * add unit tests * remove override func from provider * fix linting issues * add test cleanup step * add some comments about refactoring to hacky test function Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>	3 years ago
Michael Mandrus	acd85314b3	Secrets: Add logging to track secrets migration (#52481 ) * add logging to track migration * fix lint problem	3 years ago
lean.dev	e1785f4eb4	Secret migration from Sql KV Store to Secret Plugin (#52191 ) * Created PluginSecretMigrationService to be able to migrate from the secrets table from the database to the secret plugin. Added migration which takes all the secrets at the sql store and stores it in the plugin. Then deletes all the secrets from the sql * Added secretsKVStoreSQL.GetAll() method to return all the secrets at the sql table * Renaming kvstore_test.go as sql_test.go, adding GetAll test case. Fixing decryption of keys	3 years ago
Joan López de la Franca Beltran	9abe9fa702	Encryption: Expose secrets migrations through HTTP API (#51707 ) * Encryption: Move secrets migrations into secrets.Migrator * Encryption: Refactor secrets.Service initialization * Encryption: Add support to run secrets migrations even when EE is disabled * Encryption: Expose secrets migrations through HTTP API * Update docs * Fix docs links * Some adjustments to makes errors explicit through HTTP response	3 years ago
Joan López de la Franca Beltran	7b40322bbe	Encryption: Add support to run secrets migrations even when EE is disabled (#51705 ) * Encryption: Move secrets migrations into secrets.Migrator * Encryption: Refactor secrets.Service initialization * Encryption: Add support to run secrets migrations even when EE is disabled * Init EE providers on-demand (only when needed) * Add multiple tests + some adjustments * Apply feedback	3 years ago
Joan López de la Franca Beltran	973b3112d7	Encryption: Re-order error check (#52251 )	3 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>	3 years ago
Joan López de la Franca Beltran	81753526bd	Encryption: Refactor secrets.Service initialization (#51091 ) * Encryption: Refactor secrets.Service initialization	3 years ago
Joan López de la Franca Beltran	38bcd37fba	Encryption: Move secrets migrations into secrets.Migrator (#51014 )	3 years ago
Guilherme Caulada	d5185f8ab9	Secrets: Implement unified secrets short lived cache (#51275 ) * Implement unified secrets short lived cache * Improve debug logging for unified secrets cache * Re-add decryption cache to sql secret kvstore * Remove cache from remote secret store plugin * Revert secret store helpers implementation * Remove cache from secret store plugin struct * Update secret store cache to implement interface * Set secret store cache value on get * Fix issues with sql secret store decryption cache * Increase clean up interval on cached secret store	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	3 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>	3 years ago
Michael Mandrus	d886141d69	Plugins: Refactor secrets plugin .proto file (#50722 ) * refactor .proto file according to prior PR suggestions * re-generate protobuf files and fix compilation errors * rename proto functions to be more descriptive	3 years ago
Joan López de la Franca Beltran	97baa6911d	Metrics: Expose functions to initialize counters at zero (#50122 )	3 years ago
Michael Mandrus	f376c33903	WIP: Add private Secret Manager Plugins support to plugin platform (#49544 ) * 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 * 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 * Update pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	3 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>	3 years ago
Tania	7a614fd8a1	Encryption: Stop decrypting EE encrypted secrets with legacy encryption (#50090 )	3 years ago
Joan López de la Franca Beltran	3e4b4dba46	Encryption: Enable envelope encryption by default (#49301 ) * Encryption: Enable envelope encryption by default * Stop relying on feature toggles from settings (deprecated) * Database encryption docs (envelope encryption) * Remove deprecated (and no longer used) FT * Apply suggestions from code review Co-authored-by: Tania <yalyna.ts@gmail.com>	3 years ago
Joan López de la Franca Beltran	e43879e55d	Encryption: Add support for multiple data keys per day (#47765 ) * Add database migrations * Use short uids as data key ids * Add support for manual data key rotation * Fix duplicated mutex unlocks * Fix migration * Manage current data keys per name * Adjust key re-encryption and test * Modify rename column migration for MySQL compatibility * Refactor secrets manager and data keys cache * Multiple o11y adjustments * Fix stats query * Apply suggestions from code review Co-authored-by: Tania <yalyna.ts@gmail.com> * Fix linter * Docs: Rotate data encryption keys API endpoint Co-authored-by: Tania <yalyna.ts@gmail.com>	3 years ago

1 2

77 Commits (719f6bc5200402a12448af93a9e39e19bec4186d)