Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/6e03314f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/6e03314f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/6e03314f Branch: refs/heads/master Commit: 6e03314fa9c17e91efaa837b7a03afe0e930a942 Parents: 9d55140 8d1707f Author: William Guo <[email protected]> Authored: Thu Nov 23 08:19:18 2017 +0800 Committer: William Guo <[email protected]> Committed: Thu Nov 23 08:19:18 2017 +0800 ---------------------------------------------------------------------- griffin-doc/postman/griffin.json | 7 +++ .../apache/griffin/core/job/SparkSubmitJob.java | 18 ++++-- .../measure/entity/AbstractAuditableEntity.java | 4 +- .../griffin/core/measure/entity/Rule.java | 40 ++++++++++++- .../core/measure/MeasureControllerTest.java | 13 ++-- .../griffin/core/measure/MeasureTestHelper.java | 4 +- ui/angular/src/app/health/health.component.ts | 40 +++++++++---- .../job/create-job/create-job.component.html | 2 +- .../app/job/create-job/create-job.component.ts | 2 +- .../detail-metric/detail-metric.component.ts | 33 +++++----- ui/angular/src/app/metric/metric.component.ts | 41 +++++++++---- .../src/app/sidebar/sidebar.component.html | 2 +- ui/angular/src/app/sidebar/sidebar.component.ts | 63 +++++++++++++------- 13 files changed, 190 insertions(+), 79 deletions(-) ----------------------------------------------------------------------
