changes made to build using image 42/1942/4
authorparichay gupta <pg0057291@techmahindra.com>
Tue, 22 May 2018 17:59:11 +0000 (13:59 -0400)
committerparichay gupta <pg0057291@techmahindra.com>
Wed, 30 May 2018 14:07:54 +0000 (10:07 -0400)
Issue-ID: ACUMOS-806

Removed env variables from dockerfile instead using jdbc parameters from
docker-compose.Added configuration for elasticsearch watermark issue

Change-Id: Ie719c2b3af3e46165b6adb6e142c0c07f97ecbe2
Signed-off-by: parichay gupta <pg0057291@techmahindra.com>
elk-stack/acumos-elk-env.sh
elk-stack/docker-compose.yml
elk-stack/elasticsearch/config/elasticsearch.yml
elk-stack/logstash/Dockerfile

index ece38a4..c5bfe77 100644 (file)
@@ -37,3 +37,14 @@ export ACUMOS_ELK_LS_JAVA_HEAP_MIN_SIZE=1g
 export ACUMOS_ELK_LS_JAVA_HEAP_MAX_SIZE=1g
 
 export ACUMOS_ELK_HOST=elk-stack-host-hostname
+
+# Should ONLY use Staging, if Release version not available or compatible
+export NEXUS3_STAGING_REGISTRY_LF=nexus3.acumos.org:10004
+
+# Should ONLY use Release version
+export NEXUS3_RELEASE_REGISTRY_LF=nexus3.acumos.org:10002
+
+# Images
+export ELASTICSEARCH_IMAGE=acumos-elasticsearch:1.0.1
+export LOGSTASH_IMAGE=acumos-logstash:1.0.1
+export KIBANA_IMAGE=acumos-kibana:1.0.1
index 6a06ca7..3b366d7 100644 (file)
@@ -20,8 +20,7 @@ version: '2'
 services:
 
   elasticsearch:
-    build: elasticsearch/
-    container_name: acumos-elasticsearch
+    image:  ${NEXUS3_RELEASE_REGISTRY_LF}/${ELASTICSEARCH_IMAGE}
     volumes:
       - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
       - acumos-esdata:/usr/share/elasticsearch/data
@@ -36,8 +35,7 @@ services:
       - elk
 
   logstash:
-    build: logstash/
-    container_name: acumos-logstash
+    image:  ${NEXUS3_RELEASE_REGISTRY_LF}/${LOGSTASH_IMAGE}
     volumes:
       - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml
       - ./logstash/pipeline:/usr/share/logstash/pipeline
@@ -46,14 +44,18 @@ services:
       - "${ACUMOS_ELK_LOGSTASH_PORT}:5000"
     environment:
       LS_JAVA_OPTS: "-Xmx${ACUMOS_ELK_LS_JAVA_HEAP_MAX_SIZE} -Xms${ACUMOS_ELK_LS_JAVA_HEAP_MIN_SIZE}"
+      ACUMOS_ELK_JDBC_DRIVER_LIBRARY: "/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar"
+      ACUMOS_ELK_JDBC_DRIVER_CLASS: "org.mariadb.jdbc.Driver"
+      ACUMOS_ELK_JDBC_CONNECTION_STRING: "jdbc:mariadb://databaseurl:port/databasename"
+      ACUMOS_ELK_JDBC_USERNAME: "username"
+      ACUMOS_ELK_JDBC_PASSWORD: "password"
     networks:
       - elk
     depends_on:
       - elasticsearch
 
   kibana:
-    build: kibana/
-    container_name: acumos-kibana
+    image:  ${NEXUS3_RELEASE_REGISTRY_LF}/${KIBANA_IMAGE}
     volumes:
       - ./kibana/config/:/usr/share/kibana/config
     ports:
index 5afc3f1..d9c2ee6 100644 (file)
@@ -41,3 +41,8 @@ xpack.monitoring.enabled: false
 xpack.ml.enabled: false
 xpack.graph.enabled: false
 xpack.watcher.enabled: false
+
+##  Threshold value for disk storage , low and high watermark value.
+cluster.routing.allocation.disk.threshold_enabled: true
+cluster.routing.allocation.disk.watermark.low: 5gb
+cluster.routing.allocation.disk.watermark.high: 2gb
index 033b139..3a93068 100644 (file)
 # ===============LICENSE_END=========================================================
 # https://github.com/elastic/logstash-docker
 FROM docker.elastic.co/logstash/logstash:5.5.1
-ENV ACUMOS_ELK_JDBC_DRIVER_LIBRARY=/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar
-ENV ACUMOS_ELK_JDBC_DRIVER_CLASS=org.mariadb.jdbc.Driver
-ENV ACUMOS_ELK_DATABASE_PORT=3306
-ENV ACUMOS_ELK_DATABASE_NAME=databasename
-ENV ACUMOS_ELK_DATABASE_URL=databaseurl
-ENV ACUMOS_ELK_JDBC_CONNECTION_STRING=jdbc:mariadb://$ACUMOS_ELK_DATABASE_URL:$ACUMOS_ELK_DATABASE_PORT/$ACUMOS_ELK_DATABASE_NAME
-ENV ACUMOS_ELK_JDBC_USERNAME=username
-ENV ACUMOS_ELK_JDBC_PASSWORD=password
-RUN /usr/share/logstash/bin/logstash-plugin install logstash-input-jdbc
+RUN /usr/share/logstash/bin/logstash-plugin install --version "4.3.0" logstash-input-jdbc
 ADD https://downloads.mariadb.com/enterprise/1prc-8jnh/connectors/java/connector-java-2.1.0/mariadb-java-client-2.1.0.jar /usr/share/logstash/vendor/bundle/
 USER root
 RUN ls -al /usr/share/logstash/vendor/bundle \