diff --git a/scripts/os_stats b/scripts/os_stats index 8edce24..9483c11 100755 --- a/scripts/os_stats +++ b/scripts/os_stats @@ -46,6 +46,13 @@ then MINER_FAN_SPEED=$(cat /var/local/apollo/hwmon/fan_rpm) fi +#Network +ETH_IP=$(ip addr show eth0 | awk '/inet / {print $2}' | cut -d/ -f 1) +ETH_MAC=$(ip link show eth0 | awk '/ether/ {print $2}') +WLAN_IP=$(ip addr show wlan0 | awk '/inet / {print $2}' | cut -d/ -f 1) +WLAN_MAC=$(ip link show wlan0 | awk '/ether/ {print $2}') + + # Memory memTotal=$(egrep '^MemTotal:' /proc/meminfo | awk '{print $2}') memFree=$(egrep '^MemFree:' /proc/meminfo | awk '{print $2}') @@ -77,6 +84,15 @@ JSON="{ \"minerTemperature\": \"$MINER_TEMP\", \"minerFanSpeed\": \"$MINER_FAN_SPEED\", \"activeWifi\": \"$ACTIVE_WIFI\", + \"network\": [{ + \"name\": \"eth0\", + \"address\": \"$ETH_IP\", + \"mac\": \"$ETH_MAC\" + }, { + \"name\": \"wlan0\", + \"address\": \"$WLAN_IP\", + \"mac\": \"$WLAN_MAC\" + }], \"memory\": { \"total\": $memTotal, diff --git a/scripts/os_stats_fake b/scripts/os_stats_fake index 4b2ee90..23da2f3 100755 --- a/scripts/os_stats_fake +++ b/scripts/os_stats_fake @@ -4,32 +4,41 @@ cat << EOF { "hostname": "orangepizero", "operatingSystem": "Ubuntu 18.04 bionic", - "uptime": "2018-11-06 14:01:22", - "loadAverage": "0.00 0.00 0.00 1/120 2859", + "uptime": "2018-11-27 07:09:13", + "loadAverage": "0.00 0.00 0.00 1/118 27205", "architecture": "armv7l", - "temperature": "40656", - "minerTemperature": "76", - "minerFanSpeed": "4567", - "activeWifi": "befree", + "temperature": "41745", + "minerTemperature": "0", + "minerFanSpeed": "0", + "activeWifi": "", + "network": [{ + "name": "eth0", + "address": "192.168.1.20", + "mac": "02:42:94:72:22:61" + }, { + "name": "wlan0", + "address": "", + "mac": "12:42:94:72:22:61" + }], "memory": { "total": 245760, - "available": 127384, - "used": 207276, - "cache": 90348, - "swap": 256 + "available": 109952, + "used": 233220, + "cache": 97412, + "swap": 1280 }, "cpu": { "threads": 4, - "usedPercent": 0 + "usedPercent": 29 }, "disks": [ - {"total":7678936, -"used":1468092, + {"total":7524560, +"used":971560, "mountPoint":"/"}, {"total":49584, -"used":4312, +"used":4348, "mountPoint":"/var/log"} ] } diff --git a/src/graphql/graphqlModules/Mcu/McuStats.js b/src/graphql/graphqlModules/Mcu/McuStats.js index 255afd2..6bdae2f 100644 --- a/src/graphql/graphqlModules/Mcu/McuStats.js +++ b/src/graphql/graphqlModules/Mcu/McuStats.js @@ -23,6 +23,7 @@ module.exports.typeDefs = ` minerTemperature: Int minerFanSpeed: Int activeWifi: String + network: [NetworkStats!] memory: MemoryStats cpu: CpuStats disks: [DiskStats!] @@ -41,6 +42,12 @@ module.exports.typeDefs = ` usedPercent: Float } + type NetworkStats { + name: String + address: String + mac: String + } + type DiskStats { total: Float used: Float