Torkel Ödegaard
|
babab7677c
|
tech(lib upgrade): fixed issue with angular 1.5.8, so can revert revert of upgrade, that is we are no on latest angularjs, #6022
|
2016-09-14 10:45:56 +02:00 |
|
Torkel Ödegaard
|
c594f9f2ad
|
fix(lodash): corrected checked in lodash version
|
2016-09-14 10:13:33 +02:00 |
|
Torkel Ödegaard
|
649d9f9177
|
tech(lodash): upraded lodash to 4.15.0, closes #6021
|
2016-09-14 09:17:10 +02:00 |
|
Torkel Ödegaard
|
0fa0066cd9
|
tech(lodash): began migration work
|
2016-09-13 22:10:44 +02:00 |
|
Torkel Ödegaard
|
2146e69a11
|
revert angularjs upgrade
|
2016-09-13 21:26:28 +02:00 |
|
Torkel Ödegaard
|
fffa26b876
|
tech(lib upgrade): updated jquery to 3.1, fixes #6034
|
2016-09-13 20:42:28 +02:00 |
|
Torkel Ödegaard
|
25139c77b9
|
tech(update angularjs): updated angularjs to 1.5.9
|
2016-09-13 20:33:49 +02:00 |
|
Torkel Ödegaard
|
f5809c0209
|
fix(build): trying to fix build
|
2016-09-13 20:14:18 +02:00 |
|
Torkel Ödegaard
|
9cd517780f
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-13 16:25:48 +02:00 |
|
Torkel Ödegaard
|
8c30babdf1
|
feat(alerting): fixed build issues
|
2016-09-13 16:24:00 +02:00 |
|
Torkel Ödegaard
|
3af891d023
|
feat(alerting): restored alert history
|
2016-09-13 16:13:41 +02:00 |
|
Torkel Ödegaard
|
b0c7e61ef8
|
feat(alerting): removed severity
|
2016-09-13 15:09:55 +02:00 |
|
wvl
|
a73424d6af
|
Secure Elasticsearch datasources a bit (#6031)
Instead of allowing users to access the
entire cluster, apply some sane restrictions.
Change-Id: Ib2e93722bf2e39d700d4afa713ff49ec556f2fdf
|
2016-09-13 15:04:21 +02:00 |
|
bergquist
|
6a723dff37
|
feat(notifications): set default value to false for new notifications
|
2016-09-13 14:25:48 +02:00 |
|
Torkel Ödegaard
|
6375418d8c
|
Merge branch 'alerting' into grafana-annotations
|
2016-09-13 09:38:12 +02:00 |
|
Mitsuhiro Tanda
|
1264a1b3a6
|
(cloudwatch) add metrics/dimensions (#6020)
|
2016-09-13 09:08:33 +02:00 |
|
Jouni Kuusisto
|
e53b815956
|
Enable "With Credentials" for InfluxDB datasource (#6018)
|
2016-09-13 08:57:39 +02:00 |
|
Carl Bergquist
|
52dc2db769
|
Merge pull request #6008 from rubycut/patch-1
Increase datasource limit to 1000 #3910
|
2016-09-13 08:38:07 +02:00 |
|
bergquist
|
3ba3d9d445
|
docs(changelog): add note about closing #2839
|
2016-09-13 08:14:43 +02:00 |
|
bergquist
|
f7abf01efb
|
Merge branch 'mtanda-template_sort'
|
2016-09-13 08:12:23 +02:00 |
|
bergquist
|
03fb152d4b
|
tech(templates): extract sort method
|
2016-09-13 08:11:04 +02:00 |
|
bergquist
|
9c5436c648
|
feat(templating): set default sort order
|
2016-09-13 07:39:30 +02:00 |
|
bergquist
|
e348822190
|
Merge branch 'template_sort' of https://github.com/mtanda/grafana into mtanda-template_sort
|
2016-09-13 07:16:34 +02:00 |
|
Carl Bergquist
|
1c7b76cb43
|
Merge pull request #6013 from mtanda/cloudwatch_kinesis_analytics
(cloudwatch) add metrics/dimensions
|
2016-09-12 17:03:25 +02:00 |
|
Mitsuhiro Tanda
|
f998b86ade
|
(cloudwatch) add metrics/dimensions
|
2016-09-12 23:47:31 +09:00 |
|
bergquist
|
157ab1ba36
|
fix(setting): broken code
|
2016-09-12 14:57:37 +02:00 |
|
bergquist
|
811b7188c4
|
docs(config): add docs for how to run grafana behind a reverse proxy
|
2016-09-12 14:47:21 +02:00 |
|
bergquist
|
d7bf70a77b
|
tech(tsdb): remove skip ssl setting. should be based on datasource settings
|
2016-09-12 13:37:00 +02:00 |
|
bergquist
|
6c5860d3e8
|
feat(metrics): measure proxy requests
|
2016-09-12 13:29:31 +02:00 |
|
Rubycut
|
501f89e829
|
Increase datasource limit to 1000 #3910
|
2016-09-12 10:45:17 +02:00 |
|
bergquist
|
eb673fd16d
|
fix(middleware): typo
|
2016-09-12 10:11:55 +02:00 |
|
Torkel Ödegaard
|
014b70ded9
|
fix(graph): fixed showing rendering error in inspector, fixes #5995
|
2016-09-10 12:00:33 +02:00 |
|
Torkel Ödegaard
|
7aab4a4a59
|
fix(table): fixed issue with using mixed data source in table panel, fixes #5999
|
2016-09-10 09:57:25 +02:00 |
|
Chen Chenglong
|
7b1c374f64
|
support connect ldap server with starttls (#5969)
* support connect ldap server with starttls
* add more doc for start_tls option
|
2016-09-10 09:40:56 +02:00 |
|
bergquist
|
4edb31723c
|
fix(metrics): ignore datasource proxy requests
|
2016-09-09 13:53:50 +02:00 |
|
bergquist
|
e7b56c6389
|
tech(metrics): move all request counters into one middleware
|
2016-09-09 13:28:19 +02:00 |
|
Torkel Ödegaard
|
4a2f2fba73
|
feat(alerting): show panel specific alert annotations, #5694
|
2016-09-09 11:30:55 +02:00 |
|
bergquist
|
583790e650
|
fix(alering): the crocdile turned on me > <
closes #5855
|
2016-09-09 07:42:07 +02:00 |
|
Carl Bergquist
|
51d2534f6a
|
Merge pull request #5994 from mtanda/prometheus_fix_legend_template
(prometheus) fix template variable expansion in legend
|
2016-09-08 18:37:27 +02:00 |
|
Mitsuhiro Tanda
|
9d09e5bbd0
|
(prometheus) fix template variable expansion in legend
|
2016-09-09 00:46:04 +09:00 |
|
bergquist
|
aa80b52c07
|
feat(alerting): make it possible to skip ssl verification for alerting https requests
|
2016-09-08 16:29:31 +02:00 |
|
bergquist
|
7b9099ef93
|
fix(query): requires all that all series are empty to set NoDataFound
|
2016-09-08 14:33:10 +02:00 |
|
Torkel Ödegaard
|
0ac4ece00d
|
feat(annotations): refactoring annotations srv to typescript, #5990
|
2016-09-08 14:31:30 +02:00 |
|
bergquist
|
9511f89a22
|
fix(alerting): fixes bug in query conditions
|
2016-09-08 13:28:41 +02:00 |
|
Torkel Ödegaard
|
23de094a81
|
feat(alerting/annotations): fixed broken test
|
2016-09-08 13:22:30 +02:00 |
|
bergquist
|
bec099cd84
|
tech: remove unused files
|
2016-09-08 11:41:56 +02:00 |
|
Torkel Ödegaard
|
b8081b29fd
|
Merge branch 'master' into grafana-annotations
|
2016-09-08 11:26:55 +02:00 |
|
Torkel Ödegaard
|
d60bd77658
|
feat(annotations): added support to show grafana stored annotations in graphs, #5982
|
2016-09-08 11:25:45 +02:00 |
|
bergquist
|
3c9432b7e9
|
fix(metrics): default updateSince to ms
|
2016-09-08 10:48:11 +02:00 |
|
bergquist
|
acf74cdacc
|
fix(alerting): change execution time to ms
|
2016-09-08 10:45:10 +02:00 |
|