Carl Bergquist
|
fbf2113904
|
Merge pull request #6795 from hvnsweeting/patch-1
Use space to separate multiple modes
|
2016-12-03 03:15:31 +01:00 |
|
Viet Hung Nguyen
|
c6e66ec15e
|
Update sample.ini
Use space to separate multiple modes
|
2016-12-02 13:48:08 +07:00 |
|
Viet Hung Nguyen
|
b00fc73242
|
Use space to separate multiple modes
|
2016-12-02 13:46:41 +07:00 |
|
bergquist
|
a51de8e987
|
tech(conf): remove dragoo :(
|
2016-11-10 16:15:55 +01:00 |
|
Eric Uldall
|
658fc1a67a
|
added hosted domain suppport to google oauth login (#6372)
|
2016-10-28 12:00:47 +02: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 |
|
Dan Cech
|
b387c1291d
|
Merge branch 'master' into gnet-oauth
Conflicts:
pkg/api/login_oauth.go
|
2016-09-21 09:39:35 -04:00 |
|
Dan Cech
|
dcd96c90e2
|
add grafana.net auth section to defaults.ini, normalize section heading line lengths
|
2016-09-20 10:09:20 -04:00 |
|
bergquist
|
ec452dd704
|
docs(conf): remove internal options since its not working atm
|
2016-09-20 08:18:15 +02:00 |
|
bergquist
|
d7bf70a77b
|
tech(tsdb): remove skip ssl setting. should be based on datasource settings
|
2016-09-12 13:37:00 +02:00 |
|
Chen Chenglong
|
7b1c374f64
|
support connect ldap server with starttls (#5969)
* support connect ldap server with starttls
* add more doc for start_tls option
|
2016-09-10 09:40:56 +02:00 |
|
bergquist
|
aa80b52c07
|
feat(alerting): make it possible to skip ssl verification for alerting https requests
|
2016-09-08 16:29:31 +02:00 |
|
bergquist
|
f26824049f
|
Merge branch 'master' into emails
|
2016-09-07 11:19:52 +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 |
|
Trent White
|
35b90afdd0
|
initial styling
|
2016-08-24 17:41:29 -04: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
|
c663e32ea8
|
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
|
2016-08-19 13:15:44 +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
|
6fae5a3b4e
|
Merge branch 'v3.1.x'
|
2016-08-17 10:02:08 +02:00 |
|
Torkel Ödegaard
|
093563ac37
|
fix(metrics): restored prefix default to prod.grafana..
|
2016-08-17 10:01:55 +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 |
|
Torkel Ödegaard
|
4fd8b2ace4
|
Merge branch 'master' into alerting
|
2016-08-10 12:53:41 +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
|
4fc50742a0
|
feat(alerting): working on image rendering with alert notifications
|
2016-07-29 14:55:02 +02:00 |
|
Torkel Ödegaard
|
d9096110f8
|
Merge branch 'master' into alerting
Conflicts:
pkg/api/dashboard.go
pkg/models/dashboards.go
pkg/services/sqlstore/dashboard.go
|
2016-07-11 18:28:07 +02:00 |
|
Torkel Ödegaard
|
460820a117
|
conf(): updated sample config and root_url to better explain it
|
2016-07-05 14:10:23 +02:00 |
|
Soulou
|
e2c5fac9df
|
Predefine url to let the environment variable overrider do its job
|
2016-06-28 17:45:55 +02:00 |
|
bergquist
|
690a74c6b7
|
feat(login): invert naming for dissallow user pass login
|
2016-06-25 16:30:41 +02:00 |
|
Torkel Ödegaard
|
346ca3fc89
|
Merge branch 'master' into alerting
|
2016-06-25 09:56:57 -04:00 |
|
bergquist
|
ef9766eb96
|
docs(3.1): initial post about whats new in 3.1
|
2016-06-21 16:29:17 +02:00 |
|
bergquist
|
8ec311ade4
|
Merge branch 'master' into alerting
|
2016-06-16 16:29:41 +02:00 |
|