Docker remove src/main/resource/public
Author: Liu <[email protected]> Author: bhlx3lyx7 <[email protected]> Closes #20 from bhlx3lyx7/docker. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/7bf1b16d Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/7bf1b16d Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/7bf1b16d Branch: refs/heads/master Commit: 7bf1b16d5509125bc3f2dbacef6ab000df168489 Parents: 07f1a53 Author: Liu <[email protected]> Authored: Thu May 11 10:15:26 2017 +0800 Committer: William Guo <[email protected]> Committed: Thu May 11 10:15:26 2017 +0800 ---------------------------------------------------------------------- .../measure-batch/src/main/resources/env.json | 2 +- .../measure/batch/persist/HttpPersist.scala | 5 +- .../measure/batch/persist/HttpPersistTest.scala | 21 + measure/pom.xml | 54 +- pom.xml | 2 +- .../griffin/core/schedule/SparkSubmitJob.java | 2 +- .../src/main/resources/application.properties | 6 +- service/src/main/resources/sparkJob.properties | 21 +- .../font-awesome/fonts/FontAwesome.otf | Bin 109688 -> 31963 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 70807 -> 32068 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 1192 ++++++++---------- .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 142072 -> 32068 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 83588 -> 32082 bytes .../fonts/fontawesome-webfont.woff.bak | Bin 83588 -> 32133 bytes .../fonts/fontawesome-webfont.woff2 | Bin 66624 -> 32095 bytes ui/js/controllers/createrule-ac-ctrl.js | 26 +- ui/js/services/services.js | 3 +- 17 files changed, 626 insertions(+), 708 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/measure/measure-batch/src/main/resources/env.json ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/main/resources/env.json b/measure/measure-batch/src/main/resources/env.json index 2e72601..57da895 100644 --- a/measure/measure-batch/src/main/resources/env.json +++ b/measure/measure-batch/src/main/resources/env.json @@ -18,7 +18,7 @@ "type": "http", "config": { "method": "post", - "api": "http://phxbark4dq-360935.stratus.phx.ebay.com:8080/"; + "api": "http://HOSTNAME:9200/griffin/accuracy"; } } ], http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala index 5765927..76bfd8a 100644 --- a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala +++ b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala @@ -22,12 +22,13 @@ case class HttpPersist(config: Map[String, Any], metricName: String, timeStamp: def result(rt: Long, result: Result): Unit = { result match { case ar: AccuracyResult => { - val dataMap = Map[String, Any](("metricName" -> metricName), ("timestamp" -> timeStamp), ("value" -> ar.matchPercentage)) + val dataMap = Map[String, Any](("name" -> metricName), ("tmst" -> timeStamp), ("total" -> ar.getTotal), ("matched" -> ar.getMatch)) val data = JsonUtil.toJson(dataMap) // post val params = Map[String, Object]() - val header = Map[String, Object](("content-type" -> "application/json")) +// val header = Map[String, Object](("content-type" -> "application/json")) + val header = Map[String, Object]() val status = HttpUtil.httpRequest(api, method, params, header, data) info(s"${method} to ${api} response status: ${status}") } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala b/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala new file mode 100644 index 0000000..20ebb7c --- /dev/null +++ b/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala @@ -0,0 +1,21 @@ +package org.apache.griffin.measure.batch.persist + +import org.apache.griffin.measure.batch.log.Loggable +import org.apache.griffin.measure.batch.result.AccuracyResult +import org.apache.griffin.measure.batch.utils.JsonUtil +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner +import org.scalatest.{BeforeAndAfter, FunSuite, Matchers} + + +@RunWith(classOf[JUnitRunner]) +class HttpPersistTest extends FunSuite with Matchers with BeforeAndAfter with Loggable { + + test("test result json") { + val ar = AccuracyResult(10, 1000) + val dataMap = Map[String, Any](("name" -> "metric"), ("tmst" -> System.currentTimeMillis), ("total" -> ar.getTotal), ("matched" -> ar.getMatch)) + val data = JsonUtil.toJson(dataMap) + println(data) + } + +} http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/measure/pom.xml ---------------------------------------------------------------------- diff --git a/measure/pom.xml b/measure/pom.xml index 7ed7f22..3f20b60 100644 --- a/measure/pom.xml +++ b/measure/pom.xml @@ -140,15 +140,15 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- or whatever version you use --> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> + <!--<plugin>--> + <!--<groupId>org.apache.maven.plugins</groupId>--> + <!--<artifactId>maven-compiler-plugin</artifactId>--> + <!--<configuration>--> + <!--<!– or whatever version you use –>--> + <!--<source>1.8</source>--> + <!--<target>1.8</target>--> + <!--</configuration>--> + <!--</plugin>--> <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> @@ -171,23 +171,25 @@ <target>1.8</target> </configuration> </plugin> - <!--<plugin>--> - <!--<artifactId>maven-assembly-plugin</artifactId>--> - <!--<configuration>--> - <!--<descriptorRefs>--> - <!--<descriptorRef>jar-with-dependencies</descriptorRef>--> - <!--</descriptorRefs>--> - <!--</configuration>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>make-assembly</id>--> - <!--<phase>package</phase>--> - <!--<goals>--> - <!--<goal>single</goal>--> - <!--</goals>--> - <!--</execution>--> - <!--</executions>--> - <!--</plugin>--> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + <finalName>griffin-measure-batch</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6d37e96..ac1ec29 100644 --- a/pom.xml +++ b/pom.xml @@ -22,9 +22,9 @@ <name>Apache Griffin</name> <modules> + <module>ui</module> <module>service</module> <module>measure</module> - <module>ui</module> </modules> <profiles> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java index cc8e1c5..9f34df5 100644 --- a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java +++ b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java @@ -193,7 +193,7 @@ public class SparkSubmitJob implements Job { sparkJobDO.setJars(jars); List<String> files = new ArrayList<>(); - files.add(props.getProperty("sparkJob.files_1")); +// files.add(props.getProperty("sparkJob.files_1")); sparkJobDO.setFiles(files); } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/service/src/main/resources/application.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/application.properties b/service/src/main/resources/application.properties index 0244bec..d0fea6e 100644 --- a/service/src/main/resources/application.properties +++ b/service/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.datasource.url= jdbc:mysql://10.249.75.250:3306/metastore +spring.datasource.url= jdbc:mysql://localhost:3306/metastore spring.datasource.username =griffin spring.datasource.password =123456 @@ -15,8 +15,8 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy # hive metastore -hive.metastore.uris = thrift://10.9.246.187:9083 +hive.metastore.uris = thrift://localhost:9083 hive.metastore.dbname = default # kafka schema registry -kafka.schema.registry.url = http://10.65.159.119:8081 \ No newline at end of file +kafka.schema.registry.url = http://localhost:8081 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/service/src/main/resources/sparkJob.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/sparkJob.properties b/service/src/main/resources/sparkJob.properties index e3eddcc..b6f9932 100644 --- a/service/src/main/resources/sparkJob.properties +++ b/service/src/main/resources/sparkJob.properties @@ -1,17 +1,16 @@ -sparkJob.file=/exe/griffin-measure-batch-0.0.1-SNAPSHOT.jar +sparkJob.file=hdfs:///griffin/griffin-measure-batch.jar sparkJob.className=org.apache.griffin.measure.batch.Application -sparkJob.args_1=/benchmark/test/env.json +sparkJob.args_1=hdfs:///griffin/json/env.json sparkJob.args_3=hdfs,raw -sparkJob.name=griffin-livy-rrr +sparkJob.name=griffin sparkJob.queue=default sparkJob.numExecutors=2 -sparkJob.executorCores=4 -sparkJob.driverMemory=2g -sparkJob.executorMemory=2g +sparkJob.executorCores=1 +sparkJob.driverMemory=1g +sparkJob.executorMemory=1g sparkJob.spark.jars.packages=com.databricks:spark-avro_2.10:2.0.1 -sparkJob.jars_1=/livy/datanucleus-api-jdo-3.2.6.jar -sparkJob.jars_2=/livy/datanucleus-core-3.2.10.jar -sparkJob.jars_3=/livy/datanucleus-rdbms-3.2.9.jar -sparkJob.files_1=/livy/hive-site.xml +sparkJob.jars_1=hdfs:///livy/datanucleus-api-jdo-3.2.6.jar +sparkJob.jars_2=hdfs:///livy/datanucleus-core-3.2.10.jar +sparkJob.jars_3=hdfs:///livy/datanucleus-rdbms-3.2.9.jar sparkJob.dateAndHour=dt,hour -sparkJob.uri=http://10.9.246.187:8998/batches \ No newline at end of file +sparkJob.uri=http://localhost:8998/batches \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/bower_components/font-awesome/fonts/FontAwesome.otf ---------------------------------------------------------------------- diff --git a/ui/bower_components/font-awesome/fonts/FontAwesome.otf b/ui/bower_components/font-awesome/fonts/FontAwesome.otf index 3ed7f8b..9469be7 100644 Binary files a/ui/bower_components/font-awesome/fonts/FontAwesome.otf and b/ui/bower_components/font-awesome/fonts/FontAwesome.otf differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/bower_components/font-awesome/fonts/fontawesome-webfont.eot ---------------------------------------------------------------------- diff --git a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.eot b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.eot index 9b6afae..b596125 100644 Binary files a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.eot and b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.eot differ
