Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
oalam committed Sep 4, 2019
2 parents 88d1e56 + 99e4172 commit da25bc8
Show file tree
Hide file tree
Showing 310 changed files with 2,300 additions and 1,971 deletions.
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ to build from the source just clone source and package with maven (logisland req
cd logisland
mvn clean package
the final package is available at `logisland-assembly/target/logisland-1.1.2-bin.tar.gz`
the final package is available at `logisland-assembly/target/logisland-1.2.0-bin.tar.gz`

You can also download the `latest release build <https://github.com/Hurence/logisland/releases>`_

Expand Down Expand Up @@ -88,9 +88,9 @@ But you should choose the Spark version that is compatible with your environment
curl -s http://d3kbcqa49mib13.cloudfront.net/spark-<spark-version>-bin-hadoop<hadoop-version>.tgz | tar -xz -C /usr/local/
export SPARK_HOME=/usr/local/spark-<spark-version>-bin-hadoop<hadoop-version>
# install Logisland 1.1.2
# install Logisland 1.2.0
curl -s https://github.com/Hurence/logisland/releases/download/v1.0.0-RC2/logisland-1.0.0-RC2-bin.tar.gz | tar -xz -C /usr/local/
cd /usr/local/logisland-1.1.2
cd /usr/local/logisland-1.2.0
# launch a logisland job
bin/logisland.sh --conf conf/index-apache-logs.yml
Expand Down Expand Up @@ -119,9 +119,9 @@ Launching logisland streaming apps is just easy as unarchiving logisland distrib

.. code-block:: sh
# install Logisland 1.1.2
curl -s https://github.com/Hurence/logisland/releases/download/v0.10.0/logisland-1.1.2-bin-hdp2.5.tar.gz | tar -xz -C /usr/local/
cd /usr/local/logisland-1.1.2
# install Logisland 1.2.0
curl -s https://github.com/Hurence/logisland/releases/download/v0.10.0/logisland-1.2.0-bin-hdp2.5.tar.gz | tar -xz -C /usr/local/
cd /usr/local/logisland-1.2.0
bin/logisland.sh --conf conf/index-apache-logs.yml
Expand All @@ -142,7 +142,7 @@ The first part is the `ProcessingEngine` configuration (here a Spark streaming e

.. code-block:: yaml
version: 1.1.2
version: 1.2.0
documentation: LogIsland job config file
engine:
component: com.hurence.logisland.engine.spark.KafkaStreamProcessingEngine
Expand Down
95 changes: 95 additions & 0 deletions bump_version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#!/usr/bin/env bash

# Usage: ./bump_version.sh <major|minor|patch> - Increments the relevant version part by one.
#
# Usage 2: ./bump_version.sh <version-from> <version-to>
# e.g: ./bump_version.sh 1.1.1 2.0

set -e

# Define which files to update and the pattern to look for
# $1 Current version
# $2 New version
function bump_files() {

for i in `find . -name "pom.xml"` ; do
bump $i "<version>$current_version<" "<version>$new_version<"
done
for i in `find . -name "*.yml"` ; do
bump $i "version: $current_version" "version: $new_version"
done
for i in `find . -name "*.rst"` ; do
bump $i "$current_version" "$new_version"
done
}

function bump() {
echo -n "Updating $1..."
tmp_file=$(mktemp)
rm -f "$tmp_file"
sed -i '' "s/$2/$3/1w $tmp_file" $1
if [ -s "$tmp_file" ]; then
echo "Done"
else
echo "Nothing to change"
fi
rm -f "$tmp_file"
}

function confirm() {
read -r -p "$@ [Y/n]: " confirm

case "$confirm" in
[Nn][Oo]|[Nn])
echo "Aborting."
exit
;;
esac
}

if [ "$1" == "" ]; then
echo >&2 "No 'from' version set. Aborting."
exit 1
fi

if [ "$1" == "major" ] || [ "$1" == "minor" ] || [ "$1" == "patch" ]; then
current_version=$(grep -Po '(?<="version": ")[^"]*' package.json)

IFS='.' read -a version_parts <<< "$current_version"

major=${version_parts[0]}
minor=${version_parts[1]}
patch=${version_parts[2]}

case "$1" in
"major")
major=$((major + 1))
minor=0
patch=0
;;
"minor")
minor=$((minor + 1))
patch=0
;;
"patch")
patch=$((patch + 1))
;;
esac
new_version="$major.$minor.$patch"
else
if [ "$2" == "" ]; then
echo >&2 "No 'to' version set. Aborting."
exit 1
fi
current_version="$1"
new_version="$2"
fi

if ! [[ "$new_version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo >&2 "'to' version doesn't look like a valid semver version tag (e.g: 1.2.3). Aborting."
exit 1
fi

confirm "Bump version number from $current_version to $new_version?"

bump_files "$current_version" "$new_version"
2 changes: 1 addition & 1 deletion logisland-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
</parent>
<artifactId>logisland-assembly</artifactId>
<packaging>pom</packaging>
Expand Down
5 changes: 3 additions & 2 deletions logisland-assembly/src/assembly/full-assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
<include>com.hurence.logisland:logisland-service-elasticsearch_7_x-client</include>
<include>com.hurence.logisland:logisland-service-solr_5_5_5-client</include>
<include>com.hurence.logisland:logisland-service-solr_6_6_2-client</include>
<include>com.hurence.logisland:logisland-service-solr_8-client</include>
<include>com.hurence.logisland:logisland-service-solr_chronix_6.4.2-client</include>
<include>com.hurence.logisland:logisland-service-solr_chronix_8-client</include>
<include>com.hurence.logisland:logisland-service-mongodb-client</include>
<include>com.hurence.logisland:logisland-service-cassandra-client</include>
<include>com.hurence.logisland:logisland-service-influxdb-client</include>
Expand All @@ -53,11 +55,10 @@
<include>com.hurence.logisland:logisland-processor-xml</include>
<include>com.hurence.logisland:logisland-processor-web-analytics</include>
<include>com.hurence.logisland:logisland-processor-cyber-security</include>
<include>com.hurence.logisland:logisland-processor-common-logs</include>
<include>com.hurence.logisland:logisland-processor-useragent</include>
<include>com.hurence.logisland:logisland-processor-querymatcher</include>
<include>com.hurence.logisland:logisland-processor-outlier-detection</include>
<include>com.hurence.logisland:logisland-processor-sampling</include>
<include>com.hurence.logisland:logisland-processor-timeseries</include>
<include>com.hurence.logisland:logisland-processor-enrichment</include>
<include>com.hurence.logisland:logisland-processor-hbase</include>
<include>com.hurence.logisland:logisland-processor-elasticsearch</include>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-connectors</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
</parent>
<packaging>jar</packaging>

Expand Down
2 changes: 1 addition & 1 deletion logisland-components/logisland-connectors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-components</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
</parent>
<packaging>pom</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
</parent>

<artifactId>logisland-processor-botsearch</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.hurence.logisland</groupId>
<artifactId>logisland-processors</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
</parent>

<artifactId>logisland-processor-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor;

import com.hurence.logisland.annotation.behavior.DynamicProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor.agg;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor.encryption;

public interface Encryptor {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor.encryption;

import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor.encryption;

import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor.encryption;

import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor.encryption;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2016 Hurence (support@hurence.com)
*
* Licensed 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.
*/
package com.hurence.logisland.processor;

import com.hurence.logisland.record.FieldType;
Expand Down
Loading

0 comments on commit da25bc8

Please sign in to comment.