bergquist
|
6c5860d3e8
|
feat(metrics): measure proxy requests
|
2016-09-12 13:29:31 +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 |
|
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 |
|
bergquist
|
bec099cd84
|
tech: remove unused files
|
2016-09-08 11:41:56 +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 |
|
bergquist
|
55b560a4a8
|
feat(alerting): filter notifications based on severity
closes #5851
|
2016-09-06 14:27:48 +02:00 |
|
bergquist
|
2ca7284a56
|
tech(notifications): splitt into 3 queries
closes #5883
|
2016-09-06 08:43:15 +02:00 |
|
bergquist
|
c893e5d241
|
feat(notifications): add support for default notifications
ref #5883
|
2016-09-05 21:35:37 +02:00 |
|
bergquist
|
eb0396ad95
|
chore(tsdb): remove some logging
|
2016-09-05 21:35:24 +02:00 |
|
bergquist
|
d11bc57c37
|
feat(notifications): make it possible to send test alert notifications
closes #5847
|
2016-09-05 14:45:15 +02:00 |
|
Torkel Ödegaard
|
4c5461d4ba
|
feat(alerting): alerting scheduling distribution, only distibutes it on seconds for now, not sub second distribution, #5854
|
2016-09-05 14:26:08 +02:00 |
|
bergquist
|
1955defc43
|
fix(api): add missing jsonData field to dto
The field is available on the dto so I guess is should be used.
Otherwise we should remove the field rather then not setting it.
ref #5944
|
2016-09-01 17:21:13 +02:00 |
|
bergquist
|
86aea89214
|
style(tsdb): extract some methods
|
2016-09-01 13:03:15 +02:00 |
|
bergquist
|
d73547c0dc
|
feat(tsdb): add missing content type and join url using path
|
2016-09-01 11:12:35 +02:00 |
|
bergquist
|
3d3365f242
|
tech(graphite): add more logging
|
2016-09-01 10:09:13 +02:00 |
|
bergquist
|
94389a3a44
|
tech(tsdb): improve logging for graphite client
|
2016-09-01 09:38:43 +02:00 |
|
bergquist
|
29b60329cc
|
stupid stupid stupid me
|
2016-09-01 09:17:57 +02:00 |
|
bergquist
|
7ddd625e9d
|
feat(alerting): add slack/email support for execution errors
|
2016-08-31 15:55:01 +02:00 |
|
bergquist
|
4619a05f43
|
feat(alerting): save execution error message to annotations
|
2016-08-31 14:06:54 +02:00 |
|
bergquist
|
c624f3d470
|
fix(alerting): measure state result instead of severity
|
2016-08-31 11:55:35 +02:00 |
|
bergquist
|
645293e590
|
fix(cli): improve error message for upgrade-all
closes #5885
|
2016-08-30 13:47:42 +02:00 |
|
bergquist
|
11a4ff0f8a
|
feat(alerting): add basic UI for history in alert tab
ref #5850
|
2016-08-30 13:22:59 +02:00 |
|
bergquist
|
650a87dc05
|
feat(alerting): add alert history api endpoint
ref #5850
|
2016-08-30 09:32:56 +02:00 |
|
Carl Bergquist
|
7d4cc098a8
|
Merge pull request #5924 from cmartin0077/master
feat(api) HEAD response, fixes #3854
|
2016-08-29 15:54:21 +02:00 |
|
bergquist
|
c0697b99d6
|
fix(alerting): adds support for basic auth
closes #5897
|
2016-08-29 15:50:11 +02:00 |
|
chrismartin0077
|
0050707134
|
feat(api) HEAD response, fixes #3854
|
2016-08-29 06:07:44 -07:00 |
|
paulroche
|
5ba6bab237
|
redact provider_config (#5915)
|
2016-08-27 09:50:35 +02:00 |
|
bergquist
|
d0ca4ca3cd
|
chore(alerting): remove unused files
|
2016-08-22 17:01:23 +02:00 |
|