Merge branch '8.10' into updatecli_bump-elastic-stack-snapshot-8.10

elastic · Sep 20, 2023 · 753cb81 · 753cb81
2 parents 1241680 + 5da7452
commit 753cb81
Show file tree

Hide file tree

Showing 158 changed files with 195 additions and 175 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -3,6 +3,18 @@
 :issue: https://github.com/elastic/beats/issues/
 :pull: https://github.com/elastic/beats/pull/
 
+[[release-notes-8.10.1]]
+=== Beats version 8.10.1
+https://github.com/elastic/beats/compare/v8.10.0\...v8.10.1[View commits]
+
+==== Bugfixes
+
+*Filebeat*
+
+- Revert error introduced in {pull}35734[35734] when symlinks can't be resolved in filestream. {pull}36557[36557]
+- Fix ignoring external input configuration in `take_over: true` mode {issue}36378[36378] {pull}36395[36395]
+
+
 [[release-notes-8.10.0]]
 === Beats version 8.10.0
 https://github.com/elastic/beats/compare/v8.9.2\...v8.10.0[View commits]

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -65,8 +65,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Fixes "Can only start an input when all related states are finished" error when running under Elastic-Agent {pull}35250[35250] {issue}33653[33653]
 - [system] sync system/auth dataset with system integration 1.29.0. {pull}35581[35581]
 - [GCS Input] - Fixed an issue where bucket_timeout was being applied to the entire bucket poll interval and not individual bucket object read operations. Fixed a map write concurrency issue arising from data races when using a high number of workers. Fixed the flaky tests that were present in the GCS test suit. {pull}35605[35605]
-- Revert error introduced in {pull}35734[35734] when symlinks can't be resolved in filestream. {pull}36557[36557]
-- Fix ignoring external input configuration in `take_over: true` mode {issue}36378[36378] {pull}36395[36395]
 
 *Heartbeat*
 
@@ -90,6 +88,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 
 *Packetbeat*
 
+- Prevent panic when more than one interface is configured in fleet. {issue}36574[36574] {pull}36575[36575]
 
 *Winlogbeat*
 
@@ -203,3 +202,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 
 
 
+
+
+
diff --git a/deploy/kubernetes/auditbeat-kubernetes.yaml b/deploy/kubernetes/auditbeat-kubernetes.yaml
@@ -205,7 +205,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: auditbeat
-        image: docker.elastic.co/beats/auditbeat:8.10.0
+        image: docker.elastic.co/beats/auditbeat:8.10.1
         args: [
           "-c", "/etc/auditbeat.yml",
           "-e",

diff --git a/deploy/kubernetes/filebeat-kubernetes.yaml b/deploy/kubernetes/filebeat-kubernetes.yaml
@@ -167,7 +167,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: filebeat
-        image: docker.elastic.co/beats/filebeat:8.10.0
+        image: docker.elastic.co/beats/filebeat:8.10.1
         args: [
           "-c", "/etc/filebeat.yml",
           "-e",

diff --git a/deploy/kubernetes/heartbeat-kubernetes.yaml b/deploy/kubernetes/heartbeat-kubernetes.yaml
@@ -171,7 +171,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: heartbeat
-        image: docker.elastic.co/beats/heartbeat:8.10.0
+        image: docker.elastic.co/beats/heartbeat:8.10.1
         args: [
           "-c", "/etc/heartbeat.yml",
           "-e",

diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml
@@ -290,7 +290,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: metricbeat
-        image: docker.elastic.co/beats/metricbeat:8.10.0
+        image: docker.elastic.co/beats/metricbeat:8.10.1
         args: [
           "-c", "/etc/metricbeat.yml",
           "-e",

diff --git a/filebeat/modules.d/apache.yml.disabled b/filebeat/modules.d/apache.yml.disabled
@@ -1,5 +1,5 @@
 # Module: apache
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-apache.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-apache.html
 
 - module: apache
   # Access logs

diff --git a/filebeat/modules.d/auditd.yml.disabled b/filebeat/modules.d/auditd.yml.disabled
@@ -1,5 +1,5 @@
 # Module: auditd
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-auditd.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-auditd.html
 
 - module: auditd
   log:

diff --git a/filebeat/modules.d/elasticsearch.yml.disabled b/filebeat/modules.d/elasticsearch.yml.disabled
@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-elasticsearch.html
 
 - module: elasticsearch
   # Server log

diff --git a/filebeat/modules.d/haproxy.yml.disabled b/filebeat/modules.d/haproxy.yml.disabled
@@ -1,5 +1,5 @@
 # Module: haproxy
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-haproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-haproxy.html
 
 - module: haproxy
   # All logs

diff --git a/filebeat/modules.d/icinga.yml.disabled b/filebeat/modules.d/icinga.yml.disabled
@@ -1,5 +1,5 @@
 # Module: icinga
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-icinga.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-icinga.html
 
 - module: icinga
   # Main logs

diff --git a/filebeat/modules.d/iis.yml.disabled b/filebeat/modules.d/iis.yml.disabled
@@ -1,5 +1,5 @@
 # Module: iis
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-iis.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-iis.html
 
 - module: iis
   # Access logs

diff --git a/filebeat/modules.d/kafka.yml.disabled b/filebeat/modules.d/kafka.yml.disabled
@@ -1,5 +1,5 @@
 # Module: kafka
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-kafka.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-kafka.html
 
 - module: kafka
   # All logs

diff --git a/filebeat/modules.d/kibana.yml.disabled b/filebeat/modules.d/kibana.yml.disabled
@@ -1,5 +1,5 @@
 # Module: kibana
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-kibana.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-kibana.html
 
 - module: kibana
   # Server logs

diff --git a/filebeat/modules.d/logstash.yml.disabled b/filebeat/modules.d/logstash.yml.disabled
@@ -1,5 +1,5 @@
 # Module: logstash
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-logstash.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-logstash.html
 
 - module: logstash
   # logs

diff --git a/filebeat/modules.d/mongodb.yml.disabled b/filebeat/modules.d/mongodb.yml.disabled
@@ -1,5 +1,5 @@
 # Module: mongodb
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-mongodb.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-mongodb.html
 
 - module: mongodb
   # All logs

diff --git a/filebeat/modules.d/mysql.yml.disabled b/filebeat/modules.d/mysql.yml.disabled
@@ -1,5 +1,5 @@
 # Module: mysql
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-mysql.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-mysql.html
 
 - module: mysql
   # Error logs

diff --git a/filebeat/modules.d/nats.yml.disabled b/filebeat/modules.d/nats.yml.disabled
@@ -1,5 +1,5 @@
 # Module: nats
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-nats.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-nats.html
 
 - module: nats
   # All logs

diff --git a/filebeat/modules.d/nginx.yml.disabled b/filebeat/modules.d/nginx.yml.disabled
@@ -1,5 +1,5 @@
 # Module: nginx
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-nginx.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-nginx.html
 
 - module: nginx
   # Access logs

diff --git a/filebeat/modules.d/osquery.yml.disabled b/filebeat/modules.d/osquery.yml.disabled
@@ -1,5 +1,5 @@
 # Module: osquery
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-osquery.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-osquery.html
 
 - module: osquery
   result:

diff --git a/filebeat/modules.d/pensando.yml.disabled b/filebeat/modules.d/pensando.yml.disabled
@@ -1,5 +1,5 @@
 # Module: pensando
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-pensando.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-pensando.html
 
 - module: pensando
 # Firewall logs

diff --git a/filebeat/modules.d/postgresql.yml.disabled b/filebeat/modules.d/postgresql.yml.disabled
@@ -1,5 +1,5 @@
 # Module: postgresql
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-postgresql.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-postgresql.html
 
 - module: postgresql
   # All logs

diff --git a/filebeat/modules.d/redis.yml.disabled b/filebeat/modules.d/redis.yml.disabled
@@ -1,5 +1,5 @@
 # Module: redis
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-redis.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-redis.html
 
 - module: redis
   # Main logs

diff --git a/filebeat/modules.d/santa.yml.disabled b/filebeat/modules.d/santa.yml.disabled
@@ -1,5 +1,5 @@
 # Module: santa
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-santa.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-santa.html
 
 - module: santa
   log:

diff --git a/filebeat/modules.d/system.yml.disabled b/filebeat/modules.d/system.yml.disabled
@@ -1,5 +1,5 @@
 # Module: system
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-system.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-system.html
 
 - module: system
   # Syslog

diff --git a/filebeat/modules.d/traefik.yml.disabled b/filebeat/modules.d/traefik.yml.disabled
@@ -1,5 +1,5 @@
 # Module: traefik
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-traefik.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/8.10/filebeat-module-traefik.html
 
 - module: traefik
   # Access logs

diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
@@ -8,6 +8,7 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
+* <<release-notes-8.10.1>>
 * <<release-notes-8.10.0>>
 * <<release-notes-8.9.2>>
 * <<release-notes-8.9.1>>

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,5 +1,5 @@
-:stack-version: 8.10.0
-:doc-branch: main
+:stack-version: 8.10.1
+:doc-branch: 8.10
 :go-version: 1.20.7
 :release-state: unreleased
 :python: 3.7

diff --git a/libbeat/version/version.go b/libbeat/version/version.go
diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
@@ -17,11 +17,11 @@ services:
 
   # Used by base tests
   elasticsearch:
-    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.10.0}-1
+    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.10.1}-1
     build:
       context: ./module/elasticsearch/_meta
       args:
-        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.10.0}
+        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.10.1}
     environment:
       - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
       - "transport.host=127.0.0.1"
@@ -38,11 +38,11 @@ services:
 
   # Used by base tests
   kibana:
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.10.0}-1
+    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.10.1}-1
     build:
       context: ./module/kibana/_meta
       args:
-        KIBANA_VERSION: ${KIBANA_VERSION:-8.10.0}
+        KIBANA_VERSION: ${KIBANA_VERSION:-8.10.1}
     healthcheck:
       test: ["CMD-SHELL", "curl -u beats:testing -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
       retries: 600
@@ -53,11 +53,11 @@ services:
 
   # Used by base tests
   metricbeat:
-    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.10.0}-1
+    image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.10.1}-1
     build:
       context: ./module/beat/_meta
       args:
-        BEAT_VERSION: ${BEAT_VERSION:-8.10.0}
+        BEAT_VERSION: ${BEAT_VERSION:-8.10.1}
     command: '-e'
     ports:
       - 5066:5066
diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled
@@ -1,5 +1,5 @@
 # Module: aerospike
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-aerospike.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-aerospike.html
 
 - module: aerospike
   #metricsets:

diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled
@@ -1,5 +1,5 @@
 # Module: apache
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-apache.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-apache.html
 
 - module: apache
   #metricsets:

diff --git a/metricbeat/modules.d/beat-xpack.yml.disabled b/metricbeat/modules.d/beat-xpack.yml.disabled
@@ -1,5 +1,5 @@
 # Module: beat
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-beat.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-beat.html
 
 - module: beat
   xpack.enabled: true

diff --git a/metricbeat/modules.d/beat.yml.disabled b/metricbeat/modules.d/beat.yml.disabled
@@ -1,5 +1,5 @@
 # Module: beat
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-beat.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-beat.html
 
 - module: beat
   metricsets:

diff --git a/metricbeat/modules.d/ceph-mgr.yml.disabled b/metricbeat/modules.d/ceph-mgr.yml.disabled
@@ -1,5 +1,5 @@
 # Module: ceph
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-ceph.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-ceph.html
 
 - module: ceph
   metricsets:

diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled
@@ -1,5 +1,5 @@
 # Module: ceph
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-ceph.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-ceph.html
 
 - module: ceph
   #metricsets:

diff --git a/metricbeat/modules.d/consul.yml.disabled b/metricbeat/modules.d/consul.yml.disabled
@@ -1,5 +1,5 @@
 # Module: consul
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-consul.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-consul.html
 
 - module: consul
   metricsets:

diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled
@@ -1,5 +1,5 @@
 # Module: couchbase
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-couchbase.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-couchbase.html
 
 - module: couchbase
   #metricsets:

diff --git a/metricbeat/modules.d/couchdb.yml.disabled b/metricbeat/modules.d/couchdb.yml.disabled
@@ -1,5 +1,5 @@
 # Module: couchdb
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-couchdb.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-couchdb.html
 
 - module: couchdb
   metricsets: ["server"]

diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled
@@ -1,5 +1,5 @@
 # Module: docker
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-docker.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-docker.html
 
 - module: docker
   #metricsets:

diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled
@@ -1,5 +1,5 @@
 # Module: dropwizard
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-dropwizard.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-dropwizard.html
 
 - module: dropwizard
   #metricsets:

diff --git a/metricbeat/modules.d/elasticsearch-xpack.yml.disabled b/metricbeat/modules.d/elasticsearch-xpack.yml.disabled
@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-elasticsearch.html
 
 - module: elasticsearch
   xpack.enabled: true

diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled
@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-elasticsearch.html
 
 - module: elasticsearch
   #metricsets:

diff --git a/metricbeat/modules.d/envoyproxy.yml.disabled b/metricbeat/modules.d/envoyproxy.yml.disabled
@@ -1,5 +1,5 @@
 # Module: envoyproxy
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-envoyproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-envoyproxy.html
 
 - module: envoyproxy
   #metricsets:

diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled
@@ -1,5 +1,5 @@
 # Module: etcd
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-etcd.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-etcd.html
 
 - module: etcd
   #metricsets:

diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled
@@ -1,5 +1,5 @@
 # Module: golang
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-golang.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/8.10/metricbeat-module-golang.html
 
 - module: golang
   #metricsets: