 Torkel Ödegaard
|
597ebb1161
fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974
|
9 years ago |
|
Torkel Ödegaard
|
6e27db148c
Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
|
9 years ago |
|
Torkel Ödegaard
|
80d88d302c
fix(config): changed default for oauth and allow_sign_up setting, #6928
|
9 years ago |
 Seuf
|
ae27c17c68
Auth Proxy improvements
|
9 years ago |
 bergquist
|
464553a453
docs: explains how to use comment chars in passwords
|
9 years ago |
 Viet Hung Nguyen
|
b00fc73242
Use space to separate multiple modes
|
9 years ago |
|
bergquist
|
a51de8e987
tech(conf): remove dragoo :(
|
9 years ago |
 Eric Uldall
|
658fc1a67a
added hosted domain suppport to google oauth login (#6372)
|
9 years ago |
|
bergquist
|
04f417a423
feat(alerting): enabled by default. configurable elert engine
|
9 years ago |
|
bergquist
|
a3c91450d5
tech(config): add log.filters to default and sample
|
9 years ago |
 Eric Perrino
|
d3b0905899
Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191)
|
9 years ago |
|
bergquist
|
92121ea656
feat(alerting): add nop uploader
|
9 years ago |
|
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
|
9 years ago |
|
Torkel Ödegaard
|
5ccdbf01fd
merge with master
|
9 years ago |
|
bergquist
|
dbb7852f21
feat: purge old files and snapshots
|
9 years ago |
 Dan Cech
|
b387c1291d
Merge branch 'master' into gnet-oauth
|
9 years ago |
|
Dan Cech
|
dcd96c90e2
add grafana.net auth section to defaults.ini, normalize section heading line lengths
|
9 years ago |
|
bergquist
|
ec452dd704
docs(conf): remove internal options since its not working atm
|
9 years ago |
|
bergquist
|
f26824049f
Merge branch 'master' into emails
|
9 years ago |
|
bergquist
|
3b6820ef03
feat(oauth): create struct for generic oauth and add config values
|
9 years ago |
 Trent White
|
35b90afdd0
initial styling
|
9 years ago |
|
bergquist
|
26c6437846
Merge branch 'master' into alerting
|
9 years ago |
|
bergquist
|
92a52ccdf7
docs(conf): add more info about using database.url
|
9 years ago |
|
bergquist
|
c663e32ea8
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
|
9 years ago |
|
bergquist
|
cbe7f8b697
feat(config): add ascii dragon to sample.ini
|
9 years ago |
|
Torkel Ödegaard
|
05697d5ecd
Merge branch 'master' into alerting
|
9 years ago |
|
Torkel Ödegaard
|
6fae5a3b4e
Merge branch 'v3.1.x'
|
9 years ago |
|
Torkel Ödegaard
|
093563ac37
fix(metrics): restored prefix default to prod.grafana..
|
9 years ago |
|
Torkel Ödegaard
|
f9b628ad0e
Merge branch 'v3.1.x'
|
9 years ago |
|
bergquist
|
f7a9102523
feat(metrics): improve graphite settings
|
9 years ago |
