From: jialv01 Date: Thu, 11 Apr 2019 09:11:09 +0000 (+0800) Subject: Add logging repo as submodule and support arm64 X-Git-Tag: 1.0.0~23 X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=68e3d29afd20f76c411bb7041e110fcf16cfa09d;p=iec.git Add logging repo as submodule and support arm64 1.forked SEBA componants`s repo to IEC repo,include: elasticsearch-docker,kibana-docker,kubernetes,logstash-docker,logstash_exporter 2.Add patch files inorder to aarch64 docker image support src/use_cases/seba_on_arm/docker/build/elasticsearch-docker/build.arm src/use_cases/seba_on_arm/docker/build/kibana-docker/build.arm src/use_cases/seba_on_arm/docker/build/kubernetes/build.arm src/use_cases/seba_on_arm/docker/build/logstash-docker/build.arm src/use_cases/seba_on_arm/docker/build/logstash_exporter/build.arm Change-Id: I641a33fcd91403b68627a86dcb4e5f7286cb102a Signed-off-by: jialv01 --- diff --git a/.gitmodules b/.gitmodules index ef0f933..9569596 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,3 +68,21 @@ path = src/use_cases/seba_on_arm/src_repo/olt-service url = https://github.com/iecedge/olt-service.git branch = 2.1.14 +[submodule "elasticsearch-docker"] + path = src/use_cases/seba_on_arm/src_repo/elasticsearch-docker + url = https://github.com/iecedge/elasticsearch-docker.git + branch = 6.4.2-arm64v8 +[submodule "kubernetes"] + path = src/use_cases/seba_on_arm/src_repo/kubernetes + url = https://github.com/iecedge/kubernetes.git + branch = fluentd-elasticsearch-v2.3.1-arm64v8 +[submodule "kibana-docker"] + path = src/use_cases/seba_on_arm/src_repo/kibana-docker + url = https://github.com/iecedge/kibana-docker.git + branch = 6.4.2-arm64v8 +[submodule "logstash-docker"] + path = src/use_cases/seba_on_arm/src_repo/logstash-docker + url = https://github.com/iecedge/logstash-docker.git +[submodule "logstash_exporter"] + path = src/use_cases/seba_on_arm/src_repo/logstash_exporter + url = https://github.com/iecedge/logstash_exporter.git diff --git a/src/use_cases/seba_on_arm/docker/build/elasticsearch-docker/build.arm b/src/use_cases/seba_on_arm/docker/build/elasticsearch-docker/build.arm new file mode 100755 index 0000000..09aff69 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/elasticsearch-docker/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the elasticsearch-docker docker image +set -o errexit +set -o xtrace + +#cd $ELASTICSEARCH-DOCKER_PATH + +#building elasticsearch-docker docker image +make +docker tag docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2 iecedge/elasticsearch-oss_arm64:6.4.2 diff --git a/src/use_cases/seba_on_arm/docker/build/kibana-docker/build.arm b/src/use_cases/seba_on_arm/docker/build/kibana-docker/build.arm new file mode 100755 index 0000000..270bf68 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/kibana-docker/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the kibana-docker docker image +set -o errexit +set -o xtrace + +#cd $KIBANA-DOCKER_PATH + +#building kibana-docker docker image +make +docker tag docker.elastic.co/kibana/kibana-oss:6.4.2 iecedge/kibana-oss_arm64:6.4.2 diff --git a/src/use_cases/seba_on_arm/docker/build/kubernetes/build.arm b/src/use_cases/seba_on_arm/docker/build/kubernetes/build.arm new file mode 100755 index 0000000..a2558f0 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/kubernetes/build.arm @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# This script builds the fluentd-elasticsearch docker image +set -o errexit +set -o xtrace + +#cd $FLUENTD-ELASTICSEARCH_PATH + +#building fluentd-elasticsearch docker image +cd ./cluster/addons/fluentd-elasticsearch/fluentd-es-image +make build +docker tag akrainoenea/fluentd-elasticsearch:v2.3.1 iecedge/fluentd-elasticsearch_arm64:v2.3.1 diff --git a/src/use_cases/seba_on_arm/docker/build/logstash-docker/build.arm b/src/use_cases/seba_on_arm/docker/build/logstash-docker/build.arm new file mode 100755 index 0000000..e92a067 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/logstash-docker/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the logstash-docker docker image +set -o errexit +set -o xtrace + +#cd $LOGSTASH-DOCKER_PATH + +#building logstash-docker docker image +make +docker tag docker.elastic.co/logstash/logstash-oss:6.4.2 iecedge/logstash-oss_arm64:6.4.2 diff --git a/src/use_cases/seba_on_arm/docker/build/logstash_exporter/build.arm b/src/use_cases/seba_on_arm/docker/build/logstash_exporter/build.arm new file mode 100755 index 0000000..420dac6 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/logstash_exporter/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the logstash_exporter docker image +set -o errexit +set -o xtrace + +#cd $LOGSTASH-EXPORTER_PATH + +#building logstash_exporter docker image +docker build -t iecedge/logstash_explorer_arm64:v0.1.2 . diff --git a/src/use_cases/seba_on_arm/src_repo/elasticsearch-docker b/src/use_cases/seba_on_arm/src_repo/elasticsearch-docker new file mode 160000 index 0000000..540153a --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/elasticsearch-docker @@ -0,0 +1 @@ +Subproject commit 540153ae8cb482b3769fd3ba2126bfd70df884d9 diff --git a/src/use_cases/seba_on_arm/src_repo/kibana-docker b/src/use_cases/seba_on_arm/src_repo/kibana-docker new file mode 160000 index 0000000..ea21f2e --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/kibana-docker @@ -0,0 +1 @@ +Subproject commit ea21f2e2ce4464e37da9fdc3158f4c44e5ff75ec diff --git a/src/use_cases/seba_on_arm/src_repo/kubernetes b/src/use_cases/seba_on_arm/src_repo/kubernetes new file mode 160000 index 0000000..9e73a9a --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/kubernetes @@ -0,0 +1 @@ +Subproject commit 9e73a9a2804332e7d2560372f18395e6fc0c58c0 diff --git a/src/use_cases/seba_on_arm/src_repo/logstash-docker b/src/use_cases/seba_on_arm/src_repo/logstash-docker new file mode 160000 index 0000000..9448cf4 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/logstash-docker @@ -0,0 +1 @@ +Subproject commit 9448cf4572b1d43f4f3beaffbdd8b6ed77cbbb19 diff --git a/src/use_cases/seba_on_arm/src_repo/logstash_exporter b/src/use_cases/seba_on_arm/src_repo/logstash_exporter new file mode 160000 index 0000000..302e9e8 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/logstash_exporter @@ -0,0 +1 @@ +Subproject commit 302e9e86b2aa99e1239a5075ea27b89b69480d37