122 Commits

Author SHA1 Message Date
b4a8c227cc feat(update checks): started work on update checks 2016-04-11 12:21:48 -04:00
87aca5bf1b new config option for source of %s in group_search_filter, useful for nested LDAP groups 2016-03-23 08:21:25 -04:00
5b5cf9f006 documentation for ldap nested groups 2016-03-22 13:54:36 -04:00
6c8d084664 Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql 2016-01-07 17:08:31 +01:00
ec36e28368 Small typo in comment 2015-12-23 15:15:59 -06:00
4da56b65ab Fixes #2818. Adds support for mysql backends via unix sockets 2015-12-23 15:06:28 -06:00
ea566fff24 Add TLS for mysql
Use ssl_mode for mysql and add docs
add docs for the new parameters in config

Tolerate ssl_mode without client authentication

Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
333f9101a0 Merge pull request #3458 from improbable-io/use-memcache-for-session
Add memcache as session provider
2015-12-17 15:56:15 +01:00
f83d5f4280 cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08, closes #3523 2015-12-15 11:21:00 +01:00
280f9befae Merge pull request #2949 from shoonoise/master
Add option to hide raintank share button

Fixes #2727
2015-12-14 17:29:09 +01:00
fab1062c0b Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494
2015-12-11 15:16:57 +01:00
225e7a6a32 Merge pull request #3161 from mischief/syslog
syslog support closes #3160
2015-12-11 14:03:21 +01:00
ed16914715 Add memcache as session provider 2015-12-08 13:35:09 +00:00
88d27fe649 log(color): disabled console log formating by default 2015-11-09 09:48:02 +01:00
20b553461b conf: add syslog logging defaults 2015-11-07 18:35:52 -08:00
b4a2b96e32 Add options to manage snapshot publishing 2015-10-29 16:40:03 +03:00
da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
e8256f0ad7 Add support for POSIX LDAP schema
In the POSIX LDAP schema, there is no 'memberOf' attribute returned
in relation to which groups a person is a member of. Rather, it is
necessary to query the group objects which have the people as members.
This commit adds an additional filter, which if specified explicitly
searches for groups, rather than relying on the 'memberOf' attribute.
This enables Grafana to work with LDAP POSIX schema (e.g. OpenLDAP
etc.)

Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:51:59 +01:00
458e6da700 Allow user specified CA certs
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:47:24 +01:00
a906fa178a Support multiple space-separated LDAP hosts
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:46:53 +01:00
d37e18fdcf Add config option to strip (most) colors from console logs 2015-10-01 13:16:23 -07:00
6488324cf1 enhance quota support.
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
2015-09-11 23:17:10 +08:00
852f9bd277 refactor quota settings 2015-09-11 01:47:33 +08:00
9023171940 inital backend suport for quotas. issue #321
Conflicts:
	conf/defaults.ini
	main.go
	pkg/services/sqlstore/migrations/migrations.go
2015-09-11 01:01:36 +08:00
5572588c54 Update docstring for postgres session provider
The postgres provider is named postgres and not postgresql. For somebody
configuring the server from the config file example, it is very easy to
write an invalid value into the file and accidentally use the "memory"
provider instead because of a typo.
2015-09-09 14:06:14 -04:00
9603dce469 feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626 2015-09-09 17:21:25 +02:00
668b47cc6e Add comments on app_mode with possible values 2015-09-04 09:01:06 +02:00
d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
74ea266157 add login hint to defaults.ini 2015-08-20 11:20:40 -07:00
235bbc9c7e custom login hints via config file 2015-08-20 11:15:36 -07:00
ca9c11486e config(github oauth): removed allowed_domains options, closes #1986 2015-08-18 20:19:37 +02:00
6d6c9b782b fix(ldap): minor fixes, should not have any real impact, #2421 2015-08-01 10:30:05 +02:00
5744c70399 fix(ldap conf): fixed another issue in ldap conf example 2015-07-18 09:31:53 +02:00
f3342ae7d3 fix(ldap conf): updated ldap conf example to use literal string syntax for bind_password 2015-07-18 09:30:09 +02:00
5b0585ac7f feat(ldap): removed ssl_server_name and added some validation to ldap config, #1450 2015-07-16 12:58:30 +02:00
9afdea8d2a feat(ldap): added config options for ssl skip verify, and ssl server name, #1450 2015-07-16 11:59:26 +02:00
b891677ba5 docs(ldap): added ldap integration docs and config examples, #1450 2015-07-15 14:48:39 +02:00
0b5ba55131 feat(ldap): work on reading ldap config from toml file, #1450 2015-07-15 10:08:23 +02:00
fe41a4e6fa feat(ldap): began work on org role sync 2015-07-14 14:29:07 +02:00
bfe7b77313 More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450 2015-07-13 14:23:59 +02:00
db1847bc1d More work on ldap, gotten ldap search (read attributes) to work 2015-07-10 15:29:34 +02:00
0ef7271326 Started work on LDAP again, #1450 2015-07-10 11:10:48 +02:00
ae0f8c77d1 Auth: You can now authenicate against api with username / password using basic auth, Closes #2218 2015-06-30 09:37:52 +02:00
177acf835c fixed mysql session example config 2015-06-22 18:47:46 +02:00
30db7e64fb Fixed example redis session config, Fixes #2157 2015-06-13 20:06:53 +02:00
bb2d810709 Final work password reset email, Closes #1456 2015-06-08 18:25:04 +02:00
95fd34ed14 Merge branch 'emailing' 2015-06-08 17:57:33 +02:00
db0c442eaf Added configuration options for smtp 2015-06-08 17:56:56 +02:00
901685bb63 Updated sample config and config docs with example for postgres session provider_config string, #2118 2015-06-05 08:18:37 +02:00