Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move supportconfig to scc folder instead logs #116

Merged
merged 2 commits into from
Jun 18, 2024
Merged

move supportconfig to scc folder instead logs #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd34eb
build: bump buildx v0.14.1
Vicente-Cheng Jun 13, 2024
416670a
harvester-collector: move supportconfig to scc folder instead logs
Vicente-Cheng Jun 13, 2024
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
6 changes: 3 additions & 3 deletions Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ RUN zypper -n install ca-certificates awk lsb-release rsync docker containerd
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)/bin" v1.55.2;

# The docker version in dapper is too old to have buildx. Install it manually.
RUN curl -sSfL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} -o buildx-v0.13.1.linux-${ARCH} && \
chmod +x buildx-v0.13.1.linux-${ARCH} && \
mv buildx-v0.13.1.linux-${ARCH} /usr/local/bin/buildx
RUN curl -sSfL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-${ARCH} -o buildx-v0.14.1.linux-${ARCH} && \
chmod +x buildx-v0.14.1.linux-${ARCH} && \
mv buildx-v0.14.1.linux-${ARCH} /usr/local/bin/buildx

# -- for dapper
ENV DAPPER_RUN_ARGS --privileged --network host -v /run/containerd/containerd.sock:/run/containerd/containerd.sock
Expand Down
11 changes: 8 additions & 3 deletions hack/collector-harvester
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,18 @@ collect_etc ${BUNDLE_DIR}/configs/etc
###############################################################################
# collect logs
###############################################################################
mkdir -p logs
cd logs
mkdir -p scc

# Generate supportconfig from node
chroot $HOST_PATH /sbin/supportconfig -c -m -B supportconfig_$SUPPORT_BUNDLE_NODE_NAME \
-i BOOT,DAEMONS,ETC,ISCSI,MEM,MOD,NTP,SMART,DISK,pharvester_plugin_rke2,pharvester_plugin_console
mv $HOST_PATH/var/log/scc_supportconfig_$SUPPORT_BUNDLE_NODE_NAME.txz .
mv $HOST_PATH/var/log/scc_supportconfig_$SUPPORT_BUNDLE_NODE_NAME.txz ./scc

###############################################################################
# collect logs
###############################################################################
mkdir -p logs
cd logs

chroot $HOST_PATH /usr/bin/journalctl -k > kernel.log
# also collect logs of previous two boots
Expand Down