Skip to content

Commit 7fc7501

Browse files
authored
don't check cpu where %cpu is not available for ps (#452)
1 parent d13091f commit 7fc7501

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

system-metrics-collector

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#
1616
# $ cat /tmp/system-metrics-collector
1717
#
18-
# Mon May 18 14:50:58 UTC 2020 | mem: 5.03%, disk: 47.75%
19-
# Mon May 18 14:51:28 UTC 2020 | mem: 5.03%, disk: 47.75%
18+
# Mon May 18 14:50:58 UTC 2020 | cpu: 6% , mem: 5.03% , system_disk 1% , docker_disk: 1% , shared_memory 1%
19+
# Mon May 18 14:51:28 UTC 2020 | cpu: 4% , mem: 5.03% , system_disk 1.9% , docker_disk: 11% , shared_memory 41%
2020
#
2121
# Jobs that run for an hour collect around 120 log lines. This should be safe
2222
# and not introduce any performance of disk usage problems.
@@ -31,7 +31,7 @@ while true; do
3131
SHARED_MEMORY=$(free -m | grep Mem | awk '{ print $5 }')
3232
SYSTEM_DISK=$(df "$SYSTEM_DISK_LOCATION" | sed 1d | awk '{ printf("%6.2f%%\n", ($3/$2 * 100.0)) }')
3333
DOCKER_DISK=$(df "$DOCKER_DISK_LOCATION" | sed 1d | awk '{ printf("%6.2f%%\n", ($3/$2 * 100.0)) }')
34-
CPU_USAGE=$(ps -A -o %cpu | awk '{s+=$1} END {print s "%"}')
34+
CPU_USAGE=$(ps L | grep -q '%cpu' && ps -A -o %cpu | awk '{s+=$1} END {print s "%"}')
3535
echo "$(date) | cpu:$CPU_USAGE, mem:$MEMORY, system_disk:$SYSTEM_DISK, docker_disk:$DOCKER_DISK, shared_memory: $SHARED_MEMORY M" >> $OUTPUT
3636
sleep 1
3737
done

0 commit comments

Comments
 (0)