Merge pull request #22 from swimlane/1_3_0_release

1.3.0 Release
swimlane · Oct 21, 2021 · 9d38f58 · 9d38f58
2 parents 1bb1868 + 62ac11e
commit 9d38f58
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 6 deletions.
diff --git a/.env-example b/.env-example
@@ -1,6 +1,7 @@
-ELK_VERSION=7.14.1
+ELK_VERSION=7.15.0
 ELASTIC_USERNAME=elastic
 ELASTIC_PASSWORD=some_password
+KIBANA_URL=https://0.0.0.0:5601
 
 # Configuration Variables
 ELASTICSEARCH_HEAP=2g

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2021-10-21
+
+    - Added KIBANA_URL to .env variables for public base URL type
+    - Fixed issue with LetsEncrypt certificates being placed in the correct location
+    - Adding support for 7.15.0
+
 ## [1.2.0] - 2021-07-14
 
     - Updated the docker-compose.production.yml to fix some bugs

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ In order to use this project, you must first include the following in a file nam
 > Copy or create your own `.env` from the provided example or from the code block below
 
 ```text
-ELK_VERSION=7.12.0
+ELK_VERSION=7.15.0
 ELASTIC_USERNAME=elastic
 ELASTIC_PASSWORD=some_password
 

diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -122,6 +122,7 @@ services:
       ELASTIC_USERNAME: ${ELASTIC_USERNAME}
       ELASTIC_PASSWORD: ${ELASTIC_PASSWORD}
       ENCRYPTION_KEY: ${XPACK_ENCRYPTION_KEY}
+      KIBANA_URL: ${KIBANA_URL}
     secrets:
       - source: ca.crt
         target: ${KIBANA_DIR}/config/ca.crt

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -96,6 +96,7 @@ services:
       ELASTIC_USERNAME: ${ELASTIC_USERNAME}
       ELASTIC_PASSWORD: ${ELASTIC_PASSWORD}
       ENCRYPTION_KEY: ${XPACK_ENCRYPTION_KEY}
+      KIBANA_URL: ${KIBANA_URL}
     secrets:
       - source: ca.crt
         target: ${KIBANA_DIR}/config/ca.crt

diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml
@@ -1,6 +1,7 @@
 ---
 server.name: kibana
 server.host: 0.0.0.0
+server.publicBaseUrl: "${KIBANA_URL}"
 
 # Elasticsearch settings
 elasticsearch.hosts: [ "https://elasticsearch:9200" ]

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -4,7 +4,7 @@ FROM docker.elastic.co/beats/metricbeat:${ELK_VERSION}
 
 USER root
 RUN yum-config-manager --save --setopt=base.skip_if_unavailable=true
-RUN yum install ca-certificates
+RUN yum install ca-certificates -y
 RUN update-ca-trust force-enable
 
 USER metricbeat

diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
@@ -4,7 +4,7 @@ FROM docker.elastic.co/beats/packetbeat:${ELK_VERSION}
 
 USER root
 RUN yum-config-manager --save --setopt=base.skip_if_unavailable=true
-RUN yum install ca-certificates
+RUN yum install ca-certificates -y
 RUN update-ca-trust force-enable
 
 USER packetbeat

diff --git a/setup/setup.sh b/setup/setup.sh
@@ -131,9 +131,9 @@ if [ "$STAGING" = false ]; then
     if [ -d "/swag/keys" ]; then
         echo "Using letsencrypt certificate authority generated by swag"
         CA_CERT="/swag/keys/cert.crt"
-        cp $CA_CERT $OUTPUT_DIR/ca/ca.crt
+        cp $CA_CERT $CA_DIR/ca/ca.crt
         CA_KEY="/swag/keys/cert.key"
-        cp $CA_KEY $OUTPUT_DIR/ca/ca.key
+        cp $CA_KEY $CA_DIR/ca/ca.key
     else
         echo "PLEASE RUN DOCKER-COMPOSE.PRODUCTION.YML TO COMPLETE SETUP!"
     fi