From 9f60251c3ac9fa1bc3ec33d77276688b5602cff1 Mon Sep 17 00:00:00 2001
From: Jiaxun Song <jiaxsong@microsoft.com>
Date: Tue, 15 Sep 2020 22:44:28 -0700
Subject: [PATCH] Filter container by "pause". Add container id as file
 identifier.

---
 diagnosis/collectlogs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/diagnosis/collectlogs.sh b/diagnosis/collectlogs.sh
index cc0df00..f1757a6 100755
--- a/diagnosis/collectlogs.sh
+++ b/diagnosis/collectlogs.sh
@@ -169,15 +169,15 @@ do
     if [ -z "${NAMESPACES}" ] || (echo $NAMESPACES | grep -qw $cns);
     then
         # Ignore the Pause container
-        if docker inspect --format='{{ .Config.Image }}' ${cid} | grep -q -v pause-amd64;
+        if docker inspect --format='{{ .Config.Image }}' ${cid} | grep -q -v pause;
         then
             pname=$(docker inspect --format='{{ index .Config.Labels "io.kubernetes.pod.name" }}' ${cid})
             cname=$(docker inspect --format='{{ index .Config.Labels "io.kubernetes.container.name" }}' ${cid})
             clog=$(docker inspect --format='{{ .LogPath }}' ${cid})
             
             collectContainerMetadata ${cid} ${pname} ${cname}
-            sudo docker inspect ${cid} &> ${LOGDIRECTORY}/containers/k8s-${pname}-${cname}.json
-            sudo cat $clog >> ${LOGDIRECTORY}/containers/k8s-${pname}-${cname}.log
+            sudo docker inspect ${cid} &> ${LOGDIRECTORY}/containers/k8s-${pname}-${cname}-${cid}.json
+            sudo cat $clog >> ${LOGDIRECTORY}/containers/k8s-${pname}-${cname}-${cid}.log
         fi
     fi
 done