57 Commits (3cfb7ac0ddec7ef200d6c9e6e39a933ccb6c44ab)

Author	SHA1	Message	Date
ismail simsek	3cfb7ac0dd	Chore: Remove expr imports (#64543) ... * Remove expr imports * Add comment	2 years ago
Yuri Tseretyan	f066e8cdcd	Alerting: Update to alerting 20230203015918-0e4e2675d7aa (after refactoring) (#62823) ... * add alerting prefix to some packages from alerting that have similar names in prometheus alertmanager	2 years ago
Serge Zaitsev	d6d4097567	Chore: Fix goimports grouping in alerting (#62424) ... * fix goimports * fix goimports order	2 years ago
Matthew Jacobson	8379a29b53	Alerting: Improve comments on alert table migration immutability (#62161) ... * Alerting: Improve comments around alert migration immutability * Reunite alerting config history migrations	2 years ago
Alexander Weaver	0e7640475f	Alerting: Store alertmanager configuration history in a separate table in the database (#60492) ... * Update config store to split between active and history tables * Migrations to fix up indexes * Implement migration from old format to new * Move add migrations call * Delete duplicated rows * Explicitly map fields * Quote the column name because it's a reserved word * Lift migrations to top * Use XORM for nearly everything, avoid any non trivial raw SQL * Touch up indexes and zero out IDs on move * Drop TODO that's already completed * Fix assignment of IDs	3 years ago
Matthew Jacobson	570b62091c	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.	3 years ago
Yuri Tseretyan	f990be58cb	Alerting: Use all notifiers from alerting repository (#60655)	3 years ago
Yuri Tseretyan	35090c376c	Alerting: Replace VictorOps receiver with the one from alerting repository (#60543) ... * replace victorops with one from alerting * update other usages	3 years ago
Yuri Tseretyan	f0cabe14d5	Alerting: import Grafana alerting package and update usages (#60490) ... * update remaining notifiers to use alerting package	3 years ago
Yuri Tseretyan	9ad45aedcf	Alerting: replace usage of simplejson to json.RawMessage in NotificationChannelConfig (#60423) ... * introduce alias for json.RawMessage with name RawMessage. This is needed to keep raw JSON and implement a marshaler for YAML, which does not seem to be used but there are tests that fail. * replace usage of simplejson with RawMessage in NotificationChannelConfig * remove usage of simplejson in tests * change migration code to convert simplejson to raw message	3 years ago
Alexander Weaver	91bd1cdb41	Revert "Alerting: Store alertmanager configuration history in a separate table in the database" (#60470) ... Revert "Alerting: Store alertmanager configuration history in a separate table in the database (#60197)" This reverts commit ec80f38c34.	3 years ago
Alexander Weaver	ec80f38c34	Alerting: Store alertmanager configuration history in a separate table in the database (#60197) ... * Update config store to split between active and history tables * Migrations to fix up indexes * Implement migration from old format to new * Move add migrations call * Delete duplicated rows * Explicitly map fields * Quote the column name because it's a reserved word * Lift migrations to top	3 years ago
Yuri Tseretyan	6637333748	Alerting: refactor notifiers to use package specific Logger interface (#60361) ... * introduce Logger interface local to channles + implementaton that wraps the Grafana logger * make NewFactoryConfig accept LoggerFactory * add logger field to FactoryConfig * update usages of log.Logger to internal interface	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
Yuriy Tseretyan	3487e68d15	Alerting: Fix migration to create rules with group index 1 (#56511)	3 years ago
Jean-Philippe Quéméner	f3a307778a	Alerting: cache general folder in migration based on org id (#55620)	3 years ago
Emil Tullstedt	b287047052	Chore: Upgrade Go to 1.19.1 (#54902) ... * WIP * Set public_suffix to a pre Ruby 2.6 version * we don't need to install python * Stretch->Buster * Bump versions in lib.star * Manually update linter Sort of messy, but the .mod-file need to contain all dependencies that use 1.16+ features, otherwise they're assumed to be compiled with -lang=go1.16 and cannot access generics et al. Bingo doesn't seem to understand that, but it's possible to manually update things to get Bingo happy. * undo reformatting * Various lint improvements * More from the linter * goimports -w ./pkg/ * Disable gocritic * Add/modify linter exceptions * lint + flatten nested list Go 1.19 doesn't support nested lists, and there wasn't an obvious workaround. https://go.dev/doc/comment#lists	3 years ago
Sofia Papagiannaki	ae101bf935	Alerting: Fix migration (#53253)	3 years ago
idafurjes	f5cace8bbd	Rename Acl to ACL (#52342) ... * Rename Acl to ACL * Fix yaml files * Add xorm tags and fix test	3 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	3 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>	3 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	3 years ago
George Robinson	3b7f871bf4	Alerting: Enable Unified Alerting for open source and enterprise (#49834) ... This commit enables Unified Alerting for open source and enterprise unless disabled in configuration.	3 years ago
Joe Blubaugh	12c25759da	Alerting: Attach screenshot data to Slack notifications. (#49374) ... This change extracts screenshot data from alert messages via a private annotation `__alertScreenshotToken__` and attaches a URL to a Slack message or uploads the data to an image upload endpoint if needed. This change also implements a few foundational functions for use in other notifiers.	3 years ago
Yuriy Tseretyan	00ef1acb93	Alerting: Create folder for alerting when start from the scratch (#48866) ... * create folderHelper struct	3 years ago
Jean-Philippe Quéméner	0a87ef06af	Alerting: add safeguard for migrations that might cause dataloss (#48526) ... * Alerting: add safeguard for migrations that might cause dataloss * add test for panic * add documentation	3 years ago
Matthew Jacobson	0301d956da	Alerting: Create fewer contact points on migration (#47291) ... * Alerting: Create fewer contact points on migration Previously a new contact point was created for every unique combination of channels attached to any legacy alert. This was very hard to maintain, requiring modifications in every generated contact point. This change deduplicates the generated contact points to a more reasonable state. There should now only be one contact point per legacy channel, and we attached multiple contact points to a route by nesting them. The sole exception to this is if there were multiple default legacy channels, in which case we create a redundant contact point containing all of them used only in the root policy. This allows for a much simpler notification policy structure. Co-authored-by: gotjosh <josue.abreu@gmail.com>	3 years ago
Matthew Jacobson	8972418113	Alerting: Add integration test for AddDashAlertMigration (#47730) ... * Alerting: Add integration test for AddDashAlertMigration * Add more targeted test cases * Apply suggestions from code review Co-authored-by: gotjosh <josue.abreu@gmail.com> * Reorganize file and improve comments * Replace custom sort+trim with go-cmp * Add test for AddDashAlertMigration * Rename test cases to standard format * Apply suggestions from code review Co-authored-by: gotjosh <josue.abreu@gmail.com> * Remove test-only snapshots of PostableUserConfig et al. * Organize imports * Fix linting Co-authored-by: gotjosh <josue.abreu@gmail.com>	3 years ago
Jean-Philippe Quéméner	e135b8531a	Alerting: refactor receiver validation to be reusable (#46103)	3 years ago
Serge Zaitsev	84a5910e56	Chore: Remove bus from ngalert (#44465) ... * pass notification service down to the notifiers * add ns to all notifiers * remove bus from ngalert notifiers * use smaller interfaces for notificationservice * attempt to fix the tests * remove unused struct field * simplify notification service mock * trying to resolve issues in the tests * make linter happy * make linter even happier * linter, you are annoying	3 years ago
Yuriy Tseretyan	ce0ef0ef5e	create only one folder per dashboard with acl (#44283)	3 years ago
Armand Grillet	6523486122	Alerting: Make Unified Alerting enabled by default for those who do not use legacy alerting (#42200) ... * update AlertingEnabled and UnifiedAlertingSettings.Enabled to be pointers * add a pseudo migration to fix the AlertingEnabled and UnifiedAlertingSettings.Enabled if the latter is not defined * update the default configuration file to make default value for both 'enabled' flags be undefined Misc * update Migrator to expose DB engine. This is needed for a ualert migration to access the database while the list of migrations is created. * add more verbose failure when migrations do not match Co-authored-by: gotjosh <josue@grafana.com> Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>	4 years ago
Tania B	5652bde447	Encryption: Use secrets service (#40251) ... * Use secrets service in pluginproxy * Use secrets service in pluginxontext * Use secrets service in pluginsettings * Use secrets service in provisioning * Use secrets service in authinfoservice * Use secrets service in api * Use secrets service in sqlstore * Use secrets service in dashboardshapshots * Use secrets service in tsdb * Use secrets service in datasources * Use secrets service in alerting * Use secrets service in ngalert * Break cyclic dependancy * Refactor service * Break cyclic dependancy * Add FakeSecretsStore * Setup Secrets Service in sqlstore * Fix * Continue secrets service refactoring * Fix cyclic dependancy in sqlstore tests * Fix secrets service references * Fix linter errors * Add fake secrets service for tests * Refactor SetupTestSecretsService * Update setting up secret service in tests * Fix missing secrets service in multiorg_alertmanager_test * Use fake db in tests and sort imports * Use fake db in datasources tests * Fix more tests * Fix linter issues * Attempt to fix plugin proxy tests * Pass secrets service to getPluginProxiedRequest in pluginproxy tests * Fix pluginproxy tests * Revert using secrets service in alerting and provisioning * Update decryptFn in alerting migration * Rename defaultProvider to currentProvider * Use fake secrets service in alert channels tests * Refactor secrets service test helper * Update setting up secrets service in tests * Revert alerting changes in api * Add comments * Remove secrets service from background services * Convert global encryption functions into vars * Revert "Convert global encryption functions into vars" This reverts commit 498eb19859. * Add feature toggle for envelope encryption * Rename toggle Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>	4 years ago
ying-jeanne	681218275e	remove crit and trace (#40320)	4 years ago
gotjosh	74fb491b6a	Alerting: Validate contact point configuration during migration to Unified Alerting (#40717) ... * Alerting: Validate contact point configuration during the migration This minimises the chances of generating broken configuration as part of the migration. Originally, we wanted to generate it and not produce a hard stop in Grafana but this strategy has the chance to avoid delivering notifications for our users. We now think it's better to hard stop the migration and let the user take care of resolving the configuration manually.	4 years ago
Yuriy Tseretyan	5836def6c2	Alerting: declare constants for __dashboardUid__ and __panelId__ literals (#39976)	4 years ago
George Robinson	935bd34a30	Panel ID annotation cannot be set without Dashboard UID (#40019)	4 years ago
George Robinson	2a4c1b1aa6	You can now get alert rules for a dashboard or a panel using /api/v1/rules endpoints. (#39476) ... Get alert rules for a dashboard and panel in /api/v1/rules	4 years ago
Sofia Papagiannaki	012d4f0905	Alerting: Remove `ngalert` feature toggle and introduce two new settings for enabling Grafana 8 alerts and disabling them for specific organisations (#38746) ... * Remove `ngalert` feature toggle * Update frontend Remove all references of ngalert feature toggle * Update docs * Disable unified alerting for specific orgs * Add backend tests * Apply suggestions from code review Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Disabled unified alerting by default * Ensure backward compatibility with old ngalert feature toggle * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com>	4 years ago
Yuriy Tseretyan	5d0d7dcb3a	Update migration to not delete existing Grafana alerts (#39541) ... * keep existing unified alert rules untouched * move silences and other alertmanager files to the organization directory (only if it is a single organization deployment) * assign the existing notification settings and routes to the first organization * create default notification settings for each organization in the case of multi org deployment	4 years ago
Sofia Papagiannaki	ba4242bdb9	Cleanup kv_store alertmanager namespace when disabling unified alerting (#39554)	4 years ago
Sofia Papagiannaki	81e82ebbbd	Alerting: fix the migrated silence file content (#39557)	4 years ago
Santiago	ae9343f8ae	Clear ngalert configuration table (#38940)	4 years ago
Sofia Papagiannaki	04d5dcb7c8	Alerting: modify DB table, accessors and migration to restrict org access (#37414) ... * Alerting: modify table and accessors to limit org access appropriately * Update migration to create multiple Alertmanager configs * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com> * replace mg.ClearMigrationEntry() mg.ClearMigrationEntry() would create a new session. This commit introduces a new migration for clearing an entry from migration log for replacing mg.ClearMigrationEntry() so that all dashboard alert migration operations will run inside the same transaction. It adds also `SkipMigrationLog()` in Migrator interface for skipping adding an entry in the migration_log. Co-authored-by: gotjosh <josue@grafana.com>	4 years ago
Ganesh Vernekar	10f8a138ae	Alerting: Deduplicate receivers during migration (#36812) ... * Alerting: Deduplicate receivers during migration Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix review comments Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Better naming of contact points Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Handle some edge cases Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Don't add routes which point to default contact point Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Sofia Papagiannaki	423474325a	Alerting: fix postgres migration on conflict (#35556)	4 years ago
Sofia Papagiannaki	15c55b0115	Alerting: Fix notification channel migration and handle case when Alertmanager default configuration is absent (#35086) ... * Fix dashboard alert and nootifier migration for MySQL * Fix POSTing Alertmanager configuration if no current configuration exists in case the default configuration has not be stored yet or has failed to get stored * Change CreatedAt field type	4 years ago
Ganesh Vernekar	aa4c5bbfe4	Alerting: Don't save Alertmanager config on migration when 0 channels (#35119) ... * Alerting: Don't save Alertmanager config on migration when 0 channels Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix review Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	7c25465b3a	Alerting: Migrate paused alerts to silences (#34898) ... * Alerting: Migrate paused alerts to silences Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix lint Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Ganesh Vernekar	e52f718a87	NGAlert: Migrate old notification channel config (#33846) ... * NGAlert: Migrate old notification channel config Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Copy the required structs and functions Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix lint Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix review comments and error on discontinued channels Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Use both ID and UID to map channels, attach UID to channels Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix lint Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Bug fixes Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Use alert table instead of dashboard for channel IDs Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Fix offline reviews: don't add empty receivers and routes, add receiver for unmigrated channels Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Handle multiple default channels, pick default from used channels Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Include default channels in all receivers Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago