From 89f9cce9c6d16c70e892ae0f1109653f3b953a85 Mon Sep 17 00:00:00 2001 From: Pablo Mercado Date: Mon, 27 Jan 2020 16:33:42 +0100 Subject: [PATCH 1/2] Kubernetes: update replicaset type to apps/v1 (#15854) * update replicaset type to apps/v1 (cherry picked from commit 89822fe0a19ee57672bb6b0c366f0075de240db2) --- CHANGELOG.next.asciidoc | 7 +++++++ libbeat/common/kubernetes/types.go | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index c311722ee30e..7e0fc761319f 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -53,6 +53,13 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix a race condition with the Kafka pipeline client, it is possible that `Close()` get called before `Connect()` . {issue}11945[11945] - Allow users to configure only `cluster_uuid` setting under `monitoring` namespace. {pull}14338[14338] - Fix spooling to disk blocking infinitely if the lock file can not be acquired. {pull}15338[15338] +- TLS or Beats that accept connections over TLS and validate client certificates. {pull}14146[14146] +- Fix panics that could result from invalid TLS certificates. This can affect Beats that connect over TLS, or Beats that accept connections over TLS and validate client certificates. {pull}14146[14146] +- Fix panic in the Logstash output when trying to send events to closed connection. {pull}15568[15568] +- Fix missing output in dockerlogbeat {pull}15719[15719] +- Fix logging target settings being ignored when Beats are started via systemd or docker. {issue}12024[12024] {pull}15422[15442] +- Do not load dashboards where not available. {pull}15802[15802] +- Update replicaset group to apps/v1 {pull}15854[15802] *Auditbeat* diff --git a/libbeat/common/kubernetes/types.go b/libbeat/common/kubernetes/types.go index 9b98d22c399a..b32fb0a29ff6 100644 --- a/libbeat/common/kubernetes/types.go +++ b/libbeat/common/kubernetes/types.go @@ -23,7 +23,6 @@ import ( appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" - extv1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -62,7 +61,7 @@ type PodContainerStatus = v1.ContainerStatus type Deployment = appsv1.Deployment // ReplicaSet data -type ReplicaSet = extv1.ReplicaSet +type ReplicaSet = appsv1.ReplicaSet // StatefulSet data type StatefulSet = appsv1.StatefulSet From 56a7c0dc7c2804c098ba35915653cbd71563d34a Mon Sep 17 00:00:00 2001 From: Pablo Mercado Date: Mon, 27 Jan 2020 17:13:44 +0100 Subject: [PATCH 2/2] remove changelog not backported --- CHANGELOG.next.asciidoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 7e0fc761319f..9fafeba1620b 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -53,12 +53,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix a race condition with the Kafka pipeline client, it is possible that `Close()` get called before `Connect()` . {issue}11945[11945] - Allow users to configure only `cluster_uuid` setting under `monitoring` namespace. {pull}14338[14338] - Fix spooling to disk blocking infinitely if the lock file can not be acquired. {pull}15338[15338] -- TLS or Beats that accept connections over TLS and validate client certificates. {pull}14146[14146] -- Fix panics that could result from invalid TLS certificates. This can affect Beats that connect over TLS, or Beats that accept connections over TLS and validate client certificates. {pull}14146[14146] -- Fix panic in the Logstash output when trying to send events to closed connection. {pull}15568[15568] -- Fix missing output in dockerlogbeat {pull}15719[15719] -- Fix logging target settings being ignored when Beats are started via systemd or docker. {issue}12024[12024] {pull}15422[15442] -- Do not load dashboards where not available. {pull}15802[15802] - Update replicaset group to apps/v1 {pull}15854[15802] *Auditbeat*