Commit Graph

105 Commits

Author SHA1 Message Date
Torkel Ödegaard 88d27fe649 log(color): disabled console log formating by default 2015-11-09 09:48:02 +01:00
Torkel Ödegaard da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
Alex Bligh 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
Alex Bligh 458e6da700 Allow user specified CA certs
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:47:24 +01:00
Alex Bligh a906fa178a Support multiple space-separated LDAP hosts
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:46:53 +01:00
ctdk d37e18fdcf Add config option to strip (most) colors from console logs 2015-10-01 13:16:23 -07:00
woodsaj 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
woodsaj 852f9bd277 refactor quota settings 2015-09-11 01:47:33 +08:00
woodsaj 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
Jonathan A. Sternberg 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
Torkel Ödegaard 9603dce469 feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626 2015-09-09 17:21:25 +02:00
Rodolphe Quiédeville 668b47cc6e Add comments on app_mode with possible values 2015-09-04 09:01:06 +02:00
Torkel Ödegaard d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
Torkel Ödegaard 3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
Torkel Ödegaard ca9c11486e config(github oauth): removed allowed_domains options, closes #1986 2015-08-18 20:19:37 +02:00
Torkel Ödegaard 6d6c9b782b fix(ldap): minor fixes, should not have any real impact, #2421 2015-08-01 10:30:05 +02:00
Torkel Ödegaard 5744c70399 fix(ldap conf): fixed another issue in ldap conf example 2015-07-18 09:31:53 +02:00
Torkel Ödegaard f3342ae7d3 fix(ldap conf): updated ldap conf example to use literal string syntax for bind_password 2015-07-18 09:30:09 +02:00
Torkel Ödegaard 5b0585ac7f feat(ldap): removed ssl_server_name and added some validation to ldap config, #1450 2015-07-16 12:58:30 +02:00
Torkel Ödegaard 9afdea8d2a feat(ldap): added config options for ssl skip verify, and ssl server name, #1450 2015-07-16 11:59:26 +02:00
Torkel Ödegaard b891677ba5 docs(ldap): added ldap integration docs and config examples, #1450 2015-07-15 14:48:39 +02:00
Torkel Ödegaard 0b5ba55131 feat(ldap): work on reading ldap config from toml file, #1450 2015-07-15 10:08:23 +02:00
Torkel Ödegaard fe41a4e6fa feat(ldap): began work on org role sync 2015-07-14 14:29:07 +02:00
Torkel Ödegaard 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
Torkel Ödegaard db1847bc1d More work on ldap, gotten ldap search (read attributes) to work 2015-07-10 15:29:34 +02:00
Torkel Ödegaard 0ef7271326 Started work on LDAP again, #1450 2015-07-10 11:10:48 +02:00
Torkel Ödegaard ae0f8c77d1 Auth: You can now authenicate against api with username / password using basic auth, Closes #2218 2015-06-30 09:37:52 +02:00
Torkel Ödegaard 177acf835c fixed mysql session example config 2015-06-22 18:47:46 +02:00
Torkel Ödegaard 30db7e64fb Fixed example redis session config, Fixes #2157 2015-06-13 20:06:53 +02:00
Torkel Ödegaard bb2d810709 Final work password reset email, Closes #1456 2015-06-08 18:25:04 +02:00
Torkel Ödegaard 95fd34ed14 Merge branch 'emailing' 2015-06-08 17:57:33 +02:00
Torkel Ödegaard db0c442eaf Added configuration options for smtp 2015-06-08 17:56:56 +02:00
Torkel Ödegaard 901685bb63 Updated sample config and config docs with example for postgres session provider_config string, #2118 2015-06-05 08:18:37 +02:00
Torkel Ödegaard eb793f7feb Initial work on ldap support, #1450 2015-06-04 09:34:42 +02:00
Indrek Juhkam b55d9350e7 Add github organizations support 2015-05-23 17:06:51 +03:00
Torkel Ödegaard 448a8b8d1c Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960 2015-05-13 13:36:24 +02:00
Torkel Ödegaard 1a9f630710 Began work on adding json files to search, #960 2015-05-11 20:04:03 +02:00
Torkel Ödegaard 34539c0c13 Enforce domain, host header validation against domain setting, Refactoring of PR #1866, Closes #1732 2015-05-05 11:21:06 +02:00
Torkel Ödegaard 38fc85d619 Final tweaks to auth proxy feature 2015-05-02 12:30:53 +02:00
Torkel Ödegaard d1e9b6d6ae Began work on auth_proxy feature (#1932), and began work on testing http api, and auth middleware 2015-05-01 11:55:59 +02:00
Torkel Ödegaard 5de9230924 Security: New config option to disable the use of gravatar for profile images, Closes #1891 2015-05-01 08:40:13 +02:00
Torkel Ödegaard 74a8fa61f2 Merged with 2.0 docs and restored some stuff 2015-04-29 10:33:37 +02:00
Torkel Ödegaard 0d3fbb8659 Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660 2015-04-29 10:08:01 +02:00
Garrett Bjerkhoel 7ea579bb71 Add team_ids configuration option 2015-04-28 20:19:48 -07:00
aibou 968b1b4308 Fix and update documents 2015-04-23 17:42:04 +09:00
Jason Harvey ddaac50a25 Add allow_sign_up override for auth.google/github. 2015-04-16 13:43:18 -08:00
Torkel Ödegaard e9afd30b47 Updated changelog with, Github OAuth: Now works with Github for Enterprise, thanks @williamjoy 2015-04-15 10:31:56 +02:00
William Wei d048e39cde grafana/grafana#1781 add oauth api url as config 2015-04-15 14:03:28 +08:00
Torkel Ödegaard 47a18bba99 Fixed defaults.ini, missing allowed_domains key, #1729 2015-04-13 14:04:52 +02:00
Torkel Ödegaard 6de584aafc Updated to config file finding, and added homepath command line option 2015-04-12 09:15:49 +02:00