bergquist
|
3c0b5fe78e
|
tech(alerting): add graphite dateformat replacer
|
2016-06-10 13:26:19 +02:00 |
|
bergquist
|
8cd1d17916
|
feat(alerting): new alerting model\
|
2016-06-10 13:15:16 +02:00 |
|
bergquist
|
0c69c5afb1
|
test(alerting): fixes broken unittests
|
2016-06-10 11:37:03 +02:00 |
|
bergquist
|
ef35184a80
|
feat(alerting): rename alertrule model to alertruleDAO
|
2016-06-10 10:00:00 +02:00 |
|
bergquist
|
b17298c97c
|
test(alerting): remove unused code to enable gorename
|
2016-06-10 07:11:14 +02:00 |
|
bergquist
|
fdf051ad5a
|
feat(alerting): begin alert rule storage refactoring
|
2016-06-09 22:21:28 +02:00 |
|
bergquist
|
1e4761854e
|
Merge branch 'alerting_definitions' into alert_ui_take2
|
2016-06-09 13:03:40 +02:00 |
|
bergquist
|
66d47a9303
|
tech(alerting): go vet fix
|
2016-06-09 10:49:25 +02:00 |
|
Torkel Ödegaard
|
dee5f582d7
|
Merge branch 'master' into alerting_definitions
|
2016-06-09 10:45:16 +02:00 |
|
Torkel Ödegaard
|
1584dac00a
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-06-09 10:43:46 +02:00 |
|
bergquist
|
544073b7e1
|
feat(alerting): make sure saved alerts are valid
|
2016-06-09 10:27:23 +02:00 |
|
bergquist
|
a1f97e0b77
|
feat(alerting): add heartbeat writer
|
2016-06-09 10:00:34 +02:00 |
|
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 |
|
Carl Bergquist
|
fe5673134f
|
Merge pull request #5292 from Thib17/master
Enable the "limit" param in /api/search
|
2016-06-08 09:19:58 +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 |
|
Thibault Chataigner
|
3d77685108
|
Enable the "limit" param in /api/search
|
2016-06-06 16:15:20 +00: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 |
|