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 |
|
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 |
|
Tom Hukins
|
d1c06a93df
|
Fix a typo (#5306)
|
2016-06-08 07:27:52 +02:00 |
|
Torkel Ödegaard
|
eed0d9c8d2
|
feat(graph performance): graph performance tweaks, refactoring #5297
|
2016-06-08 07:23:44 +02:00 |
|
Torkel Ödegaard
|
bf82fdb678
|
Merge branch 'perf_graph_js' of https://github.com/mtanda/grafana into mtanda-perf_graph_js
|
2016-06-08 06:53:28 +02:00 |
|
Torkel Ödegaard
|
e1e7fbf83d
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-06-08 06:51:43 +02:00 |
|
Torkel Ödegaard
|
c739428c30
|
feat(profiling): refactorign profiling code, #5286
|
2016-06-08 06:51:10 +02:00 |
|
Torkel Ödegaard
|
2a7d2ffccb
|
Merge branch 'profiling_in_dev' of https://github.com/mtanda/grafana into mtanda-profiling_in_dev
|
2016-06-08 05:47:30 +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
|
36b0802789
|
fix(png): fixed issue with png rendering, fixes #5274
|
2016-06-08 05:29:38 +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
|
461e6ae4ac
|
feat(alerting): added missing godep libs
|
2016-06-07 13:50:55 +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 |
|
bergquist
|
b76b42f209
|
docs(changelog): add note about deb post install script
|
2016-06-07 12:09:56 +02:00 |
|
Carl Bergquist
|
ee88b0dc35
|
Merge pull request #5282 from nazco/patch-1
restart grafana after upgrade
|
2016-06-07 12:03:42 +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 |
|
Mitsuhiro Tanda
|
487b2089a9
|
cache label width
|
2016-06-07 14:28:08 +09:00 |
|
Mitsuhiro Tanda
|
b28368c859
|
cache panel width
|
2016-06-07 14:04:06 +09: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 |
|
Mitsuhiro Tanda
|
25899b72d2
|
use applyAsync for compile (#5287)
|
2016-06-06 17:18:18 +02:00 |
|
Mitsuhiro Tanda
|
f877afb74d
|
use async apply (#5258)
|
2016-06-06 17:18:10 +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 |
|
Mitsuhiro Tanda
|
83c76981b2
|
fix profiling code
|
2016-06-06 17:42:11 +09:00 |
|
Mitsuhiro Tanda
|
975b53b318
|
enable profiling in development mode
|
2016-06-06 17:42:11 +09: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 |
|
Ben Oswald
|
51878aeca8
|
change start to restart also for systemctl
I've forgotten to update the systemctl start to restart in my first commit
|
2016-06-05 16:27:57 +02:00 |
|