Skip to content

Commit ba47ab3

Browse files
Alex-DaiAlex-Dai
authored
Merge pull request sonic-net#193 from Alex-Dai/201811_cel_dev
201811 cel dev
2 parents 1c32ec6 + 1f405fb commit ba47ab3

File tree

5 files changed

+166
-4
lines changed

5 files changed

+166
-4
lines changed

‎build_debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
175175
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
176176
"deb [arch=amd64] https://download.docker.com/linux/debian stretch stable"
177177
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
178-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
178+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
179179
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
180180

181181
## Add docker config drop-in to select aufs, otherwise it may select other storage driver

‎files/build_templates/sonic_debian_extension.j2

+4-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,10 @@ sudo cp $IMAGE_CONFIGS/poap/poap.service $FILESYSTEM_ROOT/etc/systemd/system/
152152
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable poap.service
153153

154154
# Copy diag_app configuration files and templates
155-
sudo cp $IMAGE_CONFIGS/diag_app/Ali_Diag_V2.0.4.deb $FILESYSTEM_ROOT/home/
155+
sudo cp $IMAGE_CONFIGS/diag_app/Ali_Diag_V2.0.6.deb $FILESYSTEM_ROOT/home/
156+
157+
# Copy logCollect.sh
158+
sudo cp $IMAGE_CONFIGS/diag_app/logCollect.sh $FILESYSTEM_ROOT/usr/bin/
156159

157160
# Copy port_led configuration files and templates
158161
sudo cp $IMAGE_CONFIGS/port_led/port-led $FILESYSTEM_ROOT/usr/bin/

‎files/image_config/diag_app/Ali_Diag_V2.0.6.deb

79.2 MB
Binary file not shown.

‎files/image_config/diag_app/logCollect.sh

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
#!/bin/bash
2+
3+
rmalogpath="/tmp/logAll"
4+
bmclogdir="/tmp/bmcLogAll"
5+
soniclogdir="/tmp/sonicLogAll"
6+
7+
bmcloglist=("/var/log/syslog"
8+
"/var/log/syslog.1"
9+
'/var/log/syslog.[2-9].gz'
10+
"/var/log/console_syslog.log"
11+
"/var/log/console_syslog.log.1"
12+
"/var/log/console_syslog.log.[2-9].gz"
13+
"/var/log/cpumon.log"
14+
"/var/log/fand.log"
15+
"/var/log/dcdcmon.log"
16+
"/var/log/powermon.log"
17+
"/mnt/data/autodump.tar.gz"
18+
"/var/log/autodump/autodump.tar.gz")
19+
20+
sonicloglist=("/var/log/syslog"
21+
"/var/log/syslog.1"
22+
'/var/log/syslog.[2-19].gz'
23+
"/var/log/swss/sairedis.rec"
24+
"/var/log/swss/sairedis.rec.1"
25+
"/var/log/swss/sairedis.rec.[2-19].gz"
26+
"/var/log/swss/swss.rec"
27+
"/var/log/swss/swss.rec.1"
28+
"/var/log/swss/swss.rec.[2-19].gz"
29+
"/var/log/bmc/bmc_console.log"
30+
"/var/log/bmc_feed_watchdog.log"
31+
"/var/log/kern.*")
32+
33+
bmcloglistN=()
34+
sonicloglistN=()
35+
36+
37+
arrayExtend(){
38+
#echo "bmc srcArr is: ${bmcloglist[@]}"
39+
for (( i = 0 ; i < ${#bmcloglist[@]} ; i++ ))
40+
do
41+
#echo "${bmcloglist[$i]}"
42+
str=`echo "${bmcloglist[$i]}" | grep -oE "[0-9]+\-[0-9]+"`
43+
if [ $str ]; then
44+
a=`echo $str |cut -d "-" -f1`
45+
b=`echo $str |cut -d "-" -f2`
46+
for((j=$a;j<=$b;j++)){
47+
bmcloglistN[${#bmcloglistN[*]}]=`echo "${bmcloglist[$i]}" | sed -r "s/\[[0-9]+\-[0-9]+\]/$j/"`
48+
}
49+
else
50+
bmcloglistN[${#bmcloglistN[*]}]=${bmcloglist[$i]}
51+
fi
52+
done
53+
#echo ${bmcloglistN[*]}
54+
55+
#echo "sonic srcArr is: ${sonicloglist[@]}"
56+
for (( i = 0 ; i < ${#sonicloglist[@]} ; i++ ))
57+
do
58+
#echo "${sonicloglist[$i]}"
59+
str=`echo "${sonicloglist[$i]}" | grep -oE "[0-9]+\-[0-9]+"`
60+
if [ $str ]; then
61+
a=`echo $str |cut -d "-" -f1`
62+
b=`echo $str |cut -d "-" -f2`
63+
for((j=$a;j<=$b;j++)){
64+
sonicloglistN[${#sonicloglistN[*]}]=`echo "${sonicloglist[$i]}" | sed -r "s/\[[0-9]+\-[0-9]+\]/$j/"`
65+
}
66+
else
67+
sonicloglistN[${#sonicloglistN[*]}]=${sonicloglist[$i]}
68+
fi
69+
done
70+
#echo ${sonicloglistN[*]}
71+
}
72+
73+
scpFileFromBmc(){
74+
expect -c "
75+
#spawn scp -r [email protected]:$1 $2
76+
spawn sudo scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null [email protected]:$1 $2
77+
expect {
78+
\"*assword\" { set timeout 300; send \"0penBmc\r\"; exp_continue; }
79+
\"yes/no\" { send \"yes\r\"; }
80+
}"
81+
}
82+
83+
bmcLogCollect(){
84+
echo "BMC log collect ..."
85+
86+
if [ -d $bmclogdir ]; then
87+
rm -rf $bmclogdir
88+
fi
89+
mkdir -p $bmclogdir
90+
91+
for file in ${bmcloglistN[@]}
92+
do
93+
#echo "$file"
94+
scpFileFromBmc $file $bmclogdir
95+
done
96+
}
97+
98+
sonicLogCollect(){
99+
echo "SONiC log collect ..."
100+
101+
if [ -d $soniclogdir ]; then
102+
rm -rf $soniclogdir
103+
fi
104+
mkdir -p $soniclogdir
105+
106+
for file in ${sonicloglistN[@]}
107+
do
108+
if [ -f $file ]; then
109+
#echo "$file"
110+
cp $file $soniclogdir
111+
fi
112+
done
113+
}
114+
115+
checkfile(){
116+
echo "BMC log file check exist test ..."
117+
for file in ${bmcloglist[@]}
118+
do
119+
echo $file
120+
if ssh [email protected] test -e $file; then
121+
echo "$file exist"
122+
fi
123+
done
124+
125+
}
126+
127+
128+
arrayExtend
129+
echo "bmcloglist:"
130+
for line in ${bmcloglistN[*]}; do
131+
echo $line
132+
done
133+
134+
echo ""
135+
echo "sonicloglist:"
136+
for line in ${sonicloglistN[*]}; do
137+
echo $line
138+
done
139+
140+
141+
bmcLogCollect
142+
sonicLogCollect
143+
144+
rmalogdir=`echo $rmalogpath | awk -F "/" '{print $NF}'`
145+
146+
if [ -d $rmalogpath ]; then
147+
rm -rf $rmalogpath
148+
fi
149+
150+
if [ -f $rmalogpath.tar.gz ]; then
151+
rm -rf $rmalogpath.tar.gz
152+
fi
153+
154+
mkdir -p $rmalogpath
155+
mv $bmclogdir $rmalogpath
156+
mv $soniclogdir $rmalogpath
157+
158+
cd /tmp
159+
tar -zcf $rmalogdir.tar.gz $rmalogdir
160+
rm -rf $rmalogpath

‎files/image_config/platform/rc.local

+1-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ update_mgmt_interface_macaddr() {
9090

9191
diag_install() {
9292
echo "Diag install start ..."
93-
sleep 200
94-
dpkg -i /home/Ali_Diag_V2.0.4.deb
93+
dpkg -i /home/Ali_Diag_V2.0.6.deb
9594
}
9695

9796
boot_action() {

0 commit comments

Comments
 (0)