From 07212fb32b6956038c9119c3b8b413f2c5cd2d2d Mon Sep 17 00:00:00 2001 From: jiangyufang Date: Mon, 20 Jul 2026 15:37:03 +0800 Subject: [PATCH 1/6] update new agentlibs Signed-off-by: jiangyufang --- .gitmodules | 2 +- collector/docker/Dockerfile | 2 +- deploy/recompile-probe/recompile-module.sh | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 18ad8a026..12a4d3b04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "probe/libs/agent-libs"] path = probe/libs/agent-libs - url = https://github.com/KindlingProject/agent-libs.git + url = https://github.com/harmonycloud/agent-libs.git branch = kindling-dev diff --git a/collector/docker/Dockerfile b/collector/docker/Dockerfile index a091de8b1..96445c0c2 100644 --- a/collector/docker/Dockerfile +++ b/collector/docker/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app/ RUN yum install -y qt5-qtbase-devel RUN yum install -y gdb COPY gdb_print.sh /app/ -RUN curl https://k8s-bpf-probes-public.oss-cn-hangzhou.aliyuncs.com/kindling-falcolib-probe-latest.tar.gz -o kindling-falcolib-probe.tar.gz +RUN curl https://github.com/harmonycloud/agent-libs/releases/download/kindling-falcolib-probe-29721003629/kindling-falcolib-probe.tar.gz -o kindling-falcolib-probe.tar.gz COPY build-asyncprofiler.sh /app/ RUN sh build-asyncprofiler.sh diff --git a/deploy/recompile-probe/recompile-module.sh b/deploy/recompile-probe/recompile-module.sh index a9c42cdf8..e982d113e 100644 --- a/deploy/recompile-probe/recompile-module.sh +++ b/deploy/recompile-probe/recompile-module.sh @@ -1,15 +1,13 @@ -AGENT_LIBS_COMMIT_ID=5a0edd80166ea059336945a3771eb565885adf26 - mkdir -p rebuild-kindling-agent cd rebuild-kindling-agent -curl -O https://k8s-bpf-probes-public.oss-cn-hangzhou.aliyuncs.com/agent-libs-${AGENT_LIBS_COMMIT_ID}.tar.gz -tar -zvxf agent-libs-${AGENT_LIBS_COMMIT_ID}.tar.gz -cd agent-libs-${AGENT_LIBS_COMMIT_ID} +curl -O https://github.com/harmonycloud/agent-libs/archive/refs/tags/kindling-falcolib-probe-29721003629.tar.gz +tar -zvxf kindling-falcolib-probe-29721003629.tar.gz -C agent-libs +cd agent-libs docker pull kindlingproject/kernel-builder:latest docker run -it -v /usr:/host/usr -v /lib/modules:/host/lib/modules -v $PWD:/source kindlingproject/kernel-builder:latest cd .. cat < Dockerfile FROM kindlingproject/kindling-agent:latest -COPY ./agent-libs-${AGENT_LIBS_COMMIT_ID}/kindling-falcolib-probe/* /opt/kindling-extra-probe/ +COPY ./agent-libs/kindling-falcolib-probe/* /opt/kindling-extra-probe/ EOF docker build -t kindlingproject/kindling-agent:latest-bymyself . \ No newline at end of file From c27171d0f04a351b8d375e79e5408c9514c55254 Mon Sep 17 00:00:00 2001 From: jiangyufang Date: Mon, 20 Jul 2026 15:38:31 +0800 Subject: [PATCH 2/6] change kindling repository Signed-off-by: jiangyufang --- .github/workflows/kindling-ci.yaml | 2 +- .github/workflows/kindling-front-CI.yml | 2 +- .github/workflows/metadata-provider-ci.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kindling-ci.yaml b/.github/workflows/kindling-ci.yaml index 2a737f009..f719155b7 100644 --- a/.github/workflows/kindling-ci.yaml +++ b/.github/workflows/kindling-ci.yaml @@ -7,7 +7,7 @@ on: jobs: build-latest-test: - if: github.repository == 'KindlingProject/kindling' + if: github.repository == 'harmonycloud/kindling' runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/kindling-front-CI.yml b/.github/workflows/kindling-front-CI.yml index 929de36de..5823d8bd3 100644 --- a/.github/workflows/kindling-front-CI.yml +++ b/.github/workflows/kindling-front-CI.yml @@ -7,7 +7,7 @@ on: jobs: build-latest-test: - if: github.repository == 'KindlingProject/kindling' + if: github.repository == 'harmonycloud/kindling' runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/metadata-provider-ci.yml b/.github/workflows/metadata-provider-ci.yml index 4673f44e8..c242acc87 100644 --- a/.github/workflows/metadata-provider-ci.yml +++ b/.github/workflows/metadata-provider-ci.yml @@ -7,7 +7,7 @@ on: jobs: build-latest-test: - if: github.repository == 'KindlingProject/kindling' + if: github.repository == 'harmonycloud/kindling' runs-on: ubuntu-latest permissions: contents: write From 29e6e1004c40d45ce886fb910521252433d3d09a Mon Sep 17 00:00:00 2001 From: jiangyufang Date: Mon, 20 Jul 2026 15:40:37 +0800 Subject: [PATCH 3/6] change agentbuilder image tag Signed-off-by: jiangyufang --- .github/workflows/kindling-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kindling-ci.yaml b/.github/workflows/kindling-ci.yaml index f719155b7..fd4fae3e6 100644 --- a/.github/workflows/kindling-ci.yaml +++ b/.github/workflows/kindling-ci.yaml @@ -18,7 +18,7 @@ jobs: - name: build-by-builder-container uses: addnab/docker-run-action@v3 with: - image: kindlingproject/agent-builder:latest + image: kindlingproject/agent-builder:flamegraph-amd64 options: -v ${{ github.workspace }}:/kindling -w /kindling run: make - name: Login to DockerHub From 8230d51f7b049ff6aa2ce092a92efaa84b1b6349 Mon Sep 17 00:00:00 2001 From: jiangyufang Date: Mon, 20 Jul 2026 16:09:20 +0800 Subject: [PATCH 4/6] update agent-libs submodule Signed-off-by: jiangyufang --- probe/libs/agent-libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probe/libs/agent-libs b/probe/libs/agent-libs index 5a0edd801..820893a64 160000 --- a/probe/libs/agent-libs +++ b/probe/libs/agent-libs @@ -1 +1 @@ -Subproject commit 5a0edd80166ea059336945a3771eb565885adf26 +Subproject commit 820893a642180f673aa85b7e253e61d71ae7629e From d6a29c9b00da361be1ee4636f63ee76415987600 Mon Sep 17 00:00:00 2001 From: jiangyufang Date: Mon, 20 Jul 2026 16:27:07 +0800 Subject: [PATCH 5/6] replace centos repository Signed-off-by: jiangyufang --- collector/docker/Dockerfile | 6 ++++++ collector/docker/DockerfileLocalProbe | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/collector/docker/Dockerfile b/collector/docker/Dockerfile index 96445c0c2..aa12def3a 100644 --- a/collector/docker/Dockerfile +++ b/collector/docker/Dockerfile @@ -1,6 +1,12 @@ FROM centos:7 WORKDIR /app/ + +RUN sed -i 's|mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/CentOS-*.repo && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*.repo && \ + yum clean all && \ + yum makecache + RUN yum install -y qt5-qtbase-devel RUN yum install -y gdb COPY gdb_print.sh /app/ diff --git a/collector/docker/DockerfileLocalProbe b/collector/docker/DockerfileLocalProbe index 16d8cc51f..676483742 100644 --- a/collector/docker/DockerfileLocalProbe +++ b/collector/docker/DockerfileLocalProbe @@ -1,6 +1,11 @@ FROM centos:7 WORKDIR /app/ +RUN sed -i 's|mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/CentOS-*.repo && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*.repo && \ + yum clean all && \ + yum makecache + RUN yum install -y qt5-qtbase-devel RUN yum install -y gdb COPY gdb_print.sh /app/ From 569b11f7830a7cb7d6b78ec9f098916a19508aa6 Mon Sep 17 00:00:00 2001 From: jiangyufang Date: Tue, 21 Jul 2026 16:07:11 +0800 Subject: [PATCH 6/6] fix skip metric data Signed-off-by: jiangyufang --- probe/src/cgo/kindling.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/probe/src/cgo/kindling.cpp b/probe/src/cgo/kindling.cpp index b6ed9e346..cfa07ed6d 100644 --- a/probe/src/cgo/kindling.cpp +++ b/probe/src/cgo/kindling.cpp @@ -757,6 +757,7 @@ int is_normal_event(int res, sinsp_evt* s_evt, ppm_event_category* category) { return -1; } } + return 0; } int setTuple(kindling_event_t_for_go* p_kindling_event, const sinsp_evt_param* pTuple,