You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/05/27 03:16:17 UTC
incubator-griffin git commit: docker version 0.0.1
Repository: incubator-griffin
Updated Branches:
refs/heads/master 2de6a5497 -> a0802ed49
docker version 0.0.1
Author: Liu <ll...@ebay.com>
Author: Liu <ll...@lm-shc-16501428.corp.ebay.com>
Author: Lionel Liu <bh...@163.com>
Author: Liu <ll...@lm-shc-16501428.dhcp>
Author: bhlx3lyx7 <bh...@163.com>
Closes #40 from bhlx3lyx7/master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/a0802ed4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/a0802ed4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/a0802ed4
Branch: refs/heads/master
Commit: a0802ed4987f0ee69c67f55bbc15bd25f6ebbd80
Parents: 2de6a54
Author: Liu <ll...@ebay.com>
Authored: Sat May 27 11:16:11 2017 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Sat May 27 11:16:11 2017 +0800
----------------------------------------------------------------------
README.md | 4 ++--
docker/griffin_demo/Dockerfile | 2 +-
docker/griffin_demo/bootstrap-all.sh | 2 +-
docker/griffin_demo/prep/data/init-demo-data.sh | 5 +++++
griffin-doc/dockerUIguide.md | 6 +++---
measure/pom.xml | 12 ------------
6 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a0802ed4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0eee2b7..1724e18 100644
--- a/README.md
+++ b/README.md
@@ -19,14 +19,14 @@ Release:
1. Install [docker](https://www.docker.com/).
2. Pull our built docker image.
```
- docker pull bhlx3lyx7/griffin_demo:0.1.0
+ docker pull bhlx3lyx7/griffin_demo:0.0.1
```
3. Run this docker image, then griffin is ready.
```
docker run -it -h sandbox --name griffin_demo -m 8G --memory-swap -1 \
-p 32122:2122 -p 37077:7077 -p 36066:6066 -p 38088:8088 -p 38040:8040 \
-p 33306:3306 -p 39000:9000 -p 38042:8042 -p 38080:8080 -p 37017:27017 \
- -p 39083:9083 -p 38998:8998 -p 39200:9200 bhlx3lyx7/griffin_demo:0.1.0
+ -p 39083:9083 -p 38998:8998 -p 39200:9200 bhlx3lyx7/griffin_demo:0.0.1
```
4. Now you can visit UI through your browser, login with account "test" and password "test" if required.
```
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a0802ed4/docker/griffin_demo/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/griffin_demo/Dockerfile b/docker/griffin_demo/Dockerfile
index 0ef9b06..855404d 100644
--- a/docker/griffin_demo/Dockerfile
+++ b/docker/griffin_demo/Dockerfile
@@ -1,4 +1,4 @@
-FROM bhlx3lyx7/griffin_env:0.1.0
+FROM bhlx3lyx7/griffin_env:0.0.1
MAINTAINER org.apache.griffin
WORKDIR /root
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a0802ed4/docker/griffin_demo/bootstrap-all.sh
----------------------------------------------------------------------
diff --git a/docker/griffin_demo/bootstrap-all.sh b/docker/griffin_demo/bootstrap-all.sh
index ae9c6b9..fdd37c2 100755
--- a/docker/griffin_demo/bootstrap-all.sh
+++ b/docker/griffin_demo/bootstrap-all.sh
@@ -41,7 +41,7 @@ service elasticsearch start
#griffin prepare
cd /root/data
nohup ./gen-hive-data.sh > hive-data.log &
-#nohup ./gen-es-data.sh > es-data.log &
+nohup ./init-demo-data.sh > init-data.log &
cd /root
sed s/HOSTNAME/$HOSTNAME/ /root/service/config/application.properties.template > /root/service/config/application.properties
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a0802ed4/docker/griffin_demo/prep/data/init-demo-data.sh
----------------------------------------------------------------------
diff --git a/docker/griffin_demo/prep/data/init-demo-data.sh b/docker/griffin_demo/prep/data/init-demo-data.sh
new file mode 100755
index 0000000..d7b0357
--- /dev/null
+++ b/docker/griffin_demo/prep/data/init-demo-data.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sleep 30
+
+nohup ./gen-es-data.sh > gen-es.log &
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a0802ed4/griffin-doc/dockerUIguide.md
----------------------------------------------------------------------
diff --git a/griffin-doc/dockerUIguide.md b/griffin-doc/dockerUIguide.md
index 467681e..3d2adf9 100644
--- a/griffin-doc/dockerUIguide.md
+++ b/griffin-doc/dockerUIguide.md
@@ -20,14 +20,14 @@ Follow the steps [here](https://github.com/apache/incubator-griffin#how-to-run-i
3. Now you've created a new DQ measurement, the measurement needs to be scheduled to run in the docker container.
Our default schedule UI is not implemented at current, so you can call the rest api we provide, to schedule this measurement.
- Assume that your measure name is "demo_accu", and you want to start the job immediately, run the job every 5 minutes.
+ Assume that you want to start the job immediately, run the job every 5 minutes.
```
- curl -X POST -d '{
+ curl -X POST -H "Content-Type: application/json" -d '{
"sourcePat":"YYYYMMdd-HH",
"targetPat":"YYYYMMdd-HH",
"jobStartTime":"0",
"periodTime":"300"
- }' "http://<you local ip>:38080/jobs/add/BA/<job id>/demo_accu"
+ }' "http://<you local ip>:38080/jobs/add/BA/<job id>/<measure-name>"
```
The port 38080 is mapping to docker container 8080, the port of griffin service, and each time you submit a new schedule, you need to submit a new <job id>.
Wait for about 1 minute, after the calculation, results would be published to web UI, then you can watch the dashboard by clicking "DQ Metrics" at the top right corner.
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a0802ed4/measure/pom.xml
----------------------------------------------------------------------
diff --git a/measure/pom.xml b/measure/pom.xml
index 54e4894..cf0e09b 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -144,18 +144,6 @@
<version>${scalamock.version}</version>
<scope>test</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.scalamock</groupId>-->
- <!--<artifactId>scalamock-specs2-support_${scala.binary.version}</artifactId>-->
- <!--<version>${scalamock.version}</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.scalamock</groupId>-->
- <!--<artifactId>scalamock-core_${scala.binary.version}</artifactId>-->
- <!--<version>${scalamock.version}</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
</dependencies>