13828 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Efraimsson	ef3588c1f8	docker: mssql and mssql tests blocks with common build context	2018-03-15 09:49:53 +01:00
Carl Bergquist	18e498e0ff	Update README.md ... Removes alpha closes https://github.com/grafana/grafana/issues/11251	2018-03-14 21:07:55 +01:00
Marcus Efraimsson	61e1c12fee	docker: fake-data-gen:latest updates ... fake-data-gen for elastic 2.4 and 5 blocks, new graphite 1.1+ block. added big dashboard for graphite 1 and 1.1+ that can be imported to grafana	2018-03-14 20:47:52 +01:00
ilgizar	bd3d17ab8c	Merge remote-tracking branch 'upstream/master' into 1271_share_zero	2018-03-14 23:42:58 +05:00
ilgizar	9d7ab78d9f	Resolved conflict	2018-03-14 23:39:05 +05:00
bergquist	8efb39ee2b	docs: more details about slack notifier ... closes #11059	2018-03-14 18:26:05 +01:00
bergquist	bdf6a75c91	docs: updates latest release for docs	2018-03-14 17:09:02 +01:00
bergquist	cf67584998	changelog: improve description of closed issues	2018-03-14 16:06:03 +01:00
Carl Bergquist	105f6ff88c	Merge pull request #11249 from bergquist/legacy_render_urls ... Avoid redirecting internal rendering requests	2018-03-14 15:42:07 +01:00
bergquist	6cac7c2de9	renderer: avoid redirect render requests ... closes #11180	2018-03-14 15:27:18 +01:00
bergquist	e4cca1943c	changelog: adds notes about 5.0.2 ... [ci skip]	2018-03-14 15:05:17 +01:00
Carl Bergquist	6d1e3613f7	Merge pull request #11246 from grafana/11227_import ... dashboard: fix import dashboard with alert rule(s)	2018-03-14 14:38:29 +01:00
Carl Bergquist	a8918047a2	Merge pull request #11238 from grafana/11155-mysql-issue ... middleware: recover and retry on session start	2018-03-14 14:29:47 +01:00
Marcus Efraimsson	87284d284e	dashboard: fix import dashboard with alert rule ... Importing a dashboard with alert rule(s) should be possible without receiving invalid alert data error. This fix reverts the import logic to how it worked before Grafana v5.0, that is import will allow dashboard with alert rule(s) but no alerts will be created. After an import the user will need to update the dashboard for the alerts to be created. Fixes #11227	2018-03-14 14:24:56 +01:00
Carl Bergquist	0ef94ea403	Merge pull request #11232 from grafana/11231_dash_url ... Should be possible to browse dashboard using only uid	2018-03-14 14:18:58 +01:00
Carl Bergquist	a0a57ac33a	Merge pull request #11236 from grafana/alerting_collapsed_panels ... alerting: supports extracting alerts from collapsed panels	2018-03-14 14:16:50 +01:00
Daniel Lee	5f511deefc	middleware: recover and retry on session start ... Partial fix for #11155 - the Macaron session middleware panics if mysql returns an error. This fix recovers from the panic and retries once	2018-03-14 12:26:59 +01:00
bergquist	be7ec310b1	alerting: supports extracting alerts from collapsed panels ... collapsed rows wrap the hidden rows within itself. This caused the extractor to miss the panel and therefore delete the alert accosiated with the graph. closes #11222	2018-03-14 11:23:16 +01:00
Marcus Efraimsson	6503e482e3	docker: add test dashboard for mssql for visualizing data generated by fake-data-gen	2018-03-13 23:07:40 +01:00
Marcus Efraimsson	c87752102a	mssql datasource: support for timeGroup macro function	2018-03-13 22:49:49 +01:00
Carl Bergquist	9cae6f05b4	Merge pull request #11225 from flopp999/patch-1 ... Added icon for iOS web app	2018-03-13 21:54:55 +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	57d46a706c	mssql datasource: additional data type tests	2018-03-13 19:54:29 +01:00
Marcus Efraimsson	e7b790316e	docker: add mssql block	2018-03-13 17:03:10 +01:00
Marcus Efraimsson	d4beee2bb0	Merge branch 'master' into mssql_datasource	2018-03-13 16:03:02 +01:00
flopp999	0fd75e6005	Added icon for iOS web app ... If you using Safari on a iOS device and save the page to home screen you will get the Grafana icon as icon	2018-03-13 15:12:04 +01:00
Alexander Zobnin	0185ad5b04	changelog: add note about closing #8151	2018-03-13 15:54:58 +03:00
Alexander Zobnin	560aec50b3	Merge PR #8613	2018-03-13 15:36:32 +03:00
Leonard Gram	87bc60b9d7	alerting: adds back the link to grafana.	2018-03-13 13:29:57 +01:00
John Baublitz	aba6f627c5	Fix CI	2018-03-13 13:29:57 +01:00
John Baublitz	89557dd67b	Modify Grafana Pagerduty notifier to use Pagerduty API V2	2018-03-13 13:29:57 +01:00
Alexander Zobnin	30d077d1d1	graph: minor refactor of histogram mode PR #8613	2018-03-13 15:25:28 +03:00
bergquist	da19000733	changelog: adds note about closing #11220	2018-03-13 11:26:30 +01:00
bergquist	061a418f0f	style: dont expose func outside package	2018-03-13 11:24:10 +01: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
Daniel Lee	3f2c086e6f	teams: removes quota on route ... Got added by mistake a year ago.	2018-03-13 10:56:35 +01:00
bergquist	c18c0f6db7	changelog: adds note about closing #11143 ... [ci skip]	2018-03-13 10:43:44 +01: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
bergquist	b400f7ccff	changelog: adds note about closing #11107 ... [ci skip]	2018-03-13 09:54:46 +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
bergquist	18638c21c9	changelog: adds note about closing #10009 ... [ci skip]	2018-03-13 09:48:22 +01:00
Carl Bergquist	bf6ff50d0b	Merge pull request #11087 from alexanderzobnin/prometheus-heatmap ... Prometheus heatmap support	2018-03-13 09:44:25 +01:00
Carl Bergquist	ccd11ac928	Merge pull request #11212 from flopp999/patch-1 ... Added concentration units and "Normal cubic metre"	2018-03-13 08:23:04 +01:00
Carl Bergquist	a9fd3e65ea	Merge pull request #11214 from kkohtaka/patch-1 ... docs: fix an outdated link to Prometheus's doc	2018-03-13 08:00:26 +01:00
Kazumasa Kohtaka	fcca00c0f9	docs: fix an outdated link to Prometheus's doc	2018-03-13 10:27:18 +09: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
Carl Bergquist	a9d485c1e8	Merge pull request #11205 from matrixik/patch-1 ... Fix urls in plugin update_checker logs	2018-03-12 20:40:24 +01:00
ilgizar	7dd66450ad	Corrected work for graphs created before this feature.	2018-03-12 23:43:13 +05:00
ilgizar	8c82e5701c	Replaced array values to variables yLeft and yRight for easy reading code.	2018-03-12 23:12:45 +05:00