1681 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	6257ae094c	feat(sqlstore): added index for dashboard_id in dashboard_tag table, fixes #5868	2016-09-21 21:32:51 +02:00
Dan Cech	b387c1291d	Merge branch 'master' into gnet-oauth ... Conflicts: pkg/api/login_oauth.go	2016-09-21 09:39:35 -04:00
Torkel Ödegaard	b4111d78e1	fix(security): fixed login issue that was a potential for social engineering, fixes #6014	2016-09-21 15:03:14 +02:00
bergquist	b856d7e193	fix(prometheus): remove timerange from context	2016-09-21 13:55:42 +02:00
bergquist	ae7345b04d	style(prometheus): remove commented test	2016-09-21 13:46:26 +02:00
bergquist	c084145cba	refactor(prometheus): add timerange to alert context	2016-09-21 13:46:10 +02:00
bergquist	af551b8825	refactor(tsdb): remove toUnix from timerange	2016-09-21 13:41:25 +02:00
bergquist	9534a04d3d	fix(prometheus): only accept matrix result	2016-09-21 13:30:41 +02:00
bergquist	ee0f1a0f36	feat(prometheus): handle more errors	2016-09-21 13:17:36 +02:00
bergquist	3e73be8d2e	feat(prometheus): improve error handling	2016-09-21 11:31:56 +02:00
bergquist	4c88db3e43	feat(prometheus): add support for legend formatting	2016-09-21 11:17:29 +02:00
bergquist	43d8bd5a25	feat(prometheus): initial support for prometheus	2016-09-21 07:01:53 +02:00
Dan Cech	630a8ed8aa	support setting default org role when adding user via grafana.net auth	2016-09-20 12:36:36 -04:00
Dan Cech	da95a23080	remove 'Github' from oauth login error messages	2016-09-20 11:36:13 -04:00
bergquist	d2fb660557	fix(cli): remove unused logging	2016-09-20 10:10:27 +02:00
Dan Cech	f5e2d61aef	Merge branch 'master' into gnet-oauth	2016-09-19 16:48:40 -04:00
Dan Cech	fc17ed351c	support logging in with grafana.net credentials	2016-09-19 16:48:07 -04:00
bergquist	3f00834f25	tech: remove unused dependencies	2016-09-19 15:21:53 +02:00
bergquist	77783c02cd	fix(alerting): dont log null series ... closes #6025	2016-09-16 14:59:54 +02:00
bergquist	3c92f78ee7	feat(cli): add grafana version header to all request against grafana.net	2016-09-15 16:01:06 +02:00
bergquist	3c966caa23	feat(cli): download all plugin dependencies	2016-09-15 14:38:11 +02:00
bergquist	6be48269e2	tech(build): update build docs	2016-09-15 13:09:33 +02:00
bergquist	4e567b5f02	feat(alert): order alerts by name.. instead of nothing.	2016-09-14 14:51:31 +02:00
bergquist	a23b7f1371	fix(alerting): add missing evaldata field to set state command	2016-09-14 14:35:05 +02:00
bergquist	9dd8b3b408	wip	2016-09-14 14:12:19 +02:00
bergquist	d0f9623037	feat(alertlistpanel): support state filter ... ref #5981	2016-09-14 10:49:05 +02:00
Torkel Ödegaard	f5809c0209	fix(build): trying to fix build	2016-09-13 20:14:18 +02:00
Torkel Ödegaard	9cd517780f	Merge branch 'master' of github.com:grafana/grafana	2016-09-13 16:25:48 +02:00
Torkel Ödegaard	8c30babdf1	feat(alerting): fixed build issues	2016-09-13 16:24:00 +02:00
Torkel Ödegaard	3af891d023	feat(alerting): restored alert history	2016-09-13 16:13:41 +02:00
Torkel Ödegaard	b0c7e61ef8	feat(alerting): removed severity	2016-09-13 15:09:55 +02:00
wvl	a73424d6af	Secure Elasticsearch datasources a bit (#6031) ... Instead of allowing users to access the entire cluster, apply some sane restrictions. Change-Id: Ib2e93722bf2e39d700d4afa713ff49ec556f2fdf	2016-09-13 15:04:21 +02:00
Torkel Ödegaard	6375418d8c	Merge branch 'alerting' into grafana-annotations	2016-09-13 09:38:12 +02:00
Mitsuhiro Tanda	1264a1b3a6	(cloudwatch) add metrics/dimensions (#6020)	2016-09-13 09:08:33 +02:00
Carl Bergquist	52dc2db769	Merge pull request #6008 from rubycut/patch-1 ... Increase datasource limit to 1000 #3910	2016-09-13 08:38:07 +02:00
Carl Bergquist	1c7b76cb43	Merge pull request #6013 from mtanda/cloudwatch_kinesis_analytics ... (cloudwatch) add metrics/dimensions	2016-09-12 17:03:25 +02:00
Mitsuhiro Tanda	f998b86ade	(cloudwatch) add metrics/dimensions	2016-09-12 23:47:31 +09:00
bergquist	157ab1ba36	fix(setting): broken code	2016-09-12 14:57:37 +02:00
bergquist	d7bf70a77b	tech(tsdb): remove skip ssl setting. should be based on datasource settings	2016-09-12 13:37:00 +02:00
bergquist	6c5860d3e8	feat(metrics): measure proxy requests	2016-09-12 13:29:31 +02:00
Rubycut	501f89e829	Increase datasource limit to 1000 #3910	2016-09-12 10:45:17 +02:00
bergquist	eb673fd16d	fix(middleware): typo	2016-09-12 10:11:55 +02:00
Chen Chenglong	7b1c374f64	support connect ldap server with starttls (#5969) ... * support connect ldap server with starttls * add more doc for start_tls option	2016-09-10 09:40:56 +02:00
bergquist	4edb31723c	fix(metrics): ignore datasource proxy requests	2016-09-09 13:53:50 +02:00
bergquist	e7b56c6389	tech(metrics): move all request counters into one middleware	2016-09-09 13:28:19 +02:00
Torkel Ödegaard	4a2f2fba73	feat(alerting): show panel specific alert annotations, #5694	2016-09-09 11:30:55 +02:00
bergquist	583790e650	fix(alering): the crocdile turned on me > < ... closes #5855	2016-09-09 07:42:07 +02:00
bergquist	aa80b52c07	feat(alerting): make it possible to skip ssl verification for alerting https requests	2016-09-08 16:29:31 +02:00
bergquist	7b9099ef93	fix(query): requires all that all series are empty to set NoDataFound	2016-09-08 14:33:10 +02:00
bergquist	9511f89a22	fix(alerting): fixes bug in query conditions	2016-09-08 13:28:41 +02:00