Commit Graph

7589 Commits (0ef68011173175fd9e6d441ca722e2bb74dc41b9)
 

Author SHA1 Message Date
Torkel Ödegaard 0ef6801117 Merge branch 'master' into alert_ui_take2 9 years ago
Torkel Ödegaard bf1ea560e9 feat(logging): error logging improvements 9 years ago
Torkel Ödegaard 77a5e3f14d feat(alerting): minor fixes 9 years ago
Torkel Ödegaard 086b59483e feat(loggin): disable logging by default so unit tests are not full of logging 9 years ago
Torkel Ödegaard 382f396247 feat(alerting): more model changes 9 years ago
Torkel Ödegaard a362984c57 feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part 9 years ago
Torkel Ödegaard 2b4a9954b1 feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package 9 years ago
bergquist 1fa9ae810b test(alerting): enable disabled tests 9 years ago
bergquist 83c422e6ef feat(alerting): implement transform objects 9 years ago
Torkel Ödegaard c18017381b Merge branch 'alert_ui_take2' of github.com:grafana/grafana into alert_ui_take2 9 years ago
Torkel Ödegaard 48cbeb96bf feat(alerting): updated rule model and UI 9 years ago
bergquist ea8fb66f73 test(alerting): fixes broken unittests 9 years ago
bergquist 3c0b5fe78e tech(alerting): add graphite dateformat replacer 9 years ago
bergquist 8cd1d17916 feat(alerting): new alerting model\ 9 years ago
bergquist 0c69c5afb1 test(alerting): fixes broken unittests 9 years ago
bergquist ef35184a80 feat(alerting): rename alertrule model to alertruleDAO 9 years ago
bergquist b17298c97c test(alerting): remove unused code to enable gorename 9 years ago
bergquist fdf051ad5a feat(alerting): begin alert rule storage refactoring 9 years ago
bergquist 3898f427f5 feat(alerting): update the ux model 9 years ago
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