From 9308787c8844dac297540440cc298ff75507883c Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo Date: Fri, 5 Mar 2021 16:44:51 +0100 Subject: [PATCH 1/2] Update to Elastic Stack 7.11.1 --- Dockerfile | 2 +- README.md | 8 ++++---- hardening_manifest.yaml | 22 ++++++---------------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23cef95..439b936 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=elastic-agent ARG OS_AND_ARCH=linux-x86_64 diff --git a/README.md b/README.md index a5cb255..049b144 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **elastic-agent** is a single, unified way to add monitoring for logs, metrics, and other types of data to each host. A single agent makes it easier and faster to deploy monitoring across your infrastructure. The agent’s single, unified configuration makes it easier to add integrations for new data sources. For more information about elastic-agent, please visit -https://www.elastic.co/guide/en/ingest-management/7.10/index.html. +https://www.elastic.co/guide/en/ingest-management/7.11/index.html. --- **NOTE** @@ -14,7 +14,7 @@ This functionality is in beta and is subject to change. The design and code is l ### Installation instructions -Please follow the documentation on [Quick start](https://www.elastic.co/guide/en/ingest-management/7.10/ingest-management-getting-started.html). +Please follow the documentation on [Quick start](https://www.elastic.co/guide/en/ingest-management/7.11/ingest-management-getting-started.html). ### Where to file issues and PRs @@ -37,9 +37,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 34c10d5..bf932cc 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "elastic/beats/elastic-agent" # 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: "elastic-agent" # Docker image labels @@ -30,7 +30,7 @@ labels: org.opencontainers.image.url: "https://www.elastic.co/products/beats/elastic-agent" ## 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,metrics,monitoring,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: elastic-agent-7.10.2-linux-x86_64.tar.gz - url: https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-7.10.2-linux-x86_64.tar.gz +- filename: elastic-agent-7.11.1-linux-x86_64.tar.gz + url: https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-7.11.1-linux-x86_64.tar.gz validation: type: sha512 - value: d6180e5b3d8d0a73f26772426791c3c6786ee835183de934accc920b617f527d177bd7b3316d2f8301d1ba83e03eeaf07531969de20b27ad293f215a361bd391 + value: ec30fb58d7e5ff5d16044a0810ebd3919b70fb04d908c971ee4a0d10a49d184e6c0e96aec800b9839d6ff6fe70aaf109f78970104c77c03cde84d78daedf6072 - filename: tinit url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: @@ -58,18 +58,8 @@ resources: value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 # 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 9945b141218b200bdfcf194cf6e16d921bb48749 Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo Date: Fri, 5 Mar 2021 17:16:32 +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 bf932cc..a8d6bb0 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -61,5 +61,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