Repository: incubator-senssoft Updated Branches: refs/heads/kubernetes 6c79f91a9 -> d2ca76f4d
Added back elasticsearch 5.6.3 build w/ xpack enabled. Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/d2ca76f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/d2ca76f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/d2ca76f4 Branch: refs/heads/kubernetes Commit: d2ca76f4d7e34ed45040c38c86aaf48691d17dbc Parents: 6c79f91 Author: msbeard <msbe...@apache.org> Authored: Fri Apr 13 16:49:43 2018 -0400 Committer: msbeard <msbe...@apache.org> Committed: Fri Apr 13 16:49:43 2018 -0400 ---------------------------------------------------------------------- docker/docker-compose.5.6.3.yml | 133 ++++++++++++++++ docker/docker-compose.cluster.yaml | 153 ------------------- docker/docker-compose.cluster.yml | 153 +++++++++++++++++++ docker/elasticsearch/5.6.3/Dockerfile | 29 ++++ .../5.6.3/config/elasticsearch.yml | 49 ++++++ .../5.6.3/config/log4j2.properties | 24 +++ 6 files changed, 388 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d2ca76f4/docker/docker-compose.5.6.3.yml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.5.6.3.yml b/docker/docker-compose.5.6.3.yml new file mode 100644 index 0000000..00b6157 --- /dev/null +++ b/docker/docker-compose.5.6.3.yml @@ -0,0 +1,133 @@ +# 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. + +# Apache SensSoft Single-Node Build + +version: "3" +services: + + # Startup + startup: + build: ./startup + image: senssoft/startup:latest + container_name: senssoft-start + depends_on: + - "loadbalancer" + command: bash /opt/entrypoint.sh + + # # Site + site: + build: ./site + image: senssoft/website:latest + container_name: senssoft-app + ports: + - 8080:8080 + depends_on: + - "logstash" + command: python -m SimpleHTTPServer 8080 + + # Elasticsearch Loadbalancer/Entry + loadbalancer: + build: ./elasticsearch/5.6.3 + image: senssoft/elasticsearch:5.6.3 + container_name: senssoft-loadbalancer + environment: + - NODE_MASTER=true + - NUMBER_OF_MASTERS=1 + - NODE_COORDINATE=true + - "DISCOVERY_SERVICE=elasticsearch" + - NODE_DATA=true + - NODE_INGEST=true + - MAX_LOCAL_STORAGE_NODES=1 + - NETWORK_HOST=0.0.0.0 + - HTTP_ENABLE=true + - HTTP_CORS_ENABLE=true + - HTTP_CORS_ALLOW_ORIGIN=* + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + ports: + - "9200:9200" + - "9300" + networks: + - esnet + + # Kibana + kibana: + build: ./kibana/5.6.3 + image: senssoft/kibana:5.6.3 + container_name: senssoft-kibana + environment: + - "ES_JAVA_OPTS=-Xms2g -Xmx2g" + - "ELASTICSEARCH_URL=http://loadbalancer:9200"; + ports: + - "5601:5601" + depends_on: + - "loadbalancer" + networks: + - esnet + + # Logstash + logstash: + build: ./logstash/5.6.3 + image: senssoft/logstash:5.6.3 + container_name: senssoft-logstash + environment: + - "ELASTICSEARCH_URL=loadbalancer:9200" + ports: + - 8100:8100 + volumes: + - ./logstash/pipeline/logstash-userale.conf:/usr/share/logstash/pipeline/logstash-userale.conf + - ./logstash/templates/userale.json:/usr/share/logstash/templates/userale.json + depends_on: + - "loadbalancer" + networks: + - esnet + + # Distill + distill: + build: ./distill + image: senssoft/distill:0.1.0 + container_name: senssoft-distill + ports: + - 8090:8090 + depends_on: + - "loadbalancer" + networks: + - esnet + + # TAP's Database + db: + build: ./db + image: senssoft/postgres:latest + container_name: senssoft-postgres + ports: + - "5432:5432" + + # TAP + tap: + build: ./tap + image: senssoft/tap:0.1.0 + container_name: senssoft-tap + # command: ["bash", "./wait-for-postgres.sh"] + command: bash -c "/usr/src/app/wait-for-postgres.sh" + ports: + - "8010:8010" + depends_on: + - db + links: + - db:db + +networks: + esnet: + driver: bridge http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d2ca76f4/docker/docker-compose.cluster.yaml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.cluster.yaml b/docker/docker-compose.cluster.yaml deleted file mode 100644 index 5835716..0000000 --- a/docker/docker-compose.cluster.yaml +++ /dev/null @@ -1,153 +0,0 @@ -# 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. - -# Apache SensSoft Cluster Build - -version: "3" -services: - - # Startup - startup: - build: ./startup - image: senssoft/startup:latest - container_name: senssoft-start - depends_on: - - "loadbalancer" - command: bash /opt/entrypoint.sh - - # # Site - site: - build: ./site - image: senssoft/website:latest - container_name: senssoft-app - ports: - - 8080:8080 - depends_on: - - "logstash" - command: python -m SimpleHTTPServer 8080 - - # Elasticsearch Swarm Workers - elasticsearch: - build: ./elasticsearch - image: senssoft/elasticsearch:6.2.2 - environment: - - NODE_MASTER=true - - NUMBER_OF_MASTERS=3 - - NODE_COORDINATE=true - - "DISCOVERY_SERVICE=elasticsearch" - - NODE_DATA=true - - NODE_INGEST=true - - MAX_LOCAL_STORAGE_NODES=1 - - NETWORK_HOST=0.0.0.0 - - HTTP_ENABLE=false - - HTTP_CORS_ENABLE=false - - HTTP_CORS_ALLOW_ORIGIN=* - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - networks: - - esnet - - # Elasticsearch Loadbalancer/Entry - loadbalancer: - build: ./elasticsearch - image: senssoft/elasticsearch:6.2.2 - container_name: senssoft-loadbalancer - environment: - - NODE_MASTER=false - - NUMBER_OF_MASTERS=1 - - NODE_COORDINATE=true - - "DISCOVERY_SERVICE=elasticsearch" - - NODE_DATA=false - - NODE_INGEST=false - - MAX_LOCAL_STORAGE_NODES=1 - - NETWORK_HOST=0.0.0.0 - - HTTP_ENABLE=true - - HTTP_CORS_ENABLE=true - - HTTP_CORS_ALLOW_ORIGIN=* - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - ports: - - "9200:9200" - - "9300" - networks: - - esnet - - # Kibana - kibana: - build: ./kibana - image: senssoft/kibana:6.2.2 - container_name: senssoft-kibana - environment: - - "ES_JAVA_OPTS=-Xms2g -Xmx2g" - - "ELASTICSEARCH_URL=http://loadbalancer:9200"; - ports: - - "5601:5601" - depends_on: - - "loadbalancer" - networks: - - esnet - - # Logstash - logstash: - build: ./logstash - image: senssoft/logstash:6.2.2 - container_name: senssoft-logstash - environment: - - "ELASTICSEARCH_URL=loadbalancer:9200" - ports: - - 8100:8100 - volumes: - - ./logstash/pipeline/logstash-userale.conf:/usr/share/logstash/pipeline/logstash-userale.conf - - ./logstash/templates/userale.json:/usr/share/logstash/templates/userale.json - depends_on: - - "loadbalancer" - networks: - - esnet - - # Distill - distill: - build: ./distill - image: senssoft/distill:0.1.0 - container_name: senssoft-distill - ports: - - 8090:8090 - depends_on: - - "loadbalancer" - networks: - - esnet - - # TAP's Database - db: - build: ./db - image: senssoft/postgres:latest - container_name: senssoft-postgres - ports: - - "5432:5432" - - # TAP - tap: - build: ./tap - image: senssoft/tap:0.1.0 - container_name: senssoft-tap - # command: ["bash", "./wait-for-postgres.sh"] - command: bash -c "/usr/src/app/wait-for-postgres.sh" - ports: - - "8010:8010" - depends_on: - - db - links: - - db:db - -networks: - esnet: - driver: bridge http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d2ca76f4/docker/docker-compose.cluster.yml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.cluster.yml b/docker/docker-compose.cluster.yml new file mode 100644 index 0000000..5835716 --- /dev/null +++ b/docker/docker-compose.cluster.yml @@ -0,0 +1,153 @@ +# 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. + +# Apache SensSoft Cluster Build + +version: "3" +services: + + # Startup + startup: + build: ./startup + image: senssoft/startup:latest + container_name: senssoft-start + depends_on: + - "loadbalancer" + command: bash /opt/entrypoint.sh + + # # Site + site: + build: ./site + image: senssoft/website:latest + container_name: senssoft-app + ports: + - 8080:8080 + depends_on: + - "logstash" + command: python -m SimpleHTTPServer 8080 + + # Elasticsearch Swarm Workers + elasticsearch: + build: ./elasticsearch + image: senssoft/elasticsearch:6.2.2 + environment: + - NODE_MASTER=true + - NUMBER_OF_MASTERS=3 + - NODE_COORDINATE=true + - "DISCOVERY_SERVICE=elasticsearch" + - NODE_DATA=true + - NODE_INGEST=true + - MAX_LOCAL_STORAGE_NODES=1 + - NETWORK_HOST=0.0.0.0 + - HTTP_ENABLE=false + - HTTP_CORS_ENABLE=false + - HTTP_CORS_ALLOW_ORIGIN=* + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + networks: + - esnet + + # Elasticsearch Loadbalancer/Entry + loadbalancer: + build: ./elasticsearch + image: senssoft/elasticsearch:6.2.2 + container_name: senssoft-loadbalancer + environment: + - NODE_MASTER=false + - NUMBER_OF_MASTERS=1 + - NODE_COORDINATE=true + - "DISCOVERY_SERVICE=elasticsearch" + - NODE_DATA=false + - NODE_INGEST=false + - MAX_LOCAL_STORAGE_NODES=1 + - NETWORK_HOST=0.0.0.0 + - HTTP_ENABLE=true + - HTTP_CORS_ENABLE=true + - HTTP_CORS_ALLOW_ORIGIN=* + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + ports: + - "9200:9200" + - "9300" + networks: + - esnet + + # Kibana + kibana: + build: ./kibana + image: senssoft/kibana:6.2.2 + container_name: senssoft-kibana + environment: + - "ES_JAVA_OPTS=-Xms2g -Xmx2g" + - "ELASTICSEARCH_URL=http://loadbalancer:9200"; + ports: + - "5601:5601" + depends_on: + - "loadbalancer" + networks: + - esnet + + # Logstash + logstash: + build: ./logstash + image: senssoft/logstash:6.2.2 + container_name: senssoft-logstash + environment: + - "ELASTICSEARCH_URL=loadbalancer:9200" + ports: + - 8100:8100 + volumes: + - ./logstash/pipeline/logstash-userale.conf:/usr/share/logstash/pipeline/logstash-userale.conf + - ./logstash/templates/userale.json:/usr/share/logstash/templates/userale.json + depends_on: + - "loadbalancer" + networks: + - esnet + + # Distill + distill: + build: ./distill + image: senssoft/distill:0.1.0 + container_name: senssoft-distill + ports: + - 8090:8090 + depends_on: + - "loadbalancer" + networks: + - esnet + + # TAP's Database + db: + build: ./db + image: senssoft/postgres:latest + container_name: senssoft-postgres + ports: + - "5432:5432" + + # TAP + tap: + build: ./tap + image: senssoft/tap:0.1.0 + container_name: senssoft-tap + # command: ["bash", "./wait-for-postgres.sh"] + command: bash -c "/usr/src/app/wait-for-postgres.sh" + ports: + - "8010:8010" + depends_on: + - db + links: + - db:db + +networks: + esnet: + driver: bridge http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d2ca76f4/docker/elasticsearch/5.6.3/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/5.6.3/Dockerfile b/docker/elasticsearch/5.6.3/Dockerfile new file mode 100644 index 0000000..4f1e5c9 --- /dev/null +++ b/docker/elasticsearch/5.6.3/Dockerfile @@ -0,0 +1,29 @@ +# 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. + +FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.3 + +MAINTAINER Michelle Beard <msbe...@apache.org> + +# Override config +COPY config /usr/share/elasticsearch/config + +# Set environment +ENV CLUSTER_NAME SensSoft + +# Kubernetes requires swap is turned off +ENV MEMORY_LOCK false + +EXPOSE 9200 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d2ca76f4/docker/elasticsearch/5.6.3/config/elasticsearch.yml ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/5.6.3/config/elasticsearch.yml b/docker/elasticsearch/5.6.3/config/elasticsearch.yml new file mode 100644 index 0000000..a245d97 --- /dev/null +++ b/docker/elasticsearch/5.6.3/config/elasticsearch.yml @@ -0,0 +1,49 @@ +# 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. + +cluster: + name: ${CLUSTER_NAME} + +node: + master: ${NODE_MASTER} + data: ${NODE_DATA} + #name: ${NODE_NAME} + ingest: ${NODE_INGEST} + max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES} + +network.host: ${NETWORK_HOST} + +search.remote.connect: ${NODE_COORDINATE} + +path: + data: /usr/share/elasticsearch/data + logs: /usr/share/elasticsearch/log + +bootstrap: + memory_lock: ${MEMORY_LOCK} + +http: + enabled: ${HTTP_ENABLE} + compression: true + cors: + enabled: ${HTTP_CORS_ENABLE} + allow-origin: ${HTTP_CORS_ALLOW_ORIGIN} + +# Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1): +discovery: + zen: + ping.unicast.hosts: ${DISCOVERY_SERVICE} + minimum_master_nodes: ${NUMBER_OF_MASTERS} + http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d2ca76f4/docker/elasticsearch/5.6.3/config/log4j2.properties ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/5.6.3/config/log4j2.properties b/docker/elasticsearch/5.6.3/config/log4j2.properties new file mode 100644 index 0000000..7f7817d --- /dev/null +++ b/docker/elasticsearch/5.6.3/config/log4j2.properties @@ -0,0 +1,24 @@ +# 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. + +status = error + +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + +rootLogger.level = info +rootLogger.appenderRef.console.ref = console \ No newline at end of file
