From 96ba14e69d2439a905706b69dbf947dc74ee701d Mon Sep 17 00:00:00 2001 From: thiagoftsm Date: Wed, 3 Apr 2024 02:56:32 +0000 Subject: [PATCH 1/3] tgid2nv: Sync branches --- kernel-collector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel-collector b/kernel-collector index 1cd2e6b..0d1ad64 160000 --- a/kernel-collector +++ b/kernel-collector @@ -1 +1 @@ -Subproject commit 1cd2e6bd224fa3078fd1a4c2e3944789d046aafa +Subproject commit 0d1ad645dc665dcce5a50f90a9ba12db5837f7dd From dc09109d373bd3b87e49b9cf67b9662a147f70b7 Mon Sep 17 00:00:00 2001 From: thiagoftsm Date: Wed, 3 Apr 2024 03:00:29 +0000 Subject: [PATCH 2/3] tgid2nv: Add Task ID to create conditions to match charts that only use /proc --- src/networkviewer.bpf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/networkviewer.bpf.c b/src/networkviewer.bpf.c index 3ccc83d..dbb944d 100644 --- a/src/networkviewer.bpf.c +++ b/src/networkviewer.bpf.c @@ -144,6 +144,7 @@ static __always_inline void set_common_tcp_nv_data(netdata_nv_idx_t *idx, __u32 tgid = 0; data->pid = netdata_get_pid(&nv_ctrl, &tgid); + data->tgid = tgid; data->uid = bpf_get_current_uid_gid(); // Only update this data when it is a new value if (!data->ts) @@ -171,6 +172,7 @@ static __always_inline void set_common_udp_nv_data(netdata_nv_idx_t *idx, NETDATA_SOCKET_DIRECTION direction) { __u32 tgid = 0; data->pid = netdata_get_pid(&nv_ctrl, &tgid); + data->tgid = tgid; data->uid = bpf_get_current_uid_gid(); // Only update this data when it is a new value if (!data->ts) From 3b2f47d6d6ee59f1346f7085e31a58f0eed25ddf Mon Sep 17 00:00:00 2001 From: thiagoftsm Date: Thu, 2 May 2024 18:26:17 +0000 Subject: [PATCH 3/3] update_image: Update Ubuntu version --- Dockerfile.glibc.core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.glibc.core b/Dockerfile.glibc.core index e7f71c7..b7f873f 100644 --- a/Dockerfile.glibc.core +++ b/Dockerfile.glibc.core @@ -1,4 +1,4 @@ -FROM ubuntu:23.04 AS build +FROM ubuntu:24.04 AS build ARG ARCH=x86 ENV ARCH=$ARCH