From b766be896a5cbe8166047d3833904879ba53dab2 Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo Date: Fri, 5 Mar 2021 16:44:53 +0100 Subject: [PATCH 1/2] Update to Elastic Stack 7.11.1 --- Dockerfile | 2 +- README.md | 4 ++-- hardening_manifest.yaml | 22 ++++++---------------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48a26aa..cd4a43d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files -ARG ELASTIC_STACK=7.10.2 +ARG ELASTIC_STACK=7.11.1 ARG ELASTIC_PRODUCT=filebeat ARG OS_AND_ARCH=linux-x86_64 diff --git a/README.md b/README.md index e4bbaec..3b222db 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@ visiting [Elastic Community](https://www.elastic.co/community). This software is governed by the [Elastic -License](https://github.com/elastic/elasticsearch/blob/7.10/licenses/ELASTIC-LICENSE.txt), +License](https://github.com/elastic/elasticsearch/blob/7.11/licenses/ELASTIC-LICENSE.txt), and includes the full set of [free features](https://www.elastic.co/subscriptions). View the detailed release notes -[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.10.0.html). +[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.11.1.html). diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 963b302..e5beee9 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "elastic/beats/filebeat" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "7.10.2" +- "7.11.1" - "latest" # Build args passed to Dockerfile ARGs @@ -16,7 +16,7 @@ args: BASE_IMAGE: "redhat/ubi/ubi8" BASE_TAG: "8.3" BASE_REGISTRY: registry1.dsop.io - ELASTIC_STACK: "7.10.2" + ELASTIC_STACK: "7.11.1" ELASTIC_PRODUCT: "filebeat" # Docker image labels @@ -30,7 +30,7 @@ labels: org.opencontainers.image.url: "https://www.elastic.co/products/beats/filebeat" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Elastic" - org.opencontainers.image.version: "7.10.2" + org.opencontainers.image.version: "7.11.1" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "log,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang" ## This value can be "opensource" or "commercial" @@ -40,11 +40,11 @@ labels: # List of resources to make available to the offline build context resources: -- filename: filebeat-7.10.2-linux-x86_64.tar.gz - url: https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.2-linux-x86_64.tar.gz +- filename: filebeat-7.11.1-linux-x86_64.tar.gz + url: https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.11.1-linux-x86_64.tar.gz validation: type: sha512 - value: 975cfae19d0f32af3b937b74633bf0ca0106071482d5e8b0bd7607d9ae09f2ee55f8f438f98ada30cda76799f2136131c5f11abf03ca5b13e8d81962d4257bb7 + value: 3b12c7208707e627bc26964b1b07702bc788961e63f0187830dd5cd6dc9120178f29d04b42c5ff2ede44cc0810e6a592eb93736513af5d2dca92379334b51655 - filename: tinit url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: @@ -52,18 +52,8 @@ resources: value: 93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c # List of project maintainers -# FIXME: Fill in the following details for the current container owner in the whitelist -# FIXME: Include any other vendor information if applicable maintainers: - email: "nassim.kammah@elastic.co" name: Nassim Kammah - email: "ivan.fernandez@elastic.co" name: Ivan Fernandez Calvo -# # The name of the current container owner -# name: "FIXME" -# # The gitlab username of the current container owner -# username: "FIXME" -# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT -# - name: "FIXME" -# username: "FIXME" -# email: "FIXME" -- GitLab From 5df6f10df73d444e1f675413fbde6b1cbb892545 Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo Date: Fri, 5 Mar 2021 17:16:36 +0100 Subject: [PATCH 2/2] Update to Elastic Stack 7.11.1 --- hardening_manifest.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e5beee9..1a4bb3b 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -55,5 +55,7 @@ resources: maintainers: - email: "nassim.kammah@elastic.co" name: Nassim Kammah + username: nassim.kammah - email: "ivan.fernandez@elastic.co" name: Ivan Fernandez Calvo + username: ivan.fernandez -- GitLab