Merge pull request #33 from shazChaudhry/v7.7.0

shazChaudhry · web-flow · commit 780eb8ca2263 · 2020-05-19T02:15:00.000+01:00
Upgraded Elastic Stack to version 7.7.0
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 *.exe
 *.o
 *.so
+.idea
 
 # Packages #
 ############
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,12 @@
 sudo: required
+dist: bionic
 before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
   - sudo apt-get update
   - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - docker version
+  - docker --version
+
 services:
   - docker
 
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ You will need these files to deploy Eleasticsearch, Logstash, Kibana, and Beats.
 
 # Deploy Elastic Stack
 * SSH in to the master node of the Docker Swarm cluster allocated to running Elastic Stack. Deploy Elastic stack by running the following commands:
-  * `export ELASTIC_VERSION=7.1.1`
+  * `export ELASTIC_VERSION=7.7.0`
   * `export ELASTICSEARCH_USERNAME=elastic`
   * `export ELASTICSEARCH_PASSWORD=changeme`
   * `export INITIAL_MASTER_NODES=node1` _(See Important discovery and cluster formation settings: https://www.elastic.co/guide/en/elasticsearch/reference/current/discovery-settings.html#initial_master_nodes)_
@@ -67,7 +67,7 @@ You will need these files to deploy Eleasticsearch, Logstash, Kibana, and Beats.
 SSH in to the master node of the Docker Swarm cluster allocated to running containerized custom applicatins and beats. Clone this repo and change directory as per the instructions above.
 
 Execute the following commands to deploy filebeat and metricbeat:
-  * `export ELASTIC_VERSION=7.1.1`
+  * `export ELASTIC_VERSION=7.7.0`
   * `export ELASTICSEARCH_USERNAME=elastic`
   * `export ELASTICSEARCH_PASSWORD=changeme`
   * `export ELASTICSEARCH_HOST=node1` _(node1 is default value if you are creating VirtualBox with the provided Vagrantfile. Otherwise, change this value to your Elasticsearch host)_
diff --git a/Vagrantfile b/Vagrantfile
@@ -8,9 +8,9 @@ docker swarm join-token --quiet manager > /vagrant/manager_token
 SCRIPT
 
 Vagrant.configure("2") do |config|
-	# https://app.vagrantup.com/bento/boxes/ubuntu-18.04
-	config.vm.box 									= "bento/ubuntu-18.04"
-	config.hostmanager.enabled 			= true
+	# https://app.vagrantup.com/bento/boxes/ubuntu-20.04
+	config.vm.box                   = "bento/ubuntu-20.04"
+	config.hostmanager.enabled 		= true
 	config.hostmanager.manage_host 	= true
 	config.hostmanager.manage_guest = true
 	config.vm.provision "docker"
diff --git a/auditbeat-README.md b/auditbeat-README.md
@@ -3,7 +3,7 @@ Eagerly waiting for Docker 19.06 release which will bring --privileged flag to D
 Until capabilities are available in docker swarm mode, execute the following instructions on each node where auditbeat is required
 
 Firstly, set the system variables as needed:
-- export ELASTIC_VERSION=7.1.1
+- export ELASTIC_VERSION=7.7.0
 - export ELASTICSEARCH_USERNAME=elastic
 - export ELASTICSEARCH_PASSWORD=changeme
 - export ELASTICSEARCH_HOST=node1
@@ -26,7 +26,7 @@ And than run the command below:
     --env ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD:-changeme} \
     --env ELASTICSEARCH_HOST=${ELASTICSEARCH_HOST:-node1} \
     --env KIBANA_HOST=${KIBANA_HOST:-node1} \
-    docker.elastic.co/beats/auditbeat:${ELASTIC_VERSION:-7.1.1} \
+    docker.elastic.co/beats/auditbeat:${ELASTIC_VERSION:-7.7.0} \
     --strict.perms=false
 ```
 
diff --git a/auditbeat-docker-compose.yml b/auditbeat-docker-compose.yml
@@ -1,12 +1,12 @@
-version: "3.7"
+version: "3.8"
 
 # https://www.elastic.co/guide/en/beats/auditbeat/current/auditbeat-overview.html
 # Does not look like Auditd is supported in Alpine linux: https://github.com/linuxkit/linuxkit/issues/52
 
 services:
 
   auditbeat:
-    image: docker.elastic.co/beats/auditbeat:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/beats/auditbeat:${ELASTIC_VERSION:-7.7.0}
     # https://github.com/docker/swarmkit/issues/1951
     hostname: "{{.Node.Hostname}}-auditbeat"
     # Need to override user so we can access the log files, and docker.sock
diff --git a/deployStack.sh b/deployStack.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export ELASTIC_VERSION=7.1.1
+export ELASTIC_VERSION=7.7.0
 export ELASTICSEARCH_USERNAME=elastic
 export ELASTICSEARCH_PASSWORD=changeme
 export ELASTICSEARCH_HOST=node1
diff --git a/docker-compose.portainer.yml b/docker-compose.portainer.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   agent:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 # 10 Things to Consider When Planning Your Elasticsearch Project: https://ecmarchitect.com/archives/2015/07/27/4031
 # Using Apache JMeter to Test Elasticsearch: https://ecmarchitect.com/archives/2014/09/02/3915
@@ -34,7 +34,7 @@ services:
       - BIND_PORTS=9200
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-7.7.0}
     environment:
       # https://github.com/docker/swarmkit/issues/1951
       - node.name={{.Node.Hostname}}
@@ -61,7 +61,7 @@ services:
         - com.df.srcPort=9200
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-7.7.0}
     hostname: "{{.Node.Hostname}}-logstash"
     environment:
       - XPACK_MONITORING_ELASTICSEARCH_URL=http://elasticsearch:9200
@@ -76,7 +76,7 @@ services:
         target: /usr/share/logstash/pipeline/logstash.conf
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION:-7.7.0}
     hostname: "{{.Node.Hostname}}-kibana"
     environment:
       - ELASTICSEARCH_URL=http://elasticsearch:9200
diff --git a/examples/learn_autodiscover.md b/examples/learn_autodiscover.md
@@ -9,10 +9,10 @@ Use the provided Vagrantfile to create 3x VMs:
 
 ### Versions
 Example has been tested in following versions:
-- Elasticsearch 7.1.1
-- Kibana 7.1.1
-- Filebeat 7.1.1
-- Metricbeat 7.1.1
+- Elasticsearch 7.7.0
+- Kibana 7.7.0
+- Filebeat 7.7.0
+- Metricbeat 7.7.0
 
 ### Elastic Stack - Apache2 module
 Ensure there is nothing listening on port 80.
diff --git a/examples/learn_filebeat.md b/examples/learn_filebeat.md
@@ -2,9 +2,9 @@ The examples here are for learning purpose only and show how to start filebeat a
 
 ### Versions
 Example has been tested in following versions:
-- Elasticsearch 7.1.1
-- Kibana 7.1.1
-- Filebeat 7.1.1
+- Elasticsearch 7.7.0
+- Kibana 7.7.0
+- Filebeat 7.7.0
 
 
 ### Prerequisites
@@ -28,7 +28,7 @@ docker container run --rm \
 --network host \
 --volume filebeat:/usr/share/filebeat/data \
 --volume $PWD:/tmp \
-docker.elastic.co/beats/filebeat:7.1.1 \
+docker.elastic.co/beats/filebeat:7.7.0 \
 -e --modules=nginx --setup  -M "nginx.access.var.paths=[/tmp/nginx_logs]" \
 -E output.elasticsearch.hosts='node1:9200' \
 -E output.elasticsearch.username=elastic \
@@ -65,7 +65,7 @@ chmod go-w ./nyc_collision_filebeat.yml
 ```
 Modify the paths to `/tmp/nyc_collision_data.csv` and replace the word _prospectors_ with `inputs` in nyc_collision_filebeat.yml
 ```
-docker container run --name filebeat --rm --network host --volume filebeat:/usr/share/filebeat/data --volume $PWD:/tmp docker.elastic.co/beats/filebeat:7.1.1 \
+docker container run --name filebeat --rm --network host --volume filebeat:/usr/share/filebeat/data --volume $PWD:/tmp docker.elastic.co/beats/filebeat:7.7.0 \
 -e -c /tmp/nyc_collision_filebeat.yml \
 -E output.elasticsearch.hosts='node1:9200' \
 -E output.elasticsearch.username=elastic \
diff --git a/filebeat-docker-compose.yml b/filebeat-docker-compose.yml
@@ -1,11 +1,11 @@
-version: "3.7"
+version: "3.8"
 
 services:
 
   # How to Tune Elastic Beats Performance: A Practical Example with Batch Size, Worker Count, and More
   # https://www.elastic.co/blog/how-to-tune-elastic-beats-performance-a-practical-example-with-batch-size-worker-count-and-more?blade=tw&hulk=social
   filebeat:
-    image: docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-7.7.0}
     # https://github.com/docker/swarmkit/issues/1951
     hostname: "{{.Node.Hostname}}-filebeat"
     # Need to override user so we can access the log files, and docker.sock
diff --git a/metricbeat-docker-compose.yml b/metricbeat-docker-compose.yml
@@ -1,9 +1,9 @@
-version: "3.7"
+version: "3.8"
 
 services:
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION:-7.7.0}
     # https://github.com/docker/swarmkit/issues/1951
     hostname: "{{.Node.Hostname}}-metricbeat"
     user: root
diff --git a/packetbeat-README.md b/packetbeat-README.md
@@ -5,7 +5,7 @@ Eagerly waiting for Docker 19.06 release which will bring --privileged flag to D
 Until capabilities are available in docker swarm mode, execute the following instructions on each node where packetbeat is required:
 
 Firstly, set the system variables as needed:
-- export ELASTIC_VERSION=7.1.1
+- export ELASTIC_VERSION=7.7.0
 - export ELASTICSEARCH_USERNAME=elastic
 - export ELASTICSEARCH_PASSWORD=changeme
 - export ELASTICSEARCH_HOST=node1
@@ -28,6 +28,6 @@ And than run the command below:
     --env ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD:-changeme} \
     --env ELASTICSEARCH_HOST=${ELASTICSEARCH_HOST:-node1} \
     --env KIBANA_HOST=${KIBANA_HOST:-node1} \
-    docker.elastic.co/beats/packetbeat:${ELASTIC_VERSION:-7.1.1} \
+    docker.elastic.co/beats/packetbeat:${ELASTIC_VERSION:-7.7.0} \
     --strict.perms=false
 ```
diff --git a/packetbeat-docker-compose.yml b/packetbeat-docker-compose.yml
@@ -1,9 +1,9 @@
-version: "3.7"
+version: "3.8"
 
 services:
 
   packetbeat:
-    image: docker.elastic.co/beats/packetbeat:${ELASTIC_VERSION:-7.1.1}
+    image: docker.elastic.co/beats/packetbeat:${ELASTIC_VERSION:-7.7.0}
     # https://github.com/docker/swarmkit/issues/1951
     hostname: "{{.Node.Hostname}}-packetbeat"
     user: root

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: '3.7'`
	`1`	`+version: '3.8'`
`2`	`2`
`3`	`3`	`services:`
`4`	`4`	`agent:`