218 Commits

Include renames

Author	SHA1	Message	Date
Daniel Lee	6dfdcd7ca5	email: change default from name to Grafana ... Changes default from name in smtp settings from Grafana Admin to Grafana. Fix for integration test (which is skipped but that did not work)	2017-02-15 11:02:46 +01:00
Jacob Bednarz	7520b4f404	Update default configuration to include from_name values	2017-02-15 08:06:58 +11:00
bergquist	5b7b3fef64	conf: adds sample values for db conn settings	2017-02-10 15:30:01 +01:00
huydx	28d93b574d	(feat) support max connection setting for database configuration	2017-02-10 15:30:01 +01:00
Torkel Ödegaard	2a09d4a5a6	fix(): conf file had left over of old config key, #7395	2017-01-30 07:11:12 +01:00
Torkel Ödegaard	e073d20731	updated sample config	2017-01-25 13:34:02 +01:00
Torkel Ödegaard	40d39f8a3e	refactor(): renaming alerting hide ui option, #7318	2017-01-25 13:32:26 +01:00
Torkel Ödegaard	fee4846429	Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui	2017-01-25 13:16:48 +01:00
smalik	9862c9ff40	feat(alerting): Show/hide alerting UI using configuration variable ... Use configuration variable "show_alerting_ui" to show/hide alerting UI	2017-01-20 10:43:29 -05:00
bergquist	06440ef57b	tech(dataproxy): moves cfg to [dataproxy]	2017-01-16 12:43:59 +01:00
bergquist	839eb97061	Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog	2017-01-16 12:02:43 +01:00
bergquist	eb8d1dfa34	docs(smtp): adds info about how to use passwords with # ... closes #7265	2017-01-16 07:03:35 +01:00
Ricky Niemi	269d16301a	Rename to audit logging to data proxy logging	2017-01-11 07:40:06 -08:00
Ricky Niemi	0fee7c863a	Gate data proxy audit logging behind audit_logging server setting	2017-01-11 07:22:57 -08:00
bergquist	c18741c605	docs(ldap): adds note about special chars in password ... closes #5337	2016-12-21 22:02:34 +01:00
Torkel Ödegaard	597ebb1161	fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974	2016-12-15 14:08:39 +01:00
Torkel Ödegaard	df562e23cf	feat(ldap): better ldap logging, closes #6918	2016-12-14 22:01:02 +01:00
Torkel Ödegaard	6e27db148c	Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap	2016-12-14 21:45:15 +01:00
Torkel Ödegaard	80d88d302c	fix(config): changed default for oauth and allow_sign_up setting, #6928	2016-12-12 16:35:42 +01:00
Seuf	ae27c17c68	Auth Proxy improvements ... - adds the option to use ldap groups for authorization in combination with an auth proxy - adds an option to limit where auth proxy requests come from by configure a list of ip's - fixes a security issue, session could be reused	2016-12-12 09:43:17 +01:00
bergquist	464553a453	docs: explains how to use comment chars in passwords	2016-12-06 09:48:56 +01:00
Carl Bergquist	fbf2113904	Merge pull request #6795 from hvnsweeting/patch-1 ... Use space to separate multiple modes	2016-12-03 03:15:31 +01:00
Viet Hung Nguyen	c6e66ec15e	Update sample.ini ... Use space to separate multiple modes	2016-12-02 13:48:08 +07:00
Viet Hung Nguyen	b00fc73242	Use space to separate multiple modes	2016-12-02 13:46:41 +07:00
bergquist	a51de8e987	tech(conf): remove dragoo :(	2016-11-10 16:15:55 +01:00
Eric Uldall	658fc1a67a	added hosted domain suppport to google oauth login (#6372)	2016-10-28 12:00:47 +02:00
bergquist	04f417a423	feat(alerting): enabled by default. configurable elert engine ... closes #6210	2016-10-10 13:09:16 +02:00
bergquist	a3c91450d5	tech(config): add log.filters to default and sample	2016-10-07 10:39:01 +02:00
Eric Perrino	d3b0905899	Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191)	2016-10-07 08:49:58 +02:00
bergquist	92121ea656	feat(alerting): add nop uploader ... ref #6183	2016-10-05 07:34:48 +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	5ccdbf01fd	merge with master	2016-09-28 13:02:15 +02:00
bergquist	dbb7852f21	feat: purge old files and snapshots ... closes #4087 closes #2172	2016-09-26 14:33:40 +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
Dan Cech	dcd96c90e2	add grafana.net auth section to defaults.ini, normalize section heading line lengths	2016-09-20 10:09:20 -04:00
bergquist	ec452dd704	docs(conf): remove internal options since its not working atm	2016-09-20 08:18:15 +02:00
bergquist	d7bf70a77b	tech(tsdb): remove skip ssl setting. should be based on datasource settings	2016-09-12 13:37:00 +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	aa80b52c07	feat(alerting): make it possible to skip ssl verification for alerting https requests	2016-09-08 16:29:31 +02:00
bergquist	f26824049f	Merge branch 'master' into emails	2016-09-07 11:19:52 +02:00
bergquist	3b6820ef03	feat(oauth): create struct for generic oauth and add config values	2016-09-07 10:34:56 +02:00
bergquist	a2525f77d9	fix(config): comment sample value	2016-08-29 21:14:47 +02:00
Trent White	35b90afdd0	initial styling	2016-08-24 17:41:29 -04:00
bergquist	26c6437846	Merge branch 'master' into alerting	2016-08-22 12:27:08 +02:00
bergquist	92a52ccdf7	docs(conf): add more info about using database.url	2016-08-19 14:48:40 +02:00
bergquist	c663e32ea8	Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url	2016-08-19 13:15:44 +02:00
bergquist	cbe7f8b697	feat(config): add ascii dragon to sample.ini	2016-08-18 14:13:02 +02:00
Torkel Ödegaard	05697d5ecd	Merge branch 'master' into alerting ... Conflicts: conf/sample.ini	2016-08-17 10:03:33 +02:00
Torkel Ödegaard	6fae5a3b4e	Merge branch 'v3.1.x'	2016-08-17 10:02:08 +02:00
Torkel Ödegaard	093563ac37	fix(metrics): restored prefix default to prod.grafana..	2016-08-17 10:01:55 +02:00