grafana

Commit Graph

Author	SHA1	Message	Date
Karl Persson	1b933ff3ed	RBAC: Move resource permissions store to service package (#53815 ) * Rename file to store * Move resource permission specific database functions to resourcepermissions package * Wire: Remove interface bind * RBAC: Remove injection of resourcepermission Store * RBAC: Export store constructor * Tests: Use resource permission package to initiate store used in tests * RBAC: Remove internal types package and move to resourcepermissions package * RBAC: Run database tests as itegration tests	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
Emil Tullstedt	cc777e175e	Chore: Panic! in the Logs (#53664 )	3 years ago
idafurjes	da72a4ed2e	Chore move Filter to user service (#53588 )	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
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
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	20f4191e56	Chore: Add user service method ChangePassword (#53303 ) * Chore: Add user service method ChangePassword * Fix lint	3 years ago
Kyle Brandt	643d2bc890	Chore: Sql store split for legacy alerting (#52901 ) Moves ~20 sqlstore methods for legacy alerting out of sqlstore (sqlstore.Store interface) and into alerting.	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	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
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	38bcd37fba	Encryption: Move secrets migrations into secrets.Migrator (#51014 )	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
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>	3 years ago
Serge Zaitsev	0b55c41d05	Chore: Remove global bus variable (#50765 ) * Chore: Remove global bus variable * fix bus in tests	3 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	3 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	3 years ago
Kat Yang	3c3039f5b3	Chore: Remove Wrap (#50048 ) * Chore: Remove Wrap and Wrapf * Fix: Add error check	3 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>	3 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>	3 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>	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	5645d7a5e3	Encryption: Fix b64 encoding on CLI secretsmigrations commands (#49340 )	3 years ago
Joan López de la Franca Beltran	6c4eae710f	Encryption: Split database transactions within migration/rollback commands (#48394 )	3 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	3 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	3 years ago
Serge Zaitsev	e86b6662a1	Chore: Remove bus.Bus field (#47695 ) * Chore: Remove bus.Bus field * fix integration test	3 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>	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
Ryan McKinley	bb86ba99ee	Heatmap: new panel based based on uPlot (#44080 ) Co-authored-by: Leon Sorokin <leeoniya@gmail.com>	3 years ago
Sofia Papagiannaki	6a38ce2307	Resolve depedency cycle (#45427 )	3 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>	3 years ago
Kat Yang	7abd372e68	Chore: Remove bus from commands service (#45177 )	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	f8105efff3	Encryption: CLI rollback command (#43935 ) * Encryption: CLI rollback command * Update flag reference to 'featuremgmt' pkg * Update feature toggles usage * Clean up data keys table after envelope encryption rollback	3 years ago
Ryan McKinley	7ee38af95a	FeatureToggls: remove IsFeatureToggleEnabled from SettingsProvider (#44574 )	3 years ago
Ryan McKinley	5d66194ec5	FeatureFlags: define features outside settings.Cfg (take 3) (#44443 )	3 years ago
Guilherme Caulada	29268483c2	HTTPServer: Implement named middlewares (#44231 ) * Implement named middlewares on http server * Fix minor ordering issue with named middlewares	3 years ago
idafurjes	30aa24a183	Chore: Implement OpenTelemtry in Grafana (#42674 ) * Separate Tracer interface to TracerService and Tracer * Fix lint * Fix:Make it possible to start spans for both opentracing and opentelemetry in ds proxy * Add span methods, use span interface for rest of tracing * Fix logs in tracing * Fix tests that are related to tracing * Fix resourcepermissions test * Fix some tests * Fix more tests * Add TracingService to wire cli runner * Remove GlobalTracer from bus * Renaming test function * Remove GlobalTracer from TSDB * Replace GlobalTracer in api * Adjust tests to the InitializeForTests func * Remove GlobalTracer from services * Remove GlobalTracer * Remove bus.NewTest * Remove Tracer interface * Add InitializeForBus * Simplify tests * Clean up tests * Rename TracerService to Tracer * Update pkg/middleware/request_tracing.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Initialize tracer before passing it to SQLStore initialization in commands * Remove tests for opentracing * Set span attributes correctly, remove unnecessary trace initiliazation form test * Add tracer instance to newSQLStore * Fix changes due to rebase * Add modified tracing middleware test * Fix opentracing implementation tags Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563 )	3 years ago
idafurjes	c80e7764d8	Chore: Remove Dispatch and AddHandler (#42603 ) * Remove Dispatch * Remove context.TODO() * Remove AddHandler and Dispatch	4 years ago
Joan López de la Franca Beltran	5183cc4dc4	Store 'alertmanager_configuration' as JSON string instead of raw bytes (#42443 )	4 years ago
idafurjes	725dbf8d95	Chore: Add context to datasource service (#42294 ) * Add context to datasource service * Adjust wire for ShouldBeReported method * Replace inTransactionCtx	4 years ago
sam boyer	fc3ed34b22	Add basic resource trimming command (#41780 ) * Add basic trim command * Indent properly * Actually apply defaults if the user asks for it	4 years ago
Joan López de la Franca Beltran	0c280319af	Envelope encryption CLI migration command (#41454 ) * Working version of migrate secrets CLI command * Move user oauth info encryption away from db transaction * Enable a mechanism for re-use db session on encryption * De-duplicate shared code between db and runner commands * Set up Wire build graph * Remove enterprise Wire set * Fix cylic dependency: sqlstore.DBSession <-> xorm.Session * Minor fix (add missing base64 encoding) * Extract CLI 'secrets-migration' commands from 'data-migration' ones * Move runner package outside commands * Update Makefile (gen-go path) * Minor prettier fix * Some minor XORM related refactors * Include new Wire enterprise file into .gitignore * Update Wire deps Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com> Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>	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
Ryan McKinley	1aac13e5d0	MarketTrend: rename to candlestick panel (#41582 )	4 years ago
ying-jeanne	54de1078c8	remove the global log error/warn etc functions (#41404 ) * remove the global log error/warn etc functions and use request context logger whenever possible	4 years ago

1 2 3 4 5 ...

486 Commits (eb4266a85e0097fad84ec907ed84b571aad0769f)