From 8a81b6b0577691b3ec0a4153a4e7a114471b3df9 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 28 Dec 2016 00:32:32 -0800 Subject: [PATCH] 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) --- cluster/log-dump.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cluster/log-dump.sh b/cluster/log-dump.sh index 7b93706b2dc..aea37ff9f9d 100755 --- a/cluster/log-dump.sh +++ b/cluster/log-dump.sh @@ -43,6 +43,7 @@ readonly gce_logfiles="startupscript" readonly kern_logfile="kern" readonly initd_logfiles="docker" 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 # file descriptors for large clusters. @@ -133,13 +134,16 @@ function save-logs() { ;; esac fi + local -r services=( ${systemd_services} ${LOG_DUMP_SAVE_SERVICES:-} ) 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-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 + + for svc in "${services[@]}"; do + log-dump-ssh "${node_name}" "sudo journalctl --output=cat -u ${svc}.service" > "${dir}/${svc}.log" || true + done else files="${kern_logfile} ${files} ${initd_logfiles} ${supervisord_logfiles}" fi