grafana

Commit Graph

Author	SHA1	Message	Date
Grot (@grafanabot)	5a35850514	[v9.3.x] Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#66592 ) * Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#65577) * extract function * use context logger * put alert to general folder if folder is missing * move folderHelper init * add test * Update pkg/services/sqlstore/migrations/ualert/ualert.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> --------- Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> (cherry picked from commit `7b2f44762e`) * rename ID to Id and dashboards.Dashboard to models.Dashboard --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Horst Gutmann	64f074ca8d	[v9.3.x] CI: Update golangci-lint to 1.51.2 for Go 1.20 compatibility (#65506 ) [v9.3.x] Update golangci-lint to 1.51.2 for Go 1.20 compatibility	3 years ago
ismail simsek	ead3a002df	[v9.3.x] Expressions: Fixes the issue showing expressions editor (#62627 ) Expressions: Fixes the issue showing expressions editor (#62510) * Use suggested value for uid * update the snapshot * use __expr__ * replace all -100 with __expr__ * update snapshot * more changes * revert redundant change * Use expr.DatasourceUID where it's possible * generate files (cherry picked from commit `91221bc436`)	3 years ago
Grot (@grafanabot)	007110c599	[v9.3.x] Traces: Fix timestamp for database query traces (#61162 ) Traces: Fix timestamp for database query traces (#61109) (cherry picked from commit `e7b17cde47`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Grot (@grafanabot)	9f639403e6	[v9.3.x] Alerting: Prevent uid collision in migration when db is case-insensitive (#60835 ) Alerting: Prevent uid collision in migration when db is case-insensitive (#60494) * Alerting: Prevent short uid collision in legacy migration when db is case-insensitive Two factors come into play that cause sporadic uid conflicts during legacy alert migration: - MySQL and MySQL-compatible backends use case-insensitive collation. - Our short uid generator is not a uniform RNG and generates uids in such a way that generations in quick succession have a higher probability of creating similar uids. Normally we would be guaranteed unique short uid generation, however if the source alphabet contains duplicate characters (for example, if we use case-insensitive comparison) this guarantee is void. Generating even ~1000 uids in quick succession is nearly guaranteed to create a case-insensitive duplicate. (cherry picked from commit `570b62091c`) Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	3 years ago
Grot (@grafanabot)	25382580fe	[v9.3.x] RBAC: Handle edge case where there is duplicated acl entries for a role on a single dashboard (#59573 ) RBAC: Handle edge case where there is duplicated acl entries for a role on a single dashboard (#58079) * RBAC: Handle edge case where there is duplicated acl entries for a role on a single dashboard (cherry picked from commit `6aaf36776b`) Co-authored-by: Karl Persson <kalle.persson@grafana.com>	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
Ryan McKinley	5934407443	Storage: add an admin write flavor that can explicitly set the user/time (#58618 )	3 years ago
ying-jeanne	69b5a9c752	Chore: [Nested Folder] Add db migration at service start time (#58590 ) * add db migration at service start time * make changes for the 3 db * revert migrator * fix feature toggle check Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>	3 years ago
Alex Moreno	45facbba11	Alerting: Remove url based external alertmanagers config (#57918 ) * Remove URL-based alertmanagers from endpoint config * WIP * Add migration and alertmanagers from admin_configuration * Empty comment removed * set BasicAuth true when user is present in url * Remove Alertmanagers from GET /admin_config payload * Remove URL-based alertmanager configuration from UI * Fix new uid generation in external alertmanagers migration * Fix tests for URL-based external alertmanagers * Fix API tests * Add more tests, move migration code to separate file, and remove possible am duplicate urls * Fix edge cases in migration * Fix imports * Remove useless fields and fix created_at/updated_at retrieval Co-authored-by: George Robinson <george.robinson@grafana.com> Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>	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
Emil Tullstedt	1ba25b2baa	Preferences: Create indices (#48356 )	3 years ago
Ryan McKinley	eb1cc80941	Storage: include SQL implementation (#58018 )	3 years ago
Dan Cech	9ea6a43089	Build: clean up and document integration test convention (#58170 ) * clean up and document integration test convention * clarify integration test conventions * clean up integration tests that don't follow convention * mark testIntegration* functions as helpers to avoid confusion	3 years ago
Sofia Papagiannaki	5c973e58bd	Nested Folders: Add tests for store methods (#57662 ) * Nested Folders: Add store tests * Fix parent order * Fix update * skip tests! * Export test helpers for now	3 years ago
Eric Leijonmarck	fc1b647474	Auth: Add fixed repeat migration w. checks for subset of permissions (#58054 ) * add: added a repeat migration w. fixed checks for permissions * add: migration to migrations * refactor: fix migration instead of making a new one * fix: removed the old id * fix: keep old name but change id * add: migration for patched previous migration * add: migration from missing file	3 years ago
Alexander Weaver	ea8c5ce929	SQLStore: Create utility for bulk inserts (#57632 ) * Add batchsize to dialects * Some intermediary progress * Reflection-based implementation * Validate batch size * Implement a few simple tests * Fix linter error * Add debug message when falling back to default batch size	3 years ago
Alexander Weaver	0dfd78c88c	Attempt to preserve UID from migrated channel (#57639 )	3 years ago
Ryan McKinley	9149544086	Store: Add SQL tables for SQL based object store (dev mode only) (#57785 )	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
Kristin Laemmert	b346ae0310	feat: add new Folder table migration & define nested folder interfaces (#56882 ) * feat: add new Folder table migration Add a new folder table to support the Nested Folders feature. https://github.com/grafana/grafana/issues/56880 * register nested folders feature flag (unused) * feat: nested folder service (experiment) This commit adds a NestedFolderSvc interface and stubbed out implementation as an alternative to the existing folder service. This is an experimental feature to try out different methods for backwards compatibility and parallelization, so that Grafana can continue to store folders in the existing (non-nested) manner while also using the new nested folder service. Eventually the new service will (hopefully) become _the_ service, at which point the legacy service can be deprecated (or remain, with the new service methods replacing the original. whatever makes sense at the time). * nested folders: don't run the new migration This commit removes the nested folder migration from the list of active migrations so we can merge this branch and continue development without impacting Grafana instances built off main.	3 years ago
Ryan McKinley	a3acfb1a48	Chore: Register a feature flag for "newDBLibrary" (#57468 )	3 years ago
Karl Persson	7386f8652c	RBAC: Improve performance of dashboard filter query (#56813 ) * RBAC: Move UserRolesFilter to domain package * Dashboard Permissions: Rewrite rbac filter to check access in sql * RBAC: Add break when wildcard is found * RBAC: Add tests for dashboard filter * RBAC: Update tests * RBAC: Cover more test cases Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>	3 years ago
idafurjes	1bda67ab11	Chore: Delete unused mocks (#57512 ) * Chore: Delete unused mocks * Add back used methods * Add back used mocks 2 * Add back used mocks 3 * Add back used mocks 4 * Add back the alerting mocks * Remove mock variables * Add bacl needed mock var	3 years ago
owensmallwood	0b8fb543fc	Public Dashboards: Can toggle annotations in modal (#57312 ) adds toggle for pubdash annotations	3 years ago
Ryan McKinley	15517f8329	SQLX: Expose sqlxdb query functions (#57227 )	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	fa45742abc	Quota(fix): remove service accounts from quota count (#56700 )	3 years ago
Matthew Jacobson	0db339d82f	Alerting: Improve notification policies created during migration (#52071 ) * Alerting: Improve notification policies created during migration Previously, migrated legacy alerts were connected to notification policies through a `rule_uid` label in a 1:1 fashion. While this correctly mimicked pre-migration routing, it didn't create a notification policy structure that is easy to view/modify. In addition, having one policy per migrated alert is, in some ways, counter to the recommended approach of Unified Alerting. This change replaces `rule_uid`-based migrated notification policies with a private label called `__contacts__`. This label stores a list of double quoted strings containing the names of all contact points an AlertRule should route to (based on legacy notification channels). Finally, one notification policy is created per contact point with each matching AlertRules via regex on this `__contacts__` label. The result is a simpler, clearer, and easier to modify notification policy structure, with the added benefit that you can see which contact points an AlertRule is being routed to from the AlertRule creation page.	3 years ago
Sofia Papagiannaki	46fb4081ba	SQLStore: Optionally retry queries if sqlite returns database is locked (#56096 ) * SQLStore: Retry queries if sqlite returns database is locked * Configurable retries * Apply suggestions from code review Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>	3 years ago
Karl Persson	21792fdf37	RBAC: Make uid for managed role names deterministic during migrations (#56620 ) * RBAC: Change the generate uid function to be deterministic so we can avoid collision * RBAC: Use fmt.Errorf * RBAC: Add comment * RBAC: Export GenerateManagedRoleUID	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
idafurjes	ef651daed2	Use org service instead of sqlstore (#56407 ) * Use org service instead of sqlstore * Remove methods from sqlstore * Remove commented out code * Fix lint * Fix lint 2	3 years ago
Karl Persson	b1761908c2	RBAC: Add primary key to seed_assignment table (#56540 ) * RBAC: Add seed_assignment migrations from enterprise * RBAC: Create migration to add primary key to seed_assignment table	3 years ago
ying-jeanne	80ede174dd	update the feature toggle usage in backend (#56787 )	3 years ago
Yuriy Tseretyan	3487e68d15	Alerting: Fix migration to create rules with group index 1 (#56511 )	3 years ago
Yuriy Tseretyan	e2f1201382	Alerting: Fix migration to not add label "alertname" (#56509 ) * do not add label alertname because it is overridden in state manager anyway * update state manager to not consider labels with same value as dupe	3 years ago
Joe Blubaugh	b476ae62fb	Alerting: Write and Delete multiple alert instances. (#55350 ) Prior to this change, all alert instance writes and deletes happened individually, in their own database transaction. This change batches up writes or deletes for a given rule's evaluation loop into a single transaction before applying it. These new transactions are off by default, guarded by the feature toggle "alertingBigTransactions" Before: ``` goos: darwin goarch: arm64 pkg: github.com/grafana/grafana/pkg/services/ngalert/store BenchmarkAlertInstanceOperations-8 398 2991381 ns/op 1133537 B/op 27703 allocs/op --- BENCH: BenchmarkAlertInstanceOperations-8 util.go:127: alert definition: {orgID: 1, UID: FovKXiRVzm} with title: "an alert definition FTvFXmRVkz" interval: 60 created util.go:127: alert definition: {orgID: 1, UID: foDFXmRVkm} with title: "an alert definition fovFXmRVkz" interval: 60 created util.go:127: alert definition: {orgID: 1, UID: VQvFuigVkm} with title: "an alert definition VwDKXmR4kz" interval: 60 created PASS ok github.com/grafana/grafana/pkg/services/ngalert/store 1.619s ``` After: ``` goos: darwin goarch: arm64 pkg: github.com/grafana/grafana/pkg/services/ngalert/store BenchmarkAlertInstanceOperations-8 1440 816484 ns/op 352297 B/op 6529 allocs/op --- BENCH: BenchmarkAlertInstanceOperations-8 util.go:127: alert definition: {orgID: 1, UID: 302r_igVzm} with title: "an alert definition q0h9lmR4zz" interval: 60 created util.go:127: alert definition: {orgID: 1, UID: 71hrlmR4km} with title: "an alert definition nJ29_mR4zz" interval: 60 created util.go:127: alert definition: {orgID: 1, UID: Cahr_mR4zm} with title: "an alert definition ja2rlmg4zz" interval: 60 created PASS ok github.com/grafana/grafana/pkg/services/ngalert/store 1.383s ``` So we cut time by about 75% and memory allocations by about 60% when storing and deleting 100 instances.	3 years ago
idafurjes	bc7a383252	Remove org methods from sqlstore interface (#56358 ) * Remove org methods from sqlstore interface * Remove some mocks * Fix some tests	3 years ago
idafurjes	5167c55760	Chore: Move methods from sqlstore to user store (#56305 ) * Copy sqlstore methods to suer store * Adjust ProvideService signatures in test * Add xorm tags and tests for search * Remove methods from sqlstore * fix lint in tests	3 years ago
Ryan McKinley	3b1a8d45ed	Playlist: update service so it supports both read+write (#55959 )	3 years ago
idafurjes	a25516fbe3	Chore: Copy sqlstore methods to user store (#56280 ) * Chore: Copy sqlstore methods to user store * Fix xorm tag * Add tests * Remove unused methods from sqlstore	3 years ago
idafurjes	a863a4d95d	Chore: Copy user methods over to user store (#56000 ) * Chore: Copy user methods over to user store * Fix some tests and bugs * Add some more tests * Move tests to user store * Move back the tests * Add some tests	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
idafurjes	122e7c141d	Chore: Delete UpdateUser, ChangeUserPassword, UpdateLastSeenAt from sqlstore (#55928 )	3 years ago
idafurjes	a45ef61d25	Chore: Remove GetUserByEmail and GetUserByLogin from sqlstore (#55903 ) * Chore: Remove GetUserByEmail and GetUserByLogin from sqlstore Rename GetUserProfile to GetProfile * Fix lint * Skip test for mysql * Add missing method to sqlstore mock	3 years ago
idafurjes	56cfe02ca2	Chore: Remove methods from sqlstore interface (#55802 ) * Remove SearchOrgUsers from sqlstore interface * Remove RemoveOrgUser method from sqlstore interface * Delete RemoveOrgUser from sqlstore * Fix lint	3 years ago
Kristin Laemmert	701f6d5436	UserService: use the UserService instead of calling sqlstore directly (#55745 ) * UserService: update callers to use the UserService instead of calling sqlstore directly There is one major change hiding in this PR. UserService.Delete originally called a number of services to delete user-related records. I moved everything except the actual call to the user table, and moved those into the API. This was done to avoid dependencies cycles; many of our services depend on the user service, so the user service itself should have as few dependencies as possible.	3 years ago

1 2 3 4 5 ...

1741 Commits (a9873db0f94dea418511ecc953bc3d304ab95e3f)