bergquist
|
6be48269e2
|
tech(build): update build docs
|
2016-09-15 13:09:33 +02:00 |
|
bergquist
|
4e567b5f02
|
feat(alert): order alerts by name.. instead of nothing.
|
2016-09-14 14:51:31 +02:00 |
|
bergquist
|
a23b7f1371
|
fix(alerting): add missing evaldata field to set state command
|
2016-09-14 14:35:05 +02:00 |
|
bergquist
|
9dd8b3b408
|
wip
|
2016-09-14 14:12:19 +02:00 |
|
bergquist
|
d0f9623037
|
feat(alertlistpanel): support state filter
ref #5981
|
2016-09-14 10:49:05 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
bergquist
|
592ae5a39a
|
tests(alerting): fixes broken tests. pointers and stuff 🤷
|
2016-09-07 17:05:41 +02:00 |
|
bergquist
|
c769148701
|
Merge branch 'emails'
|
2016-09-07 13:52:16 +02:00 |
|
bergquist
|
59cb51dc6f
|
test(emails): update fake data model
|
2016-09-07 13:47:57 +02:00 |
|
bergquist
|
712061ab4f
|
test(alerting): fixes broken unit tests
|
2016-09-07 11:45:38 +02:00 |
|
bergquist
|
374016b9b5
|
Merge branch 'kfitzpatrick-custom-github-style-oauth'
|
2016-09-07 11:07:30 +02:00 |
|
bergquist
|
53dddf1a8f
|
fix(oauth): remove github refs from generic auth
|
2016-09-07 10:55:46 +02:00 |
|
bergquist
|
3b6820ef03
|
feat(oauth): create struct for generic oauth and add config values
|
2016-09-07 10:34:56 +02:00 |
|
Torkel Ödegaard
|
0d083bad14
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/components/imguploader/s3uploader.go
|
2016-09-07 10:14:36 +02:00 |
|
Torkel Ödegaard
|
50b41130ca
|
feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations
|
2016-09-07 10:11:00 +02:00 |
|
bergquist
|
d1a7a23c84
|
test(imageupload): add more specific tests
torkels commit will fix this unit test :)
|
2016-09-07 10:05:01 +02:00 |
|
bergquist
|
4646723cbb
|
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
|
2016-09-07 08:15:44 +02:00 |
|
Torkel Ödegaard
|
fc8f0721cd
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/services/alerting/eval_context.go
|
2016-09-06 20:40:49 +02:00 |
|
Torkel Ödegaard
|
fbae6abb3c
|
feat(alerting): progress on handling no data in alert query, #5860
|
2016-09-06 20:40:12 +02:00 |
|
bergquist
|
04690ca920
|
feat(alerting): add support for retries
ref #5855
|
2016-09-06 15:09:49 +02:00 |
|
bergquist
|
0d7a871223
|
style(alerting): remove blank lines
|
2016-09-06 14:57:15 +02:00 |
|