13834 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thibault Chataigner	38bdb8dfb3	Alerting: move getNewState to EvalContext ... This fix alert state update when several evaluation attempts are needed Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>	2018-03-21 20:59:39 +01:00
Alexander Zobnin	2ade0881b1	minor refactor of dashboard version cleanup	2018-03-21 22:48:17 +03:00
Alexander Zobnin	3f85fcce2d	refactor: dashboard version cleanup	2018-03-21 21:01:15 +03:00
Alexander Zobnin	f976b690ca	limit number of rows deleted by dashboard version cleanup	2018-03-21 20:26:27 +03:00
Alexander Zobnin	fc2d1d6ca9	fix dashboard version cleanup on large datasets	2018-03-21 17:23:05 +03:00
Daniel Lee	624dac16fa	docs: add variable regex examples (#11327)	2018-03-21 13:23:50 +01:00
bergquist	519fd8b2ba	graphite: adds more traces for alerting	2018-03-21 13:16:59 +01:00
Marcus Efraimsson	42299eb328	Merge branch 'master' into 11306-sql-table-time	2018-03-21 12:08:48 +01:00
Marcus Efraimsson	3cb0bc3da1	sql datasource: extract common logic for converting time column to epoch time in ms	2018-03-21 11:20:15 +01:00
bergquist	f41f2089a2	docs: details about provisioning elastic ... closes #11292	2018-03-21 08:54:09 +01:00
Carl Bergquist	4bcc073813	Merge pull request #11322 from jordo1138/patch-1 ... update email template default year and name	2018-03-21 07:49:35 +01:00
Jordan Hamel	7a4475fbf3	update email default year and name ... from 2016 grafana and raintank to 2018 Grafana Labs	2018-03-20 16:55:57 -07:00
bergquist	f142548969	dataproxy: adds dashboardid and panelid as tags ... closes #11315	2018-03-20 22:23:28 +01:00
Thibault Chataigner	5d23e7710b	Alerting: Add retry mechanism and its unitests ... Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>	2018-03-20 21:01:56 +01:00
Daniel Lee	c53fda4b5a	Merge pull request #11264 from grafana/11102_duplicate_panel_shortcut ... Keyboard shortcut to duplicate panel	2018-03-20 20:56:35 +01:00
Daniel Lee	685a371747	Merge pull request #11316 from ryantxu/ace-disable-snippets ... Expose option to disable snippets in ACE code-editor	2018-03-20 20:53:34 +01:00
Marcus Efraimsson	9df5476fe3	Merge pull request #11312 from grafana/func_editor_js_to_ts ... convert func_editor.js to typescript	2018-03-20 20:51:58 +01:00
Marcus Efraimsson	de396b277e	Merge pull request #11309 from grafana/add_graphite_func_js_to_ts ... convert add_graphite_func.js to typescript	2018-03-20 20:51:21 +01:00
Daniel Lee	4dcf1b72b3	Merge pull request #11313 from ryantxu/remove-unused-images ... Remove unused kibana images	2018-03-20 20:44:00 +01:00
Daniel Lee	70cd501373	Merge pull request #11320 from daniellee/update-xorm ... mysql: fixes panics when mysql connection times out (#11155)	2018-03-20 20:16:18 +01:00
Daniel Lee	32d1477b79	Merge pull request #11319 from alexanderzobnin/fix-11318 ... snapshot: fix legend rendering bug	2018-03-20 20:02:25 +01:00
Alexander Zobnin	a472d38fbf	snapshot: fix legend rendering bug	2018-03-20 21:33:54 +03:00
Daniel Lee	92388f7faf	session: update defaults for ConnMaxLifetime ... to be the same as the 5.0.3 release defaults	2018-03-20 19:31:01 +01:00
Daniel Lee	1cef373d16	Merge remote-tracking branch 'upstream/master' into update-xorm	2018-03-20 19:21:58 +01:00
Daniel Lee	70630d742e	snapshots: removes errors for empty values in ViewStore ... Occurs when opening a snapshot.	2018-03-20 19:12:52 +01:00
ilgizar	0e159dada1	Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.	2018-03-20 22:44:48 +05:00
ryan	f9acb4157b	Expose option to disable snippets	2018-03-20 15:26:41 +01:00
Patrick O'Carroll	47215098a3	changed var to const, changed to string interpolation	2018-03-20 14:43:09 +01:00
Daniel Lee	e5e9d3c2f3	mssql: adds test for time should be ms in table mode	2018-03-20 14:42:29 +01:00
ryan	54c4b6a11a	Remove unused kibana images	2018-03-20 14:39:19 +01:00
Patrick O'Carroll	3bdd006291	changed var to const	2018-03-20 14:26:03 +01:00
bergquist	fdf7a4c435	changelog: adds note about closing #11114 & #11086	2018-03-20 13:15:45 +01:00
Daniel Lee	d34cd8730e	mssql: convert tests to jest	2018-03-20 13:01:32 +01:00
Daniel Lee	ae4c6e4648	mssql: fix precision for time column in table mode ... ref #11306	2018-03-20 12:59:40 +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
Patrick O'Carroll	2a90370230	converted file to ts	2018-03-20 12:36:02 +01:00
Marcus Efraimsson	51cbf23c4a	changelog: notes about #10093 and #11298 ... [ci skip]	2018-03-20 12:26:37 +01:00
Alexander Zobnin	05ac7d8fca	dashboard: fix phantomjs panel rendering in collapsed row	2018-03-20 14:13:31 +03:00
ilgizar	e015047ed1	Fixed unit test.	2018-03-20 16:09:52 +05:00
ilgizar	341afe65ef	Merge remote-tracking branch 'upstream/master' into 1271_share_zero	2018-03-20 15:54:56 +05:00
ilgizar	1588295375	Changed the way this feature was activated. And changed tolltip.	2018-03-20 15:38:48 +05:00
ilgizar	230f018c78	Added validation of input parameters.	2018-03-20 15:37:18 +05:00
Patrick O'Carroll	2a50bc35a3	converted file to ts	2018-03-20 11:07:31 +01:00
Carl Bergquist	f64c6e490a	Merge pull request #11258 from mitjaziv/hide-credentials ... add regex search/replace of username/password in urls	2018-03-20 09:37:09 +01:00
Marcus Efraimsson	720711d1fe	fix: only run gofmt on pkg directory omitting vendor directory	2018-03-20 09:24:04 +01:00
Marcus Efraimsson	b816f18b3d	fix: dep ensure. now without gofmt on ventor directory	2018-03-20 09:23:18 +01:00
Daniel Lee	4033283254	Merge pull request #11298 from grafana/mssql_datasource ... Microsoft SQL Server data source	2018-03-20 00:03:26 +01:00
Marcus Efraimsson	192e913b7b	mssql: add integration test to verify stored procedure usage	2018-03-19 19:56:34 +01: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