public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,898 Commits 655 Branches 650 Tags
7a96df875b7c272f7cf8cd366529ed056eb6a42e
Commit Graph

6373 Commits

Author SHA1 Message Date
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 5d821d3492 style(cli): minor fix 2016-08-24 20:27:41 +02:00
bergquist c087445d51 feat(cli): add db command to cli. 2016-08-24 15:46:26 +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