12292 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
THIERRY SALLE	bd4d665d54	Elasticsearch max_concurrent_shard_requests parameter for es 5.6+	2017-11-21 10:56:34 +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
Torkel Ödegaard	6c5e19c1e0	dashboard search	2017-11-20 13:37:26 +01:00
Torkel Ödegaard	fc1d8416a7	working on dashboard search	2017-11-20 12:47:03 +01:00
Ryan McKinley	b1de1e6f26	Move the loading flag to PanelCtrl (#9929)	2017-11-20 11:27:18 +01:00
Alexander Zobnin	f54547776d	graph: disable zoom in non-timeseries modes (#9914)	2017-11-20 10:06:34 +01:00
Patrick O'Carroll	66e4297816	changed padding to pixels, fixes #9916 (#9924)	2017-11-20 10:05:18 +01:00
Maytee Chinavanichkit	c1e5f5be87	Use correct moments format for Showing last us time instead of value test (#9923) ... Fixes this issue: PhantomJS 2.1.1 (Mac OS X 0.0.0) SingleStatCtrl showing last us time instead of value should set formatted value FAILED expected '09/17/2017 4:56:37 pm' to equal '09/17/2017 16:56:37 pm'	2017-11-20 10:00:56 +01:00
Carl Bergquist	3351f959d0	Merge pull request #9913 from tomwilkie/dashboard-json-configmaps ... Don't import JSON dashboards from hidden directories.	2017-11-20 08:31:05 +01:00
Tom Wilkie	0015183a7b	Don't import JSON dashboards from hidden directories.	2017-11-17 17:21:49 +00:00
Torkel Ödegaard	0fe4229023	Merge branch 'develop' into develop-search	2017-11-17 16:37:09 +01:00
Torkel Ödegaard	8160e68f93	fix: build & tests	2017-11-17 16:18:30 +01:00
Torkel Ödegaard	7b17d134fc	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-11-17 15:49:47 +01:00
Torkel Ödegaard	0e44fe082b	Merge branch 'master' into develop	2017-11-17 15:49:17 +01:00
Daniel Lee	7c74111187	search: add expanded folders	2017-11-17 15:30:21 +01:00
Torkel Ödegaard	6595be95eb	influxdb: another minor refactor of #9474	2017-11-17 15:23:45 +01:00
Torkel Ödegaard	37409163b9	refactor: refactoring InfluxDB query builder with policy PR #9473	2017-11-17 15:16:36 +01:00
Torkel Ödegaard	bcb52417db	refactor: refactoring InfluxDB query builder with policy PR #9473	2017-11-17 15:16:04 +01:00
Torkel Ödegaard	4b76c6d652	Merge branch 'master' of https://github.com/omki2005/grafana into omki2005-master	2017-11-17 14:57:44 +01:00
Torkel Ödegaard	153a9bf43a	docs: added versions_to_keep to config docs, #9671	2017-11-17 14:53:08 +01:00
Torkel Ödegaard	36c9b7df53	Update CHANGELOG.md	2017-11-17 14:45:38 +01:00
Torkel Ödegaard	98b4074c16	refactoring: minor refactor of clean up dashboard history PR #9882	2017-11-17 14:41:44 +01:00
Torkel Ödegaard	aaa465a100	Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671	2017-11-17 14:16:49 +01:00
Torkel Ödegaard	908be13c03	Update CHANGELOG.md	2017-11-17 13:26:36 +01:00
Torkel Ödegaard	b481ff27b2	Update CHANGELOG.md	2017-11-17 13:22:49 +01:00
Torkel Ödegaard	303e3de488	fix: fix for avatar images when gzip is turned on, fixes #5952	2017-11-17 13:13:58 +01:00
Torkel Ödegaard	7ccc8ae298	elasticsearch: default version to 5.x	2017-11-17 12:23:40 +01:00