194 Commits (a52999a8863500690aed49ff8506eba1ce9be80e)

Author	SHA1	Message	Date
Andres Martinez Gotor	45e478182b	grafana-cli: update plugins ls command (#63492)	3 years ago
Jo	f9163351fd	Support bundles: Refactor registry into separate service (#62945) ... * add bundle registry service to avoid dependency cycles * move user support bundle collector to user service * move usage stat bundle implementation to usage stats * add info for background service * fix remaining imports * whitespace	3 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	3 years ago
idafurjes	cbc10f9c5d	Chore: Delete password and search from models package (#62482) ... * Chore: Delete password and search from models package * Rename model to AdminCreateUserResponse	3 years ago
Serge Zaitsev	aebcecf538	Chore: Fix goimports grouping in other backend platform packages (#62422) ... * fix goimports * fix goimports order * fix goimports order * fix goimports order * fix goimports order * fix goimports order	3 years ago
idafurjes	f2ffce4351	Chore: Move team models to models pkg (#61262) ... * Chore: Move team models to models pkg * Fix ACL tests * More ACL tests * Change Id to ID in conflict user command test * Remove team from models * Fix ac test lint	3 years ago
Dan Cech	9c4051bfa1	Switch grafana server command to use urfave/cli/v2 (#60684) ... * switch grafana server to use urfave/cli/v2 * autocomplete support * lint fix	3 years ago
Kristin Laemmert	c90756eef5	feat(grafana-cli): allow configuring admin ID for reset-admin-password (#60603) ... * feat(grafana-cli): add a flag to control the admin user's ID for reset-admin-password Since this is now more permissive, I've also added validation that the requested user is an admin. * slight refactor to support testing	3 years ago
Kristin Laemmert	70fbf47022	chore: remove CreateUser from sqlstore & replace with userService.CreateUserForTests (#59910)	3 years ago
idafurjes	4ec08c4317	Chore: Delete DeleteUserInSession from sqlstore (#59275) ... * Remove DeleteUser from sqlstore * Use Delete instead of DeleteUser * Remove unused method * Remove DeleteUserSession from sqlstore * Add fake for DeleteUseraccessControl * Use user service, add fakes to tests * Add comments to sqlstore * Correct typo * Add quota service initialisation * Add config to acimpl initialisation * Add routing to initialisation * Making user provideStore private * Use InTransaction instead of session * Add cfg to userimpl * Fix lint * Make ProvideStore public again - enterprise tests * Fix back ProvideStore to public * Wrap merge user in transaction * Delete DeleteUserAccessControl use DeleteUSerPermissions instead * Add feature mgmt into acimpl * DeleteUserAccessControl from ac database * Remove case insensitive clause	3 years ago
Eric Leijonmarck	8a0e0584ba	Auth: Add caseinsensitive check for ingestion command (#59129) ... add: check for caseinsensitive configuration and have that on during ingestion	3 years ago
Dan Cech	de99ce139c	Server: Switch from separate server & cli to a unified grafana binary (#58286) ... * avoid the need for a second bulky binary for grafana-cli * look for grafana-server in $PATH as well as same directory * implement unified "grafana" command * update dockerfiles, fix grafana-cli -v * update packaging to work with single binary - add wrapper scripts for grafana and grafana-server - update and sync package files - implement --sign flag of build package command - stop packaging scripts folder, they are not useful for end users - add support for --configOverrides in server command - remove unused nfpm.yaml config file * windows support	3 years ago
Eric Leijonmarck	2a6ed76e54	[Docs] Edit terraform example and doc for file generation (#58822) ... * docs: update terraform example and doc for file generation * docs: updated the documnettaion to include the help command with fields included * Update pkg/cmd/grafana-cli/commands/commands.go * docs: add help command	3 years ago
Eric Leijonmarck	76947b10e2	Auth: conflicting users validation improvements (#58136) ... * WIP * add: better validation of conflict file * add: better description of validation and ingest command * add: check for at least one user to delete * add: example in terraform to setup for conflicts * Update pkg/cmd/grafana-cli/commands/conflict_user_command.go Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * Add: print of conflict block for error - adds conflict block to error output for validation of the file to easier diagnose in the file * fix: formatting of errors * fix: info strings improvements * add: default 0 to blocks to check for users * fixed: tests * test integration * fix strings fmt * set store in resolver Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>	3 years ago
idafurjes	50fb47dba0	Chore: Remove methods from sqlstore (#57545) ... * Remove methods from sqlstore * Remove commented out code * Remove GetUserById from tests * Adjust fake for get user profile * Adjust test * Adjust go mod files * Try fix test * Test adjustment * Adjust test 2 * Remove commented out code	3 years ago
Eric Leijonmarck	924d6a82a3	add: postgresql as a database for resolving conflicts (#57466)	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
Eric Leijonmarck	4200d7b246	Auth: fix check for conflict login in validation (#56154) ... * fix: check for conflict login * review comment fix	3 years ago
Sofia Papagiannaki	6099e55e62	SQLStore: Remove call to deleted `store.NewSession()` (#56025)	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
Eric Leijonmarck	1e8f8dff4b	Auth: Adds validation and ingestion of conflict file (#53014) ... * add users-manager command * add users-manager command * rename files * refactor: imports and renaming * Command: add conflict merge user command - MergeUser will - replace all user_ids from conflicting users to the chosen userId - delete users whose user_ids are not the chosen user - SameIdentification will - update chosen user with chosen email,login details - delete users whose user_ids are not the chosen user * refactor: clean up * refactor: create structure for read, validate, ingest * feat: ls and generate-file for conflicting users * remove usagestats * added back pkg/services/login/authinfoservice/database/stats.go * Revert "added back pkg/services/login/authinfoservice/database/stats.go" This reverts commit 2ba6e3c4d6. * Revert "remove usagestats" This reverts commit 1e3fa97810. * cherry pick * Revert "cherry pick" This reverts commit 461626c306. * validation of picked merge user * fix test * make lint * make test run * tests for ingest working * clean up and refactored to align with downstream refactoring * formatting * refactor: name list instead of ls * fix: static lint error use trimprefix * WIP: permissions for validation * fix: remove unused functions in sqlstore * fix: remove unused function * handling of multiple users and resolve discarded users * fix tests * fix: bug that did not exclude the blocks * ioutil is blacklisted * WIP: validation * tests for merging a user working * add latest changes to output print * refactor: removed conflictEmail and conflictLogin that was not used * refactor: code clean up, showChanges working * test and linting fixes * test and linting fixes * refactor: removed logging of config and added more info for vlidation command * refactor: fix order of code * fix time now * refactor: no longer need for check casesensitive login/email * removed unnessecary loop * refactor: move functions around * test: working * docs: add docuemntationf for file * Add failing test for generating the conflict login block * Fix regex * Fix some stuff/tests Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * add: docs for conflict file * add: conflict_email, conflict_login fields * add: conflict_email, conflict_login fields * WIP * fix: tests working as intended * Update pkg/cmd/grafana-cli/commands/conflict_user_command.go Co-authored-by: linoman <2051016+linoman@users.noreply.github.com> * review comments * Update pkg/cmd/grafana-cli/commands/conflict_user_command.go Co-authored-by: Misi <mgyongyosi@users.noreply.github.com> * Update pkg/cmd/grafana-cli/commands/conflict_user_command.go Co-authored-by: Misi <mgyongyosi@users.noreply.github.com> * missspelling * trailing new line * update to use userimpl store * remove newline * remove newline * refactor: initializing of resolver for conflicts * fix: test sqlStore * refactor: removed lines * refactor: remove TODOs Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com> Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>	3 years ago
Will Browne	26dfdd5af3	Plugins: Refactor plugin download/installation (#43046) ... * installer -> repo * add semver format checking * add plugin callbacks in test * remove newline * post install only scans new directories * remove unused stuff * everything in own package * add missing cli params * make grafana version part of the API * resolve conflicts * tidy up logger * fix cli and tidy log statements * rename log package * update struct name * fix linter issue * fs -> filestore * reorder imports * alias import * fix test * fix test * inline var * revert jsonc file * make repo dep of manager * actually inject the thing * accept all args for compatability checks * accept compat from store * pass os + arch vals * don't inject fs * tidy up * tidy up * merge with main and tidy fs storage * fix test * fix packages * fix comment + field name * update fs naming * fixed wire * remove unused func * fix mocks * fix storage test * renaming * fix log line * fix test * re-order field * tidying * add test for update with same version * fix wire for CLI * remove use of ioutil * don't pass field * small tidy * ignore code scanning warn * fix testdata link * update lgtm code	3 years ago
Eric Leijonmarck	cac3833b8e	Auth: Add cli command users-manager for conflict resolution (#52344) ... * add users-manager command * add users-manager command * rename files * refactor: imports and renaming * Command: add conflict merge user command - MergeUser will - replace all user_ids from conflicting users to the chosen userId - delete users whose user_ids are not the chosen user - SameIdentification will - update chosen user with chosen email,login details - delete users whose user_ids are not the chosen user * refactor: clean up * refactor: create structure for read, validate, ingest * feat: ls and generate-file for conflicting users * remove usagestats * added back pkg/services/login/authinfoservice/database/stats.go * Revert "added back pkg/services/login/authinfoservice/database/stats.go" This reverts commit 2ba6e3c4d6. * Revert "remove usagestats" This reverts commit 1e3fa97810. * cherry pick * Revert "cherry pick" This reverts commit 461626c306. * fix test * make lint * make test run * clean up and refactored to align with downstream refactoring * formatting * refactor: name list instead of ls * fix: static lint error use trimprefix * fix: remove unused functions in sqlstore * fix: remove unused function * handling of multiple users and resolve discarded users * fix tests * fix: bug that did not exclude the blocks * ioutil is blacklisted * should not run tests for mysql * fix tests	3 years ago
Jo	ca72cd570e	Remove ioutil.ReadDir from usage (#53550) ... * add depguard rule for ioutil * replace ioutil.ReadDir with os.ReadDir * use legacy option in depguard supported in golangci-lint v1.40 * replace ioutil.ReadDir with os.ReadDir * return error for file info	3 years ago
idafurjes	20f4191e56	Chore: Add user service method ChangePassword (#53303) ... * Chore: Add user service method ChangePassword * Fix lint	3 years ago
idafurjes	fab6c38c95	Chore: Split get user by ID (#52442) ... * Remove user from preferences, stars, orguser, team member * Fix lint * Add Delete user from org and dashboard acl * Delete user from user auth * Add DeleteUser to quota * Add test files and adjust user auth store * Rename package in wire for user auth * Import Quota Service interface in other services * do the same in tests * fix lint tests * Fix tests * Add some tests * Rename InsertUser and DeleteUser to InsertOrgUser and DeleteOrgUser * Rename DeleteUser to DeleteByUser in quota * changing a method name in few additional places * Fix in other places * Fix lint * Fix tests * Chore: Split Delete User method * Add fakes for userauth * Add mock for access control Delete User permossion, use interface * Use interface for ream guardian * Add simple fake for dashboard acl * Add go routines, clean up, use interfaces * fix lint * Update pkg/services/user/userimpl/user_test.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Update pkg/services/user/userimpl/user_test.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Update pkg/services/user/userimpl/user_test.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Split get user by ID * Use new method in api * Add tests * Aplly emthod in auth info service * Fix lint and some tests * Fix get user by ID * Fix lint Remove unused fakes * Use split get user id in admin users * Use GetbyID in cli commands * Clean up after merge * Remove commented out code * Clena up imports * add back ) * Fix wire generation for runner after merge with main Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	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	4 years ago
Joan López de la Franca Beltran	38bcd37fba	Encryption: Move secrets migrations into secrets.Migrator (#51014)	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
Marcus Efraimsson	b47ec36d0d	CLI: Allow relative symlinks in zip archives when installing plugins (#50537) ... Earlier we only allowed symlinks in plugins starting with grafana- in zip archives when installing plugins using the grafana-cli. This changes so that symlinks in zip archives containing relative links to files in the zip archive are always allowed when installing plugins. The reasoning behind this is that Grafana per default doesn't load a plugin that has an invalid plugin signature meaning that any symlink must be included in the plugin signature manifest. Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	4 years ago
Serge Zaitsev	0b55c41d05	Chore: Remove global bus variable (#50765) ... * Chore: Remove global bus variable * fix bus in tests	4 years ago
sam boyer	8876d56495	schema: Migrate from scuemata to thema (#49805) ... * Remove crufty scuemata bits Buhbye to: cue/ dir with old definitions, CI steps for checking unnecessary things, and the original dashboard scuemata file. * Remove grafana-cli cue subcommand * Remove old testdata * Don't swallow errors from codegen * Small nits and tweaks to cuectx package * WIP - refactor pluggen to use Thema Also consolidate the embed.FS in the repo root. * Finish halfway rename * Convert all panel models.cue to thema * Rewrite pluggen to use Thema * Remove pkg/schema, and trim command * Remove schemaloader service and usages Will be replaced by coremodel-centric hydrate/dehydrate system Soon™. * Remove schemaloader from wire * Remove hangover field on histogram models.cue * Fix lint errors, some vestiges of trim service * Remove unused cuetsify cli command	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
Kat Yang	3c3039f5b3	Chore: Remove Wrap (#50048) ... * Chore: Remove Wrap and Wrapf * Fix: Add error check	4 years ago
sam boyer	be06d37a20	schema: Generate Go and Typescript from Thema coremodels (#49193) ... * Add go code generator for coremodels * Just generate the entire coremodel for now Maybe we'll need more flexibility as more coremodels are added, but for now this is fine. * Add note on type comment about stability, grodkit * Remove local replace directive for thema * Generate typescript from coremodel * Update pkg/coremodel/dashboard/addenda.go Co-authored-by: Ryan McKinley <ryantxu@gmail.com> * Update cuetsy to new release * Update thema to latest * Fix enum generation for FieldColorModeId * Put main generated object at the end of the file * Tweaks to generated Go output * Retweak back to var * Add generated coremodel test * Remove local replace statement again * Add Make target and call into cuetsy cmd from gen * Rename and comment linsrc for readability * Move key codegen bits into reusable package * Move body of cuetsifier into codegen pkg Also genericize the diffing output into reusable WriteDiffer. * Refactor coremodel generator to use WriteDiffer * Add gen-cue step to CI * Whip all the codegen automation into shape * Add simplistic coremodel canonicality controls * Remove erroneously committed test * Bump thema version * Remove dead code * Improve wording of non-canonicality comment Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	4 years ago
Ashley Harrison	970c395fb1	Cue: Use BarGauge, DashList and Gauge panel cue schemas (#49580) ... * user essentials mob! 🔱 * Wip * user essentials mob! 🔱 lastFile:public/app/plugins/panel/bargauge/module.tsx * user essentials mob! 🔱 * update betterer results file Co-authored-by: kay delaney <kay@grafana.com> Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> Co-authored-by: Joao Silva <joao.silva@grafana.com>	4 years ago
Josh Hunt	9092150143	Cue: Update Text, Stat, and Annolist panel cue schemas (#49479) ... * user essentials mob! 🔱 * user essentials mob! 🔱 * user essentials mob! 🔱 lastFile:public/app/plugins/panel/stat/types.ts * user essentials mob! 🔱 * user essentials mob! 🔱 * Use generate defaults, and fix a few remaining issues * Add annolist to dashboard dist plugins * minor fixes Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com> Co-authored-by: Joao Silva <joao.silva@grafana.com> Co-authored-by: Alexandra Vargas <alexa1866@gmail.com> Co-authored-by: sam boyer <sdboyer@grafana.com>	4 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>	4 years ago
Joan López de la Franca Beltran	5645d7a5e3	Encryption: Fix b64 encoding on CLI secretsmigrations commands (#49340)	4 years ago
Joan López de la Franca Beltran	6c4eae710f	Encryption: Split database transactions within migration/rollback commands (#48394)	4 years ago
sam boyer	ea96c42545	schemas: Update to cuetsy v0.0.1 (#48753) ... * Add explicit cuetsy annotations to all models.cue * Update to first cuetsy release * Clean up cuetsify a bit; remove unification * Update changes to news codegen output	4 years ago
Guilherme Caulada	2e9c38c951	Secrets: Add unified secrets table to reencryption (#48582) ... * Add secrets table to reencryption * Add updated column check for b64Secret reencryption * Use field values for b64Secret to clarify booleans	4 years ago
Serge Zaitsev	e86b6662a1	Chore: Remove bus.Bus field (#47695) ... * Chore: Remove bus.Bus field * fix integration test	4 years ago
sam boyer	60db643983	grafana-cli: Diff generated ts directly instead of relying on git (#45815) ... * Add diffing support to grafana-cli cue gen-ts * Rely on diff comparison in cuetsify pipeline step * Ignore *.gen.ts files with eslint * Chore: Fix lint `sdboyer/cuetsify-compare` (#45818) * Sync drone (cherry picked from commit 40645ab19e39ff9b0a12b7ebb13a4dc4c5e1d472) * Fix lint (cherry picked from commit c95ece983984432fea029335b2b729b09d76c7eb) * Sign drone Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>	4 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	4 years ago
Ryan McKinley	bb86ba99ee	Heatmap: new panel based based on uPlot (#44080) ... Co-authored-by: Leon Sorokin <leeoniya@gmail.com>	4 years ago
Sofia Papagiannaki	6a38ce2307	Resolve depedency cycle (#45427)	4 years ago
Sofia Papagiannaki	d718ee1918	SQLStore: Prevent concurrent migrations (#44101) ... * SQLStore: Prevent concurrent migrations * Hide behind a feature toggle * Configurable locking attempt timeout * Update docs/sources/administration/configuration.md Co-authored-by: Igor Suleymanov <radiohead@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	4 years ago
Kat Yang	7abd372e68	Chore: Remove bus from commands service (#45177)	4 years ago