8033 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	4fd8b2ace4	Merge branch 'master' into alerting	2016-08-10 12:53:41 +02:00
Torkel Ödegaard	a56cf9d6fd	Merge branch 'v3.1.x'	2016-08-10 12:44:43 +02:00
Torkel Ödegaard	9a7e0eaf42	fix(dashboard): fixed drag and drop issue in chrome, fixes #5767	2016-08-10 12:43:36 +02:00
bergquist	03f0bc46a1	fix(metrics): make metrics cfg backwards compatible	2016-08-10 11:15:49 +02:00
Torkel Ödegaard	c5d0c9f088	Merge branch 'v3.1.x'	2016-08-10 08:42:30 +02:00
Torkel Ödegaard	c0301349fb	docs(): update mac docs	2016-08-10 08:39:57 +02:00
Torkel Ödegaard	624e30e743	fix(docs): minor doc fixes, fixes #5751	2016-08-10 08:38:08 +02:00
Torkel Ödegaard	d95545b5d3	feat(graph tooltip): refactoring PR #3063	2016-08-10 08:31:53 +02:00
Torkel Ödegaard	34804bda6d	Merge branch 'issue-3063' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-issue-3063	2016-08-10 08:08:57 +02:00
Torkel Ödegaard	d49f0569f2	feat(metrics): minor fix for internal metrics fix PR #5758	2016-08-10 08:06:10 +02:00
Torkel Ödegaard	61756d2ae6	feat(alerting): removed delete button	2016-08-10 07:58:40 +02:00
bergquist	de47710f1e	tech(circle): rearrange build order	2016-08-09 14:28:44 +02:00
bergquist	5b57210aeb	fix(metrics): replaces . with _ in instance name ... closes #5739	2016-08-09 14:06:03 +02:00
bergquist	d6fdb598b0	fix(alerting): gofmt	2016-08-08 14:46:47 +02:00
Alexander Zobnin	f8f7543d4a	Fix Elastic datasource tests - use moment.utc() instead moment() to prevent timezone-related issues, fixes #5733. (#5746)	2016-08-07 12:01:53 +02:00
bmundt	6d1dd95ab3	adds check for making datasource template variables children of other template variables (#5717)	2016-08-05 10:03:46 +02:00
hc4	4d40326706	Add refresh query parameter parsing (#5729)	2016-08-04 18:58:59 +02:00
Torkel Ödegaard	34ea7312bc	docs(): added missing snapshot config options, fixes #5708	2016-08-02 09:35:15 +02:00
Torkel Ödegaard	01e5fd623b	Update latest.json	2016-08-02 09:31:02 +02:00
Torkel Ödegaard	e044a65d08	feat(alerting): updated	2016-08-01 22:15:28 +02:00
Alexander Zobnin	2c283ddd77	Fixed shared tooltip time calculation. Fixes #3063.	2016-08-01 20:41:15 +03:00
Torkel Ödegaard	1edd224168	feat(alerting): fixing failing unit tests	2016-08-01 14:34:58 +02:00
Torkel Ödegaard	e6c4e47849	updated dependencies	2016-08-01 14:15:41 +02:00
Torkel Ödegaard	2bfccd77d4	docs(): updated release links	2016-08-01 12:47:55 +02:00
Torkel Ödegaard	84d7305d37	docs(): updated release links	2016-08-01 12:45:31 +02:00
Torkel Ödegaard	fbad17d3a1	docs(): updated changelog	2016-08-01 12:27:03 +02:00
Torkel Ödegaard	317ffd1b68	Merge branch 'master' of github.com:grafana/grafana	2016-08-01 12:24:01 +02:00
Torkel Ödegaard	49abb205a0	Merge branch 'v3.1.x' ... Conflicts: public/sass/_variables.light.scss	2016-08-01 12:23:36 +02:00
Torkel Ödegaard	a4d27083d0	fix(tests): fixed unit test broken in recent dynamic dashboard fix	2016-08-01 12:20:16 +02:00
Torkel Ödegaard	a9cf7cd4f0	fix(light theme): fixes issue with hidden queries in light theme, fixes #5697	2016-08-01 11:58:12 +02:00
Torkel Ödegaard	44d1393480	fix(templating): fixed issue with panel/row repeat when saving dashboard, fixes #5591	2016-08-01 10:50:33 +02:00
Torkel Ödegaard	b46af0069e	fix(footer): fixed link in footer, #5690	2016-08-01 10:09:43 +02:00
Torkel Ödegaard	357358898d	feat(annotations): working on alert annotations, #5694	2016-08-01 10:07:00 +02:00
Torkel Ödegaard	c5e90b1801	feat(alerting): more polish on alerting tab UI	2016-07-31 21:58:12 +02:00
Torkel Ödegaard	3b69c8f687	feat(alerting): new design for alert tab with sidemenu	2016-07-31 09:31:32 +02:00
Torkel Ödegaard	2b276d5cd1	feat(alerting): working on alert notification and image rendering	2016-07-30 13:36:21 +02:00
Torkel Ödegaard	f9ddfb4337	Merge branch 'master' into alerting	2016-07-29 15:07:47 +02:00
Torkel Ödegaard	79138e211f	Merge branch 'v3.1.x'	2016-07-29 15:07:17 +02:00
Torkel Ödegaard	741b7353c1	Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x	2016-07-29 15:06:09 +02:00
Torkel Ödegaard	c4e7a3ae89	fix(png rendering): another fix for #5606	2016-07-29 15:04:51 +02:00
Torkel Ödegaard	4fc50742a0	feat(alerting): working on image rendering with alert notifications	2016-07-29 14:55:02 +02:00
Torkel Ödegaard	f9a28d3306	feat(alerting): slack notification improvements, #5679	2016-07-29 13:41:42 +02:00
Torkel Ödegaard	01da3f6cb2	feat(alerting): worked on improving slack alerts	2016-07-28 17:03:53 +02:00
Torkel Ödegaard	717cce014b	feat(alerting): refactoring	2016-07-27 17:07:44 +02:00
Torkel Ödegaard	6aaf4c97a2	feat(alerting): refactoring conditions out to seperate package	2016-07-27 16:18:10 +02:00
Torkel Ödegaard	ae5f8a76d9	feat(alerting): lots of progress on notifications, refactored them out to their own package, restored webhook notitication and added slack notification	2016-07-27 12:09:55 +02:00
Torkel Ödegaard	77c66a88d9	Merge branch 'master' into alerting	2016-07-27 10:22:00 +02:00
Torkel Ödegaard	c997923b17	Merge branch 'master' of github.com:grafana/grafana	2016-07-27 10:21:38 +02:00
Torkel Ödegaard	e789d0df63	Merge branch 'v3.1.x'	2016-07-27 10:21:16 +02:00
Torkel Ödegaard	89dc3b88d1	fix(test): fixed failing test caused by recent change	2016-07-27 10:20:48 +02:00