"report.sh" Do more things with awk

Conflicts:
	bsp/default/root_file_system/etc/report.sh
This commit is contained in:
Marc René Schädler 2013-11-15 11:20:12 +01:00
parent 7dec4ad686
commit 556b5d7b93

View File

@ -16,13 +16,13 @@ get_clients() {
local COUNT=0 local COUNT=0
local DEVNUMBER= local DEVNUMBER=
DEVNUMBER=$(brctl showstp br-mesh |\ DEVNUMBER=$(brctl showstp br-mesh |\
grep -e "^wlan0 " |\ awk '/^wlan0 / { gsub("[()]", "", $2); printf $2; exit}')
cut -d" " -f2- | tr -d "()")
if [ -n "$DEVNUMBER" ]; then if [ -n "$DEVNUMBER" ]; then
COUNT=$(brctl showmacs br-mesh |\ COUNT=$(brctl showmacs br-mesh |\
sed 's/[ \t]\+/ /g' |\ awk -v number=$DEVNUMBER '
grep -o -E "^ $DEVNUMBER [^ ]+ no" |\ BEGIN {count=0}
wc -l) {if ($1 == number && $3 == "no") count++}
END {print count}')
fi fi
echo $COUNT echo $COUNT
} }
@ -119,9 +119,9 @@ report() {
echo ",\"system\":{" echo ",\"system\":{"
local MODEL=$(uci get board.model.name) local MODEL=$(uci get board.model.name)
local CPU=$(cat /proc/cpuinfo |\ local CPU=$(cat /proc/cpuinfo |\
awk -F': ' '/^cpu model/ { print $2 }') awk -F': ' '/^cpu model/ { print $2; exit}')
local MEMORY=$(cat /proc/meminfo |\ local MEMORY=$(cat /proc/meminfo |\
awk -F" " '/^MemTotal:/ {print $2}') awk -F" " '/^MemTotal:/ {print $2; exit}')
local FIRMWARE=$(cat /etc/*release |\ local FIRMWARE=$(cat /etc/*release |\
grep "^FIRMWARE_VERSION=" |\ grep "^FIRMWARE_VERSION=" |\
cut -d= -f2 |\ cut -d= -f2 |\
@ -160,13 +160,15 @@ report() {
echo ",\"load\":{" echo ",\"load\":{"
local UPTIME=$(cat /proc/uptime | cut -d" " -f1) local UPTIME=$(cat /proc/uptime | cut -d" " -f1)
local CPU_LOAD=$(cat /proc/loadavg | cut -d" " -f2) local CPU_LOAD=$(cat /proc/loadavg | cut -d" " -f2)
local MEMORY_FREE=$(cat /proc/meminfo |\ local MEMORY_LOAD=$(cat /proc/meminfo |\
awk '/^MemFree:/ {print $2}') awk '
local MEMORY_BUFFERS=$(cat /proc/meminfo |\ /^MemTotal:/ {total=$2}
awk '/^Buffers:/ {print $2}') /^MemFree:/ {free=$2}
local MEMORY_LOAD=$(echo $MEMORY $MEMORY_FREE $MEMORY_BUFFERS |\ /^Buffers:/ {buffers=$2}
awk '{printf "%.2f",(($1-$2-$3)/$1)}') /^Cached:/ {cached=$2; exit}
local TRAFFIC_MESH= END {printf "%.2f",(free+buffers+cached)/total}
')
local TRAFFIC_MESH=
local TRAFFIC_WAN= local TRAFFIC_WAN=
if [ -f '/var/statistics/traffic' ]; then if [ -f '/var/statistics/traffic' ]; then
TRAFFIC_MESH=$(cat /var/statistics/traffic |\ TRAFFIC_MESH=$(cat /var/statistics/traffic |\