Patrick
2de5a7119b
Merge branch 'master' into add_google_hangouts_chat_notifier
2018-11-18 22:00:53 +01:00
Marcus Efraimsson
5f9fecd254
feat: team preferences
2018-11-12 20:01:53 +01:00
Andrey Kaipov
63fdffe8c0
Fixes #13993 - adds more options for Slack notifications
2018-11-07 22:08:26 -05:00
Marcus Efraimsson
26cbc6be81
Merge pull request #13966 from marefr/alert_extractor_refactor
...
Refactor dashboard alert extractor
2018-11-05 17:06:27 +01:00
bergquist
423331dae0
alerting: delete alerts when parent folder is deleted
...
closes #13322
2018-11-05 14:25:26 +01:00
Marcus Efraimsson
9e0da02b6a
refactor dashboard alert extractor
2018-11-05 14:25:19 +01:00
Marcus Efraimsson
5882e5bb46
Merge pull request #13900 from marefr/ds_cache_refactor
...
Datasource proxy cache refactor
2018-11-05 11:02:31 +01:00
Marcus Efraimsson
818d48c2c0
always execute the user teams query
2018-11-05 10:49:56 +01:00
Marcus Efraimsson
5be2332c66
handle error before populating cache
2018-11-05 09:58:13 +01:00
bergquist
7c3dcb3702
alerting: adds tests for the median reducer
...
adds a test that verify that null values are not used
when calculating the median value in alerting
closes #10056
2018-11-05 09:03:35 +01:00
Marcus Efraimsson
6ef941ea17
fix failing tests
2018-11-02 16:03:12 +01:00
Sergio Conde Gomez
65a15b157f
Increase Telegram captions length limit.
2018-10-31 18:07:09 +01:00
Torkel Ödegaard
93453c2d94
added caching of signed in user DB calls
2018-10-31 06:47:14 -07:00
Marcus Efraimsson
6f9c0241af
register datasource cache service with proper name
2018-10-30 12:32:14 +01:00
Marcus Efraimsson
70ddf93688
include teams on signed in user
2018-10-30 09:32:32 +01:00
Marcus Efraimsson
cfb061ddab
refactor datasource caching
2018-10-30 09:31:56 +01:00
Torkel Ödegaard
d505d83ee1
Merge pull request #13679 from mjtrangoni/fix-megacheck-issues
...
Fix megacheck issues
2018-10-25 16:31:53 +02:00
Carl Bergquist
0d41904ee5
Merge pull request #13755 from Yukinoshita-Yukino/master
...
Fix cannot receive dingding alert when alert message is empty
2018-10-24 14:56:08 +02:00
bergquist
0a9bfc5529
delete provisioning meta data when deleting folder
...
prior to this fix Grafana didnt delete meta data
about the provisioned dashboard in `dashboard_provisioning`
which means that the dashboard wasn't inserted into
Grafana again if the folder was delete within Grafana.
closes #13280
2018-10-24 13:32:45 +02:00
Marcus Efraimsson
b371f2d91f
add debug logging of folder/dashbord permission checks
2018-10-23 11:08:57 +02:00
Mario Trangoni
68507e8855
pkg/services/alerting/reader.go: Fix should use for range instead of for { select {} }.
...
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/alerting/reader.go:37:2⚠️ should use for range instead of for { select {} } (S1000) (megacheck)
2018-10-19 19:49:04 +02:00
Yuan Liu
68c460a957
fix cannot receive dingding alert bug
2018-10-19 17:17:38 +08:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
bergquist
70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
bergquist
5566a61aef
alerting: tests default value for disable resolve message
2018-10-17 09:53:03 +02:00
Dave Waters
a3137e731d
clean up tests
2018-10-16 20:39:07 -04:00
Dave Waters
0eae7b077d
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:38:59 -04:00
Dave Waters
c4dcf5a4ee
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:33:38 -04:00
Dave Waters
18c73631ea
rename UI Option, align with control, update tests
2018-10-16 07:12:32 -04:00
Peter Holmberg
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
Dave Waters
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
Torkel Ödegaard
938541be2e
Merge pull request #13660 from grafana/alerting-validation-messages
...
Alerting: Propagate alert validation issues to the api/user
2018-10-15 18:16:29 +02:00
Andreas Kohn
272274220c
Fix grammar in log message
2018-10-15 14:37:12 +02:00
Torkel Ödegaard
ba67dc7689
changed to plain errors further down the alerting validation model so error did not get double wrapping in ValidationError
2018-10-12 23:15:23 -07:00
Torkel Ödegaard
ec4698fb96
alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message
2018-10-12 23:03:54 -07:00
Torkel Ödegaard
d17025fb43
Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
...
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
Mario Trangoni
74533a7a19
pkg/services/sqlstore/user_auth_test.go: comment unused users slice
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/sqlstore/user_auth_test.go:28:18⚠️ this result of append is never used, except maybe in other appends (SA4010) (megacheck)
2018-10-13 02:35:03 +02:00
Torkel Ödegaard
8c9939df72
Adds backend hooks service so extensions can modify index data
2018-10-12 11:26:42 +02:00
Torkel Ödegaard
d5d8d7efa6
minor setting refactorings
2018-10-12 07:55:36 +02:00
Torkel Ödegaard
b671b9704f
changed property name to UserWasDeleted and added an assert for it
2018-10-11 12:20:53 -07:00
Mario Trangoni
9c44c75936
pkg/services/alerting/notifiers/telegram.go: check error before close.
...
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/services/alerting/notifiers/telegram.go:130:2⚠️ should check returned error before deferring imageFile.Close() (SA5001) (megacheck)
2018-10-11 19:51:54 +02:00
Torkel Ödegaard
9585dc7825
added the UserWasRemoved flag to make api aware of what happened to return correct message to UI
2018-10-11 07:58:22 +02:00
Torkel Ödegaard
5b5cb6622d
Remove user form org now completely removes the user from the system if the user is orphaned
2018-10-11 07:48:35 +02:00
Marcus Efraimsson
4d719b0d05
Merge remote-tracking branch 'origin/master' into noop-services-poc
2018-10-08 16:02:44 +02:00
Torkel Ödegaard
019d0ee179
Merge pull request #13506 from mjtrangoni/fix-megacheck-issues
...
Fix megacheck issues
2018-10-03 20:10:01 +02:00
bergquist
4498d75b17
provisioning: adds more logging about failed to deletion of provisioned dashboards
2018-10-03 17:38:10 +02:00
Mario Trangoni
d1e1fb7e72
pkg/services/alerting/notifiers/telegram_test.go: pass context.Background() instead of nil
...
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/services/alerting/notifiers/telegram_test.go:55:44⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:71:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:88:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:104:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 09:47:54 +02:00
Torkel Ödegaard
6c41cfb72c
wip: made sqlstore dialect accessable from outside
2018-10-02 16:14:29 +02:00
Marcus Efraimsson
9af809ff8a
Merge pull request #13440 from grafana/reminder_refactoring
...
Transaction issues for alert reminder
2018-10-02 15:55:18 +02:00
Marcus Efraimsson
0e0901874b
better comment about state changes
2018-10-02 15:11:33 +02:00