update to version 0.12.0-SNAPSHOT

Hurence · Feb 14, 2018 · 4325515 · 4325515
1 parent 078da3d
commit 4325515
Show file tree

Hide file tree

Showing 91 changed files with 849 additions and 863 deletions.
diff --git a/README.rst b/README.rst
@@ -51,7 +51,7 @@ to build from the source just clone source and package with maven
     cd logisland
     mvn install
 
-the final package is available at `logisland-assembly/target/logisland-0.11.0-bin-hdp2.5.tar.gz`
+the final package is available at `logisland-assembly/target/logisland-0.12.0-SNAPSHOT-bin-hdp2.5.tar.gz`
 
 You can also download the `latest release build <https://github.com/Hurence/logisland/releases>`_
 
@@ -72,9 +72,9 @@ basically **logisland** depends on Kafka and Spark, you can deploy it on any lin
     curl -s http://d3kbcqa49mib13.cloudfront.net/spark-2.1.0-bin-hadoop2.7.tgz | tar -xz -C /usr/local/
     export SPARK_HOME=/usr/local/spark-2.1.0-bin-hadoop2.7
 
-    # install Logisland 0.11.0
-    curl -s https://github.com/Hurence/logisland/releases/download/v0.10.0/logisland-0.11.0-bin-hdp2.5.tar.gz  | tar -xz -C /usr/local/
-    cd /usr/local/logisland-0.11.0
+    # install Logisland 0.12.0-SNAPSHOT
+    curl -s https://github.com/Hurence/logisland/releases/download/v0.10.0/logisland-0.12.0-SNAPSHOT-bin-hdp2.5.tar.gz  | tar -xz -C /usr/local/
+    cd /usr/local/logisland-0.12.0-SNAPSHOT
 
     # launch a logisland job
     bin/logisland.sh --conf conf/index-apache-logs.yml
@@ -99,7 +99,7 @@ The first part is the `ProcessingEngine` configuration (here a Spark streaming e
 
 .. code-block:: yaml
 
-    version: 0.11.0
+    version: 0.12.0-SNAPSHOT
     documentation: LogIsland job config file
     engine:
       component: com.hurence.logisland.engine.spark.KafkaStreamProcessingEngine

diff --git a/launch-tuto.sh b/launch-tuto.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-logisland-assembly/target/logisland-0.11.0-bin-hdp2.5/logisland-0.11.0/bin/logisland.sh \
+logisland-assembly/target/logisland-0.12.0-SNAPSHOT-bin-hdp2.5/logisland-0.12.0-SNAPSHOT/bin/logisland.sh \
     --conf logisland-framework/logisland-resources/src/main/resources/conf/$1
diff --git a/logisland-api/pom.xml b/logisland-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-api</artifactId>
     <packaging>jar</packaging>

diff --git a/logisland-assembly/pom.xml b/logisland-assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-assembly</artifactId>
     <packaging>pom</packaging>
@@ -154,11 +154,6 @@
             <groupId>com.hurence.logisland</groupId>
             <artifactId>logisland-documentation</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.hurence.logisland</groupId>
-            <artifactId>logisland-elasticsearch_2_3_3-client-service</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.hurence.logisland</groupId>
             <artifactId>logisland-elasticsearch_2_4_0-client-service</artifactId>

diff --git a/logisland-docker/full-container/Dockerfile b/logisland-docker/full-container/Dockerfile
@@ -7,7 +7,7 @@ USER root
 COPY logisland-*.tar.gz /usr/local/
 RUN cd /usr/local; \
     tar -xzf logisland-*.tar.gz; \
-    ln -s /usr/local/logisland-0.11.0 /usr/local/logisland; \
+    ln -s /usr/local/logisland-0.12.0-SNAPSHOT /usr/local/logisland; \
     mkdir /usr/local/logisland/log; \
     rm -f /usr/local/*.gz
 ENV LOGISLAND_HOME /usr/local/logisland

diff --git a/logisland-docker/full-container/README.rst b/logisland-docker/full-container/README.rst
@@ -7,7 +7,7 @@ Small standalone Hadoop distribution for development and testing purpose :
 - Elasticsearch 2.3.3
 - Kibana 4.5.1
 - Kafka 0.9.0.1
-- Logisland 0.11.0
+- Logisland 0.12.0-SNAPSHOT
 
 
 This repository contains a Docker file to build a Docker image with Apache Spark, HBase, Flume & Zeppelin. 
@@ -32,14 +32,14 @@ Building the image
 
     # build logisland
     mvn clean install
-    cp logisland-assembly/target/logisland-0.11.0-bin.tar.gz logisland-docker
+    cp logisland-assembly/target/logisland-0.12.0-SNAPSHOT-bin.tar.gz logisland-docker
 
 The archive is generated under dist directory, 
 you have to copy this file into your Dockerfile directory you can now issue
 
 .. code-block:: sh
 
-    docker build --rm -t hurence/logisland:0.11.0 .
+    docker build --rm -t hurence/logisland:0.12.0-SNAPSHOT .
 
 
 Running the image
@@ -64,13 +64,13 @@ Running the image
         -p 4040-4060:4040-4060 \
         --name logisland \
         -h sandbox \
-        hurence/logisland-hdp2.4:0.11.0 bash
+        hurence/logisland-hdp2.4:0.12.0-SNAPSHOT bash
 
 or
 
 .. code-block::
 
-    docker run -d -h sandbox hurence/logisland-hdp2.4:0.11.0 -d
+    docker run -d -h sandbox hurence/logisland-hdp2.4:0.12.0-SNAPSHOT -d
 
 if you want to mount a directory from your host, add the following option :
 

diff --git a/logisland-docker/lightweight-container/Dockerfile b/logisland-docker/lightweight-container/Dockerfile
@@ -1,6 +1,6 @@
 FROM anapsix/alpine-java
 
-ARG kafka_version=0.11.0.1
+ARG kafka_version=0.12.0-SNAPSHOT.1
 ARG scala_version=2.11
 
 MAINTAINER wurstmeister

diff --git a/logisland-docker/pom.xml b/logisland-docker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>logisland-docker</artifactId>

diff --git a/logisland-docker/src/it/resources/data/all-tutorials.yml b/logisland-docker/src/it/resources/data/all-tutorials.yml
@@ -2,7 +2,7 @@
 # Logisland configuration script template
 #########################################################################################################
 
-version: 0.11.0
+version: 0.12.0-SNAPSHOT
 documentation: LogIsland analytics main config file. Put here every engine or component config
 
 #########################################################################################################

diff --git a/logisland-documentation/api.rst b/logisland-documentation/api.rst
@@ -409,7 +409,7 @@ You can then start to generate the source code from the swgger yaml file
     swagger-codegen generate \
         --group-id com.hurence.logisland \
         --artifact-id logisland-agent \
-        --artifact-version 0.11.0 \
+        --artifact-version 0.12.0-SNAPSHOT \
         --api-package com.hurence.logisland.agent.rest.api \
         --model-package com.hurence.logisland.agent.rest.model \
         -o logisland-framework/logisland-agent \

diff --git a/logisland-documentation/changes.rst b/logisland-documentation/changes.rst
@@ -3,7 +3,7 @@ What's new in logisland ?
 
 
 
-v0.11.0
+v0.12.0-SNAPSHOT
 -------
 
 - add support for SOLR

diff --git a/logisland-documentation/conf.py b/logisland-documentation/conf.py
@@ -71,9 +71,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.11.0'
+version = '0.12.0-SNAPSHOT'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.0'
+release = '0.12.0-SNAPSHOT'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/logisland-documentation/developer.rst b/logisland-documentation/developer.rst
@@ -204,14 +204,14 @@ to release artifacts (if you're allowed to), follow this guide `release to OSS S
 
 .. code-block:: sh
 
-    mvn versions:set -DnewVersion=0.11.0
+    mvn versions:set -DnewVersion=0.12.0-SNAPSHOT
     mvn license:format
     mvn test
     mvn -DperformRelease=true clean deploy
     mvn versions:commit
 
-    git tag -a v0.11.0 -m "new logisland release 0.11.0"
-    git push origin v0.11.0
+    git tag -a v0.12.0-SNAPSHOT -m "new logisland release 0.12.0-SNAPSHOT"
+    git push origin v0.12.0-SNAPSHOT
 
 follow the staging procedure in `oss.sonatype.org <https://oss.sonatype.org/#stagingRepositories>`_ or read `Sonatype book <http://books.sonatype.com/nexus-book/reference/staging-deployment.html#staging-maven>`_
 
@@ -224,7 +224,7 @@ Publish release assets to github
 
 please refer to `https://developer.github.com/v3/repos/releases <https://developer.github.com/v3/repos/releases>`_
 
-curl -XPOST https://uploads.github.com/repos/Hurence/logisland/releases/8905079/assets?name=logisland-0.11.0-bin-hdp2.5.tar.gz -v  --data-binary  @logisland-assembly/target/logisland-0.10.3-bin-hdp2.5.tar.gz --user oalam -H 'Content-Type: application/gzip'
+curl -XPOST https://uploads.github.com/repos/Hurence/logisland/releases/8905079/assets?name=logisland-0.12.0-SNAPSHOT-bin-hdp2.5.tar.gz -v  --data-binary  @logisland-assembly/target/logisland-0.10.3-bin-hdp2.5.tar.gz --user oalam -H 'Content-Type: application/gzip'
 
 
 

diff --git a/logisland-documentation/monitoring.rst b/logisland-documentation/monitoring.rst
@@ -63,8 +63,8 @@ Manual mode :
 
     # download the latest build of Node Exporter
     cd /opt
-    wget https://github.com/prometheus/node_exporter/releases/download/0.11.0/node_exporter-0.11.0.linux-amd64.tar.gz -O /tmp/node_exporter-0.11.0.linux-amd64.tar.gz
-    sudo tar -xvzf /tmp/node_exporter-0.11.0.linux-amd64.tar.gz
+    wget https://github.com/prometheus/node_exporter/releases/download/0.12.0-SNAPSHOT/node_exporter-0.12.0-SNAPSHOT.linux-amd64.tar.gz -O /tmp/node_exporter-0.12.0-SNAPSHOT.linux-amd64.tar.gz
+    sudo tar -xvzf /tmp/node_exporter-0.12.0-SNAPSHOT.linux-amd64.tar.gz
 
     # Create a soft link to the node_exporter binary in /usr/bin.
     sudo ln -s /opt/node_exporter /usr/bin
@@ -354,4 +354,4 @@ Elasticsearch alerts
       IF elasticsearch_jvm_memory_used_bytes{area="heap"} / elasticsearch_jvm_memory_max_bytes{area="heap"} > 0.9
       FOR 15m
       LABELS {severity="critical"}
-      ANNOTATIONS {description="The heap usage is over 90% for 15m", summary="ElasticSearch node {{$labels.node}} heap usage is high"}
+      ANNOTATIONS {description="The heap usage is over 90% for 15m", summary="ElasticSearch node {{$labels.node}} heap usage is high"}
diff --git a/logisland-documentation/overview-slides.md b/logisland-documentation/overview-slides.md
@@ -369,7 +369,7 @@ you configure here your Spark job parameters
 
 Download the latest release from [github](https://github.com/Hurence/logisland/releases)
 
-	tar -xzf logisland-0.11.0-bin.tar.gz
+	tar -xzf logisland-0.12.0-SNAPSHOT-bin.tar.gz
 
 Create a job configuration
 

diff --git a/logisland-documentation/plugins_old.rst b/logisland-documentation/plugins_old.rst
@@ -60,7 +60,7 @@ Write your a custom LogParser for your super-plugin in ``/src/main/java/com/hure
 
 Our parser will analyze some Proxy Log String in the following form :
 
-	"Thu Jan 02 08:43:39 CET 2014	GET	10.118.32.164	193.251.214.117	http	webmail.laposte.net	80	/webmail/fr_FR/Images/Images-2013090.11.026/Images/RightJauge.gif	724	409	false	false"
+	"Thu Jan 02 08:43:39 CET 2014	GET	10.118.32.164	193.251.214.117	http	webmail.laposte.net	80	/webmail/fr_FR/Images/Images-2013090.12.0-SNAPSHOT26/Images/RightJauge.gif	724	409	false	false"
 
 
 .. code-block:: java

diff --git a/logisland-documentation/pom.xml b/logisland-documentation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-documentation</artifactId>
     <dependencies>
@@ -88,10 +88,6 @@
         <dependency>
             <groupId>com.hurence.logisland</groupId>
             <artifactId>logisland-elasticsearch-plugin</artifactId>
-        </dependency>
-         <dependency>
-            <groupId>com.hurence.logisland</groupId>
-            <artifactId>logisland-elasticsearch_2_3_3-client-service</artifactId>
         </dependency>
         <dependency>
             <groupId>com.hurence.logisland</groupId>

diff --git a/logisland-documentation/tutorials/prerequisites.rst b/logisland-documentation/tutorials/prerequisites.rst
@@ -115,10 +115,10 @@ From an edge node of your cluster :
 .. code-block:: sh
 
     cd /opt
-    sudo wget https://github.com/Hurence/logisland/releases/download/v0.11.0/logisland-0.11.0-bin-hdp2.5.tar.gz
+    sudo wget https://github.com/Hurence/logisland/releases/download/v0.12.0-SNAPSHOT/logisland-0.12.0-SNAPSHOT-bin-hdp2.5.tar.gz
 
     export SPARK_HOME=/opt/spark-2.1.0-bin-hadoop2.7/
     export HADOOP_CONF_DIR=$SPARK_HOME/conf
 
-    sudo /opt/logisland-0.11.0/bin/logisland.sh --conf /home/hurence/tom/logisland-conf/v0.10.0/future-factory.yml
+    sudo /opt/logisland-0.12.0-SNAPSHOT/bin/logisland.sh --conf /home/hurence/tom/logisland-conf/v0.10.0/future-factory.yml
 
diff --git a/logisland-engines/logisland-spark_1_6-engine/pom.xml b/logisland-engines/logisland-spark_1_6-engine/pom.xml
@@ -23,7 +23,7 @@ http://www.w3.org/2001/XMLSchema-instance ">
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland-engines</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-spark_1_6-engine_${scala.binary.version}</artifactId>
     <packaging>jar</packaging>

diff --git a/logisland-engines/logisland-spark_2_1-engine/pom.xml b/logisland-engines/logisland-spark_2_1-engine/pom.xml
@@ -23,7 +23,7 @@ http://www.w3.org/2001/XMLSchema-instance ">
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland-engines</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-spark_2_1-engine_${scala.binary.version}</artifactId>
     <packaging>jar</packaging>

diff --git a/logisland-engines/logisland-spark_2_1-engine/src/test/resources/conf/structured-stream.yml b/logisland-engines/logisland-spark_2_1-engine/src/test/resources/conf/structured-stream.yml
@@ -1,4 +1,4 @@
-version: 0.11.0
+version: 0.12.0-SNAPSHOT
 documentation: LogIsland future factory job
 
 engine:

diff --git a/logisland-engines/pom.xml b/logisland-engines/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/logisland-framework/logisland-agent/README.md b/logisland-framework/logisland-agent/README.md
@@ -32,5 +32,5 @@ swagger-ui will be directed to that host and not localhost!
 
 
 ```
-swagger-codegen generate --group-id com.hurence.logisland  --artifact-id logisland-agent --artifact-version 0.11.0 --api-package com.hurence.logisland.agent.rest.api --model-package com.hurence.logisland.agent.rest.model -o logisland-framework/logisland-agent -l jaxrs --template-dir logisland-framework/logisland-agent/src/main/raml/templates -i logisland-framework/logisland-agent/src/main/raml/api-swagger.yaml
+swagger-codegen generate --group-id com.hurence.logisland  --artifact-id logisland-agent --artifact-version 0.12.0-SNAPSHOT --api-package com.hurence.logisland.agent.rest.api --model-package com.hurence.logisland.agent.rest.model -o logisland-framework/logisland-agent -l jaxrs --template-dir logisland-framework/logisland-agent/src/main/raml/templates -i logisland-framework/logisland-agent/src/main/raml/api-swagger.yaml
 ```
diff --git a/logisland-framework/logisland-agent/pom.xml b/logisland-framework/logisland-agent/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland-framework</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-agent</artifactId>
     <packaging>jar</packaging>

diff --git a/logisland-framework/logisland-bootstrap/pom.xml b/logisland-framework/logisland-bootstrap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland-framework</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-bootstrap</artifactId>
     <packaging>jar</packaging>

diff --git a/...work/logisland-bootstrap/src/main/java/com/hurence/logisland/runner/SparkJobLauncher.java b/...work/logisland-bootstrap/src/main/java/com/hurence/logisland/runner/SparkJobLauncher.java
@@ -72,7 +72,7 @@ public static void main(String[] args) {
                 "██║     ██║   ██║██║  ███╗  ██║███████╗██║     ███████║██╔██╗ ██║██║  ██║\n" +
                 "██║     ██║   ██║██║   ██║  ██║╚════██║██║     ██╔══██║██║╚██╗██║██║  ██║\n" +
                 "███████╗╚██████╔╝╚██████╔╝  ██║███████║███████╗██║  ██║██║ ╚████║██████╔╝\n" +
-                "╚══════╝ ╚═════╝  ╚═════╝   ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═════╝   v0.11.0\n\n\n";
+                "╚══════╝ ╚═════╝  ╚═════╝   ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═════╝   v0.12.0-SNAPSHOT\n\n\n";
 
         System.out.println(logisland);
         Optional<EngineContext> engineInstance = Optional.empty();

diff --git a/...ogisland-bootstrap/src/main/java/com/hurence/logisland/runner/StreamProcessingRunner.java b/...ogisland-bootstrap/src/main/java/com/hurence/logisland/runner/StreamProcessingRunner.java
@@ -65,7 +65,7 @@ public static void main(String[] args) {
                 "██║     ██║   ██║██║  ███╗  ██║███████╗██║     ███████║██╔██╗ ██║██║  ██║\n" +
                 "██║     ██║   ██║██║   ██║  ██║╚════██║██║     ██╔══██║██║╚██╗██║██║  ██║\n" +
                 "███████╗╚██████╔╝╚██████╔╝  ██║███████║███████╗██║  ██║██║ ╚████║██████╔╝\n" +
-                "╚══════╝ ╚═════╝  ╚═════╝   ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═════╝   v0.11.0\n\n\n";
+                "╚══════╝ ╚═════╝  ╚═════╝   ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═════╝   v0.12.0-SNAPSHOT\n\n\n";
 
         System.out.println(logisland);
         Optional<EngineContext> engineInstance = Optional.empty();

diff --git a/logisland-framework/logisland-hadoop-utils/pom.xml b/logisland-framework/logisland-hadoop-utils/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland-framework</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-hadoop-utils</artifactId>
     <packaging>jar</packaging>

diff --git a/logisland-framework/logisland-resources/pom.xml b/logisland-framework/logisland-resources/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.hurence.logisland</groupId>
         <artifactId>logisland-framework</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>logisland-resources</artifactId>
     <packaging>pom</packaging>

diff --git a/logisland-framework/logisland-resources/src/main/resources/conf/aggregate-events.yml b/logisland-framework/logisland-resources/src/main/resources/conf/aggregate-events.yml
@@ -2,7 +2,7 @@
 # Logisland configuration script template
 #########################################################################################################
 
-version: 0.11.0
+version: 0.12.0-SNAPSHOT
 documentation: LogIsland analytics main config file. Put here every engine or component config
 
 #########################################################################################################

diff --git a/logisland-framework/logisland-resources/src/main/resources/conf/configuration-template.yml b/logisland-framework/logisland-resources/src/main/resources/conf/configuration-template.yml
@@ -2,7 +2,7 @@
 # Logisland configuration script template
 #########################################################################################################
 
-version: 0.11.0
+version: 0.12.0-SNAPSHOT
 documentation: LogIsland analytics main config file. Put here every engine or component config
 
 #########################################################################################################

diff --git a/logisland-framework/logisland-resources/src/main/resources/conf/enrich-apache-logs.yml b/logisland-framework/logisland-resources/src/main/resources/conf/enrich-apache-logs.yml
@@ -2,7 +2,7 @@
 # Logisland configuration script template
 #########################################################################################################
 
-version: 0.11.0
+version: 0.12.0-SNAPSHOT
 documentation: LogIsland analytics main config file. Put here every engine or component config
 
 #########################################################################################################

diff --git a/logisland-framework/logisland-resources/src/main/resources/conf/future-factory-indexer.yml b/logisland-framework/logisland-resources/src/main/resources/conf/future-factory-indexer.yml
@@ -2,7 +2,7 @@
 # Logisland configuration for future factory project
 #########################################################################################################
 
-version: 0.11.0
+version: 0.12.0-SNAPSHOT
 documentation: LogIsland future factory job
 
 #########################################################################################################