Merge branch 'master' of https://github.com/apache/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/d96d01a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d96d01a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d96d01a5 Branch: refs/heads/master Commit: d96d01a557d8e5bffffc1fa62e7fbc76a07bf43c Parents: 23ff65f 60e23ed Author: William Guo <guo...@icloud.com> Authored: Sat Nov 4 10:48:15 2017 +0800 Committer: William Guo <guo...@icloud.com> Committed: Sat Nov 4 10:48:15 2017 +0800 ---------------------------------------------------------------------- README.md | 15 +- .../docker/svc_msr/docker-compose-batch.yml | 42 + .../docker/svc_msr/docker-compose-streaming.yml | 61 + griffin-doc/docker/svc_msr/docker-compose.yml | 42 - griffin-doc/griffin-docker-guide.md | 105 ++ griffin-doc/postman/griffin.json | 2 +- .../griffin/measure/persist/HdfsPersist.scala | 12 +- .../griffin/measure/persist/MultiPersists.scala | 30 +- .../core/config/jobConfig/SparkJobConfig.java | 1 - .../org/apache/griffin/core/job/JobService.java | 2 + .../apache/griffin/core/job/JobServiceImpl.java | 78 +- .../core/job/entity/LivySessionStates.java | 2 +- .../core/measure/MeasureOrgController.java | 10 + .../griffin/core/measure/MeasureOrgService.java | 3 + .../core/measure/MeasureOrgServiceImpl.java | 37 +- .../griffin/core/job/JobServiceImplTest.java | 107 +- .../griffin/core/job/SparkSubmitJobTest.java | 6 +- .../core/measure/MeasureControllerTest.java | 16 +- .../core/measure/MeasureOrgControllerTest.java | 3 + .../core/measure/MeasureOrgServiceImplTest.java | 10 +- .../core/measure/MeasureServiceImplTest.java | 20 +- .../core/metric/MetricControllerTest.java | 2 +- .../core/metric/MetricServiceImplTest.java | 2 +- ui/angular/.angular-cli.json | 1 + ui/angular/package.json | 1 + ui/angular/src/app/app.component.html | 2 +- ui/angular/src/app/app.module.ts | 6 + .../src/app/dataasset/dataasset.component.css | 7 + .../src/app/dataasset/dataasset.component.html | 2 +- .../src/app/dataasset/dataasset.component.ts | 4 +- ui/angular/src/app/health/health.component.ts | 136 +-- .../job/create-job/create-job.component.html | 6 +- .../app/job/create-job/create-job.component.ts | 24 +- ui/angular/src/app/job/job.component.css | 23 +- ui/angular/src/app/job/job.component.html | 327 +++--- ui/angular/src/app/job/job.component.ts | 8 +- .../measure/create-measure/ac/ac.component.ts | 130 +-- .../create-measure.component.html | 6 +- .../measure/create-measure/pr/pr.component.css | 13 + .../measure/create-measure/pr/pr.component.html | 458 ++++---- .../measure/create-measure/pr/pr.component.ts | 363 +++--- .../create-measure/pr/rule/rule.component.css | 29 + .../create-measure/pr/rule/rule.component.html | 1084 ++++++++++++++++++ .../pr/rule/rule.component.spec.ts | 43 + .../create-measure/pr/rule/rule.component.ts | 35 + .../measure-detail.component.html | 2 +- .../measure-detail/measure-detail.component.ts | 9 +- .../src/app/measure/measure.component.css | 16 +- .../src/app/measure/measure.component.html | 234 ++-- ui/angular/src/app/measure/measure.component.ts | 14 +- .../detail-metric/detail-metric.component.ts | 177 +-- ui/angular/src/app/metric/metric.component.ts | 175 ++- ui/angular/src/app/service/chart.service.ts | 2 +- ui/angular/src/app/service/service.service.ts | 15 +- .../src/app/sidebar/sidebar.component.html | 2 +- ui/angular/src/app/sidebar/sidebar.component.ts | 46 +- ui/angular/src/app/sidebar/truncate.pipe.ts | 31 + ui/angular/src/styles.css | 34 +- 58 files changed, 2733 insertions(+), 1340 deletions(-) ----------------------------------------------------------------------
