Add Docker tracing based on its socket and containerd logging (awslab…

…s#619) * Add Docker tracing based on its socket and containerd logging * Fixing a typo jouralctl Co-authored-by: Naeil Ezzoueidi <[email protected]>
pbsc · Feb 25, 2021 · db28da1 · db28da1
1 parent 5993244
commit db28da1
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/log-collector-script/linux/eks-log-collector.sh b/log-collector-script/linux/eks-log-collector.sh
@@ -54,6 +54,7 @@ COMMON_DIRECTORIES=(
   kernel
   system
   docker
+  containerd
   storage
   var_log
   networking
@@ -190,7 +191,7 @@ create_directories() {
 
 get_instance_id() {
   INSTANCE_ID_FILE="/var/lib/cloud/data/instance-id"
-  
+
   if grep -q '^i-' "$INSTANCE_ID_FILE"; then
     cp ${INSTANCE_ID_FILE} "${COLLECT_DIR}"/system/instance-id.txt
     readonly INSTANCE_ID=$(cat "${COLLECT_DIR}"/system/instance-id.txt)
@@ -249,6 +250,7 @@ collect() {
   get_iptables_info
   get_pkglist
   get_system_services
+  get_containerd_info
   get_docker_info
   get_k8s_info
   get_ipamd_info
@@ -533,6 +535,19 @@ get_system_services() {
   ok
 }
 
+get_containerd_info() {
+    try "Collect Containerd daemon information"
+
+    if [[ "$(pgrep -o containerd)" -ne 0 ]]; then
+        timeout 75 containerd config dump > "${COLLECT_DIR}"/containerd/containerd-config.txt 2>&1 || echo -e "\tTimed out, ignoring \"containerd info output \" "
+        timeout 75 journalctl -u containerd > "${COLLECT_DIR}"/containerd/containerd-log.txt 2>&1 || echo -e "\tTimed out, ignoring \"containerd info output \" "
+    else
+        warning "The Containerd daemon is not running."
+    fi
+
+   ok
+}
+
 get_docker_info() {
   try "collect Docker daemon information"
 
@@ -541,6 +556,7 @@ get_docker_info() {
     timeout 75 docker ps --all --no-trunc > "${COLLECT_DIR}"/docker/docker-ps.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker ps --all --no-truc output \" "
     timeout 75 docker images > "${COLLECT_DIR}"/docker/docker-images.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker images output \" "
     timeout 75 docker version > "${COLLECT_DIR}"/docker/docker-version.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker version output \" "
+    timeout 75 curl --unix-socket /var/run/docker.sock http://./debug/pprof/goroutine\?debug\=2 > "${COLLECT_DIR}"/docker/docker-trace.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker version output \" "
   else
     warning "The Docker daemon is not running."
   fi