UNCLASSIFIED

Commit 6b82ca2b authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch 'metricbeat-7.11.1' into 'development'

Update to Elastic Stack 7.11.1

See merge request !11
parents 683ff096 8b883d09
Pipeline #191795 failed with stages
in 70 minutes and 52 seconds
......@@ -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=metricbeat
ARG OS_AND_ARCH=linux-x86_64
......
......@@ -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).
......@@ -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.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: "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.10.2"
org.opencontainers.image.version: "7.11.1"
## 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.10.2-linux-x86_64.tar.gz
url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.10.2-linux-x86_64.tar.gz
- filename: metricbeat-7.11.1-linux-x86_64.tar.gz
url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.11.1-linux-x86_64.tar.gz
validation:
type: sha512
value: 946183c50146146f4f6686e0012333fc8f22d1d6a389cbc8b634521dc99b0441e72c6367b13e5a3291d457bf1f3e01c92cda2af23ea0ce1e69efe5bdc638417b
value: f6b8c7e667794ce8994d064f99aa12029e0eef2f92288a5a3b76b73804798688bb9feddc28625066ba641bf9896a51df3afa8b88224d05b67526d5a9c2b6cbe9
- filename: tinit
url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64
validation:
......@@ -52,18 +52,10 @@ 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
username: 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"
username: ivan.fernandez
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment