diff --git a/Dockerfile b/Dockerfile index f9de527..27cfa2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Instructions to build this image -FROM docker.elastic.co/elasticsearch/elasticsearch:7.13.4 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.14.0 ARG VCS_REF ARG BUILD_DATE @@ -13,7 +13,7 @@ LABEL org.label-schema.vcs-url="https://github.com/xtermi2/sec-elasticsearch-pro LABEL org.label-schema.vcs-ref=$VCS_REF LABEL org.label-schema.build-date=$BUILD_DATE -ENV PROMETHEUS_EXPORTER_VERSION "7.13.4.0" +ENV PROMETHEUS_EXPORTER_VERSION "7.14.0.0" ENV ELASTIC_PASSWORD "" ENV KIBANA_PASSWORD "" diff --git a/docker-compose.yml b/docker-compose.yml index fadfda5..00cefb2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: networks: - pulldognet kibana: - image: docker.elastic.co/kibana/kibana:7.13.4 + image: docker.elastic.co/kibana/kibana:7.14.0 container_name: kibana environment: ELASTICSEARCH_HOSTS: "https://es_1:9200" @@ -118,7 +118,7 @@ services: networks: - pulldognet filebeat: - image: docker.elastic.co/beats/filebeat:7.13.4 + image: docker.elastic.co/beats/filebeat:7.14.0 container_name: filebeat # to overwrite the -e that disables logging to file and disable strict permission checks for filebeat.yml! command: -c filebeat.yml -strict.perms=false diff --git a/example/certs-gen/create-certs.yml b/example/certs-gen/create-certs.yml index e4aa072..0fa1b69 100644 --- a/example/certs-gen/create-certs.yml +++ b/example/certs-gen/create-certs.yml @@ -3,7 +3,7 @@ version: '2.2' services: create_certs: container_name: create_certs - image: docker.elastic.co/elasticsearch/elasticsearch:7.13.4 + image: docker.elastic.co/elasticsearch/elasticsearch:7.14.0 command: > bash -c ' yum install -y -q -e 0 unzip; diff --git a/example/docker-compose.yml b/example/docker-compose.yml index 6c61dba..55009d0 100644 --- a/example/docker-compose.yml +++ b/example/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.6' services: es_1: - image: xtermi2/sec-elasticsearch-prometheus:7.13.4 + image: xtermi2/sec-elasticsearch-prometheus:7.14.0 container_name: es_1 environment: - node.name=es_1 @@ -51,7 +51,7 @@ services: networks: - esnet es_2: - image: xtermi2/sec-elasticsearch-prometheus:7.13.4 + image: xtermi2/sec-elasticsearch-prometheus:7.14.0 container_name: es_2 environment: - node.name=es_2 @@ -100,7 +100,7 @@ services: networks: - esnet kibana: - image: docker.elastic.co/kibana/kibana:7.13.4 + image: docker.elastic.co/kibana/kibana:7.14.0 container_name: kibana environment: ELASTICSEARCH_HOSTS: "https://es_1:9200" @@ -121,7 +121,7 @@ services: networks: - esnet filebeat: - image: docker.elastic.co/beats/filebeat:7.13.4 + image: docker.elastic.co/beats/filebeat:7.14.0 container_name: filebeat # to overwrite the -e that disables logging to file and disable strict permission checks for filebeat.yml! command: -c filebeat.yml -strict.perms=false diff --git a/src/test/docker-compose.yml b/src/test/docker-compose.yml index eca8ea1..a80f479 100644 --- a/src/test/docker-compose.yml +++ b/src/test/docker-compose.yml @@ -94,7 +94,7 @@ services: networks: - esnet kibana: - image: docker.elastic.co/kibana/kibana:7.13.4 + image: docker.elastic.co/kibana/kibana:7.14.0 container_name: kibana environment: ELASTICSEARCH_HOSTS: "https://es_1:9200" @@ -114,7 +114,7 @@ services: networks: - esnet filebeat: - image: docker.elastic.co/beats/filebeat:7.13.4 + image: docker.elastic.co/beats/filebeat:7.14.0 container_name: filebeat # to overwrite the -e that disables logging to file and disable strict permission checks for filebeat.yml! command: -c filebeat.yml -strict.perms=false diff --git a/src/test/test_case_filebeats.sh b/src/test/test_case_filebeats.sh index c57d31c..771d7a7 100755 --- a/src/test/test_case_filebeats.sh +++ b/src/test/test_case_filebeats.sh @@ -35,7 +35,7 @@ echo "" echo -n "TEST if filebeat index exists..." meta_beat=$(jq -r '.[].mappings._meta.version' <<<"${index}") -if [ "${meta_beat}" != "7.13.4" ]; then +if [ "${meta_beat}" != "7.14.0" ]; then echo "failed: mappings._meta.version is unexpected \"${meta_beat}\"; response=\"${index}\"" echo "filebeat_stats: ${filebeat_stats}" ((general_status++))