grafana

Commit Graph

Author	SHA1	Message	Date
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
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
Yasir Ekinci	c41f97029e	Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62328 ) * Plugins: test ds.JsonData.MarshalJSON() * CustomOptions: copy to avoid cyclic marshal	2 years ago
Stephanie Hingtgen	3b718a3e8f	Plugins: enable the plugin sdk to get the json data for all datasources (#61729 )	2 years ago
Jo	dcfeab2c73	AuthN: User Quota (#61540 ) * remove reqContext from quota checks in login * add guards for nil ScopeParams	2 years ago
Sven Grossmann	386faf5958	OpenSearch: Use `aoss` servicename if OpenSearch is configured as `serverless` (#60344 ) * Use `aoss` if opensearch is configured as `serverless`	2 years ago
Kyle Brandt	55d2d872ec	Chore: Missed deprecations due to overly broad lint exclusion (#59732 )	2 years ago
Zoltán Bedi	d65899de7b	SQL Datasources: Move database setting to jsonData (#58649 ) * Datasource settings: Add deprecation notice for database field * SQL Datasources: Migrate from settings.database to settings.jsonData.database * Check jsonData first * Remove comment from docs	2 years ago
Will Browne	0fca3cf9dd	Datasources: Use context logger in cache service (#59547 )	3 years ago
Sasha Melentyev	c02003af3c	Refactor time durations (#58484 ) This change uses `time.Second` in place of `1000 * time.Millisecond` and `time.Minute` in place of `60*time.Second`.	3 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
Selene	ba6c715708	Chore: Delete unused db in orgs and use db in datasources (#57085 ) * Delete unused db in orgs and use db in datasources * Sort imports	3 years ago
Gabriel MABILLE	7595ed0668	FIX: Remove RBAC datasource permissions upon datasource deletion (#56530 ) * FIX: Remove RBAC datasource permissions upon datasource deletion * Use scope provider instead * Fix test	3 years ago
Ieva	6d5bdf12e8	resolve merge conflicts (#55503 )	3 years ago
George Robinson	c4d32dd687	Fix nil logger in SqlStore (#54726 )	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
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
Jo	062d255124	Handle ioutil deprecations (#53526 ) * replace ioutil.ReadFile -> os.ReadFile * replace ioutil.ReadAll -> io.ReadAll * replace ioutil.TempFile -> os.CreateTemp * replace ioutil.NopCloser -> io.NopCloser * replace ioutil.WriteFile -> os.WriteFile * replace ioutil.TempDir -> os.MkdirTemp * replace ioutil.Discard -> io.Discard	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
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
Todd Treece	b5d57c45e3	Plugins: Add support for HTTP logger (#46578 )	3 years ago
George Robinson	91fd0223a4	Datasources: Allow configuration of the TTL (#52161 )	3 years ago
Michael Mandrus	dfc7a98d87	add comments (#52124 )	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
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
Sergey Kostrukov	2d3cc26aa8	Prometheus: Remove Azure code from datasource service (#50737 ) Ref #35857	3 years ago
Kevin Lewin	5aab95885f	Alertmanager: Adding SigV4 Authentication to Alertmanager Datasource (#49718 ) * adding sigv4 alertmanager * adding sigv4 alertmanager * ConfigEditor: Adding Render Prop	3 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>	3 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	3 years ago
Sergey Kostrukov	2b83cf4618	Prometheus: Predefined scopes for Azure authentication (#49557 ) * Predefined scopes for Azure Prometheus * Allow override of audience	3 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	3 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	3 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	3 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	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
Ieva	68ca5b2e05	Access control: refactor RBAC checks (#48107 ) * refactor RBAC checks * fix a test * another test fix * and another	3 years ago
Serge Zaitsev	e86b6662a1	Chore: Remove bus.Bus field (#47695 ) * Chore: Remove bus.Bus field * fix integration test	3 years ago
Serge Zaitsev	18e93c7077	Chore: Remove bus (#47511 ) * Chore: Remove bus * remove unused const	3 years ago
Sergey Kostrukov	5675496f6b	Migrate to Grafana Azure SDK (#47232 )	3 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	3 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>	3 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>	3 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>	3 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	3 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	3 years ago

1 2

53 Commits (e2af8aa53b3522a393b920dc910e93ae4189473b)