 bergquist
|
8ec311ade4
Merge branch 'master' into alerting
|
9 éve |
 Torkel Ödegaard
|
ec0b09450c
Merge branch 'export-dashboard'
|
9 éve |
|
Torkel Ödegaard
|
26d93d7130
Merge branch 'master' into alerting_definitions
|
9 éve |
|
Torkel Ödegaard
|
1d8fdc09e7
feat(logging): added log format option, #4590
|
9 éve |
|
Torkel Ödegaard
|
7d6cda4916
Merge branch 'master' of github.com:grafana/grafana
|
9 éve |
 Tom Hukins
|
d1c06a93df
Fix a typo (#5306)
|
9 éve |
|
Torkel Ödegaard
|
0667d73660
Merge branch 'new-logger' into alerting_definitions
|
9 éve |
|
Torkel Ödegaard
|
a02cf5beb7
feat(logging): added loging filters
|
9 éve |
|
Torkel Ödegaard
|
22778e6efd
feat(logging): a lot of progress on moving to new logging lib, #4590
|
9 éve |
|
Torkel Ödegaard
|
f36a44c49a
Merge branch 'master' into alerting_definitions
|
9 éve |
|
Torkel Ödegaard
|
1059a35bbc
feat(instrumentation): documented instrumentation options, closes #4696
|
9 éve |
|
Torkel Ödegaard
|
064e474b0a
Merge branch 'metrics_reporting'
|
9 éve |
|
Torkel Ödegaard
|
1a05ae2eaa
feat(instrumentation): more work
|
9 éve |
|
bergquist
|
d0ac258474
Merge branch 'master' into alerting_definitions
|
9 éve |
|
Torkel Ödegaard
|
e2c794ff31
feat(instrumentation): lots of refactoring to support tag based backend, #4696
|
9 éve |
|
Torkel Ödegaard
|
6b2a4fe8e8
feat(instrumentation): work on settings model for internal metrics publishing, #4696
|
9 éve |
|
Torkel Ödegaard
|
540def2c39
feat(import): working on unit tests for import ctrl
|
9 éve |
 minki
|
05cb6048ae
fixed separate typo
|
9 éve |
|
Torkel Ödegaard
|
495404ef73
Merge branch 'master' into alerting_definitions
|
9 éve |
 Anton Chevychalov
|
c6744925c4
Add new parameter to config: default_theme.
|
9 éve |
|
bergquist
|
33108df13f
docs(conf): add warning about alerting in conf file
|
9 éve |
|
bergquist
|
35c73902da
Merge branch 'master' into alerting_definitions
|
9 éve |
|
Torkel Ödegaard
|
c6c07599c7
conf(): updated comments in config file, fixes #4933
|
9 éve |
 fg2it
|
303cd8a5af
[RenderToPng fix] (#4901)
|
9 éve |
|
bergquist
|
de7544fabd
fix(alerting): set alertin enabled to false
|
9 éve |
|
bergquist
|
6d66d9f42d
feat(alerting): adds fearture toogle for alerting
|
9 éve |
|
Torkel Ödegaard
|
b4a8c227cc
feat(update checks): started work on update checks
|
9 éve |
|
bergquist
|
6c8d084664
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
|
10 éve |
 Ed Dawley
|
ec36e28368
Small typo in comment
|
10 éve |
|
Ed Dawley
|
4da56b65ab
Fixes #2818. Adds support for mysql backends via unix sockets
|
10 éve |
