 Torkel Ödegaard
|
f36a44c49a
|
Merge branch 'master' into alerting_definitions
Conflicts:
conf/defaults.ini
pkg/api/dashboard.go
|
2016-06-06 08:43:01 +02:00 |
|
|
Torkel Ödegaard
|
064e474b0a
|
Merge branch 'metrics_reporting'
|
2016-06-03 18:06:41 +02:00 |
|
|
Torkel Ödegaard
|
eee49a4995
|
feat(instrumentation): added meter, histogram and new timer, timer now send p25, p75, p90, p99 percentiles in 1000 sample exp decaying sample
|
2016-06-03 12:50:51 +02:00 |
|
|
Torkel Ödegaard
|
6b2a4fe8e8
|
feat(instrumentation): work on settings model for internal metrics publishing, #4696
|
2016-06-02 14:32:17 +02:00 |
|
 Daker Fernandes Pinheiro
|
48e4de823a
|
Unify signal registration in a single syscall.
|
2016-06-02 01:34:37 -03:00 |
|
 bergquist
|
1686d86c3b
|
Merge branch 'master' into alerting_definitions
|
2016-05-30 08:26:08 +02:00 |
|
|
Torkel Ödegaard
|
10c47ee27c
|
feat(footer): some minor changes to footer to make it look good in light theme, closes #4889
|
2016-05-24 08:11:28 +02:00 |
|
|
bergquist
|
f05cae23d2
|
feat(alerting): alert rule selector
|
2016-05-23 10:07:04 +02:00 |
|
|
bergquist
|
9d016a2756
|
feat(alerting): add migration for create and update
|
2016-05-20 14:23:24 +02:00 |
|
|
Torkel Ödegaard
|
c133a00125
|
feat(alerting): minor progress on scheduler
|
2016-05-17 14:31:52 +02:00 |
|
|
Torkel Ödegaard
|
e7626befc5
|
updated version
|
2016-04-12 10:17:39 -04:00 |
|
|
Torkel Ödegaard
|
497e9343aa
|
Merge branch 'pluginlist'
|
2016-04-11 21:10:54 -04:00 |
|
|
Torkel Ödegaard
|
135679096b
|
feat(plugins): progress on plugin details page, # 4275
|
2016-03-07 14:31:17 +01:00 |
|
|
bergquist
|
6e7813f2f8
|
feat(build): move grafana into grafana-server
|
2016-02-15 11:15:38 +01:00 |
|