12871 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Efraimsson	1ce6a420cb	docker: use mysql and postgres from latest fake-data-gen	2018-01-23 10:51:48 +01:00
Carl Bergquist	e24d9a6224	Merge pull request #10584 from bkaganyildiz/update-opsgenie-notifier ... Update OpsGenie Notifier to support different api domains.	2018-01-23 08:57:13 +01:00
bkaganyildiz	97d969bd5c	Update OpsGenie Notifier to support different api domains.	2018-01-22 22:27:35 +03:00
Patrick O'Carroll	c611ffa4bc	10583 panel resize icon fix (#10585) ... * removed svg, added ::after * removed unnecessary code	2018-01-22 16:49:45 +01:00
Marcus Efraimsson	f8a03fa3e3	Merge pull request #10587 from grafana/10580_search_bug ... dashboards: Fix issue with first click when expanding folder in search	2018-01-22 16:44:31 +01:00
Marcus Efraimsson	b5a6a9ab3b	dashboards: Fix issue with first click when expanding folder in search ... Fixes #10580	2018-01-22 16:12:52 +01:00
bergquist	5546828b9f	cfg: adds info about local img uploader to docs	2018-01-22 11:11:30 +01:00
bergquist	704a198ffa	docs: adds info about local img uploader	2018-01-22 11:09:16 +01:00
bergquist	b98dd680e9	changelog: adds note about closing #6922	2018-01-22 11:04:56 +01:00
Carl Bergquist	184e7046df	Merge pull request #10059 from FunkyM/local-image-store ... Add support for internal image store	2018-01-22 11:03:00 +01:00
bergquist	6780e00c7d	changelog: note about closing #9664	2018-01-22 10:47:23 +01:00
Carl Bergquist	89ae4d6685	Merge pull request #9664 from mtanda/prometheus_on_by ... (prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right	2018-01-22 10:42:20 +01:00
bergquist	9678be15d9	changelog: adds note about closing #9770	2018-01-22 08:16:31 +01:00
Carl Bergquist	27d103adae	Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked ... Disable instead of hide mode options when line/points is unchecked	2018-01-22 08:11:19 +01:00
Carl Bergquist	397da7a444	Merge pull request #10572 from Jonnymcc/add-lumens-unit ... Add lumens unit	2018-01-22 07:35:26 +01:00
Jonathan McCall	f516c82ddc	Disable instead of hide mode options when line/points is unchecked	2018-01-20 19:23:26 -05:00
Jonathan McCall	88e1ec3382	Add lumens unit	2018-01-19 19:12:30 -05:00
Carl Bergquist	1de00ded1e	Merge pull request #10556 from Ultimation/patch-1 ... Recommend a limit on database query for influxdb annotations	2018-01-19 13:49:29 +01:00
bergquist	278337e45a	install dep instead of govendor on setup	2018-01-19 10:27:02 +01:00
Carl Bergquist	987a546e74	Merge pull request #10563 from grafana/golang_dep ... Migrated from govendor to dep	2018-01-19 10:22:54 +01:00
bergquist	7ed643f302	remove unused code from vendor	2018-01-19 09:54:22 +01:00
bergquist	e023f79c5a	migrate from govendor to dep	2018-01-19 09:48:15 +01:00
Torkel Ödegaard	4f59d229fe	fix: cloudwatch corrected error handling so original error is not thrown away	2018-01-19 09:24:44 +01:00
Torkel Ödegaard	4720b86f5c	Merge remote-tracking branch 'origin/mattttt-style-tweaks'	2018-01-18 19:18:34 +01:00
Dan Cech	5bb22b836d	Generic Oauth Support for ADFS (#9242) ... * check upn field if email address isn't present, support for adfs * correctly set login to the user's email address if not specified by the oauth server * break up GenericOAuth.UserInfo into helper functions	2018-01-18 17:24:04 +01:00
Andrew Cottrell	8368bfeab4	Recommend a limit on database query ... Users not putting a limit on can end up causing bad performance. A recommended limit in the placehold is a quick little help.	2018-01-18 14:31:42 +00:00
Matt	0dffb6dbb1	Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside	2018-01-18 14:40:08 +01:00
Daniel Lee	1a019052d5	mysql: convert numbers to text for annotation tooltip	2018-01-18 11:50:16 +01:00
Daniel Lee	6d13645206	mysql: update to use ColumnTypes interface in new version ... The custom code in vendor is not needed anymore and most of the mapping code can be replaced.	2018-01-18 11:50:16 +01:00
Daniel Lee	7bc7af6c39	mysql: update mysql driver to latest master ... The latest master implements the ColumnType interface. See https://github.com/go-sql-driver/mysql/issues/495 This removes the custom code in the vendor folder that did a ColumnType mapping.	2018-01-18 11:50:16 +01:00
bergquist	a32644198c	gofmt my dear friend	2018-01-18 11:49:45 +01:00
Torkel Ödegaard	7dc046d9f5	ux: updated react-layout-grid	2018-01-18 11:33:39 +01:00
Carl Bergquist	d6667c4fa0	Merge pull request #10548 from StevenTobin/follow_symlinks ... Make file_reader follow symlinks	2018-01-18 11:29:34 +01:00
bergquist	b6e6935821	plugins: send secureJsonData unencrypted	2018-01-18 11:22:44 +01:00
Carl Bergquist	81bb3e1e27	Merge pull request #10547 from grafana/provisioning ... Dashboard provisioning. Replace folder property with path	2018-01-18 10:05:19 +01:00
stobin	f1813ae3a3	Make file_reader follow symlinks	2018-01-17 14:51:17 +00:00
bergquist	34d7f8a44f	dashboards as cfg: property path replaces folder	2018-01-17 15:48:24 +01:00
bergquist	9e20004ec8	Merge branch 'plugin_lib' ... * plugin_lib: moves datasource plugin model to grafana/grafana_plugin_model	2018-01-17 13:47:36 +01:00
bergquist	a183ea97bb	moves datasource plugin model to grafana/grafana_plugin_model	2018-01-17 13:21:42 +01:00
Torkel Ödegaard	af9d1cc577	Update package.json ... fixed duplicate dev dependency, closes #10542	2018-01-17 11:53:49 +01:00
Torkel Ödegaard	561561d8fe	fix: fixed build issue	2018-01-17 10:48:07 +01:00
Torkel Ödegaard	66edb29f53	fix: multi valued query variables did not work correctly, fixes #10539	2018-01-17 09:41:35 +01:00
Torkel Ödegaard	c4c0e7934b	Update building_from_source.md ... corrected build instructions, #10532	2018-01-16 20:15:52 +01:00
Torkel Ödegaard	94b0c79631	Update README.md ... Simplified build instructions i	2018-01-16 20:14:53 +01:00
Torkel Ödegaard	6edc945e85	Update default_task.js ... removed build clean from test task, #10532	2018-01-16 20:13:27 +01:00
Leonard Gram	183507964c	Clearer naming for dashboard provisioning config. ... Renames folder (in options) to path to make it different from the grafana folder wherein the dashboard will be created.	2018-01-16 17:40:14 +01:00
Torkel Ödegaard	307b419f7c	ux: dashboard nav and settings tweaks	2018-01-16 14:41:08 +01:00
Torkel Ödegaard	11ba8070b8	Tag filters in search (#10521) ... * tag filter: initial react component * dashboard: move tag filter to filterbox * tag filter: customize value rendering * tag filter: get color from name * tag filter: custom option renderer * tag filter: mode with tags in different container * tag filter: refactor * refactoring PR #10519 * tag filter: refactor of PR #10521	2018-01-16 12:52:13 +01:00
Torkel Ödegaard	42d7308034	fix: save as enter key now works and folder selection also works, fixes #10464	2018-01-16 12:50:24 +01:00
bergquist	5eb36e65f2	use context over golang.org/x/net/context	2018-01-16 12:32:58 +01:00