 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 |
|
bergquist
|
cf6736d480
fix(metrics): add ending dot for graphite prefix
|
9 years ago |
|
bergquist
|
ebecc5e5a0
fix(metrics): make metrics cfg backwards compatible
|
9 years ago |
 Torkel Ödegaard
|
2c1b893c55
feat(metrics): minor fix for internal metrics fix PR #5758
|
9 years ago |
|
bergquist
|
0524d0c625
fix(metrics): replaces . with _ in instance name
|
9 years ago |
|
bergquist
|
4d0982a21c
Merge branch 'master' into alerting
|
9 years ago |
|
bergquist
|
2fa97427eb
fix(metrics): add ending dot for graphite prefix
|
9 years ago |
|
bergquist
|
99e99922b4
feat(alerting): add support for uploading images to webdav.
|
9 years ago |
|
Torkel Ödegaard
|
4fd8b2ace4
Merge branch 'master' into alerting
|
9 years ago |
|
bergquist
|
03f0bc46a1
fix(metrics): make metrics cfg backwards compatible
|
9 years ago |
|
Torkel Ödegaard
|
d49f0569f2
feat(metrics): minor fix for internal metrics fix PR #5758
|
9 years ago |
|
bergquist
|
5b57210aeb
fix(metrics): replaces . with _ in instance name
|
9 years ago |
|
Torkel Ödegaard
|
4fc50742a0
feat(alerting): working on image rendering with alert notifications
|
9 years ago |
|
Torkel Ödegaard
|
d9096110f8
Merge branch 'master' into alerting
|
9 years ago |
 Soulou
|
e2c5fac9df
Predefine url to let the environment variable overrider do its job
|
9 years ago |
|
bergquist
|
690a74c6b7
feat(login): invert naming for dissallow user pass login
|
9 years ago |
|
Torkel Ödegaard
|
346ca3fc89
Merge branch 'master' into alerting
|
9 years ago |
|
bergquist
|
ef9766eb96
docs(3.1): initial post about whats new in 3.1
|
9 years ago |
|
bergquist
|
8ec311ade4
Merge branch 'master' into alerting
|
9 years ago |
|
Torkel Ödegaard
|
ec0b09450c
Merge branch 'export-dashboard'
|
9 years ago |
|
Torkel Ödegaard
|
26d93d7130
Merge branch 'master' into alerting_definitions
|
9 years ago |
|
Torkel Ödegaard
|
1d8fdc09e7
feat(logging): added log format option, #4590
|
9 years ago |
