5262 Commits

Author	SHA1	Message	Date
bergquist	f142548969	dataproxy: adds dashboardid and panelid as tags ... closes #11315	2018-03-20 22:23:28 +01:00
Carl Bergquist	10a0460dc6	Merge pull request #11282 from alexanderzobnin/fix-11086 ... Fix rendering link to panel in collapsed row	2018-03-20 12:40:30 +01:00
Alexander Zobnin	05ac7d8fca	dashboard: fix phantomjs panel rendering in collapsed row	2018-03-20 14:13:31 +03:00
Marcus Efraimsson	8f6626e805	mssql: encrypt password in database	2018-03-19 17:32:51 +01:00
Marcus Efraimsson	6044b3aeeb	Merge branch 'master' into mssql_datasource	2018-03-19 17:14:33 +01:00
Daniel Lee	caf60dda0e	Merge pull request #10376 from grafana/openTSDB-file-to-ts ... migrated file to ts	2018-03-19 14:32:32 +01:00
Daniel Lee	8b9c44be17	Merge pull request #10369 from grafana/elastic-file-to-ts ... migrated files to ts	2018-03-19 13:59:30 +01:00
Marcus Efraimsson	24c0f28f41	mssql: allow host without port and fallback to default port 1433	2018-03-19 13:24:31 +01:00
Marcus Efraimsson	62174c81c8	mssql: cleanup and minor changes	2018-03-19 13:06:46 +01:00
Marcus Efraimsson	8c2f3f761b	mssql: update readme	2018-03-19 11:20:17 +01:00
Marcus Efraimsson	294ee5a610	Merge branch 'master' into mssql_datasource	2018-03-19 11:03:13 +01:00
Marcus Efraimsson	74a98d46eb	mssql: remove logos for now	2018-03-19 11:02:55 +01:00
flopp999	6718915a23	Changed Swedish and Icelandic currency ... Swedish krone -> Swedish krona Icelandic krone - > Icelandic króna	2018-03-16 19:46:20 +01:00
Alexander Zobnin	205714759e	fix failed tests for dashboard view state	2018-03-16 21:45:31 +03:00
Alexander Zobnin	0e5b790b54	dashboard: fix rendering link to panel in collapsed row	2018-03-16 21:03:49 +03:00
Marcus Efraimsson	d26d8c713e	Merge branch 'master' into mssql_datasource	2018-03-16 15:19:19 +01:00
Marcus Efraimsson	06afd24a10	mssql: add alternative logo without text	2018-03-16 15:18:05 +01:00
Marcus Efraimsson	1c7aff7810	mssql: strip inkscape from logo	2018-03-16 15:17:25 +01:00
Marcus Efraimsson	69b9fb6d15	mssql: minor improvements of query editor help	2018-03-16 15:11:15 +01:00
Marcus Efraimsson	ccd57fbfa3	mssql: skip rendering of mssql logos until we have a valid logo	2018-03-16 14:47:43 +01:00
Marcus Efraimsson	a6e4ac5484	mssql: update plugin.json, added description and name MSSQL -> Microsft SQL Server	2018-03-16 14:26:05 +01:00
Mitsuhiro Tanda	c6fa0b90a7	prometheus editor: variable autocomplete support (PR #9988) ... * prometheus ace editor, template variable support * minor fix * support [[var]] notation * don't remove last ] if token type is string * Revert "don't remove last ] if token type is string" This reverts commit bce5b2d56e. * Revert "support [[var]] notation" This reverts commit 10012f8ffe. * fix token type and regex	2018-03-15 20:17:51 +03:00
Marcus Efraimsson	d2267643ed	Merge branch 'master' into mssql_datasource	2018-03-15 09:53:19 +01:00
Marcus Efraimsson	91fa076fb3	folders: should be possible to browse folder using only uid ... That is, the slug part of url should be optional.	2018-03-13 21:32:37 +01:00
Marcus Efraimsson	5fbfd67b94	dashboards: should be possible to browse dashboard using only uid ... That is, the slug part of url should be optional. Closes #11231	2018-03-13 21:06:25 +01:00
Marcus Efraimsson	d4beee2bb0	Merge branch 'master' into mssql_datasource	2018-03-13 16:03:02 +01:00
Alexander Zobnin	560aec50b3	Merge PR #8613	2018-03-13 15:36:32 +03:00
Alexander Zobnin	30d077d1d1	graph: minor refactor of histogram mode PR #8613	2018-03-13 15:25:28 +03:00
Alexander Zobnin	38a19f7c90	Merge branch 'histogram_multi' of https://github.com/mtanda/grafana into mtanda-histogram_multi	2018-03-13 13:18:55 +03:00
Carl Bergquist	6df13252bf	Merge pull request #11143 from ApsOps/colorize-singlestat-prefix-postfix ... Add color to prefix and postfix in singlestat panel	2018-03-13 10:41:40 +01:00
Yohann BARRE	a3388ef45f	Second to HH:mm:ss formatter (#11105) ... * Seconds to HH:MM:SS format	2018-03-13 09:52:41 +01:00
Carl Bergquist	bf6ff50d0b	Merge pull request #11087 from alexanderzobnin/prometheus-heatmap ... Prometheus heatmap support	2018-03-13 09:44:25 +01:00
flopp999	185aa6d47b	Added concentration units and "Normal cubic metre" ... ppm, ppb, ng/m3, ng/Nm3, μg/m3, μg/Nm3, mg/m3, mg/Nm3, g/m3, g/Nm3, Nm3 ppm was moved from "Dimensionless" and "submenu" to "Concentration"	2018-03-12 20:59:43 +01:00
Alexander Zobnin	989ba9763f	prometheus: fix bug introduced by #9859 (httpMethod is undefined)	2018-03-12 19:41:07 +03:00
Alexander Zobnin	46d2067af2	prometheus: add tests for heatmap mode	2018-03-12 17:37:21 +03:00
Alexander Zobnin	94cf560304	Merge remote-tracking branch 'upstream/master' into prometheus-heatmap	2018-03-12 17:16:02 +03:00
Alexander Zobnin	479209f483	prometheus: datasource refactor	2018-03-12 17:13:05 +03:00
Carl Bergquist	e94d23e5ff	Merge pull request #10873 from willyhutw/cloudwatch_dimension_values_add_dimension_filter ... Cloudwatch dimension_values add dimension filter.	2018-03-12 14:24:26 +01:00
Carl Bergquist	74602b1077	Merge pull request #11183 from jtyr/jtyr-timeticks ... Adding Timeticks unit	2018-03-12 09:53:53 +01:00
Mitsuhiro Tanda	4e1501b172	set default value of httpMethod	2018-03-12 13:53:05 +09:00
Mitsuhiro Tanda	a83ede0193	support POST for query and query_range	2018-03-12 13:25:05 +09:00
Jiri Tyr	6bfed903c4	Adding Timeticks unit	2018-03-09 17:20:24 +00:00
bergquist	0ee6a5216b	Merge branch 'master' of https://github.com/mayli/grafana into mayli-master ... * 'master' of https://github.com/mayli/grafana: Use B/s instead Bps for Bytes per second	2018-03-08 18:50:02 +01:00
Carl Bergquist	a589f701ad	Merge pull request #10925 from mtanda/cw_high_resolution ... (cloudwatch) support high resolution query	2018-03-08 18:06:08 +01:00
Carl Bergquist	b1494637d1	Merge pull request #11141 from mtanda/templating_comma_join ... add comma templating format	2018-03-07 16:49:19 +01:00
Mitsuhiro Tanda	244cbe8cbd	add csv templating format	2018-03-08 00:13:58 +09:00
Alexander Zobnin	759e05d09e	heatmap: add explanation of Time series buckets mode	2018-03-07 17:08:34 +03:00
Aman	a94de51e5e	Add color to prefix and postfix in singlestat	2018-03-07 19:36:42 +05:30
Alexander Zobnin	5e452e445c	heatmap: able to set upper/lower bucket bound manually	2018-03-07 16:57:46 +03:00
Alexander Zobnin	18a90667ba	heatmap: refactor	2018-03-07 16:33:33 +03:00