From 4adaaca649f801c10fce9b4c2b0266bc580e2251 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Wed, 4 Aug 2021 19:19:44 +0200 Subject: [PATCH 1/2] Update to Elastic Stack 7.14.0 --- Dockerfile | 2 +- README.md | 4 ++-- hardening_manifest.yaml | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a66652..f6e6d8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_TAG=8.4 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files -ARG ELASTIC_STACK=7.13.4 +ARG ELASTIC_STACK=7.14.0 ARG ELASTIC_PRODUCT=metricbeat ARG OS_AND_ARCH=linux-x86_64 diff --git a/README.md b/README.md index 3c21b13..3cdea0e 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.13/licenses/ELASTIC-LICENSE.txt), +License](https://github.com/elastic/elasticsearch/blob/7.14/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.13.1.html). +[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.14.1.html). diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 363bca9..103db60 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "elastic/beats/metricbeat" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "7.13.4" +- "7.14.0" - "latest" # Build args passed to Dockerfile ARGs @@ -16,7 +16,7 @@ args: BASE_IMAGE: "redhat/ubi/ubi8" BASE_TAG: "8.4" BASE_REGISTRY: registry1.dsop.io - ELASTIC_STACK: "7.13.4" + ELASTIC_STACK: "7.14.0" ELASTIC_PRODUCT: "metricbeat" # Docker image labels @@ -30,7 +30,7 @@ labels: org.opencontainers.image.url: "https://www.elastic.co/products/beats/metricbeat" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Elastic" - org.opencontainers.image.version: "7.13.4" + org.opencontainers.image.version: "7.14.0" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "metrics,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang" ## This value can be "opensource" or "commercial" @@ -40,16 +40,16 @@ labels: # List of resources to make available to the offline build context resources: -- filename: metricbeat-7.13.4-linux-x86_64.tar.gz - url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.13.4-linux-x86_64.tar.gz +- filename: metricbeat-7.14.0-linux-x86_64.tar.gz + url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.14.0-linux-x86_64.tar.gz validation: type: sha512 - value: 38aba8b62327c070c46eff36f45ed829e829f2e9584bb5875c095af07d04194d65f72c371b32ec7fb785516534cbf229f900d6f7f72ebb5a5321646b11b7d21f + value: - filename: tinit url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: type: sha256 - value: 93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c + value: # List of project maintainers -- GitLab From 67fc28fb8ccbaeb1280c56883b065ea397cf46e5 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Thu, 5 Aug 2021 11:19:31 +0200 Subject: [PATCH 2/2] Update to Elastic Stack 7.14.0 --- Dockerfile | 2 +- README.md | 4 ++-- hardening_manifest.yaml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a66652..f6e6d8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_TAG=8.4 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files -ARG ELASTIC_STACK=7.13.4 +ARG ELASTIC_STACK=7.14.0 ARG ELASTIC_PRODUCT=metricbeat ARG OS_AND_ARCH=linux-x86_64 diff --git a/README.md b/README.md index 3c21b13..3cdea0e 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.13/licenses/ELASTIC-LICENSE.txt), +License](https://github.com/elastic/elasticsearch/blob/7.14/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.13.1.html). +[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.14.1.html). diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 363bca9..9860805 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "elastic/beats/metricbeat" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "7.13.4" +- "7.14.0" - "latest" # Build args passed to Dockerfile ARGs @@ -16,7 +16,7 @@ args: BASE_IMAGE: "redhat/ubi/ubi8" BASE_TAG: "8.4" BASE_REGISTRY: registry1.dsop.io - ELASTIC_STACK: "7.13.4" + ELASTIC_STACK: "7.14.0" ELASTIC_PRODUCT: "metricbeat" # Docker image labels @@ -30,7 +30,7 @@ labels: org.opencontainers.image.url: "https://www.elastic.co/products/beats/metricbeat" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Elastic" - org.opencontainers.image.version: "7.13.4" + org.opencontainers.image.version: "7.14.0" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "metrics,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: metricbeat-7.13.4-linux-x86_64.tar.gz - url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.13.4-linux-x86_64.tar.gz +- filename: metricbeat-7.14.0-linux-x86_64.tar.gz + url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.14.0-linux-x86_64.tar.gz validation: type: sha512 - value: 38aba8b62327c070c46eff36f45ed829e829f2e9584bb5875c095af07d04194d65f72c371b32ec7fb785516534cbf229f900d6f7f72ebb5a5321646b11b7d21f + value: 337f4c77226485b76cd240015cad669b334ff3cefc481fa43266672f943af38d54aa47375ffc1e253c0e49b5b7d58479d47a03c577a39e33121444d64e6f35da - filename: tinit url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: -- GitLab