Commit Graph
5628 Commits
Author SHA1 Message Date
bergquist a90bba859a fixes merge error 2018-12-07 14:17:09 +01:00
moznion 4397ee61d0 Put issue number to test code 2018-12-05 22:47:41 +09:00
moznion d1e1cde00e Fix bug what updating user quota doesn't work
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion 061e06c226 Fix bug what updating org quota doesn't work
https://github.com/grafana/grafana/blob/3c330c8e4c0b0f9fb258801ba8a7fe2586bbc819/pkg/services/sqlstore/quota.go#L106

In the real use case, `has` that is described by the above code is always `false` because it includes `Updated` in a query.

So this commit fixes this issue.
2018-12-05 22:19:40 +09:00
Mario Trangoni fadd816d89 pkg/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
danielbh d1b8f13c66 feat: #11067 prevent removing last grafana admin permissions 2018-12-03 20:05:52 -05:00
Marcus Efraimsson 36aec52c08 return actual error if failing to update alert data 2018-11-22 11:19:08 +01:00
bergquist 862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
Carl Bergquist 6049855dc7 Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Patrick 2de5a7119b Merge branch 'master' into add_google_hangouts_chat_notifier 2018-11-18 22:00:53 +01:00
bergquist caec36e7ec alert rule have to be pending before alerting is for is specified 2018-11-15 15:37:46 +01:00
bergquist a70ea2101c alertmanager: adds tests for should notify 2018-11-15 12:36:11 +01:00
bergquist 28029ce4a7 alerting: support for on execution errors and notdata 2018-11-15 11:04:16 +01:00
bergquist 84eb3bd095 tests for supporting for with all alerting scenarios 2018-11-14 23:43:09 +01:00
bergquist 8fb997d935 should not notify when going from unknown to pending 2018-11-14 23:43:09 +01:00
Marcus Efraimsson 5f9fecd254 feat: team preferences 2018-11-12 20:01:53 +01:00
bergquist 2fb78a50d6 minor fixes based on code review 2018-11-12 10:50:56 +01:00
Athurg Feng 919d00437e Add pic into actionCard message 2018-11-12 11:18:53 +08:00
Athurg Feng b7787db34e Add new option to set where to open the message url 2018-11-08 18:44:00 +08: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
bergquist ae2d536740 adds tests for extracting for property 2018-11-05 13:29:33 +01:00
bergquist ccd89eee97 renames debouceduration to for 2018-11-05 11:05:30 +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
bergquist d25284a364 introduce state unknown for rules that have not been evaluated yet 2018-11-05 10:50:28 +01:00
bergquist 6f748d8a96 fixes go meta lint issue 2018-11-05 10:50:28 +01:00
bergquist 4526660cb2 wire up debounce setting in the ui 2018-11-05 10:50:28 +01:00
bergquist 2d3a575489 adds db migration for debounce_duration 2018-11-05 10:50:28 +01:00
bergquist ccfd9c89b2 introduces hard coded deboucing for alerting 2018-11-05 10:50:28 +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
Athurg Feng 201dd6bf65 Optimize the Dingding match values format 2018-10-25 18:53:45 +08:00
Athurg Feng cb86e38628 Add Dingding message type to support mass text notification 2018-10-25 18:34:34 +08:00
Athurg Feng 7f45afac63 Split text template into variable 2018-10-25 18:24:04 +08:00
Athurg Feng ca6dd73923 Add match values into Dingding notification message 2018-10-25 18:23:37 +08: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