Nick Owens
|
60e797ccc4
|
pkg/setting: integrate syslog logger settings
|
2015-11-07 18:35:57 -08:00 |
|
ctdk
|
d37e18fdcf
|
Add config option to strip (most) colors from console logs
|
2015-10-01 13:16:23 -07:00 |
|
Torkel Ödegaard
|
6a30511fc4
|
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
|
2015-09-15 14:23:13 +02:00 |
|
woodsaj
|
86ed85aa6e
|
move toMap function to be a method on the quota structs
|
2015-09-15 17:18:26 +08:00 |
|
Torkel Ödegaard
|
64973f1d57
|
fix(settings): another attempt at fixing, #2736
|
2015-09-14 15:54:35 +02:00 |
|
Torkel Ödegaard
|
d7bfb727b0
|
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
|
2015-09-14 13:42:23 +02:00 |
|
Torkel Ödegaard
|
d17f8538b2
|
fix(backend): made public_gen detection more bullet proof, #2731
|
2015-09-13 15:23:23 +02: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 |
|
Torkel Ödegaard
|
8174b9f041
|
fix(tests): fixed failling backend test
|
2015-09-11 08:58:45 +02:00 |
|
Torkel Ödegaard
|
286b4c0e46
|
Merge branch 'typescript'
|
2015-09-11 08:01:11 +02:00 |
|
woodsaj
|
852f9bd277
|
refactor quota settings
|
2015-09-11 01:47:33 +08:00 |
|
Torkel Ödegaard
|
0b5f40e66c
|
tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public
|
2015-09-10 13:34:32 +02:00 |
|
Torkel Ödegaard
|
9603dce469
|
feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626
|
2015-09-09 17:21:25 +02:00 |
|
Mat Schaffer
|
6c04ee1abd
|
Iterate over the right env override list variable
|
2015-09-01 11:11:54 +09:00 |
|
Torkel Ödegaard
|
d19e101e6b
|
feat(signup): almost done with new sign up flow, #2353
|
2015-08-31 11:35:07 +02:00 |
|
Torkel Ödegaard
|
d25624a8ad
|
feat(signup): began work on new / alternate signup flow that includes email verification, #2353
|
2015-08-27 13:59:58 +02:00 |
|
Torkel Ödegaard
|
3d37c9c9a3
|
feat(tagmanager): support to add google tagmanager id, closes #2569
|
2015-08-21 09:30:39 +02:00 |
|
woodsaj
|
c138f390ac
|
close all existing loggers before re-initilizing loggers. fixes #2533
|
2015-08-17 15:59:40 +08:00 |
|
Brandon Turner
|
1e2e65b40d
|
Allow default org role to be Read Only Editor
|
2015-08-05 23:04:47 -05:00 |
|
Dieter Plaetinck
|
0f7a77f45b
|
fix unknown key error formatting
|
2015-07-24 12:29:03 +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
|
a7b1df34c5
|
feat(ldap): more unit tests for ldap to grafana user sync
|
2015-07-14 10:20:30 +02:00 |
|
Torkel Ödegaard
|
2fa9311eee
|
Progress on ldap support, #1450
|
2015-07-13 16:45:47 +02:00 |
|
Torkel Ödegaard
|
14f439f8ba
|
refactor(ldap): refactoring ldap code, #1450
|
2015-07-13 15:37:25 +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
|
aedaae852b
|
Fixed minor mistake in last commit
|
2015-06-30 12:14:13 +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
|
5962bcbc6c
|
Do not show create org link when allow_org_create is set to false, Fixes #2135
|
2015-06-11 08:16:09 +02:00 |
|
Torkel Ödegaard
|
bb2d810709
|
Final work password reset email, Closes #1456
|
2015-06-08 18:25:04 +02:00 |
|
Torkel Ödegaard
|
db0c442eaf
|
Added configuration options for smtp
|
2015-06-08 17:56:56 +02:00 |
|
Torkel Ödegaard
|
89418a155a
|
More work on email and notification infra #1456
|
2015-06-05 11:08:19 +02:00 |
|
Torkel Ödegaard
|
3706d0dedd
|
More work on email and notification infra #1456
|
2015-06-04 17:23:46 +02:00 |
|
Torkel Ödegaard
|
3f5ab189cd
|
Began work on emailing service #1456
|
2015-06-04 14:29:39 +02:00 |
|
Torkel Ödegaard
|
eb793f7feb
|
Initial work on ldap support, #1450
|
2015-06-04 09:34:42 +02:00 |
|
Torkel Ödegaard
|
85c3a0aa14
|
Panel menu now hides edit actions for users with role Viewer, Closes #1826
|
2015-06-01 16:36:15 +02:00 |
|
Torkel Ödegaard
|
1c9993f185
|
Backend configuration: When unknown key was detected the log error was not visible in log file due to logging was initialized after user config file is loaded, logging is now initialized twice, once based on defaults and command line arguments, then then again after user config file, Fixes #1992
|
2015-05-14 10:15:46 +02:00 |
|
Torkel Ödegaard
|
a40299b4dc
|
Progress on json file index and search #960
|
2015-05-12 12:20: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
|
f416e2d1ac
|
More middleware unit test, starting to look really good
|
2015-05-01 22:26:16 +02:00 |
|
Torkel Ödegaard
|
cb8110cd48
|
Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921
|
2015-05-01 16:23:36 +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 Odegaard
|
1edb13d715
|
Fixed gofmt formating
|
2015-04-19 09:29:08 +02:00 |
|
Torkel Ödegaard
|
aa8beda4ec
|
Merge pull request #1800 from alienth/allowsignup
Add allow_sign_up setting for auth.google/github.
|
2015-04-19 09:16:48 +02:00 |
|
Torkel Odegaard
|
7178dcad35
|
Windows: Fixed runtime issue with file logging config that casued errors on startup
|
2015-04-19 09:14:50 +02: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 |
|
Torkel Ödegaard
|
6de584aafc
|
Updated to config file finding, and added homepath command line option
|
2015-04-12 09:15:49 +02:00 |
|