Torkel Ödegaard
3b69c8f687
feat(alerting): new design for alert tab with sidemenu
2016-07-31 09:31:32 +02:00
Torkel Ödegaard
2b276d5cd1
feat(alerting): working on alert notification and image rendering
2016-07-30 13:36:21 +02:00
slqgsm
e17b1548e8
Release there were some issues with the way removing columns was being implemented.
...
So I decided to scrap that, and go for just having a hidden column style. This is what
@madshall did in his enhanced table pull request, so this is basically the hidden
column style feature form his pull request.
2016-07-29 20:21:59 +00:00
slqgsm
93cb08d9d0
fixed typo and issue of not being able to add fields in table transformation
2016-07-29 16:30:38 +00:00
Torkel Ödegaard
f9ddfb4337
Merge branch 'master' into alerting
2016-07-29 15:07:47 +02:00
Torkel Ödegaard
79138e211f
Merge branch 'v3.1.x'
2016-07-29 15:07:17 +02:00
Torkel Ödegaard
741b7353c1
Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x
2016-07-29 15:06:09 +02:00
Torkel Ödegaard
c4e7a3ae89
fix(png rendering): another fix for #5606
2016-07-29 15:04:51 +02:00
Torkel Ödegaard
4fc50742a0
feat(alerting): working on image rendering with alert notifications
2016-07-29 14:55:02 +02:00
slqgsm
afb55fb3bd
fixed to allow adding columns back in
2016-07-29 12:25:36 +00:00
Torkel Ödegaard
f9a28d3306
feat(alerting): slack notification improvements, #5679
2016-07-29 13:41:42 +02:00
slqgsm
e420bee2ab
First commit for this branch, to allow removing of columns in table transformation
2016-07-28 21:44:07 +00:00
Torkel Ödegaard
01da3f6cb2
feat(alerting): worked on improving slack alerts
2016-07-28 17:03:53 +02:00
Torkel Ödegaard
717cce014b
feat(alerting): refactoring
2016-07-27 17:07:44 +02:00
Torkel Ödegaard
6aaf4c97a2
feat(alerting): refactoring conditions out to seperate package
2016-07-27 16:18:10 +02:00
Torkel Ödegaard
ae5f8a76d9
feat(alerting): lots of progress on notifications, refactored them out to their own package, restored webhook notitication and added slack notification
2016-07-27 12:09:55 +02:00
Torkel Ödegaard
77c66a88d9
Merge branch 'master' into alerting
2016-07-27 10:22:00 +02:00
Torkel Ödegaard
c997923b17
Merge branch 'master' of github.com:grafana/grafana
2016-07-27 10:21:38 +02:00
Torkel Ödegaard
e789d0df63
Merge branch 'v3.1.x'
2016-07-27 10:21:16 +02:00
Torkel Ödegaard
89dc3b88d1
fix(test): fixed failing test caused by recent change
2016-07-27 10:20:48 +02:00
Torkel Ödegaard
c2eeb6dda0
fix(alerting): minor notification fix
2016-07-27 10:15:21 +02:00
Thib17
732c84c230
Enable scaling down seconds unit s > ms > µs > ns ( #5642 )
2016-07-27 10:10:01 +02:00
Torkel Ödegaard
cde1bbff78
Merge branch 'alert_conditions' into alerting
2016-07-27 09:52:42 +02:00
Torkel Ödegaard
c675ffc682
Merge branch 'master' into alerting
2016-07-27 09:45:16 +02:00
Mark Henderson
39be7cf7d7
Added grafana-cli command. Added public documentation for specifying plugin version when installing. ( #5665 )
2016-07-27 09:41:33 +02:00
Torkel Ödegaard
e8e8463828
docs(): updated changelog
2016-07-27 09:39:46 +02:00
Torkel Ödegaard
e4592c8d53
Merge branch 'v3.1.x'
2016-07-27 09:36:46 +02:00
Torkel Ödegaard
971e2d62f1
fix(zoom): fixed zoom in and out issues when graph is embedded, fixes #5666 , fixes #4489
2016-07-27 09:36:35 +02:00
Leandro Piccilli
3057c9747c
Change size on terms aggregation for ES 5.x
2016-07-26 22:05:49 +02:00
Torkel Ödegaard
5155c8a753
feat(templating): set default min span to 4, fixes #5662
2016-07-26 17:20:27 +02:00
Torkel Ödegaard
0b0f6b0848
feat(alerting): made very basic threshold viz work again
2016-07-26 14:35:42 +02:00
Torkel Ödegaard
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +02:00
Torkel Ödegaard
6cb1dafb1d
feat(alerting): progress on notifications
2016-07-25 16:26:28 +02:00
Torkel Ödegaard
8df558dece
feat(notifications): refactoring notification handling
2016-07-25 13:52:17 +02:00
Torkel Ödegaard
9f14b209bd
fix(html): moved body tag, fixes #5648
2016-07-25 12:21:51 +02:00
Torkel Ödegaard
d4e2bb70e9
Merge branch 'v3.1.x'
...
Conflicts:
package.json
2016-07-25 12:20:59 +02:00
Torkel Ödegaard
66a72e9ece
changed version to 3.1.1
2016-07-25 12:20:21 +02:00
Torkel Ödegaard
ee0d6ecfe6
Merge branch 'master' of github.com:grafana/grafana
2016-07-25 12:04:58 +02:00
Torkel Ödegaard
def4d8f8dc
docs(): updated changelog
2016-07-25 12:04:43 +02:00
Torkel Ödegaard
9fd7676846
Merge branch 'v3.1.x'
2016-07-25 12:03:40 +02:00
Torkel Ödegaard
0de0f4d014
feat(templating): fixed issue with template variables set to reload on dashboard load being issued multiple times, fixes #5637
2016-07-25 12:02:59 +02:00
bmundt
f6b1d5a84a
Added '!=' option for where clause in the influx query builder ( #5646 )
2016-07-25 10:36:38 +02:00
Torkel Ödegaard
9f777a535b
fix(): removed dashboard version to schema version migration
2016-07-23 13:29:48 +02:00
Torkel Ödegaard
6d28365e84
docs(): updated changelog
2016-07-23 12:59:07 +02:00
Torkel Ödegaard
7a2e8324b9
Merge branch 'v3.1.x'
2016-07-23 12:54:23 +02:00
Torkel Ödegaard
ddf579f204
fix(mixed data sources): fix when using two graphite data sources in mixed mode, fixes #5617
2016-07-23 12:54:11 +02:00
Torkel Ödegaard
b943e41434
Merge branch 'master' of github.com:grafana/grafana
2016-07-23 12:01:48 +02:00
Torkel Ödegaard
4a33e2023f
Merge branch 'v3.1.x'
2016-07-23 12:01:27 +02:00
Torkel Ödegaard
3abbf08a17
tech(): upgrade jquery to 2.2.4, closes #5627
2016-07-23 12:00:45 +02:00
Torkel Ödegaard
474a821767
fix(elasticsearch): fix json escape logic when doing terms template value lookup, fixes #5485
2016-07-23 11:52:49 +02:00
Torkel Ödegaard
slqgsm
Thib17
Mark Henderson
Leandro Piccilli
bmundt