1036 Commits

Author	SHA1	Message	Date
bergquist	8bb62a79d0	feat(alerting): excisting alerts are now updated	2016-04-22 16:51:24 +02:00
bergquist	ba5978abd3	Merge branch 'master' into alerting_definitions	2016-04-22 15:52:56 +02:00
bergquist	51de894692	fix(snapshots): sets default value for snapshot name ... make it possible for < 3.0 instances to publish snapshots ref #4778	2016-04-21 09:59:48 +02:00
Torkel Ödegaard	41e5812a22	Merge pull request #4771 from mtanda/cloudwatch_kinesis_metrics ... (cloudwatch) add kinesis metrics	2016-04-20 08:57:26 -07:00
bergquist	96e88ee84d	refactor(alerting): changes interval to string from int	2016-04-20 16:57:03 +02:00
bergquist	262821e7e7	feat(alerting): tests that alertes can be read from db	2016-04-20 16:46:24 +02:00
bergquist	ef92fd4ebc	feat(alerting): renames error_level to crit_level	2016-04-20 15:02:49 +02:00
bergquist	7860a2a1b8	feat(alerting): make sure dashboard id exists	2016-04-20 09:55:32 +02:00
Mitsuhiro Tanda	8d1ac8c7f5	(cloudwatch) add kinesis metrics	2016-04-20 14:33:08 +09:00
Carl Bergquist	9f4ad73698	Merge pull request #4758 from bergquist/cli_local_pluginfolder ... CLI: Adds support for local plugin folder	2016-04-19 17:30:01 +02:00
bergquist	ca3ad7d17c	tests(alerting): add tests for saving alerts	2016-04-19 16:52:20 +02:00
bergquist	832e38af34	feat(alerting): limit alerts to one per panel	2016-04-19 15:34:23 +02:00
bergquist	ff22f43002	fix(cli): fixes missplaced %	2016-04-19 14:46:03 +02:00
bergquist	d38d4efc18	style(cli): improve logging to find install crash	2016-04-19 10:39:55 +02:00
bergquist	a8c68e33db	feat(cli): add more logging for failed install	2016-04-19 10:22:02 +02:00
bergquist	903d1b7797	tech(cli): dont use defer statements in loops	2016-04-19 09:13:58 +02:00
bergquist	5abaf26b5f	style(cli): remove some logging	2016-04-19 08:39:22 +02:00
bergquist	485a377800	fix(cli): adds support for local plugin folder ... closes #4572	2016-04-19 08:27:26 +02:00
bergquist	daa5468801	feat(alerting): parses dashboard alerts	2016-04-18 14:15:03 +02:00
bergquist	769016783f	feat(alerting): add aggregator field	2016-04-18 11:10:52 +02:00
bergquist	bcf10a6483	Merge branch 'master' into alerting_definitions	2016-04-18 10:28:40 +02:00
Torkel Ödegaard	d98839fc19	Revert "feat(cli): detects plugin folder for dev env" ... This reverts commit a5eda6a87b.	2016-04-15 09:01:27 -04:00
Torkel Ödegaard	d9ad4cf2fc	fix(): made plugin settings api call accessable for viewer roles	2016-04-13 13:03:41 -04:00
Torkel Ödegaard	10131aa8a0	fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686	2016-04-13 12:23:29 -04:00
bergquist	91a1a823e2	feat(alerting): add basic tables for alerting definitions	2016-04-13 10:33:45 +02:00
Torkel Ödegaard	47bba71d7f	fixed update check	2016-04-12 10:28:32 -04:00
Torkel Ödegaard	e7626befc5	updated version	2016-04-12 10:17:39 -04:00
Torkel Ödegaard	51aed2dbc6	Merge branch 'master' of github.com:grafana/grafana	2016-04-11 21:11:08 -04:00
Torkel Ödegaard	497e9343aa	Merge branch 'pluginlist'	2016-04-11 21:10:54 -04:00
Torkel Ödegaard	6ce934f1dd	feat(pluginlist): worked on plugin list	2016-04-11 20:33:58 -04:00
Torkel Ödegaard	f1ff044967	Merge branch 'master' of github.com:grafana/grafana	2016-04-11 18:16:57 -04:00
Torkel Ödegaard	9c14b9672f	fix(): admin stats and postgres	2016-04-11 18:16:35 -04:00
Torkel Ödegaard	f93b039e42	change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases	2016-04-11 18:05:28 -04:00
Torkel Ödegaard	3849b59627	feat(updates): changed to new api	2016-04-11 17:16:52 -04:00
bergquist	a5eda6a87b	feat(cli): detects plugin folder for dev env ... closes #4572	2016-04-11 22:32:46 +02:00
Torkel Ödegaard	c518fdc155	Merge branch 'updatecheck' into pluginlist	2016-04-11 13:43:29 -04:00
Torkel Ödegaard	ab34b174f9	Added update notice to plugin list	2016-04-11 13:42:52 -04:00
Torkel Ödegaard	6ac3bd4c7c	feat(): update checks starting to work	2016-04-11 12:47:04 -04:00
Torkel Ödegaard	b4a8c227cc	feat(update checks): started work on update checks	2016-04-11 12:21:48 -04:00
bergquist	eeb7524c0f	feat(cli): improve helptext for cli	2016-04-11 14:50:34 +02:00
bergquist	2fd25f0093	feat(cli): add uninstall alias for remove	2016-04-11 14:49:12 +02:00
Torkel Ödegaard	8047f902a5	stats(): updated stats	2016-04-10 18:36:54 -04:00
Torkel Ödegaard	12800f831a	Merge branch 'master' into pluginlist	2016-04-09 15:01:39 -04:00
Torkel Ödegaard	370589d6c0	fix(org switch): fixed issue with switching orgs, fixes #4614	2016-04-09 13:27:06 -04:00
Torkel Ödegaard	d70ef90bdd	feat(): plugin list panel	2016-04-08 16:42:33 -04:00
bergquist	583c0f09a8	feat(cli): adds better support for plugin folder in dev	2016-04-08 11:59:45 +02:00
Torkel Ödegaard	9b30634217	fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558	2016-04-05 11:24:21 -04:00
bergquist	676e950fa3	fix(cli): improve error message for not using sudo ... closes #4562	2016-04-05 15:37:09 +02:00
Torkel Ödegaard	43ebc172cb	fix(profile): fixed change password link and page, fixes #4542	2016-04-04 13:52:41 -04:00
Torkel Ödegaard	cab859a0e4	Merge branch 'master' into preferences	2016-04-03 05:33:11 -07:00