1613 Commits (ab6cf9e94de7e1a0811bf2eb48cdbde6136448d9)

Author	SHA1	Message	Date
Sofia Papagiannaki	4ff0f006dd	SQLstore: Fix fetching an inexistent playlist response (#51962) ... * SQLstore: Fix fetching and deleting an inexistent playlist xorm's session.Get() does not return an error if the raw does not exist. It returns a boolean instead. The playlist `sqlstore.GetPlaylist()` used to check only the error and in case of inexistent UID didn't return an error.	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
Matthew Jacobson	434e94ef2b	Alerting: Update default route groupBy to [grafana_folder, alertname] (#50052) ... * Alerting: Update default route groupBy to [grafana_folder, alertname] Default group by for new routes and migrations is now [grafana_folder, alertname]	4 years ago
Jguer	9ab210a7d7	ServiceAccounts: Don't create new orgs for service accounts (#51819) ... * Org: use constants for status codes * ServiceAccounts: Avoid creating new orgs for service accounts * Document createUserBehavior * Update pkg/services/sqlstore/org_users_test.go * add doc string to flag	4 years ago
Eric Leijonmarck	0f919671e7	Service accounts: Add service account to teams (#51536) ... * Revert "Serviceaccounts: #48995 Do not display service accounts assigned to team (#48995)" This reverts commit cbf71fbd7f. * fix: test to not include more actions than necessary * adding service accounts to teams - backend and frontend changes * also support SA addition through the old team membership endpoints * fix tests * tests * serviceaccounts permission tests * serviceaccounts permission service tests run * added back test that was removed by accident * lint * refactor: add testoptionsTeams * fix a bug * service account picker change * explicitly set SA managed permissions to false for dash and folders * lint * allow team creator to list service accounts Co-authored-by: IevaVasiljeva <ieva.vasiljeva@grafana.com>	4 years ago
Ieva	75873d05d7	Access Control: Allow dashboard admins to query org users (#51652) ... * allow dashboard admins to query org users * rename one more variable	4 years ago
Sven Grossmann	b7e22c37a8	UsageStats: fixed elasticsearch version number to semver (#49054) ... * UsageStats: fixed elasticsearch version number - The version numbering was changed from plain numbers to a semver-ish approach * added missing version assertion * adapted tests	4 years ago
Kristin Laemmert	9de00c8eb2	chore/backend: move dashboard errors to dashboard service (#51593) ... * chore/backend: move dashboard errors to dashboard service Dashboard-related models are slowly moving out of the models package and into dashboard services. This commit moves dashboard-related errors; the rest will come in later commits. There are no logical code changes, this is only a structural (package) move. * lint lint lint	4 years ago
Jguer	6d0261263c	ServiceAccounts: Add Service Account Token last used at date (#51446) ... * ServiceAccounts Add api key last used at * ServiceAccounts: LastUpdateAt tests	4 years ago
idafurjes	6c43eb0b4d	Split Create User (#50502) ... * Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2	4 years ago
Emil Tullstedt	7d815a1db5	Alerting: Use google/uuid instead of gofrs/uuid (#51242)	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
Jguer	0689c5839a	Auth: Add option for case insensitive login (#49262) ... * add case insensitive option * treat id as case insensitive * Users: Add integration tests for case insensitive querying * Prefer config struct to global variable * change key to case_insensitive_login * impede conflicting users from logging in * add tests for impeding user retrieval if conflicting * nits and picks Co-authored-by: gamab <gabi.mabs@gmail.com> * Add check in transaction for conflicting user Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * add update tests * skip on mysql * add custom messages for user admin view Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * nit: extra else * linting mistake Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Ezequiel Victorero	4c4d6fd425	PublicDashboards: collect stats for public dashboards (#50553) ... * PublicDashboards: collect stats for public dashboards	4 years ago
owensmallwood	1802cc8aca	Add correct table definition for migrations for old dashboard_public schema (#51292) ... Co-authored-by: Jesse Weaver <jesse.weaver@grafana.com>	4 years ago
Jeff Levin	d076bedb5e	public dashboards: finalize db schema & v1 feature complete (#50467) ... This PR completes public dashboards v1 functionality and simplifies public dashboard conventions. It exists as a large PR so that we are not making constant changes to the database schema. models.PublicDashboardConfig model replaced with models.PublicDashboard directly dashboard_public_config table renamed to dashboard_public models.Dashboard.IsPublic removed from the dashboard and replaced with models.PublicDashboard.isEnabled Routing now uses a uuid v4 as an access token for viewing a public dashboard anonymously, PublicDashboard.Uid only used as database identifier Frontend utilizes uuid for auth'd operations and access token for anonymous access Default to time range defined on dashboard when viewing public dashboard Add audit fields to public dashboard Co-authored-by: Owen Smallwood <owen.smallwood@grafana.com>, Ezequiel Victorero <ezequiel.victorero@grafana.com>, Jesse Weaver <jesse.weaver@grafana.com>	4 years ago
gotjosh	90646e7f41	Alerting: Don't stop the migration when alert rule tags are invalid (#51253) ... * Alerting: Don't stop the migration when alert rule tags are invalid As we migrate we expect the `alertRuleTags` on a dashboard alert to be a JSON object. However, it seems this is not really validated by Grafana and an user can change the format to something else that the JSON parser is not able to marshal into a `map[string]string`. Let's do a bit better by "attempting" to parse the tags and if we can't we'll simple return an empty map. The data is still there so if the user wishes they can go back, fix the data and attemp the migration again.	4 years ago
Yuriy Tseretyan	4d02f73e5f	Alerting: Persist rule position in the group (#50051) ... Migrations: * add a new column alert_group_idx to alert_rule table * add a new column alert_group_idx to alert_rule_version table * re-index existing rules during migration API: * set group index on update. Use the natural order of items in the array as group index * sort rules in the group on GET * update the version of all rules of all affected groups. This will make optimistic lock work in the case of multiple concurrent request touching the same groups. UI: * update UI to keep the order of alerts in a group	4 years ago
Eric Leijonmarck	421f7a999a	Auth: Case insensitive ids duplicate usagestats (#50724) ... * WIP * update for prometheus * usagestats: tests pass for user duplicate entries * metrics: added duplicate user entries * usagestats: adds metrics gauge for duplicate users * usagestats: skip test for mysql * sql in oneplace * only use prometheus register to not panic * usagestats: RegisterMetricsFunc with loginstats * fix: remove unused commited code * refactor: move test to authinfoservice * Update pkg/models/stats.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * removed prometheus metrics, due to sql cpu requirement * Added: has_duplicate_user_entries and fix tests * remove unused test * fix: empty else statement removal * missing argument to authinfoservice Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Kristin Laemmert	72f934de01	backend/dashboardsnapshot service: move models (#50898) ... * backend/dashboard snapshots: refactor leftover models and mocks * Move all dashboard snapshot-related models into the dashboardsnapshotservice package * Remove leftover dashboard-related mocks from the mockstore	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
Alexander Zobnin	c4f0be7c8d	Service accounts: Migrate expired API keys (#50883)	4 years ago
Alexander Zobnin	f82264c2b1	ServiceAccounts: API keys migration (#50002) ... * ServiceAccounts: able to get upgrade status * Banner with API keys migration info * Show API keys migration info on Service accounts page * Migrate individual API keys * Use transaction for key migration * Migrate all api keys to service accounts * Hide api keys after migration * Migrate API keys separately for each org * Revert API key * Revert key API method * Rename migration actions and reducers * Fix linter errors * Tests for migrating single API key * Tests for migrating all api keys * More tests * Fix reverting tokens * API: rename convert to migrate * Add api route descriptions to methods * rearrange methods in api.go * Refactor: rename and move some methods * Prevent assigning tokens to non-existing service accounts * Refactor: ID TO Id * Refactor: fix error message * Delete service account if migration failed * Fix linter errors	4 years ago
Serge Zaitsev	ae9491c3a7	Chore: Make test tracer noop and return no errors (#50797)	4 years ago
Kristin Laemmert	a33a023629	backend: add PlaylistUIDs to Playlist; remove playlist IDs from API (#49609) ... * backend/api: refactor PlaylistId to PlaylistUid * Add org_id to Get and Update playlist functions Fix migration - no longer pad the uid; fix mysql syntax The relevant tests are passing using postgres, mysql and the default sqllite backends, but there are a number of other failing tests when using postgres and myself so I'm not entirely confident with those results. * fix bad query in GetPlaylistItem and add a test that would have caught the mistake in the first place. Reverted the playlist_uid column addition in playlist_item; it became unnecessary after this PR. Added default value to the new UID column based on PR feedback. * break this PRs migration into its own function * Playlists: Update UI to use the updated API Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	4 years ago
Kristin Laemmert	08c7a54c47	backend/sqlstore split: move dashboard snapshot funcs to dashboardsnapshotservice (#50727) ... * backend/sqlstore split: move dashboard snapshot funcs to dashboardsnapshotservice This commit moves the dashboard snapshot related sql functions in the dashboardsnapshots service. I split the dashboards package up so the interfaces live in dashboarsnapshots and the store and service implementations are in their own packages. This took some minor refactoring, but none of the actual underlying code has changed, just where it lives.	4 years ago
Serge Zaitsev	0b55c41d05	Chore: Remove global bus variable (#50765) ... * Chore: Remove global bus variable * fix bus in tests	4 years ago
Kat Yang	bd35e6917a	Chore: Exclude integration tests from running on test-backend step (#50359) ... * Chore: Exclude integration tests from running on test-backend step * Remove -v from go test command * Add check to skip integration tests before each integration test * Try to restart pipeline * Retrying to make pipeline run	4 years ago
Gabriel MABILLE	307a0d4538	RBAC: Inheritance permission migration should handle empty managed roles (#50611) ... * Make inheritance permission migration more robust * Better fix * Add more tests to the migration * Add removed test case * Add test case for empty role in empty org * Handling the role.ID 0 case with a log Co-authored-by: Jguer <joao.guerreiro@grafana.com> Co-authored-by: Jguer <joao.guerreiro@grafana.com>	4 years ago
George Robinson	0bd12ab531	Alerting: Fix force_migration when alerting is disabled (#50431) ... * Alerting: Fix force_migration when alerting is disabled This commit fixes a bug where force_migration must be set to true when both unified and legacy alerting is disabled. * Update comment * Fix typo in comment Co-authored-by: Armand Grillet <armand.grillet@outlook.com>	4 years ago
Joe Blubaugh	30f035ca34	Alerting: Improve Unified Alerting Rollback Warning (#50470) ... After migrating to unified alerting, users must explicitly allow rolling back to legacy alerting by setting force_migration = true in config. This updates the panic message to clarify why that's required and what the consequences of rolling back will be. Fixes #50469	4 years ago
Gabriel MABILLE	2813e49842	RBAC: Fix migrations running into the wrong order (#50452) ... Co-authored-by: Kalle Persson <kalle.persson@grafana.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	4 years ago
idafurjes	e9f8d582c8	Chore: Remove dashboard version from models (#50287) ... * Remove dashbpard version from models * Fix lint * Fix api & sqlstore tests * Remove integration tags * Fix lint again * Add integration test to correct namespace * Lont fix 2 * Change Id to ID in dashVersionMeta	4 years ago
Dan Cech	9350ab781c	clean up duplicated user creation code (#50178) ... * clean up duplicated user creation code * remove unused duplicate getOrCreateOrg function * fix up tests	4 years ago
Kat Yang	31630edf0c	Chore: Remove Wrapf (#50128) ... * Chore: Remove Wrapf * Remove all Wrapf refs * Remove last Wrapf ref * Fix lint errors * Remove Wrap and Wrapf definitions * Remove unnecessary colon	4 years ago
Ieva	7c800421d3	RBAC: change migration logic (#50187) ... * change migration logic * linting * linting * fix an issue with the migration logic * make tests runnable against other DBs Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	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
Joan López de la Franca Beltran	219e848e73	SQLStore: Prevent migration_id duplicates (#47774) ... * SQLStore: Prevent migration_id duplicates * Migrations: Remove non-executed migration (duplicated id) Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Joan López de la Franca Beltran	5f1305d280	SQLStore: Add deprecation comments for breaking migrations (#49740) ... * Migrator: Extend support to rename columns * SQLStore: Add deprecation comments for breaking migrations	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
Kat Yang	3c3039f5b3	Chore: Remove Wrap (#50048) ... * Chore: Remove Wrap and Wrapf * Fix: Add error check	4 years ago
Jeff Levin	52ed651958	public dashboards: insert default public dashboard config into database on save (#49131) ... This PR adds endpoints for saving and retrieving a public dashboard configuration and and api endpoint to retrieve the public dashboard. All of this is highly experimental and APIs will change. Notably, we will be removing isPublic from the dashboard model and moving it over to the public dashboard table in the next release. Further context can be found here: https://github.com/grafana/grafana/pull/49131#issuecomment-1145456952	4 years ago
Ryan McKinley	d452322aa8	Search (SQL): support dashboardUID query parameter (#50121)	4 years ago
Kristin Laemmert	0e991461b0	backend/sqlstore: move GetDashboardTags to dashboard service (#50091) ... + removing some functions that were already copied to the dashboard service in a previous pr.	4 years ago
idafurjes	bdf50f3dd2	Dashboards: Split GetDashboardVersions method (#49967) ... * Split GetDashboarVersions method * Add sqlstore dialect and tests * Fix signature of PAtchPreference * Add GetDialect to sqlstore and remove GetDashboardVersions * Add GetDialect to db interface * Implement List * add deleted test function * Remove GetDialect from sqlstore interface * Remove deleted method from mock * Refactor test	4 years ago
Ieva	5dbea9996b	RBAC: Make RBAC action names more consistent (#49730) ... * update action names * correctly retrieve teams for signed in user * remove test * undo swagger changes * undo swagger changes pt2 * add migration from old action names to the new ones * rename from list to read * linting * also update alertign actions * fix migration	4 years ago
Kat Yang	c63ebc887b	Chore: Run integration tests without grabpl (#49448) ... * Chore: Run integration tests without grabpl * Add new step for integration tests in lib.star * Remove old integration test step from lib.star * Change drone signature * Fix: Edit starlark integration step to not affect enterprise * Remove all build tags & rename starlark integration test step * Resync .drone.yml with .drone.star * Fix lint errors * Fix lint errors * Fix lint errors * Fix more lint errors * Fix another lint error * Rename integration test step * Fix last lint error * Recomment enterprise step * Remove comment from Makefile Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	4 years ago
Kristin Laemmert	2edfbb7767	sqlstore split: dashboard permissions (#49962) ... * backend/sqlstore split: remove unused GetDashboardPermissionsForUser from sqlstore * remove debugging line * backend/sqlstore: move dashboard permission related functions to dashboard service	4 years ago
Karl Persson	bdff63d4a8	RBAC: Include alert.rules action when setting folder permissions (#49946) ... * Generate additional actions when setting folder permissions in acl list * Add migration for managed folder permissions to include alert rule actions	4 years ago
Karl Persson	f4f25d911b	add migrator to drop folder create actions that was set fromt he folder (#49878)	4 years ago