git: 53fa3840c206 - main - sysutils/beats8: Update 8.19.15 => 8.19.21

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Tue, 22 Sep 2026 02:13:16 UTC
The branch main has been updated by vvd:

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

commit 53fa3840c20670177b227dea72775c4a21a7c76a
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-09-21 23:36:00 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-09-22 02:04:16 +0000

    sysutils/beats8: Update 8.19.15 => 8.19.21
    
    Changelogs:
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.16.html
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.17.html
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.18.html
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.19.html
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.20.html
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.21.html
    
    PR:             297679
    Approved by:    elastic (implicit, inactive for several months again)
    Sponsored by:   UNIS Labs
---
 sysutils/beats8/Makefile                           | 20 ++++++++++-----
 sysutils/beats8/distinfo                           | 30 +++++++++++-----------
 .../beats8/files/patch-dev-tools_mage_settings.go  |  6 ++---
 ...libbeat_autodiscover_providers_docker_docker.go | 12 ++++-----
 .../files/patch-metricbeat_module_docker_docker.go | 11 ++++++++
 .../files/patch-pkg_autodiscover_docker_client.go  | 11 ++++++++
 .../patch-pkg_autodiscover_docker_client__test.go  | 11 ++++++++
 .../files/patch-pkg_autodiscover_docker_watcher.go | 11 ++++++++
 .../patch-pkg_autodiscover_docker_watcher__test.go | 11 ++++++++
 ...tic_elastic-agent-autodiscover_docker_client.go | 13 ----------
 ...ic_elastic-agent-autodiscover_docker_watcher.go | 13 ----------
 ...lastic_elastic-agent-libs_monitoring_metrics.go | 16 ------------
 ...m-metrics_metric_cpu_metrics__procfs__common.go |  6 ++---
 ...cs_metric_system_filesystem_filesystem__unix.go | 12 ++++-----
 sysutils/beats8/files/patch-vendor_modules.txt     |  4 +--
 15 files changed, 103 insertions(+), 84 deletions(-)

diff --git a/sysutils/beats8/Makefile b/sysutils/beats8/Makefile
index 119e70caaa9f..b08fa57fbcff 100644
--- a/sysutils/beats8/Makefile
+++ b/sysutils/beats8/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.19.15
-PORTREVISION=	5
+DISTVERSION=	8.19.21
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 PKGNAMESUFFIX=	${DISTVERSION:R:R}
@@ -31,15 +30,13 @@ PORTSCOUT=	limit:^${DISTVERSION:R:R}\.
 
 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_MULTI=		BEATS
+OPTIONS_MULTI_BEATS=	AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
+BEATS_DESC=			Beats modules
 FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
@@ -71,6 +68,15 @@ LOCAL_MASTER_SITES=		LOCAL/vvd/elastic
 
 .include <bsd.port.options.mk>
 
+.ifmake makesum || makesum-fetch || makeplist || distclean
+.  for O in ${OPTIONS_MULTI_BEATS}
+.    if !${PORT_OPTIONS:M${O}}
+MASTER_SITES+=	${${O}_MASTER_SITES}
+DISTFILES+=	${${O}_DISTFILES}
+.    endif
+.  endfor
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${DISTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
 .for BEATMOD in ${GO_TARGET:S,^./,,g}
diff --git a/sysutils/beats8/distinfo b/sysutils/beats8/distinfo
index 3d303dbd94d5..24d149f85997 100644
--- a/sysutils/beats8/distinfo
+++ b/sysutils/beats8/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1779000000
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/go.mod) = 8354b497f56f672b71c1e5b9bc149a3f864e4bb81e833b815fbebe34771216d6
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/go.mod) = 30190
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/auditbeat-8.19.15-darwin-x86_64.tar.gz) = 47eceef9fa3c2311cf8aa1b9d435e1949640f4f5b5c9c1353aecca02dafcead7
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/auditbeat-8.19.15-darwin-x86_64.tar.gz) = 36238330
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/filebeat-8.19.15-darwin-x86_64.tar.gz) = f9c4a03883d19f197c0abf8b6d4e82c7c863ffed079cf8eac3621b1fadff0e38
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/filebeat-8.19.15-darwin-x86_64.tar.gz) = 56327577
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/heartbeat-8.19.15-darwin-x86_64.tar.gz) = 8286f6902d964e7ebf48e33706372a7292e4683a6c2c53e1f762d55bff4d0ba7
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/heartbeat-8.19.15-darwin-x86_64.tar.gz) = 36075186
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/metricbeat-8.19.15-darwin-x86_64.tar.gz) = 41a9d8400291df37ce96c8a212451f29200ef563133ad598372391a55a6ce83c
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/metricbeat-8.19.15-darwin-x86_64.tar.gz) = 60016295
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/packetbeat-8.19.15-darwin-x86_64.tar.gz) = 0374ca2e396ece60b29db1ceb70cc4bb769d35da699ed24101a7549b192f38bb
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/packetbeat-8.19.15-darwin-x86_64.tar.gz) = 37236374
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/elastic-beats-v8.19.15_GH0.tar.gz) = 62f6a50f302b2ff740f70083219232b779d055d9b9417d2df24a788dc58723fd
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.15_GH0/elastic-beats-v8.19.15_GH0.tar.gz) = 104333483
+TIMESTAMP = 1790000000
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/go.mod) = f265b7d69aa23624376c75aec78fa9afb0bdd51eeedad7addf614cc7a97374c7
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/go.mod) = 30636
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/auditbeat-8.19.21-darwin-x86_64.tar.gz) = 500a429568b141e014948d6048006c1ebe85e634e1b40092cc4575827d1e8c3f
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/auditbeat-8.19.21-darwin-x86_64.tar.gz) = 36209518
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/filebeat-8.19.21-darwin-x86_64.tar.gz) = 55d44d656de984fbe1022c5b1d6f3cf6584afaedc9f07aaffe22d1df4e288286
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/filebeat-8.19.21-darwin-x86_64.tar.gz) = 57228275
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/heartbeat-8.19.21-darwin-x86_64.tar.gz) = 8fda7f7824cebccd0cc75572aca0c6d9f3094027e5683b96167182ed3eb5c8a8
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/heartbeat-8.19.21-darwin-x86_64.tar.gz) = 35832209
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/metricbeat-8.19.21-darwin-x86_64.tar.gz) = 9e99b46c77a7740862c4e1d4b6db2b26c74e89bc6a0c1bd331691543b4b12f98
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/metricbeat-8.19.21-darwin-x86_64.tar.gz) = 61162958
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/packetbeat-8.19.21-darwin-x86_64.tar.gz) = 76801d6eb9abbe7d6a03dd429786d30ffb0e49f35a6358f397648952246bcce9
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/packetbeat-8.19.21-darwin-x86_64.tar.gz) = 37246555
+SHA256 (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/elastic-beats-v8.19.21_GH0.tar.gz) = 9fe3998712bfeac6ab12e040485d3c23e80c4af0facd4c3861cab87f689bac5e
+SIZE (go/sysutils_beats8/elastic-beats-v8.19.21_GH0/elastic-beats-v8.19.21_GH0.tar.gz) = 104588940
diff --git a/sysutils/beats8/files/patch-dev-tools_mage_settings.go b/sysutils/beats8/files/patch-dev-tools_mage_settings.go
index fff0c065e200..c9b4cb2a0446 100644
--- a/sysutils/beats8/files/patch-dev-tools_mage_settings.go
+++ b/sysutils/beats8/files/patch-dev-tools_mage_settings.go
@@ -1,6 +1,6 @@
---- dev-tools/mage/settings.go.orig	2025-09-15 19:57:17 UTC
+--- dev-tools/mage/settings.go.orig	2026-08-26 15:33:57 UTC
 +++ dev-tools/mage/settings.go
-@@ -31,7 +31,6 @@ import (
+@@ -32,7 +32,6 @@ import (
  	"sync"
  	"time"
  
@@ -8,7 +8,7 @@
  	"golang.org/x/text/cases"
  	"golang.org/x/text/language"
  	"gopkg.in/yaml.v3"
-@@ -282,7 +281,8 @@ func CommitHash() (string, error) {
+@@ -280,7 +279,8 @@ func CommitHash() (string, error) {
  func CommitHash() (string, error) {
  	var err error
  	commitHashOnce.Do(func() {
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 1ba78ac9207b..503c5f1db88d 100644
--- a/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_docker.go
+++ b/sysutils/beats8/files/patch-libbeat_autodiscover_providers_docker_docker.go
@@ -1,4 +1,4 @@
---- libbeat/autodiscover/providers/docker/docker.go.orig	2025-09-15 19:57:17 UTC
+--- libbeat/autodiscover/providers/docker/docker.go.orig	2026-08-26 15:33:57 UTC
 +++ libbeat/autodiscover/providers/docker/docker.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
@@ -9,12 +9,12 @@
  
  package docker
  
-@@ -32,7 +32,7 @@ import (
+@@ -33,7 +33,7 @@ import (
  	"github.com/elastic/beats/v7/libbeat/common"
  
- 	"github.com/elastic/elastic-agent-autodiscover/bus"
--	"github.com/elastic/elastic-agent-autodiscover/docker"
-+	docker "github.com/elastic/elastic-agent-autodiscover/docker"
- 	"github.com/elastic/elastic-agent-autodiscover/utils"
+ 	"github.com/elastic/beats/v7/pkg/autodiscover/bus"
+-	"github.com/elastic/beats/v7/pkg/autodiscover/docker"
++	docker "github.com/elastic/beats/v7/pkg/autodiscover/docker"
+ 	"github.com/elastic/beats/v7/pkg/autodiscover/utils"
  	"github.com/elastic/elastic-agent-libs/config"
  	"github.com/elastic/elastic-agent-libs/keystore"
diff --git a/sysutils/beats8/files/patch-metricbeat_module_docker_docker.go b/sysutils/beats8/files/patch-metricbeat_module_docker_docker.go
new file mode 100644
index 000000000000..2c3a5ee30d0c
--- /dev/null
+++ b/sysutils/beats8/files/patch-metricbeat_module_docker_docker.go
@@ -0,0 +1,11 @@
+--- metricbeat/module/docker/docker.go.orig	2026-08-26 15:33:57 UTC
++++ metricbeat/module/docker/docker.go
+@@ -15,7 +15,7 @@
+ // specific language governing permissions and limitations
+ // under the License.
+ 
+-//go:build linux || darwin || windows
++//go:build linux || darwin || windows || freebsd
+ 
+ package docker
+ 
diff --git a/sysutils/beats8/files/patch-pkg_autodiscover_docker_client.go b/sysutils/beats8/files/patch-pkg_autodiscover_docker_client.go
new file mode 100644
index 000000000000..dfeeb9fce2fa
--- /dev/null
+++ b/sysutils/beats8/files/patch-pkg_autodiscover_docker_client.go
@@ -0,0 +1,11 @@
+--- pkg/autodiscover/docker/client.go.orig	2026-08-26 15:33:57 UTC
++++ pkg/autodiscover/docker/client.go
+@@ -15,7 +15,7 @@
+ // specific language governing permissions and limitations
+ // under the License.
+ 
+-//go:build linux || darwin || windows
++//go:build linux || darwin || windows || freebsd
+ 
+ package docker
+ 
diff --git a/sysutils/beats8/files/patch-pkg_autodiscover_docker_client__test.go b/sysutils/beats8/files/patch-pkg_autodiscover_docker_client__test.go
new file mode 100644
index 000000000000..9693ca69512c
--- /dev/null
+++ b/sysutils/beats8/files/patch-pkg_autodiscover_docker_client__test.go
@@ -0,0 +1,11 @@
+--- pkg/autodiscover/docker/client_test.go.orig	2026-08-26 15:33:57 UTC
++++ pkg/autodiscover/docker/client_test.go
+@@ -15,7 +15,7 @@
+ // specific language governing permissions and limitations
+ // under the License.
+ 
+-//go:build integration && (linux || darwin || windows)
++//go:build integration && (linux || darwin || windows || freebsd)
+ 
+ package docker
+ 
diff --git a/sysutils/beats8/files/patch-pkg_autodiscover_docker_watcher.go b/sysutils/beats8/files/patch-pkg_autodiscover_docker_watcher.go
new file mode 100644
index 000000000000..187ec2724eaf
--- /dev/null
+++ b/sysutils/beats8/files/patch-pkg_autodiscover_docker_watcher.go
@@ -0,0 +1,11 @@
+--- pkg/autodiscover/docker/watcher.go.orig	2026-08-26 15:33:57 UTC
++++ pkg/autodiscover/docker/watcher.go
+@@ -15,7 +15,7 @@
+ // specific language governing permissions and limitations
+ // under the License.
+ 
+-//go:build linux || darwin || windows
++//go:build linux || darwin || windows || freebsd
+ 
+ package docker
+ 
diff --git a/sysutils/beats8/files/patch-pkg_autodiscover_docker_watcher__test.go b/sysutils/beats8/files/patch-pkg_autodiscover_docker_watcher__test.go
new file mode 100644
index 000000000000..05d4ff058d3d
--- /dev/null
+++ b/sysutils/beats8/files/patch-pkg_autodiscover_docker_watcher__test.go
@@ -0,0 +1,11 @@
+--- pkg/autodiscover/docker/watcher_test.go.orig	2026-08-26 15:33:57 UTC
++++ pkg/autodiscover/docker/watcher_test.go
+@@ -15,7 +15,7 @@
+ // specific language governing permissions and limitations
+ // under the License.
+ 
+-//go:build linux || darwin || windows
++//go:build linux || darwin || windows || freebsd
+ 
+ package docker
+ 
diff --git a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
deleted file mode 100644
index 4c27b7b7445b..000000000000
--- a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
+++ /dev/null
@@ -1,13 +0,0 @@
---- vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go.orig	2022-11-25 21:51:45 UTC
-+++ vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go
-@@ -15,8 +15,8 @@
- // specific language governing permissions and limitations
- // under the License.
- 
--//go:build linux || darwin || windows
--// +build linux darwin windows
-+//go:build linux || darwin || windows || freebsd
-+// +build linux darwin windows freebsd
- 
- package docker
- 
diff --git a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
deleted file mode 100644
index b3eb5109493f..000000000000
--- a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
+++ /dev/null
@@ -1,13 +0,0 @@
---- vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go.orig	2022-11-25 21:51:52 UTC
-+++ vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go
-@@ -15,8 +15,8 @@
- // specific language governing permissions and limitations
- // under the License.
- 
--//go:build linux || darwin || windows
--// +build linux darwin windows
-+//go:build linux || darwin || windows || freebsd
-+// +build linux darwin windows freebsd
- 
- package docker
- 
diff --git a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-libs_monitoring_metrics.go b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-libs_monitoring_metrics.go
deleted file mode 100644
index 65575447c4f8..000000000000
--- a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-libs_monitoring_metrics.go
+++ /dev/null
@@ -1,16 +0,0 @@
---- vendor/github.com/elastic/elastic-agent-libs/monitoring/metrics.go.orig	2026-04-16 18:36:25 UTC
-+++ vendor/github.com/elastic/elastic-agent-libs/monitoring/metrics.go
-@@ -296,7 +296,12 @@ func NewFunc(r *Registry, name string, f func(Mode, Vi
- 	return v
- }
- 
--func (f *Func) Visit(m Mode, vs Visitor) { f.f(m, vs) }
-+func (f *Func) Visit(m Mode, vs Visitor) {
-+	if f == nil || f.f == nil {
-+		return
-+	}
-+	f.f(m, vs)
-+}
- 
- func (m makeExpvar) String() string { return m() }
- 
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 287667e0d23a..cfb62bb61760 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,6 +1,6 @@
---- 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.orig	2026-09-21 20:37:49 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go
-@@ -32,7 +32,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
+@@ -31,7 +31,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
  func Get(m *Monitor) (CPUMetrics, error) {
  	procfs := m.Hostfs
  
@@ -9,7 +9,7 @@
  	fd, err := os.Open(path)
  	defer func() {
  		_ = fd.Close()
-@@ -46,7 +46,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
+@@ -45,7 +45,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_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
index 26fa875e63eb..f727a2a15315 100644
--- a/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
+++ b/sysutils/beats8/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
@@ -1,11 +1,11 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go.orig	2022-11-25 22:00:53 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go.orig	2026-09-21 00:00:00 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go
 @@ -37,9 +37,9 @@ func (fs *FSStat) GetUsage() error {
- 
- 	fs.Total = opt.UintWith(stat.Blocks).MultUint64OrNone(uint64(stat.Bsize))
- 	fs.Free = opt.UintWith(stat.Bfree).MultUint64OrNone(uint64(stat.Bsize))
--	fs.Avail = opt.UintWith(stat.Bavail).MultUint64OrNone(uint64(stat.Bsize))
-+	fs.Avail = opt.UintWith(uint64(stat.Bavail)).MultUint64OrNone(uint64(stat.Bsize))
+ 	blockSize := uint64(stat.Bsize) //nolint:gosec,nolintlint // G115 — statfs block size is non-negative
+ 	fs.Total = opt.UintWith(stat.Blocks).MultUint64OrNone(blockSize)
+ 	fs.Free = opt.UintWith(stat.Bfree).MultUint64OrNone(blockSize)
+-	fs.Avail = opt.UintWith(stat.Bavail).MultUint64OrNone(blockSize)
++	fs.Avail = opt.UintWith(uint64(stat.Bavail)).MultUint64OrNone(blockSize)
  	fs.Files = opt.UintWith(stat.Files)
 -	fs.FreeFiles = opt.UintWith(stat.Ffree)
 +	fs.FreeFiles = opt.UintWith(uint64(stat.Ffree))
diff --git a/sysutils/beats8/files/patch-vendor_modules.txt b/sysutils/beats8/files/patch-vendor_modules.txt
index b7a9b36c8f7e..bfc112b19861 100644
--- a/sysutils/beats8/files/patch-vendor_modules.txt
+++ b/sysutils/beats8/files/patch-vendor_modules.txt
@@ -1,6 +1,6 @@
---- vendor/modules.txt.orig	2026-03-16 00:00:00 UTC
+--- vendor/modules.txt.orig	2026-09-21 20:38:20 UTC
 +++ vendor/modules.txt
-@@ -2005,6 +2005,7 @@ github.com/elastic/go-sysinfo/providers/darwin
+@@ -1983,6 +1983,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