From dc451b07c65527e1132b781ef942c95e7271f5eb Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Fri, 11 Oct 2019 22:57:14 +0800
Subject: [PATCH] Add containerd to collect tool

To support kata container, kubernetes is switched to use containerd
instead of docker. And containers run by containerd, cannot be listed
with docker cmd. crictl is used to list/show them.
"/var/run/containerd" is containerd's tmp directory for runtime. Exclude
it from collect to avoid run out of disk.

Story: 2006145
Task: 37013
Depends-On: https://review.opendev.org/685211
Change-Id: Ib25dc5d0780c3fe838c73a8b852a7f3adb656634
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
 tools/collector/scripts/collect_containerization.sh | 8 ++++++++
 tools/collector/scripts/run.exclude                 | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tools/collector/scripts/collect_containerization.sh b/tools/collector/scripts/collect_containerization.sh
index d2e5a924..a26fef15 100755
--- a/tools/collector/scripts/collect_containerization.sh
+++ b/tools/collector/scripts/collect_containerization.sh
@@ -29,10 +29,18 @@ CMD="docker image ls -a"
 delimiter ${LOGFILE} "${CMD}"
 ${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
 
+CMD="crictl images"
+delimiter ${LOGFILE} "${CMD}"
+${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
+
 CMD="docker container ps -a"
 delimiter ${LOGFILE} "${CMD}"
 ${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
 
+CMD="crictl ps -a"
+delimiter ${LOGFILE} "${CMD}"
+${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
+
 ###############################################################################
 # Active Controller
 ###############################################################################
diff --git a/tools/collector/scripts/run.exclude b/tools/collector/scripts/run.exclude
index b1c1794c..d3e6d8b9 100644
--- a/tools/collector/scripts/run.exclude
+++ b/tools/collector/scripts/run.exclude
@@ -10,3 +10,4 @@
 /var/run/avahi-daemon
 /var/run/neutron/metadata_proxy
 /var/run/.vswitch
+/var/run/containerd