Merge pull request #19 from yorek/development

Merging v0.7.2
yorek · Jun 18, 2017 · 715ad47 · 715ad47
2 parents a169764 + 2377814
commit 715ad47
Show file tree

Hide file tree

Showing 154 changed files with 3,763 additions and 1,129 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version: '1.0.0-dev.{build}'
+
+shallow_clone: true
+
+build: off
+
+os:
+  - Visual Studio 2015
+
+install:
+  - echo "Install"
+
+build_script:
+  - echo "Build"
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License. 
+# limitations under the License.
 
 language: java
 

diff --git a/alluxio/pom.xml b/alluxio/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <artifactId>zeppelin</artifactId>
         <groupId>org.apache.zeppelin</groupId>
-        <version>0.7.1</version>
+        <version>0.7.2</version>
         <relativePath>..</relativePath>
     </parent>
 
     <groupId>org.apache.zeppelin</groupId>
     <artifactId>zeppelin-alluxio</artifactId>
     <packaging>jar</packaging>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <name>Zeppelin: Alluxio interpreter</name>
 
     <properties>

diff --git a/angular/pom.xml b/angular/pom.xml
@@ -22,14 +22,14 @@
   <parent>
     <artifactId>zeppelin</artifactId>
     <groupId>org.apache.zeppelin</groupId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
   <artifactId>zeppelin-angular</artifactId>
   <packaging>jar</packaging>
-  <version>0.7.1</version>
+  <version>0.7.2</version>
   <name>Zeppelin: Angular interpreter</name>
 
   <dependencies>

diff --git a/beam/pom.xml b/beam/pom.xml
@@ -22,14 +22,14 @@
   <parent>
     <artifactId>zeppelin</artifactId>
     <groupId>org.apache.zeppelin</groupId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
   <artifactId>zeppelin-beam</artifactId>
   <packaging>jar</packaging>
-  <version>0.7.1</version>
+  <version>0.7.2</version>
   <name>Zeppelin: Beam interpreter</name>
 
   <properties>

diff --git a/bigquery/pom.xml b/bigquery/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <artifactId>zeppelin</artifactId>
     <groupId>org.apache.zeppelin</groupId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
   <artifactId>zeppelin-bigquery</artifactId>
   <packaging>jar</packaging>
-  <version>0.7.1</version>
+  <version>0.7.2</version>
   <name>Zeppelin: BigQuery interpreter</name>
 
   <properties>

diff --git a/bin/interpreter.sh b/bin/interpreter.sh
@@ -61,7 +61,7 @@ fi
 
 . "${bin}/common.sh"
 
-ZEPPELIN_INTP_CLASSPATH=""
+ZEPPELIN_INTP_CLASSPATH="${CLASSPATH}"
 
 # construct classpath
 if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
@@ -184,8 +184,6 @@ fi
 
 addJarInDirForIntp "${LOCAL_INTERPRETER_REPO}"
 
-CLASSPATH+=":${ZEPPELIN_INTP_CLASSPATH}"
-
 if [[ ! -z "$ZEPPELIN_IMPERSONATE_USER" ]]; then
     suid="$(id -u ${ZEPPELIN_IMPERSONATE_USER})"
     if [[ -n  "${suid}" || -z "${SPARK_SUBMIT}" ]]; then
@@ -198,12 +196,12 @@ fi
 
 if [[ -n "${SPARK_SUBMIT}" ]]; then
     if [[ -n "$ZEPPELIN_IMPERSONATE_USER" ]] && [[ "$ZEPPELIN_IMPERSONATE_SPARK_PROXY_USER" != "false" ]];  then
-       INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path \"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} --proxy-user ${ZEPPELIN_IMPERSONATE_USER} ${SPARK_APP_JAR} ${PORT}`
+       INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path \"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH}\" --driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} --proxy-user ${ZEPPELIN_IMPERSONATE_USER} ${SPARK_APP_JAR} ${PORT}`
     else
-       INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path \"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}`
+       INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path \"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH}\" --driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}`
     fi
 else
-    INTERPRETER_RUN_COMMAND+=' '` echo ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} ${ZEPPELIN_INTP_MEM} -cp ${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} `
+    INTERPRETER_RUN_COMMAND+=' '` echo ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} ${ZEPPELIN_INTP_MEM} -cp ${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} `
 fi
 
 if [[ ! -z "$ZEPPELIN_IMPERSONATE_USER" ]] && [[ -n "${suid}" || -z "${SPARK_SUBMIT}" ]]; then

diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh
@@ -71,7 +71,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
 
-CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
+ZEPPELIN_CLASSPATH="$CLASSPATH:$ZEPPELIN_CLASSPATH"
 
 if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then
   echo "Log dir doesn't exist, create ${ZEPPELIN_LOG_DIR}"
@@ -83,4 +83,4 @@ if [[ ! -d "${ZEPPELIN_PID_DIR}" ]]; then
   $(mkdir -p "${ZEPPELIN_PID_DIR}")
 fi
 
-exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_SERVER "$@"
+exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:${ZEPPELIN_CLASSPATH} $ZEPPELIN_SERVER "$@"
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <artifactId>zeppelin</artifactId>
         <groupId>org.apache.zeppelin</groupId>
-        <version>0.7.1</version>
+        <version>0.7.2</version>
         <relativePath>..</relativePath>
     </parent>
 
     <groupId>org.apache.zeppelin</groupId>
     <artifactId>zeppelin-cassandra_2.10</artifactId>
     <packaging>jar</packaging>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <name>Zeppelin: Apache Cassandra interpreter</name>
     <description>Zeppelin cassandra support</description>
 

diff --git a/conf/interpreter-list b/conf/interpreter-list
@@ -17,6 +17,7 @@
 #
 # [name]  [maven artifact]  [description]
 
+<<<<<<< HEAD
 alluxio         org.apache.zeppelin:zeppelin-alluxio:0.7.1              Alluxio interpreter
 angular         org.apache.zeppelin:zeppelin-angular:0.7.1              HTML and AngularJS view rendering
 beam            org.apache.zeppelin:zeppelin-beam:0.7.1                 Beam interpreter
@@ -37,4 +38,26 @@ postgresql      org.apache.zeppelin:zeppelin-postgresql:0.7.1           Postgres
 python          org.apache.zeppelin:zeppelin-python:0.7.1               Python interpreter
 scio            org.apache.zeppelin:zeppelin-scio_2.11:0.7.1            Scio interpreter
 shell           org.apache.zeppelin:zeppelin-shell:0.7.1                Shell command
-sqlserver       org.apache.zeppelin:zeppelin-sqlserver:0.7.1            Microsoft SQL Server interpreter
+sqlserver       org.apache.zeppelin:zeppelin-sqlserver:0.7.1            Microsoft SQL Server interpreter
+=======
+alluxio         org.apache.zeppelin:zeppelin-alluxio:0.7.2              Alluxio interpreter
+angular         org.apache.zeppelin:zeppelin-angular:0.7.2              HTML and AngularJS view rendering
+beam            org.apache.zeppelin:zeppelin-beam:0.7.2                 Beam interpreter
+bigquery        org.apache.zeppelin:zeppelin-bigquery:0.7.2             BigQuery interpreter
+cassandra       org.apache.zeppelin:zeppelin-cassandra_2.11:0.7.2       Cassandra interpreter built with Scala 2.11
+elasticsearch   org.apache.zeppelin:zeppelin-elasticsearch:0.7.2        Elasticsearch interpreter
+file            org.apache.zeppelin:zeppelin-file:0.7.2                 HDFS file interpreter
+flink           org.apache.zeppelin:zeppelin-flink_2.11:0.7.2           Flink interpreter built with Scala 2.11
+hbase           org.apache.zeppelin:zeppelin-hbase:0.7.2                Hbase interpreter
+ignite          org.apache.zeppelin:zeppelin-ignite_2.11:0.7.2          Ignite interpreter built with Scala 2.11
+jdbc            org.apache.zeppelin:zeppelin-jdbc:0.7.2                 Jdbc interpreter
+kylin           org.apache.zeppelin:zeppelin-kylin:0.7.2                Kylin interpreter
+lens            org.apache.zeppelin:zeppelin-lens:0.7.2                 Lens interpreter
+livy            org.apache.zeppelin:zeppelin-livy:0.7.2                 Livy interpreter
+md              org.apache.zeppelin:zeppelin-markdown:0.7.2             Markdown support
+pig             org.apache.zeppelin:zeppelin-pig:0.7.2                  Pig interpreter
+postgresql      org.apache.zeppelin:zeppelin-postgresql:0.7.2           Postgresql interpreter
+python          org.apache.zeppelin:zeppelin-python:0.7.2               Python interpreter
+scio            org.apache.zeppelin:zeppelin-scio_2.11:0.7.2            Scio interpreter
+shell           org.apache.zeppelin:zeppelin-shell:0.7.2                Shell command
+>>>>>>> v0.7.2
diff --git a/conf/shiro.ini.template b/conf/shiro.ini.template
@@ -43,7 +43,7 @@ user3 = password4, role2
 #ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
 #ldapRealm.contextFactory.url = ldap://ldap.test.com:389
 #ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-#ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+#ldapRealm.contextFactory.authenticationMechanism = simple
 
 ### A sample PAM configuration
 #pamRealm=org.apache.zeppelin.realm.PamRealm

diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template
@@ -234,6 +234,11 @@
   <description>Interpreter process connect timeout in msec.</description>
 </property>
 
+<property>
+  <name>zeppelin.interpreter.output.limit</name>
+  <value>102400</value>
+  <description>Output message from interpreter exceeding the limit will be truncated</description>
+</property>
 
 <property>
   <name>zeppelin.ssl</name>

diff --git a/dev/change_zeppelin_version.sh b/dev/change_zeppelin_version.sh
@@ -58,6 +58,9 @@ sed -i '' 's/-'"${FROM_VERSION}"'.jar",/-'"${TO_VERSION}"'.jar",/g' zeppelin-exa
 sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g' zeppelin-web/src/app/tabledata/package.json
 sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g' zeppelin-web/src/app/visualization/package.json
 
+# Change version in Dockerfile
+sed -i '' 's/Z_VERSION="'"${FROM_VERSION}"'"/Z_VERSION="'"${TO_VERSION}"'"/g' scripts/docker/zeppelin/bin/Dockerfile
+
 # When preparing new dev version from release tag, doesn't need to change docs version
 if is_dev_version "${FROM_VERSION}" || ! is_dev_version "${TO_VERSION}"; then
   # When prepare new rc for the maintenance release

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -21,7 +21,7 @@ author :
   twitter : ASF
   feedburner : feedname
 
-ZEPPELIN_VERSION : 0.7.1
+ZEPPELIN_VERSION : 0.7.2
 
 # The production_url is only used when full-domain names are needed
 # such as sitemap.txt
@@ -59,7 +59,7 @@ JB :
   #   - Only the following values are falsy: ["", null, false]
   #   - When setting BASE_PATH it must be a valid url.
   #     This means always setting the protocol (http|https) or prefixing with "/"
-  BASE_PATH : /docs/0.7.1
+  BASE_PATH : /docs/0.7.2
 
   # By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
   # ex: [BASE_PATH]/assets/themes/[THEME-NAME]

diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
@@ -114,6 +114,7 @@
                 <li><a href="{{BASE_PATH}}/security/shiroauthentication.html">Shiro Authentication</a></li>                
                 <li><a href="{{BASE_PATH}}/security/notebook_authorization.html">Notebook Authorization</a></li>
                 <li><a href="{{BASE_PATH}}/security/datasource_authorization.html">Data Source Authorization</a></li>
+                <li><a href="{{BASE_PATH}}/security/helium_authorization.html">Helium Authorization</a></li>
                 <li role="separator" class="divider"></li>
                 <li class="title"><span><b>Advanced</b><span></li>
                 <li><a href="{{BASE_PATH}}/install/virtual_machine.html">Zeppelin on Vagrant VM</a></li>

diff --git a/docs/displaysystem/back-end-angular.md b/docs/displaysystem/back-end-angular.md
@@ -112,7 +112,7 @@ import AngularElem._
 ### Display Element
 ```scala
 // automatically convert to string and print with %angular display system directive in front.
-<div><div>.display
+<div></div>.display
 ```
 ### Event Handler
 ```scala

diff --git a/docs/index.md b/docs/index.md
@@ -172,6 +172,7 @@ Join to our [Mailing list](https://zeppelin.apache.org/community.html) and repor
   * [Shiro Authentication](./security/shiroauthentication.html)
   * [Notebook Authorization](./security/notebook_authorization.html)
   * [Data Source Authorization](./security/datasource_authorization.html)
+  * [Helium Authorization](./security/helium_authorization.html)
 * Advanced
   * [Apache Zeppelin on Vagrant VM](./install/virtual_machine.html)
   * [Zeppelin on Spark Cluster Mode (Standalone via Docker)](./install/spark_cluster_mode.html#spark-standalone-mode)

diff --git a/docs/install/configuration.md b/docs/install/configuration.md
@@ -251,26 +251,32 @@ If both are defined, then the **environment variables** will take priority.
     <td>Interpreter directory</td>
   </tr>
   <tr>
-    <td><h6 class="properties">ZEPPELIN_INTERPRETER_DEP_MVNREPO</h6></td>
-    <td><h6 class="properties">zeppelin.interpreter.dep.mvnRepo</h6></td>
+    <td>ZEPPELIN_INTERPRETER_DEP_MVNREPO</td>
+    <td>zeppelin.interpreter.dep.mvnRepo</td>
     <td>http://repo1.maven.org/maven2/</td>
     <td>Remote principal repository for interpreter's additional dependency loading</td>
   </tr>
   <tr>
-    <td><h6 class="properties">ZEPPELIN_DEP_LOCALREPO</h6></td>
-    <td><h6 class="properties">zeppelin.dep.localrepo</h6></td>
+    <td>ZEPPELIN_DEP_LOCALREPO</td>
+    <td>zeppelin.dep.localrepo</td>
     <td>local-repo</td>
     <td>Local repository for dependency loader.<br>ex)visualiztion modules of npm.</td>
   </tr>
   <tr>
-    <td><h6 class="properties">ZEPPELIN_HELIUM_NPM_REGISTRY</h6></td>
-    <td><h6 class="properties">zeppelin.helium.npm.registry</h6></td>
+    <td>ZEPPELIN_HELIUM_NPM_REGISTRY</td>
+    <td>zeppelin.helium.npm.registry</td>
     <td>http://registry.npmjs.org/</td>
     <td>Remote Npm registry for Helium dependency loader</td>
   </tr>
   <tr>
-    <td><h6 class="properties">ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE</h6></td>
-    <td><h6 class="properties">zeppelin.websocket.max.text.message.size</h6></td>
+    <td>ZEPPELIN_INTERPRETER_OUTPUT_LIMIT</td>
+    <td>zeppelin.interpreter.output.limit</td>
+    <td>102400</td>
+    <td>Output message from interpreter exceeding the limit will be truncated</td>
+  </tr>
+  <tr>
+    <td>ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE</td>
+    <td>zeppelin.websocket.max.text.message.size</td>
     <td>1024000</td>
     <td>Size (in characters) of the maximum text message that can be received by websocket.</td>
   </tr>

diff --git a/docs/install/docker.md b/docs/install/docker.md
@@ -19,52 +19,43 @@ limitations under the License.
 -->
 {% include JB/setup %}
 
-# Apache Zeppelin Releases Docker Images
+# Docker Image for Apache Zeppelin Releases 
 
 <div id="toc"></div>
 
 ## Overview 
 This document contains instructions about making docker containers for Zeppelin. It mainly provides guidance into how to create, publish and run docker images for zeppelin releases.
 
 ## Quick Start
+
 ### Installing Docker
 You need to [install docker](https://docs.docker.com/engine/installation/) on your machine.
 
-### Creating and Publishing Zeppelin docker image 
-* In order to be able to create and/or publish an image, you need to set the **DockerHub** credentials `DOCKER_USERNAME, DOCKER_PASSWORD, DOCKER_EMAIL` variables as environment variables.
-
-* To create an image for some release use :
-`create_release.sh <release-version> <git-tag>`.
-* To publish the created image use :
-`publish_release.sh <release-version> <git-tag>`
-
-### Running a Zeppelin  docker image 
+### Running docker image
 
-* To start Zeppelin, you need to pull the zeppelin release image: 
 ```
-docker pull ${DOCKER_USERNAME}/zeppelin-release:<release-version>
-
-docker run --rm -it -p 7077:7077 -p 8080:8080 ${DOCKER_USERNAME}/zeppelin-release:<release-version> -c bash
+docker run -p 8080:8080 --rm --name zeppelin apache/zeppelin:<release-version> 
 ```
-* Then a docker container will start with a Zeppelin release on path :
-`/usr/local/zeppelin/`
 
-* Run zeppelin inside docker:
-```
-/usr/local/zeppelin/bin/zeppelin.sh
-```
+* Zeppelin will run at `http://localhost:8080`.
 
-* To Run Zeppelin in daemon mode
-Mounting logs and notebooks zeppelin to folders on your host machine
+If you want to specify `logs` and `notebook` dir, 
 
 ```
-docker run -p 7077:7077 -p 8080:8080 --privileged=true -v $PWD/logs:/logs -v $PWD/notebook:/notebook \
--e ZEPPELIN_NOTEBOOK_DIR='/notebook' \
+docker run -p 8080:8080 --rm \
+-v $PWD/logs:/logs \
+-v $PWD/notebook:/notebook \
 -e ZEPPELIN_LOG_DIR='/logs' \
--d ${DOCKER_USERNAME}/zeppelin-release:<release-version> \
-/usr/local/zeppelin/bin/zeppelin.sh
+-e ZEPPELIN_NOTEBOOK_DIR='/notebook' \
+--name zeppelin apache/zeppelin:<release-version> # e.g '0.7.2'
 ```
 
+### Building dockerfile locally
 
-* Zeppelin will run at `http://localhost:8080`.
+```
+cd $ZEPPELIN_HOME
+cd scripts/docker/zeppelin/bin
+
+docker build -t my-zeppelin:my-tag ./
+```