Torkel Ödegaard
d6a2431767
Merge branch 'notifier-telegram-messenger' of https://github.com/leonoff/grafana into leonoff-notifier-telegram-messenger
2017-01-06 10:27:20 +01:00
Utkarsh Bhatnagar
65057212e7
Org update should throw error if not found ( #7066 )
...
* Org update should give error if not found
* Used affected rows
2017-01-03 09:21:18 +01:00
bergquist
2e7d222f6e
Revert "tech: remove unused code"
...
This reverts commit d9131be0a5
2017-01-02 13:22:37 +01:00
bergquist
d9131be0a5
tech: remove unused code
2017-01-02 13:11:09 +01:00
Mikhail Leonov
e32a653cb6
Added Telegram Messenger notification destination
2016-12-30 15:57:12 +03:00
bergquist
80d438ca49
chore(alerting): removes double logging
2016-12-20 08:34:44 +01:00
Carl Bergquist
9135abf3ae
Merge pull request #6996 from bergquist/pause_all_alerts
...
Pause all alerts
2016-12-19 16:38:44 +01:00
bergquist
6c2c3c7e24
Revert "fix(alerting): pause dto can only pause one"
...
This reverts commit b2c5a6a037
2016-12-19 16:07:55 +01:00
bergquist
b2c5a6a037
fix(alerting): pause dto can only pause one
2016-12-19 16:05:24 +01:00
bergquist
71f406558e
tech(alerting): remove comments
2016-12-19 15:40:09 +01:00
bergquist
a2257ec3d0
tech(alerting): renames pause all method
2016-12-19 15:17:49 +01:00
bergquist
ecdf1888c4
feat(alerting): removes pause per datasource
2016-12-19 13:24:45 +01:00
bergquist
6b9db0c0c5
style(alerting): simplify support for pausing multiple alerts
2016-12-19 08:18:42 +01:00
bergquist
4ef95cfd31
style(api): reduce code complexity
2016-12-16 16:07:23 +01:00
bergquist
fb6aa0e026
feat(api): adds endpoint for mass pausing alerts
...
ref #6589
2016-12-16 15:00:58 +01:00
bergquist
c467e48940
feat(notifications): removes html escaping subject
...
closes #6905
2016-12-15 14:27:33 +01:00
bergquist
f907330c9e
tech(mailer): improves error when grafana cannot read open cert/key file
...
ref #6949
2016-12-15 08:27:21 +01:00
Carl Bergquist
38d8ba8faa
Merge pull request #6952 from huydx/format-gofmt
...
(format) run go fmt in pkg
2016-12-14 09:26:38 +01:00
huydx
b97f4fd8b9
(typo) Exeuction -> Execution
2016-12-14 12:21:41 +09:00
huydx
adb441e5c8
(format) run go fmt in pkg
2016-12-14 12:17:38 +09:00
Torkel Ödegaard
5ec7dea81a
Merge branch 'v4.0.x'
2016-12-12 14:39:53 +01:00
huydx
015fa82cf5
fix(alert): alert test should return error when it failed to dispatch
2016-12-12 18:22:58 +09:00
Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
bergquist
dd3060fdc3
feat(alerting): calculate avg of valid points
2016-12-07 15:55:37 +01:00
bergquist
2bdd2a59cb
test(alerting): improve naming for test scenario
2016-12-07 15:19:58 +01:00
Carl Bergquist
0294446af9
Merge pull request #6856 from kylemcc/opsgenie-alerting
...
alerting: add support for OpsGenie
2016-12-07 11:23:54 +01:00
Carl Bergquist
2c7adccf12
Use cache for http.client in tsdb package. ( #6833 )
...
* datasource: move caching closer to datasource struct
* tsdb: use cached version of datasource http transport
closes #6825
2016-12-07 11:10:42 +01:00
Kyle McCullough
4ef940482c
alerting: add support for OpsGenie
2016-12-06 14:48:13 -06:00
Torkel Ödegaard
d1feaaf4f3
Merge branch 'v4.0.x'
2016-12-05 10:54:01 +01:00
bergquist
b81e97c99c
webhook: adds json content-type
...
closes #6822
2016-12-05 10:46:04 +01:00
bergquist
0403f53b6f
feat(webhook): adds alert rule message to webhook
...
close #6807
2016-12-05 09:34:35 +01:00
bergquist
6c9cf87080
feat(alerting): calculate avg of valid points
2016-12-02 23:44:14 +01:00
bergquist
9dd6cf45ac
feat(webhook): adds alert rule message to webhook
...
close #6807
2016-12-02 22:24:36 +01:00
bergquist
83e90325c9
chore(victorops): remove unused code
2016-11-29 22:26:42 +01:00
bergquist
a6ea2f4fdb
Merge branch 'victorops' of https://github.com/ichekrygin/grafana into ichekrygin-victorops
2016-11-29 22:22:25 +01:00
Carl Bergquist
b47410af6a
Merge pull request #6670 from tomkozlowski/feature/postgres-certs
...
generalized database connection cert support and added to postgres
2016-11-29 21:40:27 +01:00
bergquist
253324fc32
style(sqlstore): remove comment
2016-11-29 21:24:45 +01:00
Carl Bergquist
5a0fc434f3
Merge pull request #6722 from dpavlos/fix_6679
...
[6679] Check if org exists before delete it
2016-11-29 21:12:02 +01:00
bergquist
360516ed41
feat(metrics): change active alerts to guage
2016-11-29 16:46:25 +01:00
Pavlos Daoglou
0064331bbf
[6679] Check if org exists before delete it
2016-11-28 00:09:01 +02:00
bergquist
bdfb773a98
fix(alerting): fixes broken no_value evaluator
...
closes #6701
2016-11-27 16:53:29 +01:00
Daniel Lee
c9b2c694f1
refactor(dataproxy): TLS Client Auth
...
Use a SecureJsonData field for TLS
Client Auth instead of 3 new db
fields. Same model as used for
PluginSettings.
Saves and encrypts the pem file
content rather than just saving
the paths to the cert and key.
This allows for uploading from
the Edit Datasource page in
Grafana.
2016-11-24 13:22:25 +01:00
Joe Lanford
56b7e2dfaf
Added support for TLS client auth for datasource proxies ( #5801 )
2016-11-24 13:22:25 +01:00
Torkel Ödegaard
2233938ba7
Merge branch 'master' into getting-started-panel
2016-11-24 13:17:22 +01:00
Carl Bergquist
df2b2e3058
feat(alerting): validate alerts before saving dashboard ( #6691 )
...
ref #6576
2016-11-24 09:50:35 +01:00
Tom Kozlowski
c21ffcc6c9
generalized database connection cert support and added to postgres
2016-11-22 15:29:22 -08:00
bergquist
6882dcfb99
feat(alerting): add backend support for median reducer
2016-11-22 14:09:35 +01:00
bergquist
50811c80ea
fix(alerting): fixes bug that prevents noData from triggering
...
closes #6631
2016-11-22 11:47:52 +01:00
bergquist
2b6013ce81
fix(notifications): failed image upload should not stop notification
...
closes #6638
2016-11-21 09:47:59 +01:00
Torkel Ödegaard
fd512457d8
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
2016-11-18 16:31:54 +01:00
