git: fae0cd1f8ee4 - main - sysutils/beats8: Update 8.14.3 => 8.19.12

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Tue, 17 Mar 2026 21:13:27 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fae0cd1f8ee485b9c813d6d4c98b8ff6f3e46b8c

commit fae0cd1f8ee485b9c813d6d4c98b8ff6f3e46b8c
Author:     Saro <web@saromedia.com>
AuthorDate: 2026-03-17 20:06:17 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-17 21:12:08 +0000

    sysutils/beats8: Update 8.14.3 => 8.19.12
    
    Release Notes (42 new versions):
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.15.0.html
     . . .
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.12.html
    
    - Remove unnecessary '?' in "PKGNAMESUFFIX?=8".
    - Adjust COMMENT.
    - Simplify removing "./" from GO_TARGET.
    - Remove unnecessary '+' in "MAKE_ENV+=".
    - Fix GO_MODULE - must be "v7" instead of "v8".
    - Adjust CONFLICTS.
    - Use ".ifmake makesum" for generate distfiles with non-default modules too.
    - Add LOCAL/vvd/elastic to MASTER_SITES for those who can't download due
      to the HTTP error "Forbidden 403".
    - Replace PORTVERSION with DISTVERSION.
    - Add '(' and ')' around the block that is executed in the shell.
    - Refresh patches.
    - Fix description in rc.d scripts.
    
    PR:             290094
    Approved by:    elastic (maintainer, implicit - inactive for more than 6 months)
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 sysutils/beats8/Makefile                           | 46 +++++++++------
 sysutils/beats8/distinfo                           | 30 +++++-----
 sysutils/beats8/files/auditbeat.in                 |  4 +-
 sysutils/beats8/files/filebeat.in                  |  4 +-
 sysutils/beats8/files/heartbeat.in                 |  5 +-
 sysutils/beats8/files/metricbeat.in                |  4 +-
 sysutils/beats8/files/packetbeat.in                |  4 +-
 .../files/patch-auditbeat_auditbeat.reference.yml  |  8 +--
 .../beats8/files/patch-auditbeat_auditbeat.yml     |  2 +-
 .../beats8/files/patch-dev-tools_mage_settings.go  | 16 +++---
 .../files/patch-filebeat_filebeat.reference.yml    |  8 +--
 sysutils/beats8/files/patch-filebeat_filebeat.yml  |  8 +--
 sysutils/beats8/files/patch-go-sysinfo             | 67 +++++++++-------------
 ...libbeat_autodiscover_providers_docker_config.go |  4 +-
 ...libbeat_autodiscover_providers_docker_docker.go |  6 +-
 ...eat_autodiscover_providers_kubernetes_config.go |  4 +-
 ...autodiscover_providers_kubernetes_kubernetes.go |  4 +-
 .../beats8/files/patch-libbeat_scripts_Makefile    |  8 +--
 .../patch-metricbeat_metricbeat.reference.yml      |  8 +--
 .../beats8/files/patch-metricbeat_metricbeat.yml   |  6 +-
 .../patch-packetbeat_packetbeat.reference.yml      |  6 +-
 .../beats8/files/patch-packetbeat_packetbeat.yml   |  2 +-
 ...t-system-metrics_metric_cpu_metrics__freebsd.go |  6 +-
 ...m-metrics_metric_cpu_metrics__procfs__common.go | 10 ++--
 ...com_godbus_dbus_transport__unixcred__freebsd.go | 12 ----
 ...m_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go | 22 -------
 sysutils/beats8/files/patch-vendor_modules.txt     | 10 ++++
 27 files changed, 143 insertions(+), 171 deletions(-)

diff --git a/sysutils/beats8/Makefile b/sysutils/beats8/Makefile
index 5adb4b4a34b3..704dd04b6ded 100644
--- a/sysutils/beats8/Makefile
+++ b/sysutils/beats8/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.14.3
-PORTREVISION=	17
+DISTVERSION=	8.19.12
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
-PKGNAMESUFFIX?=	8
+PKGNAMESUFFIX=	8
 DISTFILES=	go.mod:gomod
 
 MAINTAINER=	elastic@FreeBSD.org
-COMMENT=	Send logs, network, metrics and heartbeat to elasticsearch or logstash
+COMMENT=	Send logs, network, metrics and heartbeat to Elasticsearch or Logstash (${DISTVERSION:R:R}.x version)
 WWW=		https://www.elastic.co/products/beats/
 
 LICENSE=	APACHE20
@@ -18,21 +17,25 @@ USE_GITHUB=	yes
 
 GH_ACCOUNT=	elastic
 
-USE_RC_SUBR=	${GO_TARGET:C,\./,,g}
+USE_RC_SUBR=	${GO_TARGET:S,./,,g}
 
-GO_MODULE=	github.com/elastic/beats/v8
+GO_MODULE=	github.com/elastic/beats/v7
 CGO_CFLAGS=	-I.
 CGO_LDFLAGS=	-L.
-MAKE_ENV+=	GOBUILD_FLAGS="-mod=vendor"
+MAKE_ENV=	GOBUILD_FLAGS="-mod=vendor"
 
-CONFLICTS=	beats6 beats7 beats9
+CONFLICTS=	${PORTNAME}9*
 
 PORTSCOUT=	limit:^8
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
+.ifmake makesum || makeplist || distclean
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+.else
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
+.endif
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
@@ -40,42 +43,49 @@ FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
 PACKETBEAT_DESC=		Packetbeat
-AUDITBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/auditbeat/:auditbeat
+AUDITBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/auditbeat/:auditbeat \
+				${LOCAL_MASTER_SITES:S|$|:auditbeat|}
 AUDITBEAT_DISTFILES=		auditbeat-${DISTVERSION}-darwin-x86_64.tar.gz:auditbeat
 AUDITBEAT_VARS=			GO_TARGET+=./auditbeat
-FILEBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/filebeat/:filebeat
+FILEBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/filebeat/:filebeat \
+				${LOCAL_MASTER_SITES:S|$|:filebeat|}
 FILEBEAT_DISTFILES=		filebeat-${DISTVERSION}-darwin-x86_64.tar.gz:filebeat
 FILEBEAT_VARS=			GO_TARGET+=./filebeat
-HEARTBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/heartbeat/:heartbeat
+HEARTBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/heartbeat/:heartbeat \
+				${LOCAL_MASTER_SITES:S|$|:heartbeat|}
 HEARTBEAT_DISTFILES=		heartbeat-${DISTVERSION}-darwin-x86_64.tar.gz:heartbeat
 HEARTBEAT_VARS=			GO_TARGET+=./heartbeat
-METRICBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/metricbeat/:metricbeat
+METRICBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/metricbeat/:metricbeat \
+				${LOCAL_MASTER_SITES:S|$|:metricbeat|}
 METRICBEAT_DISTFILES=		metricbeat-${DISTVERSION}-darwin-x86_64.tar.gz:metricbeat
 METRICBEAT_VARS=		GO_TARGET+=./metricbeat
-PACKETBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/packetbeat/:packetbeat
+PACKETBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/packetbeat/:packetbeat \
+				${LOCAL_MASTER_SITES:S|$|:packetbeat|}
 PACKETBEAT_DISTFILES=		packetbeat-${DISTVERSION}-darwin-x86_64.tar.gz:packetbeat
 PACKETBEAT_VARS=		CGO_CFLAGS+=-I/usr/include \
 				CGO_LDFLAGS+=-L/usr/lib \
 				GO_TARGET+=./packetbeat
 
+LOCAL_MASTER_SITES=		LOCAL/vvd/elastic
+
 .include <bsd.port.options.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${PORTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
-.for BEATMOD in ${GO_TARGET:C,\./,,g}
+	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${DISTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
+.for BEATMOD in ${GO_TARGET:S,^./,,g}
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|g" ${WRKSRC}/${BEATMOD}/*.yml
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
-.for BEATMOD in ${GO_TARGET:C,^\./,,g}
-	${MKDIR} ${STAGEDIR}/var/db/beats/${BEATMOD} && \
+.for BEATMOD in ${GO_TARGET:S,^./,,g}
+	(${MKDIR} ${STAGEDIR}/var/db/beats/${BEATMOD} && \
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/${BEATMOD} \
 		${STAGEDIR}${PREFIX}/sbin && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.sample && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.reference.yml \
-		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference
+		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference)
 	(MODULE_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/module; \
 	 if [ -d $${MODULE_SRC} ]; then \
 	   MODULE_DEST=${STAGEDIR}${DATADIR}/${BEATMOD}/module && \
diff --git a/sysutils/beats8/distinfo b/sysutils/beats8/distinfo
index 35b506baf697..6580ddda9af5 100644
--- a/sysutils/beats8/distinfo
+++ b/sysutils/beats8/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1721561711
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/go.mod) = 5ac53d72ec047685257e305055a61c0fe58dd64fa4809401bca4e9cd820765d1
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/go.mod) = 22285
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/auditbeat-8.14.3-darwin-x86_64.tar.gz) = ab2ed29e547dcac6f85d73738a29d3133288d25057c4b16e96ea0c8d2df1e179
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/auditbeat-8.14.3-darwin-x86_64.tar.gz) = 29504818
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/filebeat-8.14.3-darwin-x86_64.tar.gz) = 40f1b913eaede43afcf73cb669b4db57f98f1147f52fda7bfee0752eb0325651
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/filebeat-8.14.3-darwin-x86_64.tar.gz) = 44226004
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/heartbeat-8.14.3-darwin-x86_64.tar.gz) = 5b9adf542af50dfc3f0766cd79bca0379c9c7675e81c451d910d27b5fe6d0a53
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/heartbeat-8.14.3-darwin-x86_64.tar.gz) = 29600533
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/metricbeat-8.14.3-darwin-x86_64.tar.gz) = f79e4bc722b1e97025dfca427923c975539efe268686d7b53af75b758f573b87
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/metricbeat-8.14.3-darwin-x86_64.tar.gz) = 47395194
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/packetbeat-8.14.3-darwin-x86_64.tar.gz) = 88fca4b5c955a6bba3a4fa28bff5faeda1676c7e5354679e4ce6be8dc4d87265
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/packetbeat-8.14.3-darwin-x86_64.tar.gz) = 30766046
-SHA256 (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/elastic-beats-v8.14.3_GH0.tar.gz) = 146fcd1d7a9ea951e362662c9d43bfd65bbdfad3e58dc315573bd6e62065e8fe
-SIZE (go/sysutils_beats8/elastic-beats-v8.14.3_GH0/elastic-beats-v8.14.3_GH0.tar.gz) = 112258023
+TIMESTAMP = 1773063769
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/go.mod) = 40e40154944293b310ed9171b9de6be9380f0f81127e3a4f20321821d76672b9
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/go.mod) = 28836
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/auditbeat-8.19.12-darwin-x86_64.tar.gz) = fc7a06722eb8ab4fae9d9954ec4bf59522fa95c9f52f86ad346c8c20009db48b
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/auditbeat-8.19.12-darwin-x86_64.tar.gz) = 35814502
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/filebeat-8.19.12-darwin-x86_64.tar.gz) = bd6caaa9d347b951db0f277c136f49df88c34c978fca31cabbd298d459992cb3
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/filebeat-8.19.12-darwin-x86_64.tar.gz) = 55685672
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/heartbeat-8.19.12-darwin-x86_64.tar.gz) = 7bc769ce65a62072d70be1dbed0f3932b895b785ce832f49f5fc79a1e291f942
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/heartbeat-8.19.12-darwin-x86_64.tar.gz) = 35784404
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/metricbeat-8.19.12-darwin-x86_64.tar.gz) = cfd313759ad554b4f518ed6dcb222793c8d21ea67be0616aec270f3f8fc5fe21
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/metricbeat-8.19.12-darwin-x86_64.tar.gz) = 59721874
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/packetbeat-8.19.12-darwin-x86_64.tar.gz) = 21581ca09c0b9403b2cf3731c449b87c66bb3d87998bbe057b8c312d5ea70973
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/packetbeat-8.19.12-darwin-x86_64.tar.gz) = 36808663
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/elastic-beats-v8.19.12_GH0.tar.gz) = 8ca35b31098cbac291a88a0086685ba40957d3f1606ba6dc4b60242d2b69243f
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/elastic-beats-v8.19.12_GH0.tar.gz) = 104228947
diff --git a/sysutils/beats8/files/auditbeat.in b/sysutils/beats8/files/auditbeat.in
index 4091c69b6182..59f2443115cd 100644
--- a/sysutils/beats8/files/auditbeat.in
+++ b/sysutils/beats8/files/auditbeat.in
@@ -11,9 +11,9 @@
 # 				Default: NO
 # auditbeat_flags (str):	Extra flags passed to auditbeat
 # auditbeat_config (str):	auditbeat configuration directory
-#				Default: ${PREFIX}/etc/beats
+#				Default: %%ETCDIR%%
 # auditbeat_conffile (str):	auditbeat configuration file
-#				relative to ${auditbeat_conf}
+#				relative to ${auditbeat_config}
 #				Default: auditbeat.yml
 
 . /etc/rc.subr
diff --git a/sysutils/beats8/files/filebeat.in b/sysutils/beats8/files/filebeat.in
index 8ae08af5b398..824c25222d38 100644
--- a/sysutils/beats8/files/filebeat.in
+++ b/sysutils/beats8/files/filebeat.in
@@ -11,9 +11,9 @@
 # 				Default: NO
 # filebeat_flags (str):		Extra flags passed to filebeat
 # filebeat_config (str):	filebeat configuration directory
-#				Default: ${PREFIX}/etc/beats
+#				Default: %%ETCDIR%%
 # filebeat_conffile (str):	filebeat configuration file
-#				relative to ${filebeat_conf}
+#				relative to ${filebeat_config}
 #				Default: filebeat.yml
 
 . /etc/rc.subr
diff --git a/sysutils/beats8/files/heartbeat.in b/sysutils/beats8/files/heartbeat.in
index d99374ab011c..d89b13328b28 100644
--- a/sysutils/beats8/files/heartbeat.in
+++ b/sysutils/beats8/files/heartbeat.in
@@ -11,9 +11,9 @@
 # 				Default: NO
 # heartbeat_flags (str):	Extra flags passed to heartbeat
 # heartbeat_config (str):	heartbeat configuration directory
-#				Default: ${PREFIX}/etc/beats
+#				Default: %%ETCDIR%%
 # heartbeat_conffile (str):	heartbeat configuration file
-#				relative to ${heartbeat_conf}
+#				relative to ${heartbeat_config}
 #				Default: heartbeat.yml
 
 . /etc/rc.subr
@@ -29,7 +29,6 @@ load_rc_config $name
 : ${heartbeat_logs:="/var/log/beats"}
 : ${heartbeat_data:="/var/db/beats/heartbeat"}
 
-
 # daemon
 start_precmd=heartbeat_prestart
 command=/usr/sbin/daemon
diff --git a/sysutils/beats8/files/metricbeat.in b/sysutils/beats8/files/metricbeat.in
index 270966c4f669..66ba9615d2ec 100644
--- a/sysutils/beats8/files/metricbeat.in
+++ b/sysutils/beats8/files/metricbeat.in
@@ -11,9 +11,9 @@
 # 				Default: NO
 # metricbeat_flags (str):	Extra flags passed to metricbeat
 # metricbeat_config (str):	metricbeat configuration directory
-#				Default: ${PREFIX}/etc/beats
+#				Default: %%ETCDIR%%
 # metricbeat_conffile (str):	metricbeat configuration file
-#				relative to ${metricbeat_conf}
+#				relative to ${metricbeat_config}
 #				Default: metricbeat.yml
 
 . /etc/rc.subr
diff --git a/sysutils/beats8/files/packetbeat.in b/sysutils/beats8/files/packetbeat.in
index 4dc21856c49a..2541bdcc9eb7 100644
--- a/sysutils/beats8/files/packetbeat.in
+++ b/sysutils/beats8/files/packetbeat.in
@@ -11,9 +11,9 @@
 # 				Default: NO
 # packetbeat_flags (str):	Extra flags passed to packetbeat
 # packetbeat_config (str):	packetbeat configuration directory
-#				Default: ${PREFIX}/etc/beats
+#				Default: %%ETCDIR%%
 # packetbeat_conffile (str):	packetbeat configuration file
-#				relative to ${packetbeat_conf}
+#				relative to ${packetbeat_config}
 #				Default: packetbeat.yml
 
 . /etc/rc.subr
diff --git a/sysutils/beats8/files/patch-auditbeat_auditbeat.reference.yml b/sysutils/beats8/files/patch-auditbeat_auditbeat.reference.yml
index 3761774a00eb..04ef963d9642 100644
--- a/sysutils/beats8/files/patch-auditbeat_auditbeat.reference.yml
+++ b/sysutils/beats8/files/patch-auditbeat_auditbeat.reference.yml
@@ -1,6 +1,6 @@
---- auditbeat/auditbeat.reference.yml.orig	2022-10-24 06:49:31 UTC
+--- auditbeat/auditbeat.reference.yml.orig	2025-09-15 19:57:17 UTC
 +++ auditbeat/auditbeat.reference.yml
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ auditbeat.config.modules:
  auditbeat.config.modules:
  
    # Glob pattern for configuration reloading
@@ -9,12 +9,12 @@
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
-@@ -1133,7 +1133,7 @@ output.elasticsearch:
+@@ -1250,7 +1250,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/auditbeat/kibana
  
- # The URL from where to download the dashboards archive. It is used instead of
+ # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats8/files/patch-auditbeat_auditbeat.yml b/sysutils/beats8/files/patch-auditbeat_auditbeat.yml
index 20ee2d0016a5..b9c74affaee6 100644
--- a/sysutils/beats8/files/patch-auditbeat_auditbeat.yml
+++ b/sysutils/beats8/files/patch-auditbeat_auditbeat.yml
@@ -1,4 +1,4 @@
---- auditbeat/auditbeat.yml.orig	2022-10-24 06:49:31 UTC
+--- auditbeat/auditbeat.yml.orig	2025-09-15 19:57:17 UTC
 +++ auditbeat/auditbeat.yml
 @@ -82,6 +82,10 @@ setup.template.settings:
  # website.
diff --git a/sysutils/beats8/files/patch-dev-tools_mage_settings.go b/sysutils/beats8/files/patch-dev-tools_mage_settings.go
index 86e470f90315..fff0c065e200 100644
--- a/sysutils/beats8/files/patch-dev-tools_mage_settings.go
+++ b/sysutils/beats8/files/patch-dev-tools_mage_settings.go
@@ -1,20 +1,20 @@
---- dev-tools/mage/settings.go.orig	2024-07-09 00:00:36.000000000 +0200
-+++ dev-tools/mage/settings.go	2024-07-13 21:26:19.383768000 +0200
-@@ -31,7 +31,6 @@
+--- dev-tools/mage/settings.go.orig	2025-09-15 19:57:17 UTC
++++ dev-tools/mage/settings.go
+@@ -31,7 +31,6 @@ import (
  	"sync"
  	"time"
  
 -	"github.com/magefile/mage/sh"
- 	"golang.org/x/tools/go/vcs"
- 
- 	"github.com/elastic/beats/v7/dev-tools/mage/gotool"
-@@ -251,7 +250,8 @@
+ 	"golang.org/x/text/cases"
+ 	"golang.org/x/text/language"
+ 	"gopkg.in/yaml.v3"
+@@ -282,7 +281,8 @@ func CommitHash() (string, error) {
  func CommitHash() (string, error) {
  	var err error
  	commitHashOnce.Do(func() {
 -		commitHash, err = sh.Output("git", "rev-parse", "HEAD")
 +		err = nil
-+		commitHash = "v8.14.3"
++		commitHash = "%%BEATSVERSION%%"
  	})
  	return commitHash, err
  }
diff --git a/sysutils/beats8/files/patch-filebeat_filebeat.reference.yml b/sysutils/beats8/files/patch-filebeat_filebeat.reference.yml
index 71410a09ec92..33dc3a22fd11 100644
--- a/sysutils/beats8/files/patch-filebeat_filebeat.reference.yml
+++ b/sysutils/beats8/files/patch-filebeat_filebeat.reference.yml
@@ -1,6 +1,6 @@
---- filebeat/filebeat.reference.yml.orig	2022-09-27 13:19:27 UTC
+--- filebeat/filebeat.reference.yml.orig	2025-09-15 19:57:17 UTC
 +++ filebeat/filebeat.reference.yml
-@@ -1241,12 +1241,12 @@ filebeat.inputs:
+@@ -1329,12 +1329,12 @@ - type: filestream
  #filebeat.config:
    #inputs:
      #enabled: false
@@ -15,12 +15,12 @@
      #reload.enabled: true
      #reload.period: 10s
  
-@@ -2266,7 +2266,7 @@ output.elasticsearch:
+@@ -2408,7 +2408,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/filebeat/kibana
  
- # The URL from where to download the dashboards archive. It is used instead of
+ # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats8/files/patch-filebeat_filebeat.yml b/sysutils/beats8/files/patch-filebeat_filebeat.yml
index 6630fa8d04d6..c9a078cc6ffb 100644
--- a/sysutils/beats8/files/patch-filebeat_filebeat.yml
+++ b/sysutils/beats8/files/patch-filebeat_filebeat.yml
@@ -1,6 +1,6 @@
---- filebeat/filebeat.yml.orig	2022-09-27 13:19:27 UTC
+--- filebeat/filebeat.yml.orig	2025-09-15 19:57:17 UTC
 +++ filebeat/filebeat.yml
-@@ -58,7 +58,7 @@ filebeat.inputs:
+@@ -81,7 +81,7 @@ filebeat.config.modules:
  
  filebeat.config.modules:
    # Glob pattern for configuration loading
@@ -9,7 +9,7 @@
  
    # Set to true to enable config reloading
    reload.enabled: false
-@@ -101,6 +101,10 @@ setup.template.settings:
+@@ -124,6 +124,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
@@ -20,7 +20,7 @@
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
-@@ -168,8 +172,8 @@ processors:
+@@ -195,8 +199,8 @@ processors:
    - add_host_metadata:
        when.not.contains.tags: forwarded
    - add_cloud_metadata: ~
diff --git a/sysutils/beats8/files/patch-go-sysinfo b/sysutils/beats8/files/patch-go-sysinfo
index 240a59633c38..2ac3e3daee55 100644
--- a/sysutils/beats8/files/patch-go-sysinfo
+++ b/sysutils/beats8/files/patch-go-sysinfo
@@ -1,6 +1,5 @@
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/internal/cgo/disabled.go vendor/github.com/elastic/go-sysinfo/internal/cgo/disabled.go
---- vendor.orig/github.com/elastic/go-sysinfo/internal/cgo/disabled.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/internal/cgo/disabled.go	2024-07-13 20:28:36.060882000 +0200
+--- vendor/github.com/elastic/go-sysinfo/internal/cgo/disabled.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/internal/cgo/disabled.go
 @@ -0,0 +1,23 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -25,9 +24,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/internal/cgo/disabled.go ven
 +
 +// Enabled is true if cgo was enabled at compile-time.
 +const Enabled = false
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/internal/cgo/enabled.go vendor/github.com/elastic/go-sysinfo/internal/cgo/enabled.go
---- vendor.orig/github.com/elastic/go-sysinfo/internal/cgo/enabled.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/internal/cgo/enabled.go	2024-07-13 20:28:36.060953000 +0200
+--- vendor/github.com/elastic/go-sysinfo/internal/cgo/enabled.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/internal/cgo/enabled.go
 @@ -0,0 +1,23 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -52,9 +50,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/internal/cgo/enabled.go vend
 +
 +// Enabled is true if cgo was enabled at compile-time.
 +const Enabled = true
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/defs_freebsd.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/defs_freebsd.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/defs_freebsd.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/defs_freebsd.go	2024-07-13 20:28:36.065106000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/defs_freebsd.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/defs_freebsd.go
 @@ -0,0 +1,33 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -89,9 +86,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/defs_freeb
 +type kvmSwap C.struct_kvm_swap
 +
 +type clockInfo C.struct_clockinfo
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/doc.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/doc.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/doc.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/doc.go	2024-07-13 20:28:36.065203000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/doc.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/doc.go
 @@ -0,0 +1,22 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -115,9 +111,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/doc.go ven
 +package freebsd
 +
 +//go:generate sh -c "go tool cgo -godefs defs_freebsd.go > ztypes_freebsd.go"
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo.go	2024-07-13 20:28:36.065317000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo.go
 @@ -0,0 +1,238 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -357,9 +352,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/host_freeb
 +	elem := append([]string{fs.mountPoint}, p...)
 +	return filepath.Join(elem...)
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo_test.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo_test.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo_test.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo_test.go	2024-07-13 20:28:36.065385000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo_test.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/host_freebsd_cgo_test.go
 @@ -0,0 +1,53 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -414,9 +408,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/host_freeb
 +		t.Log(string(data))
 +	})
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebsd_cgo.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebsd_cgo.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebsd_cgo.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebsd_cgo.go	2024-07-13 20:28:36.065498000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebsd_cgo.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebsd_cgo.go
 @@ -0,0 +1,58 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -476,9 +469,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/kvm_freebs
 +
 +	return &swap, nil
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/process_freebsd_cgo.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/process_freebsd_cgo.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/process_freebsd_cgo.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/process_freebsd_cgo.go	2024-07-13 20:28:36.065578000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/process_freebsd_cgo.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/process_freebsd_cgo.go
 @@ -0,0 +1,386 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -866,9 +858,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/process_fr
 +
 +	return &proc, nil
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd.go	2024-07-13 20:28:36.065700000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd.go
 @@ -0,0 +1,248 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -1118,9 +1109,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_fre
 +	}
 +	return uint64(v)
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd_test.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd_test.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd_test.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd_test.go	2024-07-13 20:28:36.065808000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd_test.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_freebsd_test.go
 @@ -0,0 +1,137 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -1259,9 +1249,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/sysctl_fre
 +		t.Logf("%#v", os)
 +	})
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_freebsd.go vendor/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_freebsd.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_freebsd.go	1970-01-01 01:00:00.000000000 +0100
-+++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_freebsd.go	2024-07-13 20:28:36.065887000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_freebsd.go.orig	2025-09-19 18:12:17 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_freebsd.go
 @@ -0,0 +1,39 @@
 +// Licensed to Elasticsearch B.V. under one or more contributor
 +// license agreements. See the NOTICE file distributed with
@@ -1302,9 +1291,8 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/freebsd/ztypes_fre
 +	Stathz int32
 +	Profhz int32
 +}
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/shared/fqdn.go vendor/github.com/elastic/go-sysinfo/providers/shared/fqdn.go
---- vendor.orig/github.com/elastic/go-sysinfo/providers/shared/fqdn.go	2024-07-13 21:34:29.109657000 +0200
-+++ vendor/github.com/elastic/go-sysinfo/providers/shared/fqdn.go	2024-07-13 20:28:36.077420000 +0200
+--- vendor/github.com/elastic/go-sysinfo/providers/shared/fqdn.go.orig	2025-09-19 18:12:11 UTC
++++ vendor/github.com/elastic/go-sysinfo/providers/shared/fqdn.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
@@ -1314,10 +1302,9 @@ diff -urN vendor.orig/github.com/elastic/go-sysinfo/providers/shared/fqdn.go ven
  
  package shared
  
-diff -urN vendor.orig/github.com/elastic/go-sysinfo/system.go vendor/github.com/elastic/go-sysinfo/system.go
---- vendor.orig/github.com/elastic/go-sysinfo/system.go	2024-07-13 21:34:29.110051000 +0200
-+++ vendor/github.com/elastic/go-sysinfo/system.go	2024-07-13 20:28:36.079545000 +0200
-@@ -26,6 +26,7 @@
+--- vendor/github.com/elastic/go-sysinfo/system.go.orig	2025-09-19 18:12:11 UTC
++++ vendor/github.com/elastic/go-sysinfo/system.go
+@@ -26,6 +26,7 @@ import (
  	// Register host and process providers.
  	_ "github.com/elastic/go-sysinfo/providers/aix"
  	_ "github.com/elastic/go-sysinfo/providers/darwin"
diff --git a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_config.go b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_config.go
index f3c07f0ac593..e554c26110a0 100644
--- a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_config.go
+++ b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_config.go
@@ -1,5 +1,5 @@
---- libbeat/autodiscover/providers/docker/config.go.orig	2024-07-09 00:00:36.000000000 +0200
-+++ libbeat/autodiscover/providers/docker/config.go	2024-07-13 21:38:12.739090000 +0200
+--- libbeat/autodiscover/providers/docker/config.go.orig	2025-09-15 19:57:17 UTC
++++ libbeat/autodiscover/providers/docker/config.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
diff --git a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_docker.go b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_docker.go
index 34dc07b07dc5..1ba78ac9207b 100644
--- a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_docker.go
+++ b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_docker.go
@@ -1,5 +1,5 @@
---- libbeat/autodiscover/providers/docker/docker.go.orig	2024-07-09 00:00:36.000000000 +0200
-+++ libbeat/autodiscover/providers/docker/docker.go	2024-07-13 21:40:25.908849000 +0200
+--- libbeat/autodiscover/providers/docker/docker.go.orig	2025-09-15 19:57:17 UTC
++++ libbeat/autodiscover/providers/docker/docker.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
@@ -9,7 +9,7 @@
  
  package docker
  
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ import (
  	"github.com/elastic/beats/v7/libbeat/common"
  
  	"github.com/elastic/elastic-agent-autodiscover/bus"
diff --git a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_config.go b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
index d9a1743bfd87..d61cc99ec22f 100644
--- a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
+++ b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
@@ -1,5 +1,5 @@
---- libbeat/autodiscover/providers/kubernetes/config.go.orig	2024-07-09 00:00:36.000000000 +0200
-+++ libbeat/autodiscover/providers/kubernetes/config.go	2024-07-13 21:42:32.799000000 +0200
+--- libbeat/autodiscover/providers/kubernetes/config.go.orig	2025-09-15 19:57:17 UTC
++++ libbeat/autodiscover/providers/kubernetes/config.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
diff --git a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
index 8f446dd0f8eb..de1795f28db2 100644
--- a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
+++ b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
@@ -1,5 +1,5 @@
---- libbeat/autodiscover/providers/kubernetes/kubernetes.go.orig	2024-07-13 21:44:01.984103000 +0200
-+++ libbeat/autodiscover/providers/kubernetes/kubernetes.go	2024-07-13 21:44:07.633470000 +0200
+--- libbeat/autodiscover/providers/kubernetes/kubernetes.go.orig	2025-09-15 19:57:17 UTC
++++ libbeat/autodiscover/providers/kubernetes/kubernetes.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
diff --git a/sysutils/beats8/files/patch-libbeat_scripts_Makefile b/sysutils/beats8/files/patch-libbeat_scripts_Makefile
index f298adc0c9ad..e84469edfa3e 100644
--- a/sysutils/beats8/files/patch-libbeat_scripts_Makefile
+++ b/sysutils/beats8/files/patch-libbeat_scripts_Makefile
@@ -1,6 +1,6 @@
---- libbeat/scripts/Makefile.orig	2024-07-09 00:00:36.000000000 +0200
-+++ libbeat/scripts/Makefile	2024-07-13 21:45:40.788621000 +0200
-@@ -47,7 +47,7 @@
+--- libbeat/scripts/Makefile.orig	2025-09-15 19:57:17 UTC
++++ libbeat/scripts/Makefile
+@@ -47,7 +47,7 @@ GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name
  GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*" 2>/dev/null)
  GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go' 2>/dev/null)
  GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name "stress" \) 2>/dev/null)
@@ -9,7 +9,7 @@
  ES_HOST?=elasticsearch
  ES_PORT?=9200
  ES_USER?=beats
-@@ -352,12 +352,12 @@
+@@ -346,12 +346,12 @@ update: python-env fields collect config ## @build Upd
  update: python-env fields collect config ## @build Update expects the most recent version of libbeat in the GOPATH
  	@echo "Updating generated files for ${BEAT_NAME}"
  
diff --git a/sysutils/beats8/files/patch-metricbeat_metricbeat.reference.yml b/sysutils/beats8/files/patch-metricbeat_metricbeat.reference.yml
index 54e125f6af50..170a0e8a37f6 100644
--- a/sysutils/beats8/files/patch-metricbeat_metricbeat.reference.yml
+++ b/sysutils/beats8/files/patch-metricbeat_metricbeat.reference.yml
@@ -1,6 +1,6 @@
---- metricbeat/metricbeat.reference.yml.orig	2022-09-27 13:19:27 UTC
+--- metricbeat/metricbeat.reference.yml.orig	2025-09-15 19:57:17 UTC
 +++ metricbeat/metricbeat.reference.yml
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ metricbeat.config.modules:
  metricbeat.config.modules:
  
    # Glob pattern for configuration reloading
@@ -9,12 +9,12 @@
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
-@@ -2006,7 +2006,7 @@ output.elasticsearch:
+@@ -2199,7 +2199,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/metricbeat/kibana
  
- # The URL from where to download the dashboards archive. It is used instead of
+ # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats8/files/patch-metricbeat_metricbeat.yml b/sysutils/beats8/files/patch-metricbeat_metricbeat.yml
index 0dcf745f9cfd..7a8524fee677 100644
--- a/sysutils/beats8/files/patch-metricbeat_metricbeat.yml
+++ b/sysutils/beats8/files/patch-metricbeat_metricbeat.yml
@@ -1,6 +1,6 @@
---- metricbeat/metricbeat.yml.orig	2021-10-07 17:20:31 UTC
+--- metricbeat/metricbeat.yml.orig	2025-09-15 19:57:17 UTC
 +++ metricbeat/metricbeat.yml
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ metricbeat.config.modules:
  
  metricbeat.config.modules:
    # Glob pattern for configuration loading
@@ -20,7 +20,7 @@
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
-@@ -123,8 +127,8 @@ output.elasticsearch:
+@@ -127,8 +131,8 @@ processors:
  processors:
    - add_host_metadata: ~
    - add_cloud_metadata: ~
diff --git a/sysutils/beats8/files/patch-packetbeat_packetbeat.reference.yml b/sysutils/beats8/files/patch-packetbeat_packetbeat.reference.yml
index de6d99250123..665a35e9137b 100644
--- a/sysutils/beats8/files/patch-packetbeat_packetbeat.reference.yml
+++ b/sysutils/beats8/files/patch-packetbeat_packetbeat.reference.yml
@@ -1,11 +1,11 @@
---- packetbeat/packetbeat.reference.yml.orig	2022-09-27 13:19:27 UTC
+--- packetbeat/packetbeat.reference.yml.orig	2026-02-24 08:36:24 UTC
 +++ packetbeat/packetbeat.reference.yml
-@@ -1634,7 +1634,7 @@ output.elasticsearch:
+@@ -1718,7 +1718,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/packetbeat/kibana
  
- # The URL from where to download the dashboards archive. It is used instead of
+ # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats8/files/patch-packetbeat_packetbeat.yml b/sysutils/beats8/files/patch-packetbeat_packetbeat.yml
index 0a3f15dfcbc9..3189a9f70662 100644
--- a/sysutils/beats8/files/patch-packetbeat_packetbeat.yml
+++ b/sysutils/beats8/files/patch-packetbeat_packetbeat.yml
@@ -1,4 +1,4 @@
---- packetbeat/packetbeat.yml.orig	2022-10-24 06:49:31 UTC
+--- packetbeat/packetbeat.yml.orig	2025-09-15 19:57:17 UTC
 +++ packetbeat/packetbeat.yml
 @@ -25,7 +25,8 @@
  #   internal_networks:
diff --git a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
index f8872e79e492..d9305bc9d551 100644
--- a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
+++ b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
@@ -1,8 +1,8 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go.orig	2022-11-25 21:56:24 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go.orig	2025-09-19 18:38:09 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go
-@@ -57,3 +57,7 @@ func parseCPULine(line string) (CPU, error) {
+@@ -56,3 +56,7 @@ func parseCPULine(line string) (CPU, error) {
  
- 	return cpuData, errs.Err()
+ 	return cpuData, errors.Join(errs...)
  }
 +
 +func scanCPUInfoFile(scanner *bufio.Scanner) ([]CPUInfo, error) {
diff --git a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
index 1756133ba7a0..287667e0d23a 100644
--- a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
+++ b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
@@ -1,15 +1,15 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go.orig	2022-11-25 21:55:11 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go.orig	2025-09-19 18:44:04 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go
-@@ -32,7 +32,7 @@ import (
+@@ -32,7 +32,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
+ func Get(m *Monitor) (CPUMetrics, error) {
+ 	procfs := m.Hostfs
  
- // Get returns a metrics object for CPU data
- func Get(procfs resolve.Resolver) (CPUMetrics, error) {
 -	path := procfs.ResolveHostFS("/proc/stat")
 +	path := procfs.ResolveHostFS("/compat/linux/proc/stat")
  	fd, err := os.Open(path)
  	defer func() {
  		_ = fd.Close()
-@@ -46,7 +46,7 @@ func Get(procfs resolve.Resolver) (CPUMetrics, error) 
+@@ -46,7 +46,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
  		return CPUMetrics{}, fmt.Errorf("scanning stat file: %w", err)
  	}
  
diff --git a/sysutils/beats8/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go b/sysutils/beats8/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go
deleted file mode 100644
index cbd82643efdf..000000000000
--- a/sysutils/beats8/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go
+++ /dev/null
@@ -1,12 +0,0 @@
---- vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go.orig	2021-08-05 12:40:38 UTC
-+++ vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go
-@@ -8,7 +8,8 @@
- package dbus
- 
- /*
--const int sizeofPtr = sizeof(void*);
-+static const int sizeofPtr = sizeof(void*);
-+#include <sys/types.h>
- #define _WANT_UCRED
- #include <sys/ucred.h>
- */
diff --git a/sysutils/beats8/files/patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go b/sysutils/beats8/files/patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go
deleted file mode 100644
index 9f3b27a9518c..000000000000
--- a/sysutils/beats8/files/patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
---- vendor/github.com/insomniacslk/dhcp/dhcpv4/bindtodevice_bsd.go.orig	2021-12-20 11:34:32 UTC
-+++ vendor/github.com/insomniacslk/dhcp/dhcpv4/bindtodevice_bsd.go
-@@ -0,0 +1,19 @@
-+//go:build freebsd || openbsd || netbsd
-+// +build freebsd openbsd netbsd
-+
-+package dhcpv4
-+
-+import (
-+      "net"
-+      "syscall"
-+)
-+
-+// BindToInterface emulates linux's SO_BINDTODEVICE option for a socket by using
-+// IP_RECVIF.
-+func BindToInterface(fd int, ifname string) error {
-+      iface, err := net.InterfaceByName(ifname)
-+      if err != nil {
-+              return err
-+      }
-+      return syscall.SetsockoptInt(fd, syscall.IPPROTO_IP, syscall.IP_RECVIF, iface.Index)
-+}
diff --git a/sysutils/beats8/files/patch-vendor_modules.txt b/sysutils/beats8/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..b7a9b36c8f7e
--- /dev/null
+++ b/sysutils/beats8/files/patch-vendor_modules.txt
@@ -0,0 +1,10 @@
+--- vendor/modules.txt.orig	2026-03-16 00:00:00 UTC
++++ vendor/modules.txt
+@@ -2005,6 +2005,7 @@ github.com/elastic/go-sysinfo/providers/darwin
+ github.com/elastic/go-sysinfo/internal/registry
+ github.com/elastic/go-sysinfo/providers/aix
+ github.com/elastic/go-sysinfo/providers/darwin
++github.com/elastic/go-sysinfo/providers/freebsd
+ github.com/elastic/go-sysinfo/providers/linux
+ github.com/elastic/go-sysinfo/providers/shared
+ github.com/elastic/go-sysinfo/providers/windows