From 411823ca2455859ffa0cd36e67ca9cfec54c816d Mon Sep 17 00:00:00 2001
From: Sherif Abdel-Naby <sherifabdlnaby@gmail.com>
Date: Mon, 12 Apr 2021 09:50:09 +0200
Subject: [PATCH] =?UTF-8?q?Default=20Stack=20Version=20`7.11.1`=20=3D>=20`?=
 =?UTF-8?q?7.12.0`=20=E2=AC=86=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                             | 5 +++--
 Makefile                                         | 3 +++
 README.md                                        | 6 +++---
 kibana/Dockerfile                                | 6 +++---
 tools/filebeat/monitor/filebeat_cluster_logs.yml | 8 +++-----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.env b/.env
index 20900f6..2b8c3ec 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 COMPOSE_PROJECT_NAME=elastic
-ELK_VERSION=7.11.1
+ELK_VERSION=7.12.0
 
 #----------- Resources --------------------------#
 ELASTICSEARCH_HEAP=1024m
@@ -20,8 +20,9 @@ LOGSTASH_PORT=8080
 #----------- Credientals ------------------------#
 # Username & Password for Admin Elasticsearch cluster.
 # This is used to set the password at setup, and used by others to connect to Elasticsearch at runtime.
+# USERNAME cannot be changed! It is set here for parmeterization only.
 ELASTIC_USERNAME=elastic
-ELASTIC_PASSWORD=changeme
+ELASTIC_PASSWORD=changme
 AWS_ACCESS_KEY_ID=nottherealid
 AWS_SECRET_ACCESS_KEY=notherealsecret
 
diff --git a/Makefile b/Makefile
index 4851ce3..633e4f6 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,9 @@ all:		    ## Start Elk and all its component (ELK, Monitoring, and Tools).
 elk:		    ## Start ELK.
 	docker-compose up -d --build
 
+up:
+	@make elk
+
 monitoring:		## Start ELK Monitoring.
 	@docker-compose ${COMPOSE_MONITORING} up -d --build ${ELK_MONITORING}
 
diff --git a/README.md b/README.md
index 26bdbb1..4aa2a22 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 <h4 align="center">With tools like Curator, Rubban, ElastAlert for Alerting.</h4>
 <p align="center">
    <a>
-      <img src="https://img.shields.io/badge/Elastic%20Stack-7.11.1-blue?style=flat&logo=elasticsearch" alt="Elastic Stack Version 7^^">
+      <img src="https://img.shields.io/badge/Elastic%20Stack-7.12.0-blue?style=flat&logo=elasticsearch" alt="Elastic Stack Version 7^^">
    </a>
    <a>
       <img src="https://img.shields.io/github/v/tag/sherifabdlnaby/elastdocker?label=release&amp;sort=semver">
@@ -29,7 +29,7 @@ Elastic Stack (**ELK**) Docker Composition, preconfigured with **Security**, **M
 
 Based on [Official Elastic Docker Images](https://www.docker.elastic.co/)
 
-Stack Version: [7.11.1](https://www.elastic.co/blog/elastic-stack-7-11-1-released)
+Stack Version: [7.12.0](https://www.elastic.co/blog/elastic-stack-7-12-0-released)
 > You can change Elastic Stack version by setting `ELK_VERSION` in `.env` file and rebuild your images. Any version >= 7.0.0 is compatible with this template.
 
 ### Main Features 📜
@@ -171,7 +171,7 @@ $ make prune
 
 * Some Configuration are parameterized in the `.env` file.
   * `ELASTIC_PASSWORD`, user `elastic`'s password (default: `changeme` _pls_).
-  * `ELK_VERSION` Elastic Stack Version (default: `7.11.1`)
+  * `ELK_VERSION` Elastic Stack Version (default: `7.12.0`)
   * `ELASTICSEARCH_HEAP`, how much Elasticsearch allocate from memory (default: 1GB -good for development only-)
   * `LOGSTASH_HEAP`, how much Logstash allocate from memory.
   * Other configurations which their such as cluster name, and node name, etc.
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 9acb332..2420e9d 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -4,9 +4,9 @@ ARG ELK_VERSION
 FROM docker.elastic.co/kibana/kibana:${ELK_VERSION}
 ARG ELK_VERSION
 
-# Add healthcheck
-COPY scripts/docker-healthcheck .
-HEALTHCHECK CMD sh ./docker-healthcheck
+## Add healthcheck
+#COPY scripts/docker-healthcheck .
+#HEALTHCHECK CMD sh ./docker-healthcheck
 
 # Add your kibana plugins setup here
 # Example: RUN kibana-plugin install <name|url>
diff --git a/tools/filebeat/monitor/filebeat_cluster_logs.yml b/tools/filebeat/monitor/filebeat_cluster_logs.yml
index 6854318..57b9650 100644
--- a/tools/filebeat/monitor/filebeat_cluster_logs.yml
+++ b/tools/filebeat/monitor/filebeat_cluster_logs.yml
@@ -73,10 +73,8 @@ processors:
   - add_cloud_metadata: ~
 
 # Output to ES directly.
-output.elasticsearch:
-  hosts: '${ELASTICSEARCH_HOST_PORT}'
-  username: '${ELASTIC_USERNAME}'
-  password: '${ELASTIC_PASSWORD}'
+output.logstash:
+  hosts: ["logstash:5044"]
 
 #=================================== Kibana ==========================================
 # Enable setting up Kibana
@@ -96,7 +94,7 @@ setup:
 # Use deprecated option to avoid current UX bug in 7.3.0 where filebeat creates a
 # standalone monitoring cluster in the monitoring UI.
 # see: https://github.com/elastic/beats/pull/13182
-xpack.monitoring.enabled: true
+xpack.monitoring.enabled: false
 
 #monitoring:
 #  enabled: true