95 Commits (7535cefed9be855164aca58afd1e39c0f9266079)

Author	SHA1	Message	Date
Mikael Olenfalk	c0f100f1b5	Improve logging in the phantomjs renderer (#10697) ... * Add add adapter between io.Writer and log.Logger * Add phantomjs output to grafana log * Unexport LogWriterImpl * Add test for LogWriter * Make it possible to get phantomjs debug output * Make it possible to get the configured log level	7 years ago
Martin Szulecki	c82e23d96e	imguploader: Add support for new internal image store (#6922)	7 years ago
bergquist	b840514797	imguploader: log if the configuration is invalid	8 years ago
Mahmoud Saada	af15e3c0d0	Implement Azure Blob external image uploader	8 years ago
jomenxiao	ad2a69bff4	add encoding param	8 years ago
saady	767b460ff1	[GCS] Support for gcs path	8 years ago
xjewer	bddebf4c82	add a phantomjs execution status to log if errors happens, e.g. OOM killer kills it (#9644) ... fixes #9643	8 years ago
Ricard Clau	e4541a7fd1	support for s3 path (#9151)	8 years ago
Ivan Babrou	9a4ae30227	Enable dualstack in every net.Dialer, fixes #9364 ... Default transport enables it: * https://github.com/golang/go/blob/d2826d3e06/src/net/http/transport.go#L42-L46 ``` DialContext: (&net.Dialer{ Timeout: 30 * time.Second, KeepAlive: 30 * time.Second, DualStack: true, }).DialContext, ``` See also: https://github.com/golang/go/issues/15324	8 years ago
William	88a8991722	config bucket and region for s3 uploader ... this is to support cn-north-1 region as it can get s3 url programatically. also keeps support 'bucket_url' for backward compatiblity	8 years ago
bergquist	87308fd97f	fixes broken tests 💥	8 years ago
bergquist	16b1c0e63e	minor code adjusetments	8 years ago
bergquist	c7698a09ed	pass context to image uploaders	8 years ago
Konstantin Chukhlomin	7e3c9fcc1c	Reduced OAuth scope to read_write	8 years ago
Konstantin Chukhlomin	fcdf282090	GCS support via JSON API	8 years ago
Konstantin Chukhlomin	1188f8df73	gofmt fixes	8 years ago
Konstantin Chukhlomin	72d7c4d620	Added GCS support #8370	8 years ago
William	37962216ed	get s3 url via aws-sdk-go, fix #9189	8 years ago
wangguoliang	652fce7e76	Optimize some wrong usage and spelling ... Signed-off-by: wgliang <liangcszzu@163.com>	8 years ago
Torkel Ödegaard	34cda65998	fix: png rendering api & timeout parameter now works as it should AND default render timeout increased from 30 to 60 seconds, fixes #8710	8 years ago
Ben Tranter	1fd7b60efe	Add more information to basic diff logic	8 years ago
Ben Tranter	a3d22ae9c7	Document logic behind basic diff	8 years ago
Ben Tranter	b54b43a42e	Add tests for diff formatters	8 years ago
Daniel Lee	446104d120	dashfolders: allows phantomjs rendering for alerting ... Makes the alerting user an admin when rendering a png for emails	8 years ago
Daniel Lee	f68d2816ab	dashfolders: security for png rendering	8 years ago
Torkel Ödegaard	46412c8475	dasboard_history: security fix, added orgId filter to dashboard version lookup	8 years ago
Torkel Ödegaard	577dfee086	dasboard_history: fixed json diff so only dashbord is compared and not the whole dashboard revision object (message and restoreFrom etc was showing up in json diff)	8 years ago
Torkel Ödegaard	8f6c9c5946	dasboard_history: some polish around styles & diff colors, and minor fixes	8 years ago
Torkel Ödegaard	ef1dfed0d8	dasboard_history: big refactoring of how the compare api looked, now a POST with a model for new & base version, refactored a simplified UI code as well, this was done to lay foundation to make it possible to do diff against current in browser unsaved version	8 years ago
Torkel Ödegaard	e2061312f5	refactoring: moved compare dashboard version command out of sqlstore, the code in this command did not use any sql operations and was more high level, could be moved out and use existing queries to get the versions	8 years ago
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.	8 years ago
Torkel Ödegaard	befc15c5a1	fix: s3 image uploads to us-east-1 (us standard) did not return correct image urls so images shared to slack and other services was not correct, fixes #8444	8 years ago
berghauz	48cf58e739	Indenting fix	8 years ago
berghauz	c713bd9a9a	Proxy support added, fixes #7922 ... Well, i'm really want to see it working in 4.3.0	8 years ago
rogerswingle	02455753b5	Specify region for s3 (#8251)	8 years ago
Daniel Lee	6538e86793	webdav: add tests + path.join for public url param ... Fixes #7914. Fixes #7921	8 years ago
fir4	6d9e8bd147	webdav: allow specification of a different public_url than upload url	8 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	8 years ago
Torkel Ödegaard	f78a28395d	s3: support for alternative s3 bucket url syntax, closes #7871	8 years ago
Torkel Ödegaard	be5c4f47a6	s3: support for alternative s3 bucket url syntax, closes #7871	8 years ago
Mitsuhiro Tanda	b387a8759e	use session.NewSession() (#7745)	8 years ago
bergquist	05952688c5	tech: avoid using http.DefaultClient	8 years ago
Torkel Ödegaard	1a9aaa4138	feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264	8 years ago
Ryuichi Sakai	1bc55a2d38	Enable image rendering to use browser time offset	8 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	8 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	8 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