52 Commits (b6e46c9eb8b15d22b1e9e4e9de8a99aca1522f08)

Author	SHA1	Message	Date
Ben Tranter	b6e46c9eb8	History and Version Control for Dashboard Updates ... A simple version control system for dashboards. Closes #1504. Goals 1. To create a new dashboard version every time a dashboard is saved. 2. To allow users to view all versions of a given dashboard. 3. To allow users to rollback to a previous version of a dashboard. 4. To allow users to compare two versions of a dashboard. Usage Navigate to a dashboard, and click the settings cog. From there, click the "Changelog" button to be brought to the Changelog view. In this view, a table containing each version of a dashboard can be seen. Each entry in the table represents a dashboard version. A selectable checkbox, the version number, date created, name of the user who created that version, and commit message is shown in the table, along with a button that allows a user to restore to a previous version of that dashboard. If a user wants to restore to a previous version of their dashboard, they can do so by clicking the previously mentioned button. If a user wants to compare two different versions of a dashboard, they can do so by clicking the checkbox of two different dashboard versions, then clicking the "Compare versions" button located below the dashboard. From there, the user is brought to a view showing a summary of the dashboard differences. Each summarized change contains a link that can be clicked to take the user a JSON diff highlighting the changes line by line. Overview of Changes Backend Changes - A `dashboard_version` table was created to store each dashboard version, along with a dashboard version model and structs to represent the queries and commands necessary for the dashboard version API methods. - API endpoints were created to support working with dashboard versions. - Methods were added to create, update, read, and destroy dashboard versions in the database. - Logic was added to compute the diff between two versions, and display it to the user. - The dashboard migration logic was updated to save a "Version 1" of each existing dashboard in the database. Frontend Changes - New views - Methods to pull JSON and HTML from endpoints New API Endpoints Each endpoint requires the authorization header to be sent in the format, ``` Authorization: Bearer <jwt> ``` where `<jwt>` is a JSON web token obtained from the Grafana admin panel. `GET "/api/dashboards/db/:dashboardId/versions?orderBy=<string>&limit=<int>&start=<int>"` Get all dashboard versions for the given dashboard ID. Accepts three URL parameters: - `orderBy` String to order the results by. Possible values are `version`, `created`, `created_by`, `message`. Default is `versions`. Ordering is always in descending order. - `limit` Maximum number of results to return - `start` Position in results to start from `GET "/api/dashboards/db/:dashboardId/versions/:id"` Get an individual dashboard version by ID, for the given dashboard ID. `POST "/api/dashboards/db/:dashboardId/restore"` Restore to the given dashboard version. Post body is of content-type `application/json`, and must contain. ```json { "dashboardId": <int>, "version": <int> } ``` `GET "/api/dashboards/db/:dashboardId/compare/:versionA...:versionB"` Compare two dashboard versions by ID for the given dashboard ID, returning a JSON delta formatted representation of the diff. The URL format follows what GitHub does. For example, visiting [/api/dashboards/db/18/compare/22...33](http://ec2-54-80-139-44.compute-1.amazonaws.com:3000/api/dashboards/db/18/compare/22...33) will return the diff between versions 22 and 33 for the dashboard ID 18. Dependencies Added - The Go package [gojsondiff](https://github.com/yudai/gojsondiff) was added and vendored.	9 years ago
berghauz	48cf58e739	Indenting fix	9 years ago
berghauz	c713bd9a9a	Proxy support added, fixes #7922 ... Well, i'm really want to see it working in 4.3.0	9 years ago
rogerswingle	02455753b5	Specify region for s3 (#8251)	9 years ago
Daniel Lee	6538e86793	webdav: add tests + path.join for public url param ... Fixes #7914. Fixes #7921	9 years ago
fir4	6d9e8bd147	webdav: allow specification of a different public_url than upload url	9 years ago
Dan Cech	b489e93d94	Config Array Syntax (#8204) ... * refactor util encryption library so it doesn't have to import log * add util.SplitString to handle space and/or comma-separated config lines * go fmt	9 years ago
Torkel Ödegaard	f78a28395d	s3: support for alternative s3 bucket url syntax, closes #7871	9 years ago
Torkel Ödegaard	be5c4f47a6	s3: support for alternative s3 bucket url syntax, closes #7871	9 years ago
Mitsuhiro Tanda	b387a8759e	use session.NewSession() (#7745)	9 years ago
bergquist	05952688c5	tech: avoid using http.DefaultClient	9 years ago
Torkel Ödegaard	1a9aaa4138	feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264	9 years ago
Ryuichi Sakai	1bc55a2d38	Enable image rendering to use browser time offset	9 years ago
Torkel Ödegaard	d354f3a8af	fix(alerting): fixed evaluation for no_value condition, fixes #7244 (#7247) ... * fix(alerting): fixed evaluation for no_value condition, fixes #7244 * feat(alerting): moving null library into grafana, fixing handling on no value / no series	9 years ago
Mitsuhiro Tanda	7e4c101d02	S3 IAM support (#7058) ... * add s3 dependencly * rewrite image uploader by aws-sdk-go * improve backward compatibility of s3 image uploading * set default for expires option * remove acl and expires	9 years ago
bergquist	c17064fb44	fix(webdav): adds missing auth headers ... closes #6779	9 years ago
jifwin	e73b82d54f	Disable web-security for phantomjs rendering (#6469)	9 years ago
Torkel Ödegaard	ab07667b69	fix(rendering): minor fix for server side rendering when using non default http addr setting and non default domain setting, #6813	9 years ago
bergquist	b4b7156f42	fix(webdav): adds missing auth headers ... closes #6779	9 years ago
Daniel Lee	af07adb146	refactor(securejsondata): extract to class ... Extract from pluginsettings class so that the securejsondata type can be used in the other classes. Encrypt and decrypt functions extracted too.	9 years ago
Torkel Ödegaard	ea5cb0d076	fix(server side rendering): Fixed address used when rendering panel via phantomjs and using non default http_addr config, fixes #6660	9 years ago
bergquist	92121ea656	feat(alerting): add nop uploader ... ref #6183	9 years ago
bergquist	1a32ab64b6	tech(renderer): improve renderOpts names	9 years ago
Torkel Ödegaard	175c651e65	fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906	9 years ago
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	9 years ago
bergquist	d1a7a23c84	test(imageupload): add more specific tests ... torkels commit will fix this unit test :)	9 years ago
bergquist	99e99922b4	feat(alerting): add support for uploading images to webdav. ... closes #5770	9 years ago
Torkel Ödegaard	357358898d	feat(annotations): working on alert annotations, #5694	10 years ago
Torkel Ödegaard	2b276d5cd1	feat(alerting): working on alert notification and image rendering	10 years ago
Torkel Ödegaard	4fc50742a0	feat(alerting): working on image rendering with alert notifications	10 years ago
fg2it	303cd8a5af	[RenderToPng fix] (#4901) ... * removing useless code * fix various minor typo * don't silence phantomjs timeout and allow more time * fix gofmt	10 years ago
Torkel Ödegaard	0398face05	feat(plugins): dashboard import for data sources is working! #4298	10 years ago
Torkel Ödegaard	3fb0b71822	refactor(): refactoring json usage	10 years ago
Torkel Ödegaard	40b2f00dc5	fix(): fixed from db -> json	10 years ago
Torkel Ödegaard	1f9f439acb	lib(): added simplejson lib	10 years ago
Torkel Ödegaard	c5a817194a	more work on dashboard importing and templating	10 years ago
bergquist	43073da7eb	feat(renderer): add timeout for the renderer api ... closes #4325	10 years ago
bergquist	6a7e9134a5	fix(renderer): add .exe for phantomjs on windows ... closes #3657	10 years ago
Torkel Ödegaard	49fdf8427a	fix(png rendering): removed --ssl-protocol=any phantomjs param	10 years ago
Torkel Ödegaard	26e5d7a3de	Graph: fixed PNG rendering of panels with legend table to the right, #2185	11 years ago
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.	11 years ago
Torkel Ödegaard	ea993b6404	Some inital ldap work	11 years ago
Torkel Ödegaard	6911572fa1	Panel image rendering: now works under self-signed https cert, Fixes #1726	11 years ago
Torkel Ödegaard	059db533d5	HTTP API: grafana /render calls nows with api keys, Fixes #1649	11 years ago
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.	11 years ago
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	11 years ago
Torkel Ödegaard	5269422f7c	Began work on hashing api keys	11 years ago
Torkel Ödegaard	10820f31c2	Changed go package path	11 years ago
Torkel Ödegaard	27f07e9de2	Progress on data source admin	11 years ago
Torkel Ödegaard	90ae59ccaf	Fixed png rending	11 years ago