Stephanie Hingtgen and GitHub
785072086c
Add event after datasource create ( #38467 )
...
* Add event after datasource create
2021-08-26 08:50:05 -05:00
+2
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 >
2021-08-25 15:11:22 +02:00
Travis Patterson and GitHub
32e11434da
Fire event after datasource delete ( #38090 )
2021-08-20 14:51:31 -06:00
Jason Stangroome and GitHub
28784935b8
Sort notification channels alphabetically ( #37426 )
...
Even without the ability to control the sort order or to filter, this notably improves usability for long lists of notification channels.
Partially fixes #20067 .
2021-08-19 22:49:14 +02:00
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 >
2021-08-12 16:04:09 +03:00
gotjosh and GitHub
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.
2021-08-06 13:06:56 +01:00
Ganesh Vernekar and GitHub
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 >
2021-07-29 15:56:19 +02:00
d51b2630c7
Auth: creates a hook in the user mapping flow ( #37190 )
...
* wip
* Auth Info: refactored out into it's own service
* Auth: adds extension point where users are being mapped
* Update pkg/services/login/authinfoservice/service.go
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com >
* Update pkg/services/login/authinfoservice/service.go
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com >
* Auth: simplified code
* moved most authinfo stuff to its own package
* added back code
* linter
* simplified
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com >
2021-07-29 10:18:42 +02:00
b96dd1877c
Folder API: optionally force deleting Grafana 8 alerts when deleting a folder (or error) ( #36427 )
...
* Folder API: Add an optional query parameter for allowing deleting a folder containing rules
* Update frontend
- Set forceDeleteRules=true when frontend deletes a folder
- Improve modal text
* Update docs
* Apply suggestions from code review
Co-authored-by: gotjosh <josue@grafana.com >
Co-authored-by: Nathan Rodman <nathanrodman@gmail.com >
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com >
2021-07-22 12:27:13 +03:00
Marcus Efraimsson and GitHub
11d03f7961
Chore: Use context.Context for the get home dashboard API endpoint ( #36735 )
...
Use context.Context for the get home dashboard API endpoint.
Ref #36734
2021-07-16 12:40:03 +02:00
Selene and GitHub
1c74bb3992
UsageStats: Extend usage stats for count permissions in folders and dashborads ( #36065 )
...
* Add usage stats for permissions for dashboards and folders
* Change double quotes for simple ones
2021-07-16 10:14:33 +02:00
Marcus Efraimsson and GitHub
ca2223f705
Database: Fix incorrect format of isolation level configuration parameter for MySQL ( #36565 )
2021-07-09 19:05:48 +02:00
Hugo Häggmark and GitHub
44c48ecebb
Chore: Replace util.DynMap with structs ( #36332 )
...
* Chore: Replace util.DynMap
* Chore: added comments
2021-07-01 10:23:33 +02:00
Hugo Häggmark and GitHub
63f9231de1
Annotations: Adds tags endpoint ( #36199 )
...
* Annotations: Adds tags endpoint
* Chore: fixes sql statement
* Refactor: adds count to the api
* Chore: changes after PR comments
* Refactor: changes after PR comments
2021-06-30 13:42:54 +02:00
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 >
2021-06-22 12:07:52 +05:30
Carl Bergquist and GitHub
9ef4c21033
add context to getsignedinUser calls ( #35963 )
...
Signed-off-by: bergquist <carl.bergquist@gmail.com >
2021-06-21 07:51:33 +02:00
Sofia Papagiannaki and GitHub
5e534d212c
Alerting: Fix alert permissions migration ( #35869 )
...
* Alerting: Fix alert permissions migration
for MySQL >= 5.7 and PostgreSQL
* Do not use import struct
2021-06-17 15:49:56 +03:00
Carl Bergquist and GitHub
b40e78a943
Instrumentation: add context.Context to the dashboard get flow. ( #34955 )
...
Signed-off-by: bergquist <carl.bergquist@gmail.com >
2021-06-15 16:08:27 +02:00
Sofia Papagiannaki and GitHub
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
2021-06-14 22:13:45 +03:00
Kyle Brandt and GitHub
8a3d7b6446
Alerting: Increase alertmanager_conf column size if mysql ( #35657 )
...
fixes #35583
2021-06-14 11:02:35 -04:00
Sofia Papagiannaki and GitHub
423474325a
Alerting: fix postgres migration on conflict ( #35556 )
2021-06-14 16:43:33 +03:00
Sofia Papagiannaki and GitHub
8cda1f5153
Alerting: Allow rules with same title across folders ( #35270 )
...
* Alerting: Allow rules with same title across folders
* Add test
2021-06-04 20:45:26 +03:00
Sofia Papagiannaki and GitHub
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
2021-06-04 15:52:41 +03:00
Ganesh Vernekar and GitHub
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 >
2021-06-03 15:07:34 +02:00
Ganesh Vernekar and GitHub
a23674ef99
Alerting: Migrate tags as labels and not annotations ( #34990 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com >
2021-05-31 19:47:17 +05:30
Ganesh Vernekar and GitHub
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 >
2021-05-31 17:30:58 +05:30
Ganesh Vernekar and GitHub
ad6648b649
Alerting: Do no hard fail on finding discontinued channels on migration ( #34894 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com >
2021-05-28 16:06:30 +02:00
Carl Bergquist and GitHub
a10fa5cad3
Instrumentation: Start tracing database requests ( #34572 )
...
Signed-off-by: bergquist <carl.bergquist@gmail.com >
2021-05-27 13:55:33 +02:00
Hugo Häggmark and GitHub
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
2021-05-24 06:11:01 +02:00
23939eab10
[Alerting]: namespace fixes ( #34470 )
...
* [Alerting]: forbid viewers for updating rules if viewers can edit
check for CanSave instead of CanEdit
* Clear ngalert tables when deleting the folder
* Apply suggestions from code review
* Log failure to check save permission
Co-authored-by: gotjosh <josue@grafana.com >
2021-05-20 15:49:33 +03:00
Ganesh Vernekar and GitHub
95ee5f01b5
NGAlert: Do not pick a random default channel if no default exists ( #34465 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com >
2021-05-20 10:30:09 +02:00
Ganesh Vernekar and GitHub
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 >
2021-05-19 21:10:12 +02:00
Kyle Brandt and GitHub
e291203528
Alerting: a usage stat for ualerting ( #34390 )
...
collects `stats.alert_rules.count` , where alert_rules is the nextgen system
2021-05-19 10:31:25 -04:00
Kyle Brandt and GitHub
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.
2021-05-19 09:37:56 -04:00
David Parrott and GitHub
bbb7bbf891
Alerting: Remove back end logic for supporting KeepLastState ( #34242 )
...
* Removed back end logic for supporting KeepLastState
* Map keep_state correctly in migrations
2021-05-18 10:55:43 -07:00
Carl Bergquist and GitHub
4710566514
bus: add ctx for all signed in user queries ( #33970 )
...
Signed-off-by: bergquist <carl.bergquist@gmail.com >
2021-05-18 18:24:42 +02:00
gotjosh and GitHub
eb74994b8b
Alerting: Modify configuration apply and save semantics - v2 ( #34143 )
...
* Save default configuration to the database and copy over secure settings
2021-05-14 19:49:54 +01:00
Owen Diehl and GitHub
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
2021-05-13 14:01:38 -04:00
83abaa8bdf
Quota: Do not count folders towards dashboard quota ( #32519 )
...
For dashboard quota fix so that folders are not counted as dashboards.
Fixes #31317
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com >
2021-05-12 23:44:46 +02:00
Kyle Brandt and GitHub
3da8db7f3f
Alerting: Run table migrations regardless of feature flag and move out of service ( #33996 )
2021-05-12 14:39:48 -04:00
f2fcf721eb
32540: Add org users with pagination ( #33788 )
...
* Add model for search org user and add handler for dispatch
* 32540_org_users_with_pagination: Add endpoint for search org users
* 32540_org_users_with_pagination: Add test for org user search handler
* 32540_org_users_with_pagination: fix indentation
* 32540_org_users_with_pagination: Remove newline
* 32540_org_users_with_pagination: Remove empty line
* 32540_org_users_with_pagination: Fix indentation
* Update pkg/api/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/models/org_user.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus
* Add model for search org user and add handler for dispatch
* 32540_org_users_with_pagination: Add endpoint for search org users
* 32540_org_users_with_pagination: Add test for org user search handler
* 32540_org_users_with_pagination: fix indentation
* 32540_org_users_with_pagination: Remove newline
* 32540_org_users_with_pagination: Remove empty line
* 32540_org_users_with_pagination: Fix indentation
* Update pkg/api/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/models/org_user.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus
* 32540_org_users_with_pagination: Add test for the sqlstore
* 32540_org_users_with_pagination: Fix sqlstore test
* Update pkg/api/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/api/org_users_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/services/sqlstore/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/services/sqlstore/org_users.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/services/sqlstore/org_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* Update pkg/services/sqlstore/org_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
* 32540: Fix search org users method
* 32540: Fix sqlstore test
* 32540: Fix go-lint
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
2021-05-12 14:10:35 +02:00
b0094b325e
Annotations: Prevent orphaned annotation tags cleanup when no annotations were cleaned ( #33957 )
...
Fixes #33948
Co-authored-by: Anatoly Fayngelerin <afayngelerin@dropbox.com >
2021-05-12 10:44:00 +02:00
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 >
2021-05-11 08:08:39 -04:00
7367cfc0a3
Add isolation level db configuration parameter ( #33830 )
...
* add isolation level db configuration parameter
* add isolation_level to default.ini and sample.ini
* add note that only mysql supports isolation levels for now
* mention isolation_level in the documentation
* Update docs/sources/administration/configuration.md
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com >
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com >
2021-05-10 17:54:13 +02:00
Serge Zaitsev and GitHub
da13f88862
Redact sensitive values before logging them ( #33829 )
...
* use a common way to redact sensitive values before logging them
* fix panic on missing testCase.err, simplify require checks
* fix a silly typo
* combine readConfig and buildConnectionString methods, as they are closely related
2021-05-10 17:03:10 +02:00
Arve Knudsen and GitHub
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 >
2021-05-06 16:29:29 +02:00
Dafydd and GitHub
e642506dcb
use dynamic ID in test assertion for search ( #33320 )
2021-05-06 10:48:33 +02:00
bd66c8dde3
SQL data sources: Convert to return data frames ( #32257 )
...
Convert SQL data sources to return data frames.
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com >
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com >
Co-authored-by: Will Browne <will.browne@grafana.com >
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com >
2021-05-05 16:46:07 +02:00
540f110220
[Alerting]: Extend quota service to optionally set limits on alerts ( #33283 )
...
* Quota: Extend service to set limit on alerts
* Add test for applying quota to alert rules
* Apply suggestions from code review
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com >
* Get used alert quota only if naglert is enabled
* Set alert limit to zero if nglalert is not enabled
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com >
2021-05-04 19:16:28 +03:00
Kyle Brandt and GitHub
57d46ea991
AlertingMigration: Separate info into multiple annos ( #33641 )
2021-05-03 11:42:31 -04:00
Stephanie HingtgenandGitHub
Travis PattersonandGitHub
Jason StangroomeandGitHub
Ganesh VernekarandGitHub
Hugo HäggmarkandGitHub
Carl BergquistandGitHub
Kyle BrandtandGitHub
David ParrottandGitHub
Owen DiehlandGitHub
DafyddandGitHub
