c92d719a72
added support for listening on unix socket #4030 ( #8221 )
2017-04-27 08:54:21 +02:00
6d9e8bd147
webdav: allow specification of a different public_url than upload url
2017-04-25 17:22:18 +02:00
6e304e6e42
comments: Typos in defaults.ini ( #7988 )
2017-03-30 17:12:00 +02:00
319b8d8fca
Configurable signout menu activation ( #7968 )
2017-03-29 11:33:28 +02:00
dde8583db8
xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns
2017-03-27 18:04:03 -04:00
4d4e165be7
links: updated links from grafana.net to grafana.com
2017-03-20 10:20:32 +01:00
6dfdcd7ca5
email: change default from name to Grafana
...
Changes default from name in smtp settings
from Grafana Admin to Grafana.
Fix for integration test (which is skipped but that
did not work)
2017-02-15 11:02:46 +01:00
7520b4f404
Update default configuration to include from_name values
2017-02-15 08:06:58 +11:00
28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
9862c9ff40
feat(alerting): Show/hide alerting UI using configuration variable
...
Use configuration variable "show_alerting_ui" to show/hide alerting UI
2017-01-20 10:43:29 -05:00
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +01:00
839eb97061
Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog
2017-01-16 12:02:43 +01:00
eb8d1dfa34
docs(smtp): adds info about how to use passwords with #
...
closes #7265
2017-01-16 07:03:35 +01:00
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08:00
597ebb1161
fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974
2016-12-15 14:08:39 +01:00
6e27db148c
Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
2016-12-14 21:45:15 +01:00
80d88d302c
fix(config): changed default for oauth and allow_sign_up setting, #6928
2016-12-12 16:35:42 +01:00
ae27c17c68
Auth Proxy improvements
...
- adds the option to use ldap groups for authorization in combination with an auth proxy
- adds an option to limit where auth proxy requests come from by configure a list of ip's
- fixes a security issue, session could be reused
2016-12-12 09:43:17 +01:00
464553a453
docs: explains how to use comment chars in passwords
2016-12-06 09:48:56 +01:00
b00fc73242
Use space to separate multiple modes
2016-12-02 13:46:41 +07:00
a51de8e987
tech(conf): remove dragoo :(
2016-11-10 16:15:55 +01:00
658fc1a67a
added hosted domain suppport to google oauth login ( #6372 )
2016-10-28 12:00:47 +02:00
04f417a423
feat(alerting): enabled by default. configurable elert engine
...
closes #6210
2016-10-10 13:09:16 +02:00
a3c91450d5
tech(config): add log.filters to default and sample
2016-10-07 10:39:01 +02:00
d3b0905899
Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins ( #6191 )
2016-10-07 08:49:58 +02:00
92121ea656
feat(alerting): add nop uploader
...
ref #6183
2016-10-05 07:34:48 +02:00
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
2016-09-28 15:27:08 +02:00
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
dbb7852f21
feat: purge old files and snapshots
...
closes #4087
closes #2172
2016-09-26 14:33:40 +02:00
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
dcd96c90e2
add grafana.net auth section to defaults.ini, normalize section heading line lengths
2016-09-20 10:09:20 -04:00
ec452dd704
docs(conf): remove internal options since its not working atm
2016-09-20 08:18:15 +02:00
f26824049f
Merge branch 'master' into emails
2016-09-07 11:19:52 +02:00
3b6820ef03
feat(oauth): create struct for generic oauth and add config values
2016-09-07 10:34:56 +02:00
35b90afdd0
initial styling
2016-08-24 17:41:29 -04:00
26c6437846
Merge branch 'master' into alerting
2016-08-22 12:27:08 +02:00
92a52ccdf7
docs(conf): add more info about using database.url
2016-08-19 14:48:40 +02:00
c663e32ea8
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
2016-08-19 13:15:44 +02:00
cbe7f8b697
feat(config): add ascii dragon to sample.ini
2016-08-18 14:13:02 +02:00
05697d5ecd
Merge branch 'master' into alerting
...
Conflicts:
conf/sample.ini
2016-08-17 10:03:33 +02:00
6fae5a3b4e
Merge branch 'v3.1.x'
2016-08-17 10:02:08 +02:00
093563ac37
fix(metrics): restored prefix default to prod.grafana..
2016-08-17 10:01:55 +02:00
f9b628ad0e
Merge branch 'v3.1.x'
...
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
2016-08-17 09:53:46 +02:00
f7a9102523
feat(metrics): improve graphite settings
...
Fixes the broken support for overriding settings with ENV variables.
closes #5769
2016-08-15 09:59:55 +02:00
cf6736d480
fix(metrics): add ending dot for graphite prefix
2016-08-15 09:58:32 +02:00
ebecc5e5a0
fix(metrics): make metrics cfg backwards compatible
2016-08-15 09:57:49 +02:00
2c1b893c55
feat(metrics): minor fix for internal metrics fix PR #5758
2016-08-15 09:57:23 +02:00
Mitja Z
fir4
timolehto
Seuf
Dan Cech
Torkel Ödegaard
Daniel Lee
Jacob Bednarz
huydx
smalik
bergquist
Ricky Niemi
Viet Hung Nguyen
Eric Uldall
Eric Perrino
Trent White
Torkel Ödegaard