IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 17:43:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,448 Commits 5,447 Branches 554 Tags 1.9 GiB
8e89173095
Commit Graph

8448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2e8d5ca519 docs(changelog): add note about updating systemd description 2016-09-06 17:32:18 +02:00
Carl Bergquist
a02bef7d94 Merge pull request #5971 from cicku/master 
Update systemd unit's description to be more understandable
 2016-09-06 17:11:46 +02:00
Christopher Meng
6afb456bef Update systemd unit's description to be more understandable 
Signed-off-by: Christopher Meng <i@cicku.me>
 2016-09-06 16:29:15 +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
22805ce56b fix(alert_tab): fix broken alert history 2016-09-06 14:42:34 +02:00
bergquist
55b560a4a8 feat(alerting): filter notifications based on severity 
closes #5851
 2016-09-06 14:27:48 +02:00
Torkel Ödegaard
b1ed641d73 fix(graph): fixed issue with duplicate metric calls when doing full page reload of graph in edit/view mode 2016-09-06 09:20:34 +02:00
Torkel Ödegaard
6b17cdbca6 feat(alerting): Save As removes alerts from panels, closes #5965 2016-09-06 09:14:11 +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
015423b233 tech(gitignore): ignore vscode folder 2016-09-05 21:35:24 +02:00
Carl Bergquist
b501590a75 fix(.editorconfig): correct spelling of indent_style 
Unleash the fucking fury
 2016-09-05 17:38:55 +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
Torkel Ödegaard
e2f5bf1666 feat(alerting): fixed confirm delete dashboard issue 2016-09-05 13:38:25 +02:00
bergquist
daea38060f feat(notifications): redirect to notification list after creation. 2016-09-05 08:27:12 +02:00
Carl Bergquist
002cfb09cb Merge pull request #5953 from kobtea/fix/ng-ctrl 
fix typo
 2016-09-05 07:56:57 +02:00
Carl Bergquist
ae2fe11166 Merge pull request #5957 from tdi/master 
Changed EBS to ELB
 2016-09-05 07:54:03 +02:00
Dariusz Dwornikowski
1b283d052b Changed EBS to ELB 2016-09-02 20:49:28 +02:00
Hiroaki Kobayashi
3645fb371c fix typo 2016-09-02 15:22:04 +09: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
000eb669df tech(build): change min go version to 1.6 2016-09-01 08:13:48 +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
e493015f54 fix(alerting): replace one hack with another hack 2016-08-31 10:10:39 +02:00
bergquist
53a9dec407 feat(alerting): move timestamp to new row 
ref #5850
 2016-08-31 09:48:58 +02:00
bergquist
a5d49c9820 docs(config): add note about poodle vulnerabillity in <3.0 
closes #3483
 2016-08-31 08:34:15 +02:00
Trent White
00f82010f8 tweaked alert example to see if there were any visual changes 2016-08-30 12:11:00 -04:00
Trent White
852a8b77e4 table tweak 2016-08-30 12:04:26 -04:00
bergquist
1a70e69447 mark second td as last 2016-08-30 15:23:59 +02:00
bergquist
ae428b9177 docs(changelog): add note about cli fix 2016-08-30 13:49:50 +02:00
bergquist
645293e590 fix(cli): improve error message for upgrade-all 
closes #5885
 2016-08-30 13:47:42 +02:00
bergquist
b55b7cde4b fix(alerting): remove error message when model is valid again 
closes #5921
 2016-08-30 13:36:13 +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