Torkel Ödegaard
|
a66027830b
|
Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions
|
2016-06-08 09:42:31 +02:00 |
|
Torkel Ödegaard
|
26d93d7130
|
Merge branch 'master' into alerting_definitions
|
2016-06-08 09:36:50 +02:00 |
|
bergquist
|
366fb11416
|
style(alerting): add fmt fixes
|
2016-06-08 08:50:11 +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 |
|
Torkel Ödegaard
|
b25cb60259
|
Merge branch 'new-logger'
Conflicts:
CHANGELOG.md
|
2016-06-08 08:09:59 +02:00 |
|
Torkel Ödegaard
|
87e98f01cd
|
feat(logging): updated syslog writer to work with log15 log interface, closes #4590
|
2016-06-08 08:09:29 +02:00 |
|
Karl
|
22cda198ae
|
Apply EscapeFilter to username to address grafana/grafana#5121 (#5279)
|
2016-06-08 07:28:16 +02:00 |
|
Zdenek Styblik
|
5eceabf810
|
fix(): Check Organization exists before User is added (#5302)
Commit adds a check whether Organization exists before User is added to
the organization.
Fixes #3151.
|
2016-06-08 05:46:21 +02:00 |
|
Torkel Ödegaard
|
67ad903556
|
feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299
|
2016-06-08 05:45:13 +02:00 |
|
Torkel Ödegaard
|
93fdc18fd4
|
feat(logging): fixed dependencies
|
2016-06-07 15:59:50 +02:00 |
|
bergquist
|
8d4aa5d114
|
test(alerting): update dashboard json
|
2016-06-07 15:52:33 +02:00 |
|
Torkel Ödegaard
|
e4ea24dfc4
|
Merge branch 'new-logger' into alerting_definitions
Conflicts:
pkg/services/sqlstore/migrations/migrations_test.go
|
2016-06-07 15:51:22 +02:00 |
|
Torkel Ödegaard
|
73b0e6c37b
|
feat(logging): disable migrator logging during test
|
2016-06-07 15:50:16 +02:00 |
|
Torkel Ödegaard
|
d7c03359ea
|
feat(alerting): fixed test issues
|
2016-06-07 14:54:30 +02:00 |
|
Torkel Ödegaard
|
3289225b77
|
feat(alerting): fixed test issues
|
2016-06-07 14:51:53 +02:00 |
|
Torkel Ödegaard
|
8105ec4660
|
feat(alerting): fixed test issues
|
2016-06-07 14:27:56 +02:00 |
|
Torkel Ödegaard
|
0d9c9526b9
|
feat(alerting): fixed graphite log issue
|
2016-06-07 13:47:22 +02:00 |
|
Torkel Ödegaard
|
0667d73660
|
Merge branch 'new-logger' into alerting_definitions
Conflicts:
pkg/api/api.go
pkg/setting/setting.go
|
2016-06-07 13:31:56 +02:00 |
|
Torkel Ödegaard
|
65aad44464
|
feat(logging): added uname to context logger
|
2016-06-07 12:20:46 +02:00 |
|
Torkel Ödegaard
|
a02cf5beb7
|
feat(logging): added loging filters
|
2016-06-07 12:11:41 +02:00 |
|
Torkel Ödegaard
|
3dc7706c45
|
feat(loggin): improved http request panic handling
|
2016-06-07 10:05:10 +02:00 |
|
Torkel Ödegaard
|
9741af2031
|
feat(logging): progress on new logging #4590
|
2016-06-07 09:29:47 +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
|
34e17f7282
|
feat(alerting): requests looks to be working again
|
2016-06-06 17:11:46 +02:00 |
|
Torkel Ödegaard
|
d1acfb4494
|
feat(alerting): minor progress
|
2016-06-06 14:24:14 +02:00 |
|
Torkel Ödegaard
|
7a34c129fe
|
feat(alerting): things are compiling and tests pass
|
2016-06-06 13:50:47 +02:00 |
|
Torkel Ödegaard
|
0cbf4ae773
|
feat(alerting): began work on splitting scheduler into scheduler and engine
|
2016-06-06 11:56:58 +02:00 |
|
Torkel Ödegaard
|
a191b9b1cf
|
feat(alerting): moved alerting models back to alerting package, models is more for storage dtos
|
2016-06-06 10:31:21 +02:00 |
|
Torkel Ödegaard
|
70cb8400c3
|
feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting
|
2016-06-06 09:17:29 +02:00 |
|
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 |
|
Karl
|
2f5ae85d33
|
Initial patch for grafana/grafana#4267 (#5280)
|
2016-06-06 07:15:37 +02:00 |
|
Torkel Ödegaard
|
7cbaf06097
|
feat(instrumentation): check if enabled in http api metrics route
|
2016-06-03 21:22:34 +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
|
aef2b6b45f
|
feat(instrumentation): finial polish
|
2016-06-03 17:15:17 +02:00 |
|
Torkel Ödegaard
|
35a7a3a52b
|
feat(instrumentation): added some more timers
|
2016-06-03 17:00:39 +02:00 |
|
Torkel Ödegaard
|
e0c6048820
|
feat(instrumentation): added gauge and http endpoint
|
2016-06-03 16:15:36 +02:00 |
|
bergquist
|
6a49d4ed6b
|
feat(alerting): remove orgid from alertrule query
|
2016-06-03 15:24:53 +02:00 |
|
bergquist
|
b08f8bab71
|
Merge branch 'dakerfp-patch-3'
|
2016-06-03 15:09:18 +02:00 |
|
Torkel Ödegaard
|
1a05ae2eaa
|
feat(instrumentation): more work
|
2016-06-03 15:06:57 +02:00 |
|
bergquist
|
961c31a747
|
test(util): add unit test for string util
|
2016-06-03 15:06:54 +02:00 |
|
bergquist
|
d1a345bb03
|
Merge branch 'patch-3' of https://github.com/dakerfp/grafana into dakerfp-patch-3
|
2016-06-03 15:02:46 +02:00 |
|
bergquist
|
2cf797b567
|
tech(alerting): minor refactoring and code style
|
2016-06-03 15:01:42 +02:00 |
|
Carl Bergquist
|
236aed112f
|
Merge pull request #5255 from dakerfp/patch-1
Unify signal registration in a single syscall.
|
2016-06-03 14:59:42 +02:00 |
|
bergquist
|
65eb373808
|
Merge branch 'master' into alerting_definitions
|
2016-06-03 13:48:36 +02:00 |
|
bergquist
|
3d7facf6ee
|
fix(cli): fixes broken import
|
2016-06-03 13:40:48 +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 |
|
bergquist
|
6de1399cf0
|
fix(cli): fixes broken import
|
2016-06-03 12:35:17 +02:00 |
|
bergquist
|
d0ac258474
|
Merge branch 'master' into alerting_definitions
|
2016-06-03 12:22:46 +02:00 |
|