Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/kindling-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kindling-front-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/metadata-provider-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
8 changes: 7 additions & 1 deletion collector/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
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/
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
Expand Down
5 changes: 5 additions & 0 deletions collector/docker/DockerfileLocalProbe
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
10 changes: 4 additions & 6 deletions deploy/recompile-probe/recompile-module.sh
Original file line number Diff line number Diff line change
@@ -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 <<EOF > 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 .
1 change: 1 addition & 0 deletions probe/src/cgo/kindling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading