Torkel Ödegaard
2a09d4a5a6
fix(): conf file had left over of old config key, #7395
2017-01-30 07:11:12 +01:00
Torkel Ödegaard
e073d20731
updated sample config
2017-01-25 13:34:02 +01:00
bergquist
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +01:00
bergquist
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
bergquist
eb8d1dfa34
docs(smtp): adds info about how to use passwords with #
...
closes #7265
2017-01-16 07:03:35 +01:00
Ricky Niemi
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
Ricky Niemi
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08:00
Torkel Ödegaard
597ebb1161
fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974
2016-12-15 14:08:39 +01:00
Torkel Ödegaard
6e27db148c
Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
2016-12-14 21:45:15 +01:00
Torkel Ödegaard
80d88d302c
fix(config): changed default for oauth and allow_sign_up setting, #6928
2016-12-12 16:35:42 +01:00
Seuf
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
bergquist
464553a453
docs: explains how to use comment chars in passwords
2016-12-06 09:48:56 +01:00
Viet Hung Nguyen
c6e66ec15e
Update sample.ini
...
Use space to separate multiple modes
2016-12-02 13:48:08 +07:00
bergquist
a51de8e987
tech(conf): remove dragoo :(
2016-11-10 16:15:55 +01:00
bergquist
04f417a423
feat(alerting): enabled by default. configurable elert engine
...
closes #6210
2016-10-10 13:09:16 +02:00
bergquist
a3c91450d5
tech(config): add log.filters to default and sample
2016-10-07 10:39:01 +02:00
Eric Perrino
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
bergquist
92121ea656
feat(alerting): add nop uploader
...
ref #6183
2016-10-05 07:34:48 +02:00
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
2016-09-28 15:27:08 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
bergquist
dbb7852f21
feat: purge old files and snapshots
...
closes #4087
closes #2172
2016-09-26 14:33:40 +02:00
bergquist
3b6820ef03
feat(oauth): create struct for generic oauth and add config values
2016-09-07 10:34:56 +02:00
bergquist
a2525f77d9
fix(config): comment sample value
2016-08-29 21:14:47 +02:00
bergquist
26c6437846
Merge branch 'master' into alerting
2016-08-22 12:27:08 +02:00
bergquist
92a52ccdf7
docs(conf): add more info about using database.url
2016-08-19 14:48:40 +02:00
bergquist
cbe7f8b697
feat(config): add ascii dragon to sample.ini
2016-08-18 14:13:02 +02:00
Torkel Ödegaard
05697d5ecd
Merge branch 'master' into alerting
...
Conflicts:
conf/sample.ini
2016-08-17 10:03:33 +02:00
Torkel Ödegaard
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
bergquist
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
bergquist
cf6736d480
fix(metrics): add ending dot for graphite prefix
2016-08-15 09:58:32 +02:00
bergquist
ebecc5e5a0
fix(metrics): make metrics cfg backwards compatible
2016-08-15 09:57:49 +02:00
Torkel Ödegaard
2c1b893c55
feat(metrics): minor fix for internal metrics fix PR #5758
2016-08-15 09:57:23 +02:00
bergquist
0524d0c625
fix(metrics): replaces . with _ in instance name
...
closes #5739
2016-08-15 09:57:00 +02:00
bergquist
4d0982a21c
Merge branch 'master' into alerting
2016-08-15 07:58:30 +02:00
bergquist
2fa97427eb
fix(metrics): add ending dot for graphite prefix
2016-08-12 08:06:54 +02:00
bergquist
99e99922b4
feat(alerting): add support for uploading images to webdav.
...
closes #5770
2016-08-11 16:48:54 +02:00
bergquist
03f0bc46a1
fix(metrics): make metrics cfg backwards compatible
2016-08-10 11:15:49 +02:00
Torkel Ödegaard
d49f0569f2
feat(metrics): minor fix for internal metrics fix PR #5758
2016-08-10 08:06:10 +02:00
bergquist
5b57210aeb
fix(metrics): replaces . with _ in instance name
...
closes #5739
2016-08-09 14:06:03 +02:00
Torkel Ödegaard
460820a117
conf(): updated sample config and root_url to better explain it
2016-07-05 14:10:23 +02:00
Torkel Ödegaard
ec0b09450c
Merge branch 'export-dashboard'
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
Torkel Ödegaard
1d8fdc09e7
feat(logging): added log format option, #4590
2016-06-08 08:48:46 +02:00
Torkel Ödegaard
7d6cda4916
Merge branch 'master' of github.com:grafana/grafana
2016-06-08 08:10:22 +02:00
Tom Hukins
d1c06a93df
Fix a typo ( #5306 )
2016-06-08 07:27:52 +02:00
Torkel Ödegaard
a02cf5beb7
feat(logging): added loging filters
2016-06-07 12:11:41 +02:00
Torkel Ödegaard
22778e6efd
feat(logging): a lot of progress on moving to new logging lib, #4590
2016-06-06 23:06:44 +02:00
Torkel Ödegaard
1059a35bbc
feat(instrumentation): documented instrumentation options, closes #4696
2016-06-03 18:38:19 +02:00
Torkel Ödegaard
064e474b0a
Merge branch 'metrics_reporting'
2016-06-03 18:06:41 +02:00
Torkel Ödegaard
6b2a4fe8e8
feat(instrumentation): work on settings model for internal metrics publishing, #4696
2016-06-02 14:32:17 +02:00
minki
05cb6048ae
fixed separate typo
2016-05-23 09:32:18 +09:00
