3464 Commits

Author	SHA1	Message	Date
bergquist	8368a4a88a	Merge branch 'master' into alerting_opentsdb	2016-10-03 10:36:33 +02:00
bergquist	96ca69c5a9	tech(cloudwatch): extract method	2016-10-03 10:31:07 +02:00
bergquist	6b7015799c	Merge branch 'cloudwatch_interval' of https://github.com/mtanda/grafana into mtanda-cloudwatch_interval	2016-10-03 08:51:33 +02:00
Leandro Piccilli	0000065053	Merge branch 'master' of https://github.com/grafana/grafana	2016-10-02 16:59:25 +02:00
Torkel Ödegaard	4ec2377e09	fix(notifications): added form validation and restored Send Test button which was always hidden, #6159	2016-10-01 17:14:45 +02:00
Torkel Ödegaard	4f2263552c	feat(alerting): updated look for alerting panel, #6136	2016-10-01 16:32:13 +02:00
bergquist	91b180168e	tech(notifications): remove unused filter markup	2016-10-01 15:51:08 +02:00
Torkel Ödegaard	aa78114440	fix(alerting): fixed icon for ok state in panel header, #6136	2016-09-30 17:39:05 +02:00
Torkel Ödegaard	7c339f0794	feat(alerting): show alertin state in panel header, closes #6136	2016-09-30 17:37:47 +02:00
bergquist	1226beba31	feat(opentsdb): add alerting support to plugin.json	2016-09-30 16:50:50 +02:00
Torkel Ödegaard	2908c6a80b	fix(metricsegment): added min width for inputs for metric segment and value select components	2016-09-30 13:13:28 +02:00
Torkel Ödegaard	fe4a0a98c1	fix(alerting): added confirm modal in UI, when deleting alert	2016-09-30 13:00:16 +02:00
Torkel Ödegaard	5a1a80bcdd	feat(templating): adding missing label property to query variable defaults, fixes #6150	2016-09-29 14:46:59 +02:00
Torkel Ödegaard	88ec307f3e	fix(graph panel): fixed issue with graph axis labels	2016-09-28 21:39:51 +02:00
Alexander Zobnin	c2856926aa	fix(graph): fix X axis value selection. (#6145)	2016-09-28 21:29:51 +02:00
Torkel Ödegaard	2750c8a801	feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423	2016-09-28 15:27:08 +02:00
Torkel Ödegaard	e5fc4332cd	feat(oauth): refactoring PR #6077	2016-09-28 15:10:50 +02:00
Torkel Ödegaard	5ccdbf01fd	merge with master	2016-09-28 13:02:15 +02:00
Torkel Ödegaard	10e63e5dd2	Merge branch 'master' of github.com:grafana/grafana	2016-09-28 12:17:16 +02:00
Torkel Ödegaard	599fe49944	fix(templating): fix to datasource variable, was not updated on dashboard load, added unit test for case as well	2016-09-28 12:12:38 +02:00
Mitsuhiro Tanda	593863fb9e	(prometheus) check time range (#6137)	2016-09-28 11:54:25 +02:00
Torkel Ödegaard	68370ba2bc	feat(testdata): added alert dashboard	2016-09-28 10:44:21 +02:00
Torkel Ödegaard	a4648607bb	feat(testdata): added csv test data scenario	2016-09-28 10:37:30 +02:00
Torkel Ödegaard	63caedb094	Merge branch 'master' of github.com:grafana/grafana	2016-09-28 08:09:51 +02:00
Torkel Ödegaard	460160cfa4	feat(testdata): added test case for ms resolution data	2016-09-28 08:08:46 +02:00
Torkel Ödegaard	22e8885690	feat(testdata): progress on test data stuff	2016-09-27 18:36:00 +02:00
Torkel Ödegaard	3ecd96e682	feat(testdata): lots of work on new test data data source and scenarios	2016-09-27 18:17:39 +02:00
Torkel Ödegaard	ade8aa5b92	feat(graph): refactorings	2016-09-27 14:47:04 +02:00
Torkel Ödegaard	34f15d92d0	feat(testdata): worked on testdata app	2016-09-27 14:39:51 +02:00
Torkel Ödegaard	81cb4a740b	refactor(graph): progress on graph panel work	2016-09-26 17:25:29 +02:00
Torkel Ödegaard	40e6317b7b	feat(graph): refactoring	2016-09-26 14:04:13 +02:00
Torkel Ödegaard	acfde82c0a	refactor(graph): js -> typescript refactoring	2016-09-26 13:55:42 +02:00
Torkel Ödegaard	5682520603	feat(graph): more work on graph panel and support for non time series	2016-09-24 13:08:58 +02:00
Torkel Ödegaard	cd270f14a2	feat(graph): more work on graph panel and support for non time series	2016-09-23 17:12:10 +02:00
Dan Cech	501e67a657	use semver when comparing grafana and plugin versions (#6108)	2016-09-23 14:38:59 +02:00
Torkel Ödegaard	3bbc940b88	Merge branch 'master' into graph-panel-non-timeseries	2016-09-23 14:22:44 +02:00
Torkel Ödegaard	175c651e65	fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906	2016-09-23 12:29:53 +02:00
Torkel Ödegaard	bb77caa369	Merge branch 'master' of github.com:grafana/grafana	2016-09-22 21:49:57 +02:00
Torkel Ödegaard	e36cdac594	fix(templating): fixed issue with templating when initalizing variables without any existing value	2016-09-22 21:49:41 +02:00
bergquist	d711c0ed35	Merge branch 'master' into alert_prometheus	2016-09-22 19:27:24 +02:00
Torkel Ödegaard	f2f3115749	feat(graph panel): more progress on graph panel and non time series data support	2016-09-22 16:47:37 +02:00
Torkel Ödegaard	6cd4db12c7	feat(graph panel): refactoring axes tab options into it's own component	2016-09-22 16:19:44 +02:00
Torkel Ödegaard	23246605b0	feat(graph panel): working on adding non time series support to graph panel	2016-09-22 16:05:20 +02:00
Torkel Ödegaard	f3d4a97f49	Merge branch 'master' into graph-panel-non-timeseries	2016-09-22 14:03:06 +02:00
Torkel Ödegaard	0fc7405b95	fix(elasticsearch): for query template variable when looking up terms without query, no longer relies on elasticsearch default field, fixes #3887	2016-09-22 12:05:03 +02:00
Torkel Ödegaard	3ed7ab93c5	added small info text to plugins list page, #5176	2016-09-22 11:32:27 +02:00
Torkel Ödegaard	d8df421b43	fix(build): fixed issues with optimized build, fixes #6096	2016-09-22 10:22:16 +02:00
Torkel Ödegaard	39af588a94	fix(playlist): fixed sorting issue with playlist playback, fixes #5467	2016-09-22 10:06:03 +02:00
Torkel Ödegaard	2752dbd13a	feat(templating): minor fixes to recent refactorings	2016-09-22 09:00:15 +02:00
Torkel Ödegaard	d65fbcbb42	fix(graphite): fixed minor graphite lexer issue when nodes begin with octal syntax and end with dash identifier, fixes #6049#	2016-09-21 20:04:09 +02:00