17235 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Leonard Gram	58a567173e	build: builds grafana docker for enterprise at release.	2018-10-26 15:19:53 +02:00
Leonard Gram	a80e2e1acd	build: ge build fix.	2018-10-26 14:37:51 +02:00
Leonard Gram	e2f74b55d2	build: grafana enterprise docker. (#13839)	2018-10-26 14:23:30 +02:00
David	239dfbc9ae	Merge pull request #13824 from grafana/davkal/explore-plugins ... Explore: move suggestions logic to datasource language provider	2018-10-26 11:40:52 +02:00
Marcus Efraimsson	361864bec6	changelog: add notes about closing #13769 ... [skip ci]	2018-10-26 09:06:32 +02:00
Marcus Efraimsson	6052257515	Merge pull request #13820 from grafana/13769_mysql_time_filter ... mysql: fix timeFilter macro should respect local time zone	2018-10-26 09:02:59 +02:00
Torkel Ödegaard	b3c7a41e13	Merge pull request #13819 from mtanda/cw_desc_region ... use default region to call DescribeRegions	2018-10-26 08:35:17 +02:00
Mitsuhiro Tanda	220c4f4ab4	add test	2018-10-26 03:13:02 +09:00
Mitsuhiro Tanda	3447b8b299	cache region result	2018-10-26 01:23:44 +09:00
Mitsuhiro Tanda	c40baa1a23	use default region to call DescribeRegions	2018-10-26 01:23:44 +09:00
Torkel Ödegaard	e7f6cdc625	Merge branch '13739/alert-to-react'	2018-10-25 17:44:23 +02:00
Torkel Ödegaard	4112591042	Merge pull request #13818 from mtanda/cw_stat_template ... support template variable in stat field	2018-10-25 17:08:09 +02:00
Torkel Ödegaard	2b1ab9843d	Merge pull request #13828 from bergquist/docs_es_provisioning ... docs: improve ES provisioning examples	2018-10-25 17:06:47 +02:00
Torkel Ödegaard	f1660aa21a	fix: updated backend srv to use appEvents and removed parts of alertsSrv	2018-10-25 17:05:17 +02:00
Leonard Gram	30cb28df55	build: correctly adds enterprise to the filename. (#13831)	2018-10-25 16:55:27 +02:00
Torkel Ödegaard	d505d83ee1	Merge pull request #13679 from mjtrangoni/fix-megacheck-issues ... Fix megacheck issues	2018-10-25 16:31:53 +02:00
bergquist	d9cd20e43e	docs: improve ES provisioning examples ... closes #12281	2018-10-25 14:36:31 +02:00
bergquist	946ca5477b	changelog: adds note about closing #13723 ... [skip ci]	2018-10-25 14:31:43 +02:00
David Kaltschmidt	6f2315d5c5	Moved prom language features to datasource language provider	2018-10-25 12:24:24 +02:00
Torkel Ödegaard	be6f68f341	fix for annotation promise clearing, bug introduced last week when merging react panels step1	2018-10-25 11:35:32 +02:00
Torkel Ödegaard	df7915f3b4	Merge pull request #13822 from grafana/fix-solo-panel-size ... fix panel solo size	2018-10-25 10:48:39 +02:00
Torkel Ödegaard	defccb5ab3	fix panel solo size	2018-10-25 10:32:23 +02:00
Marcus Efraimsson	97b22aa5a9	mysql: fix timeFilter macro should respect local time zone	2018-10-25 10:29:40 +02:00
Mitsuhiro Tanda	08631ea23f	support template variable in stat field	2018-10-25 13:03:20 +09:00
Marcus Efraimsson	4ee79faff4	Merge pull request #13811 from Yukinoshita-Yukino/patch-1 ... Fix doc error for DingDIng alert	2018-10-24 16:45:26 +02:00
Yuan Liu	eb255520cb	fix dingding doc error	2018-10-24 22:28:59 +08:00
Torkel Ödegaard	5a70327dcf	Merge pull request #13805 from grafana/13804-fix-template-variable-check ... Update the regex-matching in templateSrv to work with the new variabl…	2018-10-24 14:58:13 +02:00
Carl Bergquist	0d41904ee5	Merge pull request #13755 from Yukinoshita-Yukino/master ... Fix cannot receive dingding alert when alert message is empty	2018-10-24 14:56:08 +02:00
David Kaltschmidt	54a3e2d1d1	Added types to query rows	2018-10-24 14:55:56 +02:00
Marcus Efraimsson	259c243723	update latest.json to latest stable version ... [skip ci]	2018-10-24 14:37:28 +02:00
Marcus Efraimsson	63c13198e3	changelog: update ... [skip ci]	2018-10-24 14:36:26 +02:00
Peter Holmberg	f34cbae2dd	cleaned up the flow	2018-10-24 14:33:53 +02:00
Marcus Efraimsson	3a1ece537c	changelog: add notes about closing #13280 ... [skip ci]	2018-10-24 13:58:37 +02:00
Marcus Efraimsson	1bcd4c040b	Merge pull request #13806 from bergquist/proviosioing_when_folder_is_deleted ... Delete provisioning meta data when deleting Folder	2018-10-24 13:55:14 +02:00
bergquist	0a9bfc5529	delete provisioning meta data when deleting folder ... prior to this fix Grafana didnt delete meta data about the provisioned dashboard in `dashboard_provisioning` which means that the dashboard wasn't inserted into Grafana again if the folder was delete within Grafana. closes #13280	2018-10-24 13:32:45 +02:00
Johannes Schill	b880f8d548	Update the regex-matching in templateSrv to work with the new variable-syntax and be more flexible to regex-changes #13804	2018-10-24 13:29:03 +02:00
David	a6fc74e35b	Merge pull request #13803 from grafana/davkal/explore-fix-resize ... Explore: fix graph resize on window resize	2018-10-24 12:32:27 +02:00
Marcus Efraimsson	1fbef171c5	changelog: add notes about closing #13600 ... [skip ci]	2018-10-24 12:08:33 +02:00
Marcus Efraimsson	27cbcbcbc2	changelog: update ... [skip ci]	2018-10-24 12:07:27 +02:00
Johannes Schill	38c155403e	Move the variable regex to constants to make sure we use the same reg… (#13801)	2018-10-24 12:06:09 +02:00
Marcus Efraimsson	758a5ecf51	docs: fix tutorials index page. Fixes #13799	2018-10-24 11:55:43 +02:00
David	8f7686c5a7	Merge pull request #13773 from miqh/fix/click-typeahead-suggestion ... Fix click-based selection of typeahead suggestion	2018-10-24 11:42:58 +02:00
David Kaltschmidt	d6ff16fe72	Explore: fix graph resize on window resize ... - resize HOC wrapper only resized first child which in case of large graphs was the warning button - moved warning button inside the panel parent	2018-10-24 11:30:32 +02:00
David	7d0eccdd23	Merge pull request #13787 from grafana/davkal/explore-transactions ... Explore: query transactions for faster result display	2018-10-24 11:24:29 +02:00
Daniel Lee	57a7007421	changelog: adds note for #13691	2018-10-24 11:22:23 +02:00
Marcus Efraimsson	00d6707045	docs: fix tutorials index page. Fixes #13799	2018-10-24 11:21:34 +02:00
Erik Sundell	c5af0bf1c5	Resource type filter (#13784) ... * stackdriver: add resource type to filter and group bys * stackdriver: remove not used param * stackdriver: refactor filter and group by code * stackdriver: remove resource type if its already in filter list * stackdriver: remove debug logging * stackdriver: remove more debug logging * stackdriver: append resource type to legend name if there are more than one type present in the response * stackdriver: only make new request if filter has real value * stackdriver: format legend support for resource type * stackdriver: add resource type to documentation * stackdriver: not returning promise from query function * stackdriver: fix refactoring bug * stackdriver: remove not used import	2018-10-24 11:18:49 +02:00
David Kaltschmidt	a121cd0e49	Fix race condition on add/remove query row	2018-10-24 11:08:15 +02:00
Peter Holmberg	ed99a543a5	moving things	2018-10-24 10:23:11 +02:00
Peter Holmberg	3e0a34ceca	typing changes	2018-10-24 10:18:28 +02:00