12117 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	99e52143df	sass tweaks	2017-11-23 16:50:22 +01:00
Marcus Efraimsson	7ee57b774a	dashlist: When searching should reset checked state to false	2017-11-23 14:59:52 +01:00
Daniel Lee	9ba9043d64	dashlist: change scrollbar to new perfect scroll directive	2017-11-23 13:31:35 +01:00
Torkel Ödegaard	84c46f0cd3	ux: fixed sass issue	2017-11-23 13:01:19 +01:00
Torkel Ödegaard	2b1371c4b8	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-11-23 12:54:35 +01:00
Torkel Ödegaard	458f6fc4b2	sass refactoring and updating styles for list item elements	2017-11-23 12:54:12 +01:00
Daniel Lee	245cebedde	dashlist: style list to be same as dash search	2017-11-23 11:53:55 +01:00
Torkel Ödegaard	a1d47d36f6	css tweaks and cleanup	2017-11-23 11:37:59 +01:00
Torkel Ödegaard	d9a913afe1	Merge branch 'develop-scrollable-panels' into develop	2017-11-23 11:13:21 +01:00
Torkel Ödegaard	f18f1a1093	removing gemini scrollbar and replacing with perfect scrollbar, muuuch better	2017-11-23 11:12:32 +01:00
Torkel Ödegaard	856a0393ab	Merge branch 'develop' into develop-scrollable-panels	2017-11-23 10:27:16 +01:00
Daniel Lee	41a3431c4e	dashlist: starred filter search	2017-11-22 18:44:57 +01:00
Torkel Ödegaard	2d2015d3dd	ux: tweaked panel color and dashboard background is same as page background	2017-11-22 17:18:04 +01:00
Torkel Ödegaard	c94331cd20	Merge branch 'develop' into develop-color-tweaks	2017-11-22 14:54:57 +01:00
Torkel Ödegaard	b7a8db4937	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-11-22 14:51:53 +01:00
Torkel Ödegaard	905553052a	removed call to unused function in panel_ctrl	2017-11-22 14:47:26 +01:00
Torkel Ödegaard	85e81959f2	scrollable panels works better with perfect-scrollbar	2017-11-22 14:46:17 +01:00
Torkel Ödegaard	68bd17bd0e	work on scrollable panels	2017-11-22 13:32:54 +01:00
Alexander Zobnin	18ca7a53aa	scrollable panels: fix initial content size (#9960)	2017-11-22 07:05:33 +01:00
Daniel Lee	ba511f3e24	dashlist: adds tag filter select (GitHub style)	2017-11-21 18:53:49 +01:00
Daniel Lee	121d48ec26	dashlist: toggle folders	2017-11-21 17:06:30 +01:00
Daniel Lee	3dc2e06a33	dashboard: fix test for folderIds	2017-11-21 16:41:08 +01:00
Torkel Ödegaard	9fc22e5a66	Merge branch 'master' of github.com:grafana/grafana into develop	2017-11-21 16:05:18 +01:00
bergquist	3a772c7f7f	allows head requests for /api/health endpoint ... closes #9955	2017-11-21 15:03:04 +01:00
Daniel Lee	bd2b26e9f5	dashlist: fix tag filtering and some css	2017-11-21 14:47:19 +01:00
Torkel Ödegaard	43a6a65f8b	fix: fixed issue with metric segment introduced in graphite tags query editor PR	2017-11-21 14:39:09 +01:00
Torkel Ödegaard	830c307bba	progress on scrollable panels work	2017-11-21 14:30:33 +01:00
Daniel Lee	5dd9582520	mysql: add data source support for Azure MySql ... Fixes #9649	2017-11-21 13:21:19 +01:00
Torkel Ödegaard	741e5a38bd	Merge branch 'feat-9887' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9887	2017-11-21 11:55:07 +01:00
Torkel Ödegaard	ccbdb29f07	fixed unit tests	2017-11-21 11:53:56 +01:00
Torkel Ödegaard	0d12b37dfd	fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951	2017-11-21 11:28:17 +01:00
bergquist	14b8bd35ed	Merge branch 'Fresh-Tracks-add-p8s-2-db'	2017-11-21 10:12:33 +01:00
bergquist	0390b4187b	prom: add prom2 dashboard as bundled dashboard	2017-11-21 10:12:24 +01:00
Cody Boggs	999b1211b6	show top 5 max scrape durations by job, and fix legend format	2017-11-21 10:12:24 +01:00
Cody Boggs	9151a2468d	fix scrape duration, add rule eval iteration stats, and reorg a bit	2017-11-21 10:12:24 +01:00
Cody Boggs	29de4e7c53	fix data source var and remove node_exporter dependency	2017-11-21 10:12:24 +01:00
Cody Boggs	d5ef0403af	First draft of a Prometheus 2.0 Stats dashboard	2017-11-21 10:12:24 +01:00
bergquist	d7321cd89c	prom: initial docker block for prometheus 2	2017-11-21 09:55:42 +01:00
Carl Bergquist	c83975f2e1	Merge pull request #9936 from grafana/js-to-ts-migration ... Js to ts migration	2017-11-21 09:21:22 +01:00
Trent White	56118b9fa4	tweak tabs:	2017-11-20 13:59:21 -05:00
Trent White	8fe8a62645	color fix	2017-11-20 13:31:04 -05:00
Trent White	ec49dd9231	make grays cooler	2017-11-20 13:27:20 -05:00
Daniel Lee	8daff73ba2	dashlist: started fixing js/css after design changes	2017-11-20 18:15:59 +01:00
Torkel Ödegaard	afa226bec3	updated search	2017-11-20 16:31:23 +01:00
Torkel Ödegaard	a8552bac21	more work on search	2017-11-20 16:21:50 +01:00
Torkel Ödegaard	c1539b90b7	minor update to dashboard search	2017-11-20 15:46:16 +01:00
Patrick O'Carroll	25f63e0581	converted test-files to jest	2017-11-20 15:25:42 +01:00
Torkel Ödegaard	9ace21b689	improved search srv	2017-11-20 15:11:32 +01:00
Patrick O'Carroll	59cebca4b2	converted influx-series to TS, converted test to jest	2017-11-20 14:31:51 +01:00
Alexander Zobnin	10e3b63ddb	Merge remote-tracking branch 'upstream/develop' into feat-9887	2017-11-20 15:51:49 +03:00