Skip to content

Commit

Permalink
Default Stack Version 7.11.1 => 7.12.0 ⬆️
Browse files Browse the repository at this point in the history
  • Loading branch information
sherifabdlnaby committed Apr 12, 2021
1 parent 79454d4 commit 411823c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
5 changes: 3 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
COMPOSE_PROJECT_NAME=elastic
ELK_VERSION=7.11.1
ELK_VERSION=7.12.0

#----------- Resources --------------------------#
ELASTICSEARCH_HEAP=1024m
Expand All @@ -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

This comment has been minimized.

Copy link
@drnguyenn

drnguyenn May 8, 2021

Can you please tell me why did you change that ? changme is a misspelling word, isn't it ?

This comment has been minimized.

Copy link
@scottzach1

scottzach1 Aug 7, 2021

This was resolved via 87b3407.

AWS_ACCESS_KEY_ID=nottherealid
AWS_SECRET_ACCESS_KEY=notherealsecret

Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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 📜
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 3 additions & 5 deletions tools/filebeat/monitor/filebeat_cluster_logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 411823c

Please sign in to comment.