Commit Graph

7570 Commits (1e4761854ed4f1059fcf78624aed8f5ee01e18f1)
 

Author SHA1 Message Date
bergquist 1e4761854e Merge branch 'alerting_definitions' into alert_ui_take2 9 years ago
Torkel Ödegaard 55af988e02 feat(alerting): mocking with new alert rule model 9 years ago
bergquist 66d47a9303 tech(alerting): go vet fix 9 years ago
Torkel Ödegaard c85bb47675 Merge branch 'alerting_definitions' into alert_ui_take2 9 years ago
Torkel Ödegaard dee5f582d7 Merge branch 'master' into alerting_definitions 9 years ago
Torkel Ödegaard 1584dac00a Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 79986e5593 Merge branch 'query-part-refactor' 9 years ago
Torkel Ödegaard b8aa8b3079 feat(prometheus): restore old prometheus query editor, revert this commit in prometheus query editor v2 branch 9 years ago
bergquist 544073b7e1 feat(alerting): make sure saved alerts are valid 9 years ago
Torkel Ödegaard 071c16b73c feat(alerting): start on new ui 9 years ago
bergquist a1f97e0b77 feat(alerting): add heartbeat writer 9 years ago
Mark Baas ced3bafa99 returns correct index (#5275) 9 years ago
Mukesh 755ec552de Bugfix: org select btn was not working on profile (#5317) 9 years ago
Torkel Ödegaard a66027830b Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions 9 years ago
Torkel Ödegaard 26d93d7130 Merge branch 'master' into alerting_definitions 9 years ago
bergquist ffac5c1299 docs(changelog): add note about changelog 9 years ago
Carl Bergquist fe5673134f Merge pull request #5292 from Thib17/master 9 years ago
bergquist 366fb11416 style(alerting): add fmt fixes 9 years ago
Torkel Ödegaard 1d8fdc09e7 feat(logging): added log format option, #4590 9 years ago
Torkel Ödegaard 7d6cda4916 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard b25cb60259 Merge branch 'new-logger' 9 years ago
Torkel Ödegaard 87e98f01cd feat(logging): updated syslog writer to work with log15 log interface, closes #4590 9 years ago
Karl 22cda198ae Apply EscapeFilter to username to address grafana/grafana#5121 (#5279) 9 years ago
Tom Hukins d1c06a93df Fix a typo (#5306) 9 years ago
Torkel Ödegaard eed0d9c8d2 feat(graph performance): graph performance tweaks, refactoring #5297 9 years ago
Torkel Ödegaard bf82fdb678 Merge branch 'perf_graph_js' of https://github.com/mtanda/grafana into mtanda-perf_graph_js 9 years ago
Torkel Ödegaard e1e7fbf83d Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard c739428c30 feat(profiling): refactorign profiling code, #5286 9 years ago
Torkel Ödegaard 2a7d2ffccb Merge branch 'profiling_in_dev' of https://github.com/mtanda/grafana into mtanda-profiling_in_dev 9 years ago
Zdenek Styblik 5eceabf810 fix(): Check Organization exists before User is added (#5302) 9 years ago
Torkel Ödegaard 67ad903556 feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299 9 years ago
Torkel Ödegaard 36b0802789 fix(png): fixed issue with png rendering, fixes #5274 9 years ago
Torkel Ödegaard 93fdc18fd4 feat(logging): fixed dependencies 9 years ago
bergquist 8d4aa5d114 test(alerting): update dashboard json 9 years ago
Torkel Ödegaard e4ea24dfc4 Merge branch 'new-logger' into alerting_definitions 9 years ago
Torkel Ödegaard 73b0e6c37b feat(logging): disable migrator logging during test 9 years ago
Torkel Ödegaard d7c03359ea feat(alerting): fixed test issues 9 years ago
Torkel Ödegaard 3289225b77 feat(alerting): fixed test issues 9 years ago
Torkel Ödegaard 8105ec4660 feat(alerting): fixed test issues 9 years ago
Torkel Ödegaard 461e6ae4ac feat(alerting): added missing godep libs 9 years ago
Torkel Ödegaard 0d9c9526b9 feat(alerting): fixed graphite log issue 9 years ago
Torkel Ödegaard 0667d73660 Merge branch 'new-logger' into alerting_definitions 9 years ago
Torkel Ödegaard 65aad44464 feat(logging): added uname to context logger 9 years ago
Torkel Ödegaard a02cf5beb7 feat(logging): added loging filters 9 years ago
bergquist b76b42f209 docs(changelog): add note about deb post install script 9 years ago
Carl Bergquist ee88b0dc35 Merge pull request #5282 from nazco/patch-1 9 years ago
Torkel Ödegaard 3dc7706c45 feat(loggin): improved http request panic handling 9 years ago
Torkel Ödegaard 9741af2031 feat(logging): progress on new logging #4590 9 years ago
Mitsuhiro Tanda 487b2089a9 cache label width 9 years ago
Mitsuhiro Tanda b28368c859 cache panel width 9 years ago