grafana

Commit Graph

Author	SHA1	Message	Date
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
Jeremy Price	6dbb6408d4	Access Control: Add service accounts (#38994 ) * Add extra fields to OSS types to support enterprise * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Add CloneUserToServiceAccount * Adding LinkAPIKeyToServiceAccount * Handle api key link error * Better error messages for OSS accesscontrol * Set an invalid user id as default * Re-arrange field names * ServiceAccountId is integer * Better error messages Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Guilherme Caulada	a9faab6b09	Dashboard: Add week start option to global and dashboard preferences (#40010 ) * Add global week start option to shared preferences * Add default_week_start to configuration docs * Add week start option to dashboards * Add week start argument to tsdb time range parser * Fix strict check issues * Add tests for week start * Change wording on default_week_start documentation Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update week_start column to be a nullable field Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Update configuration to include browser option * Update WeekStartPicker container selector Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Add menuShouldPortal to WeekStartPicker to remove deprecation warning Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Add inputId to WeekStartPicker * Use e2e selector on WeekStartPicker aria-label * Simplify WeekStartPicker onChange condition * Specify value type on WeekStartPicker weekStarts * Remove setWeekStart side effect from reducer * Fix updateLocale failing to reset week start * Store week start as string to handle empty values Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>	4 years ago
gotjosh	2448123a65	Alerting: Remove invalid Slack URL as we migrate notification channels (#40344 ) * Alerting: Remove invalid Slack URL as we migrate notification channels Grafana will accept any type of utf8 valid string as the Slack URL and will simply fail as we try to deliver the notification of the channel. The Alertmanager will fail to apply a configuration if the URL of the Slack Receiver is invalid. This change takes that into account by removing the URL for the receiver as we migrate notification channels that do not pass the url validation. As we assume the notification was not being delivered to being with. * Add a log line when we modify the channel Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>	4 years ago
Yuriy Tseretyan	5836def6c2	Alerting: declare constants for __dashboardUid__ and __panelId__ literals (#39976 )	4 years ago
Joan López de la Franca Beltran	722c414fef	Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865 ) * Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	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
Tania B	62689ec804	Security: Add secrets service (#39418 ) * Add secrets service * Revert accidental changes in util encryption * Make minor changes Move functional options to models Revert renaming types to models * Add context * Minor change in GetDataKey * Use CreateDataKeyWithDBSession in CreateDataKey * Handle empty DEK name in DeleteDataKey * Rename defaultProvider * Remove secrets store service	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
Selene	02702eb82d	Extract search users functions into a service (#39002 ) * Extract search users to a new service * Fix wire provider * Fix common_test and remove RouteRegister * Remove old endpoints * Fix test * Add indexes to dashboards and orgs tables * Fix lint	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
Hugo Häggmark	fc73bc1161	LibraryElements: Enables creating library elements with specific UID (#39019 ) * LibraryPanels: Enables create/update library panels with specific UID * Chore: added check for uid length after PR comments * Refactor: creates IsShortUIDTooLong function * Refactor: adds UID to PATCH endpoint * Refactor: clarifies the patch code * Refactor: changes after PR comments	4 years ago
Sofia Papagiannaki	b56bf83c19	Alerting: Fix notification channel migration (#38983 )	4 years ago
Santiago	ae9343f8ae	Clear ngalert configuration table (#38940 )	4 years ago
Dan Cech	681de1ea89	add key/value store service (#36868 ) * add key/value store service * don't export kvStoreSQL, consumers should interact with KVStore & NamespacedKVStore * add del method, avoid ErrNotFound (#38627) * switch value column to medium text Co-authored-by: Alexander Emelin <frvzmb@gmail.com>	4 years ago
Tania B	6b7b9f5158	Chore: Remove global encryption calls from sqlstore (#38588 ) * Add encryption service * Add tests for encryption service * Inject encryption service into http server * Replace encryption global function usage in login tests * Refactor UpdatePluginSetting * Refactor EncryptSecureSettings * Fix wire.go * Refactor service initialization Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com> Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289 ) Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	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
gotjosh	f83cd401e5	Alerting: Send alerts to external Alertmanager(s) (#37298 ) * Alerting: Send alerts to external Alertmanager(s) Within this PR we're adding support for registering or unregistering sending to a set of external alertmanagers. A few of the things that are going are: - Introduce a new table to hold "admin" (either org or global) configuration we can change at runtime. - A new periodic check that polls for this configuration and adjusts the "senders" accordingly. - Introduces a new concept of "senders" that are responsible for shipping the alerts to the external Alertmanager(s). In a nutshell, this is the Prometheus notifier (the one in charge of sending the alert) mapped to a multi-tenant map. There are a few code movements here and there but those are minor, I tried to keep things intact as much as possible so that we could have an easier diff.	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	91cf062d0b	Alerting: fix conflicting folder and dashboard permissions during migration (#35967 ) * Alerting: Fix conflicting user and team permissions * Avoid duplicate perrmissions * Fix lint Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Sofia Papagiannaki	5e534d212c	Alerting: Fix alert permissions migration (#35869 ) * Alerting: Fix alert permissions migration for MySQL >= 5.7 and PostgreSQL * Do not use import struct	4 years ago
Sofia Papagiannaki	c997f646cc	Alerting: Fix alert migration RefID generation (#35667 ) * Alerting: Fix alert migration RefID generation if the alert has more than 26 conditions * Remove TODO comment * Make similar change under pkg/expr	4 years ago
Kyle Brandt	8a3d7b6446	Alerting: Increase alertmanager_conf column size if mysql (#35657 ) fixes #35583	4 years ago
Sofia Papagiannaki	423474325a	Alerting: fix postgres migration on conflict (#35556 )	4 years ago
Sofia Papagiannaki	8cda1f5153	Alerting: Allow rules with same title across folders (#35270 ) * Alerting: Allow rules with same title across folders * Add test	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	a23674ef99	Alerting: Migrate tags as labels and not annotations (#34990 ) 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	ad6648b649	Alerting: Do no hard fail on finding discontinued channels on migration (#34894 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
Hugo Häggmark	7204a64717	LibraryElements: Creates usage stats for panels and variables (#34476 ) * LibraryPanels: Adds usage collection * Refactor: renames Panel and Variable consts * Chore: initialize stats * Refactor: moves library element migrations to migration namespace	4 years ago
Ganesh Vernekar	95ee5f01b5	NGAlert: Do not pick a random default channel if no default exists (#34465 ) 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
Kyle Brandt	b987237c9b	Alerting: Remove UALERT_MIG env guard from dashboard rule migration (#34384 ) Rules/notifications/etc migration will now be activated with feature flag alone. When the feature flag is enabled dashboard alerts are migrated into the system. When the feature flag is removed, all migrated and newly created alerts in the new system are deleted.	4 years ago
David Parrott	bbb7bbf891	Alerting: Remove back end logic for supporting KeepLastState (#34242 ) * Removed back end logic for supporting KeepLastState * Map keep_state correctly in migrations	4 years ago
gotjosh	eb74994b8b	Alerting: Modify configuration apply and save semantics - v2 (#34143 ) * Save default configuration to the database and copy over secure settings	4 years ago
Owen Diehl	baca873a84	extracts alertmanager from DI, including migrations (#34071 ) * extracts alertmanager from DI, including migrations * includes alertmanager Run method in ngalert * removes 3s test shutdown timeout * lint	4 years ago
Kyle Brandt	3da8db7f3f	Alerting: Run table migrations regardless of feature flag and move out of service (#33996 )	4 years ago
Kyle Brandt	dc3e17ba5b	Alerting: Change rule migration to be based on feature flag (#33792 ) makes it so the feature flag can be turned on off, and the migration will be cleared and rerun. All existing NG alert rules, configuration settings, etc are removed when disabling the feature flag. for https://github.com/grafana/alerting-squad/issues/142 Co-authored-by: Sofia Papagiannaki <sofia@grafana.com>	4 years ago
Arve Knudsen	c2c1ec7d0f	Chore: Move from master to main branch (#33693 ) * Chore: Move from master branch to main Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * CI: Upgrade build pipeline tool to v2 Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	4 years ago
Kyle Brandt	57d46ea991	AlertingMigration: Separate info into multiple annos (#33641 )	4 years ago
Kyle Brandt	efe856ae4e	AlertingMigration: Create alert_rule_version entry (#33585 ) Create the alert rule version entry during the migration so it is consistent with rules created via api. for https://github.com/grafana/alerting-squad/issues/123	4 years ago
Kyle Brandt	c25eab4eda	AlertMigration: remove alert_rule UID db check (#33568 ) do not believe this is needed due to uniqueness promised by shortid lib since there is no provisioning yet. https://github.com/teris-io/shortid	4 years ago
Kyle Brandt	713260f6fa	Alerting: Remove datasource (name) from migration (#33544 ) no longer needed as of https://github.com/grafana/grafana/pull/33416 for https://github.com/grafana/alerting-squad/issues/126	4 years ago
Kyle Brandt	6c8ef2a9c2	Alerting: Alert Rule migration (#33000 ) * Not complete, put migration behind env flag for now: UALERT_MIG=iDidBackup * Important to backup, and not expect the same DB to keep working until the env trigger is removed. * Alerting: Migrate dashboard alert permissions * Do not use imported models * Change folder titles Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>	4 years ago

1 2 3 4 5 ...

337 Commits (681218275e36d5e3eb6934a82a9f3b420653886f)