Torkel Ödegaard
175c651e65
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115 , fixes #5906
2016-09-23 12:29:53 +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
99e99922b4
feat(alerting): add support for uploading images to webdav.
...
closes #5770
2016-08-11 16:48:54 +02:00
Torkel Ödegaard
357358898d
feat(annotations): working on alert annotations, #5694
2016-08-01 10:07:00 +02:00
Torkel Ödegaard
2b276d5cd1
feat(alerting): working on alert notification and image rendering
2016-07-30 13:36:21 +02:00
Torkel Ödegaard
4fc50742a0
feat(alerting): working on image rendering with alert notifications
2016-07-29 14:55:02 +02:00
fg2it
303cd8a5af
[RenderToPng fix] ( #4901 )
...
* removing useless code
* fix various minor typo
* don't silence phantomjs timeout and allow more time
* fix gofmt
2016-05-04 09:07:45 +02:00
Torkel Ödegaard
0398face05
feat(plugins): dashboard import for data sources is working! #4298
2016-03-12 10:13:49 +01:00
Torkel Ödegaard
3fb0b71822
refactor(): refactoring json usage
2016-03-12 00:13:06 +01:00
Torkel Ödegaard
40b2f00dc5
fix(): fixed from db -> json
2016-03-11 23:39:42 +01:00
Torkel Ödegaard
1f9f439acb
lib(): added simplejson lib
2016-03-11 23:28:33 +01:00
Torkel Ödegaard
c5a817194a
more work on dashboard importing and templating
2016-03-11 17:31:57 +01:00
bergquist
43073da7eb
feat(renderer): add timeout for the renderer api
...
closes #4325
2016-03-10 16:02:10 +01:00
bergquist
6a7e9134a5
fix(renderer): add .exe for phantomjs on windows
...
closes #3657
2016-02-16 10:12:17 +01:00
Torkel Ödegaard
49fdf8427a
fix(png rendering): removed --ssl-protocol=any phantomjs param
2016-01-13 15:07:03 +01:00
Torkel Ödegaard
26e5d7a3de
Graph: fixed PNG rendering of panels with legend table to the right, #2185
2015-06-19 14:13:25 -04:00
Brandon Turner
b2a0ae0f83
Render panel images with any SSL protocol
...
This uses any available SSL protocol (instead the phantomjs default:
SSLv3) to render panels to PNGs. This is useful when reverse proxing
grafana and SSLv3 is disabled due to security vulnerabilities or other
reasons.
2015-05-25 01:52:49 -05:00
Torkel Ödegaard
6911572fa1
Panel image rendering: now works under self-signed https cert, Fixes #1726
2015-04-08 09:06:01 +02:00
Torkel Ödegaard
059db533d5
HTTP API: grafana /render calls nows with api keys, Fixes #1649
2015-04-08 08:59:12 +02:00
Anthony Woods
7010df0fe8
fixes #1619 Secure PhantomJS Png rendering
...
removes auth hack to allow phantomjs to query pages as a user
without auth. Instead we pass phantomjs the session cookie,
which it then includes in the request.
2015-03-21 07:14:13 +08:00
Torkel Ödegaard
c75aa23092
New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440
2015-02-26 17:23:28 +01:00
Torkel Ödegaard
5269422f7c
Began work on hashing api keys
2015-02-09 13:30:04 +01:00
Torkel Ödegaard
10820f31c2
Changed go package path
2015-02-05 10:37:13 +01:00
Torkel Ödegaard
27f07e9de2
Progress on data source admin
2014-12-16 16:45:07 +01:00
Torkel Ödegaard
90ae59ccaf
Fixed png rending
2014-12-01 13:25:57 -08:00
Torkel Ödegaard
e84f06b503
more macaroon stuff
2014-10-07 11:53:25 -04:00
Torkel Ödegaard
05f9e5eef1
rendering
2014-10-01 21:07:58 +02:00
Torkel Ödegaard
9e30599f1f
rename backend to pkg
2014-08-12 20:45:41 +02:00