Upgrade ELK ,Filebeat, Metricbeat to version 6.x 91/3391/3
authorAMIT M <am00474504@techmahindra.com>
Tue, 20 Nov 2018 14:04:17 +0000 (19:34 +0530)
committeramit mishra <am00474504@techmahindra.com>
Wed, 12 Dec 2018 14:58:26 +0000 (14:58 +0000)
Change-Id: Ib2573dae15b146cdd3273b09afa77dc665944ffa
Issue-ID: ACUMOS-1999
Signed-off-by: AMIT M <am00474504@techmahindra.com>
14 files changed:
elk-stack/docker-compose.yml
elk-stack/elasticsearch/Dockerfile
elk-stack/elasticsearch/config/elasticsearch.yml
elk-stack/elasticsearch/pom.xml
elk-stack/kibana/Dockerfile
elk-stack/kibana/config/kibana.yml
elk-stack/kibana/pom.xml
elk-stack/logstash/Dockerfile
elk-stack/logstash/config/logstash.yml
elk-stack/logstash/pipeline/logstash.conf
elk-stack/logstash/pom.xml
filebeat/pom.xml
metricbeat/config/metricbeat.yml
metricbeat/pom.xml

index 3b366d7..533ae40 100644 (file)
@@ -22,7 +22,6 @@ services:
   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
     ports:
     #Node client default listens at 9200, metricbeat and logstash index data into Elasticsearch using this port.
@@ -37,7 +36,6 @@ services:
   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
     ports:
     #Logstash default listens at 5000, Filebeat agentship log to this port.
index b51dd54..fb7f99d 100644 (file)
@@ -16,6 +16,7 @@
 # limitations under the License.
 # ===============LICENSE_END=========================================================
 # https://github.com/elastic/elasticsearch-docker
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.1
+FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3
+COPY /config/elasticsearch.yml /usr/share/elasticsearch/config/elasticsearch.yml
 # Add your elasticsearch plugins setup here
 # Example: RUN elasticsearch-plugin install analysis-icu
index d9c2ee6..afd9f61 100644 (file)
@@ -32,17 +32,7 @@ discovery.zen.minimum_master_nodes: 1
 #
 discovery.type: single-node
 
-## Disable X-Pack
-## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
-##     https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
-#
-xpack.security.enabled: false
-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
+#cluster.routing.allocation.disk.threshold_enabled: true
+#cluster.routing.allocation.disk.watermark.low: 5gb
+#cluster.routing.allocation.disk.watermark.high: 2gb
index ccde254..641184c 100644 (file)
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-elasticsearch</artifactId>
         <!-- docker tag -->
-        <version>1.18.2-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 </project>
 
 
index 7c7e241..c934f2d 100644 (file)
@@ -16,6 +16,7 @@
 # limitations under the License.
 # ===============LICENSE_END=========================================================
 # https://github.com/elastic/kibana-docker
-FROM docker.elastic.co/kibana/kibana:5.5.1
+FROM docker.elastic.co/kibana/kibana-oss:6.4.3
+COPY /config/kibana.yml /usr/share/logstash/config/kibana.yml
 # Add your kibana plugins setup here
 # Example: RUN kibana-plugin install <name|url>
index 8000ae3..779b5a7 100644 (file)
@@ -23,12 +23,3 @@ server.name: kibana
 server.host: "0"
 elasticsearch.url: http://elasticsearch:9200
 
-## Disable X-Pack
-## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
-##     https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
-#
-xpack.security.enabled: false
-xpack.monitoring.enabled: false
-xpack.ml.enabled: false
-xpack.graph.enabled: false
-xpack.reporting.enabled: false
index 711d5ac..9cac87a 100644 (file)
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-kibana</artifactId>
         <!-- docker tag -->
-        <version>1.18.2-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 </project>
 
 
index 3a93068..7bbdff9 100644 (file)
@@ -16,7 +16,8 @@
 # limitations under the License.
 # ===============LICENSE_END=========================================================
 # https://github.com/elastic/logstash-docker
-FROM docker.elastic.co/logstash/logstash:5.5.1
+FROM docker.elastic.co/logstash/logstash-oss:6.4.3
+COPY /config/logstash.yml /usr/share/logstash/config/logstash.yml
 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
index 0a2c063..fa41837 100644 (file)
@@ -22,7 +22,3 @@
 http.host: "0.0.0.0"
 path.config: /usr/share/logstash/pipeline
 
-## Disable X-Pack
-## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
-##     https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
-#
index fd07066..3a79090 100644 (file)
@@ -140,16 +140,8 @@ jdbc {
       }
 
 
-
-
-
   beats {
         port => 5000
-        codec => multiline {
-                 pattern => "^%{TIMESTAMP_ISO8601}"
-                 negate => true
-                 what => "previous"
-                 }                      
   }
 }
 filter {  
index fd015d0..3621886 100644 (file)
@@ -25,5 +25,5 @@
         <!-- docker image name -->
         <artifactId>acumos-logstash</artifactId>
         <!-- docker tag -->
-        <version>1.18.2-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 </project>
index a424efb..6c50999 100644 (file)
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-filebeat</artifactId>
         <!-- docker tag -->
-        <version>1.18.2-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 </project>
 
 
index 643f6ca..440a763 100644 (file)
@@ -120,6 +120,12 @@ setup.template.name: "metricbeat-%{[beat.version]}"
 setup.template.pattern: "metricbeat-%{[beat.version]}-*"
 index: "metricbeat-%{[beat.version]}-%{+yyyy.MM.dd}"
 
+#============================== Kibana =====================================
+# Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
+# This requires a Kibana endpoint configuration.
+setup.kibana.host: "${ELASTICSEARCH_HOST}:5601"
+
+
 #-------------------------- Elasticsearch output ------------------------------
 output.elasticsearch:
 
index fa37ae8..fa61c5a 100644 (file)
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-metricbeat</artifactId>
         <!-- docker tag -->
-        <version>1.18.2-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 </project>