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 |
|
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 |
|
bergquist
|
0cbedb4473
|
chore(api): remove commented endpoints
|
2016-08-22 16:56:28 +02:00 |
|
bergquist
|
7095a9d7e1
|
Merge branch 'master' into alerting
|
2016-08-22 15:31:33 +02:00 |
|
bergquist
|
3b8bba3e9f
|
feat(alerting): add more fields to webhook
|
2016-08-22 15:11:27 +02:00 |
|
Carl Bergquist
|
90388710af
|
Merge pull request #5874 from mtanda/cw_api_gateway
(cloudwatch) add api gateway metrics/dimensions
|
2016-08-22 14:36:40 +02:00 |
|
bergquist
|
77f9c24050
|
feat(alerting): add support for count reducer
|
2016-08-22 13:25:31 +02:00 |
|
bergquist
|
26c6437846
|
Merge branch 'master' into alerting
|
2016-08-22 12:27:08 +02:00 |
|
Mitsuhiro Tanda
|
6bd2bb04a7
|
(cloudwatch) add api gateway metrics/dimensions
|
2016-08-20 21:57:20 +09:00 |
|
bergquist
|
c663e32ea8
|
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
|
2016-08-19 13:15:44 +02:00 |
|
bergquist
|
d3421c671c
|
fix(alerting): make sure xorm can reset execution_error
|
2016-08-18 17:25:32 +02:00 |
|
bergquist
|
def4632f08
|
test(alerting): add falsification test
|
2016-08-18 14:13:39 +02:00 |
|
bergquist
|
d28df71c3b
|
feat(alerting): add support for "no_value" evaluator
|
2016-08-18 11:44:25 +02:00 |
|
Torkel Ödegaard
|
09cdf3e9e1
|
feat(alerting): show execution errors in alert list
|
2016-08-18 11:37:35 +02:00 |
|
Torkel Ödegaard
|
5cf9711862
|
feat(alerting): added eval match to test results
|
2016-08-18 11:22:24 +02:00 |
|
Torkel Ödegaard
|
902314d3a1
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-18 09:04:00 +02:00 |
|
Torkel Ödegaard
|
75a6c2b612
|
feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841
|
2016-08-18 09:03:46 +02:00 |
|
bergquist
|
6d080904fa
|
tech(alerting): empty string does not update database
|
2016-08-17 22:13:27 +02:00 |
|
bergquist
|
4154a4066f
|
feat(alerting): handle all results, even due they have errors
DON'T SWALLOW THE ERR CARL
|
2016-08-17 22:12:08 +02:00 |
|
Torkel Ödegaard
|
63a283b4bc
|
feat(alerting): working on alert state filters for alert list
|
2016-08-17 11:00:00 +02:00 |
|
Torkel Ödegaard
|
da59d6547f
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-17 10:03:57 +02:00 |
|
Torkel Ödegaard
|
05697d5ecd
|
Merge branch 'master' into alerting
Conflicts:
conf/sample.ini
|
2016-08-17 10:03:33 +02:00 |
|
Torkel Ödegaard
|
f9b628ad0e
|
Merge branch 'v3.1.x'
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
|
2016-08-17 09:53:46 +02:00 |
|
bergquist
|
6497b307c4
|
feat(alerting): save execution error upon state changed
|
2016-08-17 09:27:29 +02:00 |
|
bergquist
|
9915f15ed0
|
feat(alerting): adds sql layer for saving execution errors
|
2016-08-17 07:49:14 +02:00 |
|
Torkel Ödegaard
|
434332f02d
|
feat(alerting): changed fontsize in alert list
|
2016-08-16 21:26:54 +02:00 |
|
Torkel Ödegaard
|
15c11fdb54
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-16 16:51:24 +02:00 |
|
Torkel Ödegaard
|
0b7fa3c19d
|
feat(alerting): minor progress on alert list, #5784
|
2016-08-16 16:50:36 +02:00 |
|
bergquist
|
c7cb93a33a
|
style(alerting): improve codestyle for evaluators
|
2016-08-16 12:44:31 +02:00 |
|
bergquist
|
fb7f2ae2e2
|
feat(alerting): adds within_range and outside_range evaluators
closes #5829
|
2016-08-16 12:37:07 +02:00 |
|
bergquist
|
b5d92b6191
|
test(alerting): fix broken tests
|
2016-08-16 12:37:07 +02:00 |
|
Torkel Ödegaard
|
6b90587d27
|
feat(alerting): fixing failing go unit test
|
2016-08-16 10:22:16 +02:00 |
|
Torkel Ödegaard
|
f934081bcb
|
feat(alerting): making progress on alerting list, #5784
|
2016-08-16 09:52:45 +02:00 |
|
Torkel Ödegaard
|
9f29c54170
|
Merge branch 'query_part_refactor' into alerting
Conflicts:
pkg/services/sqlstore/migrations/alert_mig.go
pkg/services/sqlstore/migrations/heartbeat_mig.go
|
2016-08-15 17:54:42 +02:00 |
|
Torkel Ödegaard
|
1418cbbd8b
|
feat(query_part): refactoring query part
|
2016-08-15 17:20:45 +02:00 |
|
Torkel Ödegaard
|
0392fde34e
|
feat(alerting): doing schema changes
|
2016-08-15 15:12:43 +02:00 |
|
bergquist
|
f7a9102523
|
feat(metrics): improve graphite settings
Fixes the broken support for overriding settings with ENV variables.
closes #5769
|
2016-08-15 09:59:55 +02:00 |
|
bergquist
|
cf6736d480
|
fix(metrics): add ending dot for graphite prefix
|
2016-08-15 09:58:32 +02:00 |
|
bergquist
|
41790c6709
|
fix(metrics): hide none existing metrics settings
|
2016-08-15 09:58:23 +02:00 |
|
bergquist
|
ebecc5e5a0
|
fix(metrics): make metrics cfg backwards compatible
|
2016-08-15 09:57:49 +02:00 |
|
bergquist
|
0524d0c625
|
fix(metrics): replaces . with _ in instance name
closes #5739
|
2016-08-15 09:57:00 +02:00 |
|
bergquist
|
2b2e015d62
|
feat(cli): add default plugin folder for MAC OS
closes #5806
|
2016-08-15 09:18:56 +02:00 |
|