Carl Bergquist
c38f6ff182
Make alerting notifcations sync ( #6158 )
...
* tech(routines): move the async logic from notification to alerting notifier
* tech(notification): reduce code dupe
* fix(notification): dont touch the response unless its an error
* feat(alerting): make alerting exeuction async but flow sync
* tech(alerting): remove commented code
* tech(alerting): remove unused code
* tech(alerting): fix typo
* tech(alerting): implement Context on EvalContext
* tech(alerting): wait for all alerts to return
* feat(alerting): dont allow alert responses to cancel
* Revert "feat(alerting): dont allow alert responses to cancel"
This reverts commit 324b006c96
2016-10-03 09:38:03 +02:00
bergquist
36f0bf0e1e
chore(web): Improve error message for invalid SSL configuration
2016-10-03 08:47:36 +02:00
Torkel Ödegaard
4a116ad4ad
fix(build): fixed failing unit test
2016-10-01 17:36:56 +02:00
Torkel Ödegaard
c6cf6d4655
fix(api): fixed issue with api content-type in api success messages, fixes #6160
2016-10-01 16:52:52 +02:00
Torkel Ödegaard
a6918617ff
feat(api): fixed minor issue with error message when trying to create duplicate datasource, fixes #6164
2016-10-01 16:41:27 +02:00
Torkel Ödegaard
7c339f0794
feat(alerting): show alertin state in panel header, closes #6136
2016-09-30 17:37:47 +02:00
Torkel Ödegaard
2c4524bbfd
fix(logging): minor logging fix
2016-09-30 13:25:54 +02:00
Torkel Ödegaard
fe4a0a98c1
fix(alerting): added confirm modal in UI, when deleting alert
2016-09-30 13:00:16 +02:00
Torkel Ödegaard
24a25453f6
fix(server): shutdown logging fixes
2016-09-30 10:18:19 +02:00
Torkel Ödegaard
5ec86a9ef4
fix(build): fixed broken build, unreachable code in migrator.go
2016-09-30 09:23:26 +02:00
Torkel Ödegaard
86b546c21d
refactor(main): refactoring main grafana server / startup code
2016-09-30 08:36:20 +02:00
Torkel Ödegaard
2b8177e3e5
fix(migration): fix for sqlstore migration, the execution of the migration and recording of the success of it was not done in same transaction, fixes #5315
2016-09-30 07:49:40 +02:00
Torkel Ödegaard
0ab2113fab
docs(config): added missing smtp config section, fixes #6155
2016-09-30 07:40:58 +02:00
Torkel Ödegaard
50d146e82c
fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027
2016-09-29 14:53:50 +02:00
bergquist
1a062c52fa
fix(notifications): handle none configured image uploader
...
ref #6152
2016-09-29 14:31:19 +02:00
Torkel Ödegaard
75311e0626
feat(alerting): removed old init package
2016-09-28 21:27:24 +02:00
Torkel Ödegaard
5f5bbfbda5
Merge branch 'master' of github.com:grafana/grafana
2016-09-28 21:12:37 +02:00
Torkel Ödegaard
80eb82420e
fix(cleanup): check if images dir exists
2016-09-28 21:12:25 +02:00
Torkel Ödegaard
c28d004731
Merge branch 'go_routines'
2016-09-28 21:06:07 +02:00
Torkel Ödegaard
71e2c6f6ef
refactor(backend): refactoring management of go routines in backend
2016-09-28 21:06:00 +02:00
Dan Cech
6d7061dcaf
fix typo in config loader
2016-09-28 13:10:31 -04:00
Torkel Ödegaard
2750c8a801
feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423
2016-09-28 15:27:08 +02:00
Torkel Ödegaard
3e657357e5
Merge branch 'gnet-oauth'
2016-09-28 15:11:03 +02:00
Torkel Ödegaard
e5fc4332cd
feat(oauth): refactoring PR #6077
2016-09-28 15:10:50 +02:00
bergquist
bc634f20d5
Merge branch 'master' into go_routines
2016-09-28 13:58:14 +02:00
bergquist
7a6501640f
tech(log): fixes extra param logging
2016-09-28 13:57:19 +02:00
bergquist
991539e410
style(go_routines): improve variable naming
2016-09-28 13:35:24 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
Torkel Ödegaard
a4648607bb
feat(testdata): added csv test data scenario
2016-09-28 10:37:30 +02:00
Torkel Ödegaard
8d5857661e
refactor(tsdb): changed tsdb time series model to use null.Float instead of pointers
2016-09-28 09:15:48 +02:00
Torkel Ödegaard
63caedb094
Merge branch 'master' of github.com:grafana/grafana
2016-09-28 08:09:51 +02:00
Torkel Ödegaard
460160cfa4
feat(testdata): added test case for ms resolution data
2016-09-28 08:08:46 +02:00
Torkel Ödegaard
22e8885690
feat(testdata): progress on test data stuff
2016-09-27 18:36:00 +02:00
Torkel Ödegaard
3ecd96e682
feat(testdata): lots of work on new test data data source and scenarios
2016-09-27 18:17:39 +02:00
bergquist
34b31aeef8
tech(goroutines): sync state between different go routines
2016-09-27 16:47:17 +02:00
bergquist
8e89173095
tech(log): fixes extra param logging
2016-09-27 16:06:06 +02:00
Torkel Ödegaard
ade8aa5b92
feat(graph): refactorings
2016-09-27 14:47:04 +02:00
Torkel Ödegaard
34f15d92d0
feat(testdata): worked on testdata app
2016-09-27 14:39:51 +02:00
bergquist
262e7193a3
feat(alerting): keep proccessing results even if one response panics
2016-09-27 11:16:55 +02:00
bergquist
071f2205e1
tech(tsdb): ops <o>
2016-09-27 11:13:13 +02:00
bergquist
46d4f817e3
tech(graphite): return error if statuscode is not ok
2016-09-27 10:09:56 +02:00
bergquist
dbb7852f21
feat: purge old files and snapshots
...
closes #4087
closes #2172
2016-09-26 14:33:40 +02:00
bergquist
1a32ab64b6
tech(renderer): improve renderOpts names
2016-09-26 11:07:36 +02:00
bergquist
effd2098ee
feat(alerting): fixes broken image renderer
2016-09-26 10:51:45 +02:00
bergquist
887e236bce
fix(rule): fixes rule reading bug
2016-09-26 10:01:33 +02:00
bergquist
8cd9225eb6
feat(alerting): increase timeout to 15s
2016-09-26 08:45:55 +02:00
Dan Cech
501e67a657
use semver when comparing grafana and plugin versions ( #6108 )
2016-09-23 14:38:59 +02:00
Torkel Ödegaard
9a94072c1d
Merge branch 'master' of github.com:grafana/grafana
2016-09-23 12:30:20 +02:00
Torkel Ödegaard
175c651e65
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115 , fixes #5906
2016-09-23 12:29:53 +02:00
bergquist
99c77e7df8
tech(plugins): increase timeout
2016-09-23 09:56:42 +02:00
