bergquist
bd30a4d23e
Merge branch 'master' into alerting_definitions
2016-04-28 16:04:28 +02:00
bergquist
16cede30f6
feat(alerting): move alertingtab to seperate directive
2016-04-28 16:03:14 +02:00
Torkel Ödegaard
5d652dcaef
fix(table): table column sorting fix
2016-04-28 15:48:49 +02:00
Torkel Ödegaard
d69788c9df
Merge branch 'master' of github.com:grafana/grafana
2016-04-28 15:30:09 +02:00
Torkel Ödegaard
69c2fafa7a
feat(elasticsearch): added geo hash bucket aggregation
2016-04-28 15:29:54 +02:00
bergquist
f442adca47
feat(alerting): adds api endpoints for alerts per dashboard and panel
2016-04-28 15:13:42 +02:00
Torkel Ödegaard
620e3a602d
Merge pull request #4842 from grafana/pluginSettingFix
...
allow updates to secureJsonData.
2016-04-28 13:07:39 +02:00
woodsaj
ad8dbbb559
allow updates to secureJsonData.
...
SecureJsonData is stored as a json object in the DB. As the
secureJsonData is never returned to the user they are unable
to provide the full json object when performing updates instead
the user can only provide the specific keys they wish to update.
This commit ensures that only the provided keys are updated and
existing keys in the secureJsonData object are left untouched.
2016-04-28 18:39:23 +08:00
bergquist
1f414c1372
test(alerting): add test that validates rule updates do not change state
2016-04-28 11:47:14 +02:00
bergquist
ecfbc2edca
feat(alerting): adds alert history page
2016-04-28 11:42:03 +02:00
bergquist
5bc3672296
Merge branch 'master' into alerting_definitions
2016-04-28 11:03:33 +02:00
bergquist
0f0fa0c257
feat(alerting): adds endpoint for getting alert states log
2016-04-28 10:59:46 +02:00
Torkel Ödegaard
5a241a8290
fix(): minor query editor fix
2016-04-28 10:29:36 +02:00
Torkel Ödegaard
4a332065d0
changelog(): updated changelog with notice about new query editors, closes #3900
2016-04-28 10:22:17 +02:00
Torkel Ödegaard
0e4b70a4a8
feat(query_editors): more work
2016-04-28 10:13:18 +02:00
bergquist
3ecc13506c
feat(alerting): adds alert state go ui
2016-04-28 08:53:34 +02:00
bergquist
1631673485
feat(alerting): dont change state when updating alert definitions
2016-04-28 08:42:51 +02:00
bergquist
e7be7d2835
feat(alerting): add api endpoint for alert state
2016-04-28 08:23:50 +02:00
Torkel Ödegaard
f1d4fd3e67
feat(query editors): changed chevron position
2016-04-27 21:24:41 +02:00
Torkel Ödegaard
7b560f9080
feat(query editors): converted OpenTSDB editor to new form styles
2016-04-27 16:29:59 +02:00
bergquist
6a5ecb3fca
feat(alerting): adds basic page for listing alerts
2016-04-27 13:02:28 +02:00
bergquist
3cf6532515
feat(alerting): add json encoding name for properties
2016-04-27 11:44:04 +02:00
Torkel Ödegaard
0ebd921bbb
feat(query editors): updated cloudwatch to new form styles
2016-04-27 11:07:26 +02:00
Torkel Ödegaard
206cb51219
feat(query editors): updated prometheus editor
2016-04-27 10:50:29 +02:00
Torkel Ödegaard
5e6485c210
feat(query editors): minor progress
2016-04-27 10:16:04 +02:00
bergquist
44dd98e277
tech(alerting): rename alerting sql server
2016-04-27 09:25:11 +02:00
bergquist
7041169ffb
feat(alerting): add datasource name field
2016-04-27 09:06:19 +02:00
bergquist
973db1ac38
feat(alerting): add api route for alert changes
2016-04-27 08:59:33 +02:00
Torkel Ödegaard
65b4945548
Merge branch 'master' into query-editor-style
2016-04-27 08:43:34 +02:00
bergquist
2e097f4af1
Merge branch 'master' into alerting_definitions
2016-04-26 17:38:29 +02:00
bergquist
9b50313f11
feat(alerting): add api endpoints for listing alerts
2016-04-26 17:36:50 +02:00
bergquist
996eec3ce2
tech(alerting): refactored save alerts code
2016-04-26 16:31:13 +02:00
bergquist
55e83a3d62
feat(alerting): rename alerting dashboard names
2016-04-26 16:06:29 +02:00
bergquist
3ef2be13df
feat(alerting): move alert deletion to alert code
2016-04-26 15:48:29 +02:00
Torkel Ödegaard
aa98ada141
fix(snapshots): fixed snapshot issue introdiuced yesterday
2016-04-26 14:51:06 +02:00
Torkel Ödegaard
26eeb6578d
feat(gauge): polish to gauge, better handling of automatic font size, added option to hide threshold markers
2016-04-26 13:50:04 +02:00
Torkel Ödegaard
8bb07124f7
fix(gauge): validate min / max range, fixes #4820
2016-04-26 13:14:43 +02:00
Torkel Ödegaard
bce5c447b3
fix(apps): app dashboards can now be updated, fixes #4817
2016-04-26 12:52:44 +02:00
Torkel Ödegaard
34cb17546d
fix(): minor fix for event emitter
2016-04-26 12:39:24 +02:00
Torkel Ödegaard
7c06604f16
Merge branch 'master' of github.com:grafana/grafana
2016-04-26 11:00:20 +02:00
Torkel Ödegaard
0762c38d35
fix(ds_edit): dont show warning when data source does not support testing, fixes #4811
2016-04-26 10:59:57 +02:00
bergquist
baac7809c5
docs(changelog): add notes about fixes for singlestat
2016-04-26 10:04:39 +02:00
bergquist
79ed99a940
fix(singlestat): fixes font size diffs for gauge
2016-04-26 10:00:13 +02:00
Torkel Ödegaard
bca0894f73
feat(query editors): progress on query editors
2016-04-26 09:58:55 +02:00
bergquist
9316bcf307
fix(singlestat): enables autoupdate on change
...
closes #4809
closes #4812
2016-04-26 09:51:31 +02:00
Torkel Ödegaard
60855643c4
Merge pull request #4807 from grafana/makefile
...
add basic Makefile, remove need for global grunt-cli
2016-04-25 19:01:44 +02:00
Dan Cech
650bb4c719
use npm test to run npm tests
2016-04-25 12:53:15 -04:00
Dan Cech
2244224b12
add basic Makefile, remove need for global grunt-cli
2016-04-25 12:44:26 -04:00
bergquist
bb42579b0f
Merge branch 'master' into alerting_definitions
2016-04-25 16:42:33 +02:00
bergquist
ddd826616b
feat(alerting): serialize whole target obj from dashboard
2016-04-25 16:38:27 +02:00
