12110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Torkel Ödegaard	f591bea696	Merge branch 'graphite-series-by-tags'	2017-11-17 12:15:21 +01:00
Alexander Zobnin	490b8fc50f	panels: add css tweaks for scrollable panels	2017-11-17 12:13:56 +03:00
Alexander Zobnin	a55be07ea5	dashboard history clean up: avoid potential SQL injections	2017-11-17 10:51:50 +03:00
Daniel Lee	f47673ab5c	search: refactor search sql into a builder class	2017-11-17 00:16:33 +01:00
bergquist	fe42f81441	changelog: note about closing #9798	2017-11-16 16:55:02 +01:00
bergquist	0f69e06fcf	removes invalid comment	2017-11-16 16:55:02 +01:00
Carl Bergquist	03c23dd9c1	Merge pull request #9901 from grafana/fix_annotations_api ... fix: return id from api when creating new annotation, fixes #9798	2017-11-16 16:51:41 +01:00
Marcus Efraimsson	909601d6ab	api: fix so that datasources functions returns Response	2017-11-16 16:29:05 +01:00
bergquist	dcffcbb6d3	changelog: note about closing #1789	2017-11-16 16:21:14 +01:00
Torkel Ödegaard	26577ab600	Merge branch 'master' into graphite-series-by-tags	2017-11-16 16:20:44 +01:00
Marcus Efraimsson	89b27b35ba	fix: Use Response as return type	2017-11-16 16:19:01 +01:00
Marcus Efraimsson	540d540ea9	fix: return id from api when creating new annotation/graphite annotation, fixes #9798 ... When creating a region annotation the response will include both id (region start id) and endId (region end id), if not only id.	2017-11-16 16:19:01 +01:00
Carl Bergquist	9ea5af578e	Merge pull request #9504 from grafana/datasource_as_cfg ... Datasources as configuration	2017-11-16 16:13:02 +01:00
bergquist	c60915c146	datasources as cfg: adds docs for all jsondata and secure_json fields	2017-11-16 14:22:52 +01:00
Torkel Ödegaard	3ae0cfa1d0	graphite: minor changes	2017-11-16 14:16:37 +01:00
Alexander Zobnin	126f3703dc	text panel: make scrollable	2017-11-16 15:43:04 +03:00
Alexander Zobnin	4b88cc0226	panels: general property which makes panel scrollable	2017-11-16 15:38:52 +03:00
bergquist	87983021e2	datasources as cfg: convert yaml map into json for jsonData	2017-11-16 13:23:42 +01:00
Torkel Ödegaard	119f5427af	fix: fix cloudwatch metricFindQuery error that stopped it working completely, fixes #9876	2017-11-16 13:06:24 +01:00
Alexander Zobnin	fd046428b4	dashlist: css adjustments for scrollbar	2017-11-16 14:41:42 +03:00
Alexander Zobnin	e89e64e94e	dashlist: fix resizing after mode switching	2017-11-16 14:40:09 +03:00
Alexander Zobnin	7d8b2cb05f	dashlist: add scrollbar	2017-11-16 14:11:01 +03:00
Alexander Zobnin	06622088a1	dashlist: fix panel resizing	2017-11-16 14:10:28 +03:00
bergquist	5b674ce29c	docs: release 4.6.2	2017-11-16 11:22:09 +01:00
bergquist	bfd8afaf13	docs: update metrics api path	2017-11-16 09:38:37 +01:00
bergquist	e15fed10e2	changelog: adds note about closing #1871	2017-11-15 15:04:29 +01:00
Patrick O'Carroll	d800e64368	fixes: #1871 Dropdown starred (#9490) ... adding the ability to star dashboard in search and dashboard-list closes #1871	2017-11-15 15:01:44 +01:00
Sven Klemm	26ab25b7c0	dont loose subsecond precision when dealing with timestamp or (#9851) ... timestamptz	2017-11-15 14:50:32 +01:00
Torkel Ödegaard	3b18adfe1a	graphite: progress on new query editor	2017-11-15 14:35:22 +01:00
bergquist	6267ef1391	datasource as cfg: fixes typos	2017-11-15 14:30:32 +01:00
bergquist	6e82dbafbc	docs: format cfg mgt tools as table	2017-11-15 14:30:32 +01:00
bergquist	29dff8b6cd	docs: adds more info about provisioning	2017-11-15 14:30:32 +01:00