8210 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bergquist	690a74c6b7	feat(login): invert naming for dissallow user pass login	2016-06-25 16:30:41 +02:00
Torkel Ödegaard	346ca3fc89	Merge branch 'master' into alerting	2016-06-25 09:56:57 -04:00
bergquist	092b6517dc	Merge branch 'recreate-4675' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-recreate-4675	2016-06-25 15:53:42 +02:00
Mohammad Mehdi Saboorian	1e486398cc	Escape html chararcters in singlestat renderer	2016-06-25 13:43:58 +04:30
Torkel Ödegaard	23345c563c	changed version in master to 3.2-pre	2016-06-24 16:51:55 +02:00
Torkel Ödegaard	60f45c965c	Merge branch 'master' of github.com:grafana/grafana	2016-06-24 10:25:44 +02:00
Mitsuhiro Tanda	6ef27a87e4	fix catch clause	2016-06-24 13:44:10 +09:00
Kevin Fitzpatrick	040586604b	Allow configuration to disable the username and password login interface. ... Used for when admins only want users to login via OAuth.	2016-06-23 10:09:13 -07:00
Alexander Zobnin	e593cc3e9f	Issue #4740 - change variable $SeriesName to $seriesName.	2016-06-23 19:35:50 +03:00
Torkel Ödegaard	efad4bcb56	docs(): updated changelog	2016-06-23 17:45:29 +02:00
Torkel Ödegaard	9435e70b37	docs(): spelling fix	2016-06-23 17:31:22 +02:00
bergquist	48e1a17ac2	feat(alerting): remove dummie values from email notifier	2016-06-23 16:30:12 +02:00
bergquist	6121d15ba7	feat(alerting): more aggressive requirements for parsing alertrules	2016-06-23 16:08:18 +02:00
bergquist	8b05af2f90	feat(alerting): add exeuction time to alertResult	2016-06-23 15:52:45 +02:00
bergquist	2063fee4fe	docs(changelog): add note about cli fix #5410	2016-06-23 15:16:26 +02:00
Torkel Ödegaard	c3e1955792	docs(): updated export docs	2016-06-23 13:21:30 +02:00
bergquist	6af2d99862	style(light-theme): make text-color-weak a little bit darker ... otherwise its not possible to see which queries are disabled in the query editor	2016-06-23 13:17:53 +02:00
Emmanuel Quentin	6487814007	Avoid to request influxdb when query is hidden	2016-06-23 13:11:16 +02:00
bergquist	f95be63c43	feat(alerting): move response handling to seperate file	2016-06-23 12:57:10 +02:00
bergquist	67197d54f9	feat(alerting): add triggeredAlerts as json to alert_state	2016-06-23 11:14:40 +02:00
bergquist	488b42377b	feat(alerting): update state if not been updated for 15min	2016-06-23 11:03:27 +02:00
Torkel Ödegaard	838284c09f	docs(): updated changelog	2016-06-23 10:38:11 +02:00
Torkel Ödegaard	1d35b90484	docs(): updated download links	2016-06-23 10:35:47 +02:00
Mitsuhiro Tanda	44b2a292eb	notify dashboard migration fail	2016-06-23 16:56:18 +09:00
Torkel Ödegaard	f3c1a894de	changed version to 3.1-beta1	2016-06-23 09:12:17 +02:00
bergquist	eb54fbaef5	docs(changelog): add note about cli fix #5410	2016-06-23 08:41:25 +02:00
bergquist	af1c8dc5d9	feat(cli): adds support for dist/plugin.json location for plugins ... ref #5410	2016-06-23 08:35:40 +02:00
bergquist	2123fbdf9b	feat(cli): make remove command an alias for uninstall	2016-06-23 08:21:55 +02:00
Mitsuhiro Tanda	09f7222e79	add cloudwatch metrics	2016-06-23 11:24:21 +09:00
bergquist	14169c5092	tech(docker): add memcached exporter target for prom	2016-06-22 17:36:22 +02:00
bergquist	925806df87	tech(alerting): add recovery logging	2016-06-22 13:43:11 +02:00
Othyus	e204c308bf	feat(sidemenu): filtering organizations by an input, issue #2609	2016-06-22 13:04:38 +02:00
Torkel Ödegaard	0555525f97	tech(): updated list of docker stuff	2016-06-22 11:01:11 +02:00
bergquist	7952723b71	feat(alerting): add warn/crit filter	2016-06-22 08:09:45 +02:00
bergquist	b5a29b6246	test(alerting): add tests for when to send notifcations	2016-06-22 07:58:30 +02:00
bergquist	6edae37ac9	feat(alerting): rename state response method	2016-06-22 07:23:31 +02:00
Torkel Ödegaard	24a54cd95b	feat(units): refactoring #5404	2016-06-21 21:08:07 +02:00
Torkel Ödegaard	a7a5f36b49	Merge branch 'issue-2971' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-issue-2971	2016-06-21 21:00:00 +02:00
Alexander Zobnin	ab0155c861	Issue #2971 - add time units for use in singlestat panel.	2016-06-21 20:56:34 +03:00
Torkel Ödegaard	53c424caf8	docs(): title change	2016-06-21 18:25:24 +02:00
Torkel Ödegaard	23cfbac4ec	feat(docs): updated import / export docs	2016-06-21 18:24:25 +02:00
Torkel Ödegaard	f23d72001d	fix(dashboard): fixed issue triggering refresh after leaving fullscreen/edit mode with time range change	2016-06-21 17:21:45 +02:00
Torkel Ödegaard	302ad5f1f9	Merge branch 'master' of github.com:grafana/grafana	2016-06-21 17:08:16 +02:00
Torkel Ödegaard	257e6c469e	feat(collectd): updated collectd config	2016-06-21 17:07:01 +02:00
bergquist	ef9766eb96	docs(3.1): initial post about whats new in 3.1	2016-06-21 16:29:17 +02:00
Alexander Zobnin	cc433c1fbd	Issue #4740 - able to use $SeriesName variable in prefix of postfix.	2016-06-21 15:48:18 +03:00
bergquist	aa9e524e73	tech(docker): add node exporter to prometheus	2016-06-21 11:46:08 +02:00
Carl Bergquist	3b1ae3f7d2	Merge pull request #5396 from hailthemelody/fix_issue_template_typos ... fix typos in GitHub Issue Template	2016-06-21 10:27:41 +02:00
hailthemelody	cccfe47bf0	fix typos in GitHub Issue Template	2016-06-20 21:39:11 -04:00
hailthemelody	13d1fec2cb	fix z-index order in Series Overrides	2016-06-20 20:54:01 -04:00