 bergquist
|
04f417a423
feat(alerting): enabled by default. configurable elert engine
|
9 gadi atpakaļ |
|
bergquist
|
a3c91450d5
tech(config): add log.filters to default and sample
|
9 gadi atpakaļ |
 Eric Perrino
|
d3b0905899
Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191)
|
9 gadi atpakaļ |
|
bergquist
|
92121ea656
feat(alerting): add nop uploader
|
9 gadi atpakaļ |
 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 gadi atpakaļ |
|
Torkel Ödegaard
|
5ccdbf01fd
merge with master
|
9 gadi atpakaļ |
|
bergquist
|
dbb7852f21
feat: purge old files and snapshots
|
9 gadi atpakaļ |
 Dan Cech
|
b387c1291d
Merge branch 'master' into gnet-oauth
|
9 gadi atpakaļ |
|
Dan Cech
|
dcd96c90e2
add grafana.net auth section to defaults.ini, normalize section heading line lengths
|
9 gadi atpakaļ |
|
bergquist
|
ec452dd704
docs(conf): remove internal options since its not working atm
|
9 gadi atpakaļ |
|
bergquist
|
f26824049f
Merge branch 'master' into emails
|
9 gadi atpakaļ |
|
bergquist
|
3b6820ef03
feat(oauth): create struct for generic oauth and add config values
|
9 gadi atpakaļ |
 Trent White
|
35b90afdd0
initial styling
|
9 gadi atpakaļ |
|
bergquist
|
26c6437846
Merge branch 'master' into alerting
|
9 gadi atpakaļ |
|
bergquist
|
92a52ccdf7
docs(conf): add more info about using database.url
|
9 gadi atpakaļ |
|
bergquist
|
c663e32ea8
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
|
9 gadi atpakaļ |
|
bergquist
|
cbe7f8b697
feat(config): add ascii dragon to sample.ini
|
9 gadi atpakaļ |
|
Torkel Ödegaard
|
05697d5ecd
Merge branch 'master' into alerting
|
9 gadi atpakaļ |
|
Torkel Ödegaard
|
6fae5a3b4e
Merge branch 'v3.1.x'
|
9 gadi atpakaļ |
|
Torkel Ödegaard
|
093563ac37
fix(metrics): restored prefix default to prod.grafana..
|
9 gadi atpakaļ |
|
Torkel Ödegaard
|
f9b628ad0e
Merge branch 'v3.1.x'
|
9 gadi atpakaļ |
|
bergquist
|
f7a9102523
feat(metrics): improve graphite settings
|
9 gadi atpakaļ |
|
bergquist
|
cf6736d480
fix(metrics): add ending dot for graphite prefix
|
9 gadi atpakaļ |
|
bergquist
|
ebecc5e5a0
fix(metrics): make metrics cfg backwards compatible
|
9 gadi atpakaļ |
 Torkel Ödegaard
|
2c1b893c55
feat(metrics): minor fix for internal metrics fix PR #5758
|
9 gadi atpakaļ |
|
bergquist
|
0524d0c625
fix(metrics): replaces . with _ in instance name
|
9 gadi atpakaļ |
|
bergquist
|
4d0982a21c
Merge branch 'master' into alerting
|
9 gadi atpakaļ |
|
bergquist
|
2fa97427eb
fix(metrics): add ending dot for graphite prefix
|
9 gadi atpakaļ |
|
bergquist
|
99e99922b4
feat(alerting): add support for uploading images to webdav.
|
9 gadi atpakaļ |
|
Torkel Ödegaard
|
4fd8b2ace4
Merge branch 'master' into alerting
|
9 gadi atpakaļ |
