webadmin/okaeri-timings
1
0
Fork 0
mirror of https://github.com/OkaeriPoland/okaeri-timings.git synced 2026-01-18 03:28:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include uptime and cpu sockets/cores/threads in the report meta

Browse Source
This commit is contained in:
Sandra
2022-02-08 17:06:00 +01:00
parent e666b2022d
commit 270467d686
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/public/otimings.sh
View File

@@ -17,12 +17,21 @@ print_metadata() {
provider=$(echo "$noproxyout" | grep -oP '"provider":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}') provider=$(echo "$noproxyout" | grep -oP '"provider":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}')
country=$(echo "$noproxyout" | grep -oP '"country":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}') country=$(echo "$noproxyout" | grep -oP '"country":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}')
cpuarch=$(lscpu | grep '^Architecture: ' | cut -d\ -f3- | awk '{$1=$1; print}')
cpumodel=$(lscpu | grep '^Model name: ' | cut -d\ -f3- | awk '{$1=$1; print}')
cputhreadspercore=$(lscpu | grep '^Thread(s) per core: ' | cut -d\ -f4- | awk '{$1=$1; print}')
cpucorespersocket=$(lscpu | grep '^Core(s) per socket: ' | cut -d\ -f4- | awk '{$1=$1; print}')
cpusockets=$(lscpu | grep '^Socket(s): ' | cut -d\ -f4- | awk '{$1=$1; print}')
echo "#" echo "#"
echo "# Okaeri Timings 1.0" echo "# Okaeri Timings 1.0"
echo "#" echo "#"
echo "# User: $(with_fallback "<Unknown>" $(whoami))" echo "# User: $(with_fallback "<Unknown>" $(whoami))"
echo "# Hostname: $(with_fallback "<Unknown>" $(hostname))" echo "# Hostname: $(with_fallback "<Unknown>" $(hostname))"
echo "#" echo "#"
echo "# Startup: $(with_fallback "<Unknown>" $(uptime -s))"
echo "# Uptime: $(with_fallback "<Unknown>" $(uptime -p))"
echo "#"
echo "# IP: $(with_fallback "<Unknown>" $ip)" echo "# IP: $(with_fallback "<Unknown>" $ip)"
echo "# ASN: $(with_fallback "<Unknown>" $asn)" echo "# ASN: $(with_fallback "<Unknown>" $asn)"
echo "# Provider: $(with_fallback "<Unknown>" $provider)" echo "# Provider: $(with_fallback "<Unknown>" $provider)"
@@ -31,8 +40,8 @@ print_metadata() {
echo "# Kernel: $(with_fallback "<Unknown>" $(uname -r))" echo "# Kernel: $(with_fallback "<Unknown>" $(uname -r))"
echo "# OS: $(with_fallback "<Unknown>" $(cat /etc/os-release | grep PRETTY_NAME | awk -F '"' '{print $2}'))" echo "# OS: $(with_fallback "<Unknown>" $(cat /etc/os-release | grep PRETTY_NAME | awk -F '"' '{print $2}'))"
echo "#" echo "#"
echo "# Arch: $(with_fallback "<Unknown>" $(lscpu | grep '^Architecture: ' | cut -d\ -f3- | awk '{$1=$1; print}'))" echo "# Arch: $(with_fallback "<Unknown>" $cpuarch)"
echo "# CPU: $(with_fallback "<Unknown>" $(lscpu | grep '^Model name: ' | cut -d\ -f3- | awk '{$1=$1; print}'))" echo "# CPU: $(with_fallback "<Unknown>" $cpumodel) [$(with_fallback "?" $cpusockets) x $(with_fallback "?" $cpucorespersocket) x $(with_fallback "?" $cputhreadspercore)]"
echo "#" echo "#"
echo "# Hypervisor: $(with_fallback "N/A" $(lscpu | grep '^Hypervisor vendor: ' | cut -d\ -f3- | awk '{$1=$1; print}'))" echo "# Hypervisor: $(with_fallback "N/A" $(lscpu | grep '^Hypervisor vendor: ' | cut -d\ -f3- | awk '{$1=$1; print}'))"
echo "# Virtualization: $(with_fallback "N/A" $(lscpu | grep '^Virtualization type: ' | cut -d\ -f3- | awk '{$1=$1; print}'))" echo "# Virtualization: $(with_fallback "N/A" $(lscpu | grep '^Virtualization type: ' | cut -d\ -f3- | awk '{$1=$1; print}'))"
@@ -119,4 +128,3 @@ else
echo "[$(date '+%Y/%m/%d %H:%M:%S')] Done!" echo "[$(date '+%Y/%m/%d %H:%M:%S')] Done!"
fi fi