mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #39268 from zmerlynn/log-dump-added-services
Automatic merge from submit-queue (batch tested with PRs 39266, 39268) cluster/log-dump.sh: Add a way to dump more journalctl services as well (And tiny refactor of the two generic ones we already dump) ```release-note NONE ```
This commit is contained in:
commit
d86e16a3bd
@ -43,6 +43,7 @@ readonly gce_logfiles="startupscript"
|
|||||||
readonly kern_logfile="kern"
|
readonly kern_logfile="kern"
|
||||||
readonly initd_logfiles="docker"
|
readonly initd_logfiles="docker"
|
||||||
readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr"
|
readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr"
|
||||||
|
readonly systemd_services="kubelet docker"
|
||||||
|
|
||||||
# Limit the number of concurrent node connections so that we don't run out of
|
# Limit the number of concurrent node connections so that we don't run out of
|
||||||
# file descriptors for large clusters.
|
# file descriptors for large clusters.
|
||||||
@ -133,13 +134,16 @@ function save-logs() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
local -r services=( ${systemd_services} ${LOG_DUMP_SAVE_SERVICES:-} )
|
||||||
|
|
||||||
if log-dump-ssh "${node_name}" "command -v journalctl" &> /dev/null; then
|
if log-dump-ssh "${node_name}" "command -v journalctl" &> /dev/null; then
|
||||||
log-dump-ssh "${node_name}" "sudo journalctl --output=short-precise -u kube-node-installation.service" > "${dir}/kube-node-installation.log" || true
|
log-dump-ssh "${node_name}" "sudo journalctl --output=short-precise -u kube-node-installation.service" > "${dir}/kube-node-installation.log" || true
|
||||||
log-dump-ssh "${node_name}" "sudo journalctl --output=short-precise -u kube-node-configuration.service" > "${dir}/kube-node-configuration.log" || true
|
log-dump-ssh "${node_name}" "sudo journalctl --output=short-precise -u kube-node-configuration.service" > "${dir}/kube-node-configuration.log" || true
|
||||||
log-dump-ssh "${node_name}" "sudo journalctl --output=cat -u kubelet.service" > "${dir}/kubelet.log" || true
|
|
||||||
log-dump-ssh "${node_name}" "sudo journalctl --output=cat -u docker.service" > "${dir}/docker.log" || true
|
|
||||||
log-dump-ssh "${node_name}" "sudo journalctl --output=short-precise -k" > "${dir}/kern.log" || true
|
log-dump-ssh "${node_name}" "sudo journalctl --output=short-precise -k" > "${dir}/kern.log" || true
|
||||||
|
|
||||||
|
for svc in "${services[@]}"; do
|
||||||
|
log-dump-ssh "${node_name}" "sudo journalctl --output=cat -u ${svc}.service" > "${dir}/${svc}.log" || true
|
||||||
|
done
|
||||||
else
|
else
|
||||||
files="${kern_logfile} ${files} ${initd_logfiles} ${supervisord_logfiles}"
|
files="${kern_logfile} ${files} ${initd_logfiles} ${supervisord_logfiles}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user