Torkel Ödegaard
43d5525aaa
Merge branch 'master' into alert_state
2017-05-18 13:38:34 +02:00
Dan Cech
9dc220b8e2
include error message in email notification ( #8392 )
2017-05-17 09:51:51 +02:00
Torkel Ödegaard
f84dc24fcb
alerting: improving and fixing alert history, #7257
2017-05-15 16:17:05 +02:00
Torkel Ödegaard
f697f81950
sqlite: fixed database table looked handling, now retries up to 5 times, fixes #7992
2017-05-15 12:19:19 +02:00
Torkel Ödegaard
4ce0bf4d16
mysql: improved mysql data source, added test feature when adding data source, fixed cache issue
2017-05-11 10:50:24 +02:00
Torkel Ödegaard
368e847d12
feat: added api health endpoint that does not require auth and never creates sessions, returns db status as well. #3302
2017-04-25 17:17:45 +02:00
Torkel Ödegaard
87c978ebc9
fix: better error handling / messsage when testing email notification when stmp is not configured, fixes #8093
2017-04-25 13:16:41 +02:00
Dan Cech
b489e93d94
Config Array Syntax ( #8204 )
...
* refactor util encryption library so it doesn't have to import log
* add util.SplitString to handle space and/or comma-separated config lines
* go fmt
2017-04-25 09:14:29 +02:00
Torkel Ödegaard
b22b3e5bb9
mysql: added default query template
2017-04-21 16:28:01 +02:00
Daniel Lee
ee3a553800
Merge pull request #8163 from bashgeek/telegram_metrics
...
Add metrics/matches to Telegram notifications (proposed fix for #8110 )
2017-04-19 15:03:03 +02:00
Daniel Schmitz
d123b951e9
Fixed parsing error
2017-04-19 17:02:52 +08:00
Torkel Ödegaard
e164eba677
mysql: began work on backend macro engine
2017-04-19 10:10:08 +02:00
Daniel Schmitz
7078d5d524
Added metrics/matches to telegram notifications; Added some HTML to beautify
2017-04-19 15:53:23 +08:00
Torkel Ödegaard
0bae7212f6
annotations: removed category stuff, my mistake, we need tags
2017-04-18 17:15:22 +02:00
Alexander Zobnin
7aa992bde4
initial category types
2017-04-17 18:56:39 +03:00
Alexander Zobnin
f0816b37bd
rename annotation_category to category
2017-04-17 18:53:10 +03:00
Torkel Ödegaard
60ef7d8768
Merge branch 'master' into create-annotations
2017-04-14 22:36:34 +02:00
Dan Cech
f490c5f12c
use X-Grafana-Org-Id header to ensure backend uses correct org ( #8122 )
2017-04-14 15:47:39 +02:00
Alexander Zobnin
ab99a7c1c7
graph(create annotation): add initial annotation_category table
2017-04-13 16:57:22 +03:00
Torkel Ödegaard
593b2ef866
annotation: added region support to annoations
2017-04-12 16:26:34 +02:00
Torkel Ödegaard
0156a94a49
annotations: you can now read annoations via manually created annoation query
2017-04-12 15:46:41 +02:00
Alexander Zobnin
f42202e665
Merge branch 'master' into graph-annotations
2017-04-11 10:27:37 +03:00
Alexander Zobnin
d553498a33
graph(add annotation): initial backend implementation #1286
2017-04-10 20:22:58 +03:00
Torkel Ödegaard
0384eecf5c
fix: minor fix for bug when saving alert with empty message, fixes #7927
2017-04-10 15:26:05 +02:00
Alfred Krohmer
41171f8a5c
Add a link to a graph image in Pushover notifications ( #8075 )
2017-04-10 09:17:37 +02:00
Torkel Ödegaard
26804d630f
Merge branch 'master' into sql-proxy
2017-04-07 10:34:51 +02:00
Torkel Ödegaard
f5f0d94ad4
fix: temp/testing fix for hanging issue, #8033
2017-04-06 13:18:50 +02:00
Torkel Ödegaard
95e0010a5b
fix: sqlite3 and concurrent write requests caused database locked error some times, depending on how many concurrent requests and speed of disk drive. Fixed by reducign the number of concurrent db connections to 1 for sqlite3, fixes #7992
2017-04-03 09:42:11 +02:00
Torkel Ödegaard
5af81b974e
mysql: graph showing
2017-03-31 13:57:10 +02:00
Torkel Ödegaard
e5a5bef200
mysql: minor update
2017-03-31 12:49:05 +02:00
Torkel Ödegaard
d6d2080f11
mysql: minor progress on response processing
2017-03-31 11:45:25 +02:00
Torkel Ödegaard
bd4f073425
mysql: minor update
2017-03-30 20:23:40 +02:00
Torkel Ödegaard
998f04e1e8
mysql: testdata
2017-03-30 20:01:04 +02:00
Torkel Ödegaard
34d92b0e79
mysql: starting work on test data
2017-03-30 18:03:50 +02:00
Torkel Ödegaard
080d2a2054
mysql: reading arbitrary SQL data in go is really strange, data is only in strings?
2017-03-30 13:46:46 +02:00
Dan Cech
24d4e50343
utf8mb4 encoding ( #7959 )
...
* use utf8mb4 character set for connections to mysql
* use utf8mb4 character set for tables, shorten varchar fields used in unique indexes
* migration type to update table character set
* update table character sets
* set charset for temp_user.status
* gofmt
2017-03-28 14:34:53 +02:00
Jaroslav Hanslík
e91a078105
Slack notification should contain fallback text ( #7961 )
2017-03-28 10:05:44 +02:00
Dan Cech
dde8583db8
xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns
2017-03-27 18:04:03 -04:00
Daniel Lee
69bec98962
chore: update all grafana.org urls to .com
2017-03-21 15:37:55 +01:00
Pandurang Waghulde
f3cce7efc9
typo fix for OpsGenie
2017-03-17 12:57:52 +05:30
Daniel Lee
9efb6e76e9
users: adds search and pagination ( #7753 )
...
ref #7469 . Follow up change that adds proper paging with 50 results
per page as well as a search box to search by name, login or email.
2017-03-07 16:03:54 +01:00
Wouter Smit
125ee865b6
Spelling mistake ( #7739 )
2017-03-06 21:08:45 +01:00
Torkel Ödegaard
9f1c6a73f0
tech: added sql logger to log all sql statements sent to sql server
2017-03-06 11:51:35 +01:00
Carl Bergquist
f185c2c953
Merge pull request #7676 from dbrgn/threema-emoji
...
feat(alerting): Add emoji to Threema alert notifications
2017-03-03 11:04:49 +01:00
bergquist
412b8998a8
webhooks: get proxy settings from ini file
...
closes #7710
2017-03-02 13:57:28 +01:00
Danilo Bargen
1422655e97
feat(alerting): Add emoji to Threema alert notifications
...
This commit prepends emoji to Threema alert notifications to make it
easier to discern various notification types (e.g. alert, no data, ok).
2017-02-27 17:10:52 +01:00
bergquist
05952688c5
tech: avoid using http.DefaultClient
2017-02-24 17:22:12 +01:00
bergquist
03354bc49a
tech: replace context.TODO with background ctx
2017-02-24 09:20:28 +01:00
Carl Bergquist
5d3da99806
Merge pull request #7482 from dbrgn/master
...
Alerting: Add Threema Gateway integration
2017-02-24 07:40:36 +01:00
Carl Bergquist
bef216b6f4
Merge pull request #7526 from Mic92/master
...
Add Pushover alert notifications
2017-02-24 07:32:59 +01:00
bergquist
00dddca26a
alerting: dedupe alert notifications when running multiple servers
...
alert notifications will only be sent if the database value
is updated.
ref #6957
2017-02-21 16:54:49 +01:00
bergquist
6115941df0
middleware: rename org-id -> orgId
2017-02-17 15:18:40 +01:00
bergquist
5174d050f2
middlware: change org when url contains orgid
...
closes #6948
ref #1613
2017-02-17 15:02:14 +01:00
bergquist
bd010289b2
alerting: images in alert notifications is now optional
...
its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.
closes #7419
2017-02-15 14:17:36 +01:00
bergquist
f14e25612e
annotations: go vet fixes
2017-02-15 14:15:42 +01:00
Daniel Lee
6dfdcd7ca5
email: change default from name to Grafana
...
Changes default from name in smtp settings
from Grafana Admin to Grafana.
Fix for integration test (which is skipped but that
did not work)
2017-02-15 11:02:46 +01:00
Jacob Bednarz
796957c8c6
Update mailer tests to include FromName
2017-02-15 08:04:21 +11:00
Jacob Bednarz
66445faeb5
Format mailer From field to include name
...
Updates the messafe `From` field to include the name and email of the
sender.
2017-02-15 07:51:41 +11:00
Jacob Bednarz
7dc6b69c8b
s/smpt/SMTP
2017-02-15 07:43:59 +11:00
Jacob Bednarz
c9d4654592
s/from_adress/from_address
2017-02-15 07:43:16 +11:00
Daniel Lee
193d468ed3
admin: adds paging to global user list
...
Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.
Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.
Fixes #7469
2017-02-13 12:59:36 +01:00
Jörg Thalheim
f069aae576
Add Pushover alert notifications
...
Pushover is a service for getting real-time
notifications on your mobile devices and desktop
computers: https://pushover.net
2017-02-10 22:44:33 +01:00
Carl Bergquist
7f4f38e773
Merge pull request #7519 from huydx/master
...
(feat) support datasource delete by name api
2017-02-10 15:53:34 +01:00
huydx
143cbe921f
(feat) support datasource delete by name api
2017-02-10 23:30:14 +09:00
huydx
28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
bergquist
00549f393c
style(hipchat): improves code style
2017-02-08 11:24:49 +01:00
James Regovich
53942f7987
Adding HipChat Notifier
2017-02-07 10:50:49 -06:00
Danilo Bargen
689f5cb686
feat(alerting): Text formatting for Threema alert messages
2017-02-07 11:14:57 +01:00
Danilo Bargen
d1a5d9c15c
feat(alerting): Add Threema Gateway integration
...
This commit adds alerting support for Threema Gateway. It supports all
Simple IDs (managed by the Gateway server).
More information can be found on https://gateway.threema.ch/
2017-02-07 11:14:57 +01:00
bergquist
3827c0a69c
tech(alerting): adds tags to alerting data model
2017-02-06 14:59:29 +01:00
bergquist
c05bc0cb17
chore(vet): fixes invalid fmt.Sprintf format
2017-02-05 21:19:39 +01:00
lucapette
032ecad3b7
Fix typo
2017-02-03 12:10:22 +01:00
Stanislav Vetlovskiy
0e892e9f86
Add image url to telegram alert notifier
...
If public image url of alert is exist add it to the telegram message
2017-01-31 16:47:14 +03:00
Stanislav Vetlovskiy
bd4eadf69c
#7383 Fix factory typo in telegram notifier ( #7406 )
2017-01-31 06:23:19 +01:00
bergquist
46e4a54a6e
style: go fmt with simplify
2017-01-27 15:21:02 +01:00
bergquist
f5d8a75381
tech(webhook): remove redundant if statement
2017-01-19 09:29:40 +01:00
huydx
376d2d56bf
(feature) add LINE notify to notifier
2017-01-19 17:26:53 +09:00
bergquist
4ea4e0436a
feat(mailer): set localname to hostname
...
Some email providers does not accept localhost
in the HELO message. So we set it to hostname
instead. Our hope is that should be enough for
those providers who does not accept localhost.
closes #7223
2017-01-17 10:36:04 +01:00
bergquist
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
Carl Bergquist
c43bb7fb99
Extractor should not modify dashboard json ( #7256 )
...
* test(dashboard): tests that he extractor does not modify original json
* feat(extractor): validate a cloned version of the dashboard json
2017-01-13 15:46:23 +01:00
Carl Bergquist
1efeaafdbf
Merge pull request #7249 from grafana/alerting_test_alertrule
...
Enable error and no_data overrides when testing alerting.
2017-01-13 15:18:02 +01:00
Torkel Ödegaard
d354f3a8af
fix(alerting): fixed evaluation for no_value condition, fixes #7244 ( #7247 )
...
* fix(alerting): fixed evaluation for no_value condition, fixes #7244
* feat(alerting): moving null library into grafana, fixing handling on no value / no series
2017-01-13 12:32:30 +01:00
bergquist
0873d493c2
feat(alerting): moves getNewState to evalHandler
...
closes #7149
2017-01-13 11:02:24 +01:00
Lee Briggs
2e796da441
Add support for sensu notifications ( #7207 )
2017-01-11 13:57:07 +01:00
Mark Theisen
afda9cbb2d
Fix webhook username mismatch
...
Fixing variable name mismatch so that the Authorization HTTP header is added to webhook notifications.
2017-01-09 17:18:53 +01:00
Torkel Ödegaard
b8f559aecb
feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162
2017-01-06 12:04:25 +01:00
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
