Merging upstream version 1.34.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 0 deletions

diff --git a/collectors/ebpf.plugin/ebpf.d/network.conf b/collectors/ebpf.plugin/ebpf.d/network.conf
index e692622a9..d939d8e1f 100644
--- a/collectors/ebpf.plugin/ebpf.d/network.conf
+++ b/collectors/ebpf.plugin/ebpf.d/network.conf
@@ -14,6 +14,16 @@
 #  `ipv6 connection table size`: Maximum number of IPV6 connections monitored
 #  `udp connection table size`: Maximum number of UDP connections monitored
 #
+# The `ebpf type format` option accepts the following values :
+#  `auto`  : The eBPF collector will investigate hardware and select between the two next options.
+#  `legacy`: The eBPF collector will load the legacy code. Note: This has a bigger overload.
+#  `co-re` : The eBPF collector will use latest tracing method. Note: This is not available on all platforms.
+#
+# The `ebpf co-re tracing` option accepts the following values:
+#   `trampoline`: This is the default mode used by the eBPF collector, due the small overhead added to host.
+#   `tracepoint`: When available, the eBPF collector will use kernel tracepoint to monitor syscall.
+#   `probe`     : This is the same as legacy code.
+#
 [global]
 #    ebpf load mode = entry
 #    apps = yes
@@ -23,6 +33,8 @@
     ipv4 connection table size = 16384
     ipv6 connection table size = 16384
     udp connection table size = 4096
+    ebpf type format = auto
+    ebpf co-re tracing = trampoline
 
 #
 # Network Connection