Retropex/apolloapi-v2
1
0
Fork 0
mirror of https://github.com/Retropex/apolloapi-v2.git synced 2025-06-02 23:42:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added network info

Browse Source
This commit is contained in:
Michele Marcucci 2018-11-27 10:45:37 +01:00
parent b96885eb4d
commit e58b87d7fd
3 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/os_stats
View File

@ -46,6 +46,13 @@ then
MINER_FAN_SPEED=$(cat /var/local/apollo/hwmon/fan_rpm) MINER_FAN_SPEED=$(cat /var/local/apollo/hwmon/fan_rpm)
fi 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 # Memory
memTotal=$(egrep '^MemTotal:' /proc/meminfo | awk '{print $2}') memTotal=$(egrep '^MemTotal:' /proc/meminfo | awk '{print $2}')
memFree=$(egrep '^MemFree:' /proc/meminfo | awk '{print $2}') memFree=$(egrep '^MemFree:' /proc/meminfo | awk '{print $2}')
@ -77,6 +84,15 @@ JSON="{
\"minerTemperature\": \"$MINER_TEMP\", \"minerTemperature\": \"$MINER_TEMP\",
\"minerFanSpeed\": \"$MINER_FAN_SPEED\", \"minerFanSpeed\": \"$MINER_FAN_SPEED\",
\"activeWifi\": \"$ACTIVE_WIFI\", \"activeWifi\": \"$ACTIVE_WIFI\",
\"network\": [{
\"name\": \"eth0\",
\"address\": \"$ETH_IP\",
\"mac\": \"$ETH_MAC\"
}, {
\"name\": \"wlan0\",
\"address\": \"$WLAN_IP\",
\"mac\": \"$WLAN_MAC\"
}],
\"memory\": \"memory\":
{ {
\"total\": $memTotal, \"total\": $memTotal,

37
scripts/os_stats_fake
View File

@ -4,32 +4,41 @@ cat << EOF
{ {
"hostname": "orangepizero", "hostname": "orangepizero",
"operatingSystem": "Ubuntu 18.04 bionic", "operatingSystem": "Ubuntu 18.04 bionic",
"uptime": "2018-11-06 14:01:22", "uptime": "2018-11-27 07:09:13",
"loadAverage": "0.00 0.00 0.00 1/120 2859", "loadAverage": "0.00 0.00 0.00 1/118 27205",
"architecture": "armv7l", "architecture": "armv7l",
"temperature": "40656", "temperature": "41745",
"minerTemperature": "76", "minerTemperature": "0",
"minerFanSpeed": "4567", "minerFanSpeed": "0",
"activeWifi": "befree", "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": "memory":
{ {
"total": 245760, "total": 245760,
"available": 127384, "available": 109952,
"used": 207276, "used": 233220,
"cache": 90348, "cache": 97412,
"swap": 256 "swap": 1280
}, },
"cpu": "cpu":
{ {
"threads": 4, "threads": 4,
"usedPercent": 0 "usedPercent": 29
}, },
"disks": [ "disks": [
{"total":7678936, {"total":7524560,
"used":1468092, "used":971560,
"mountPoint":"/"}, "mountPoint":"/"},
{"total":49584, {"total":49584,
"used":4312, "used":4348,
"mountPoint":"/var/log"} "mountPoint":"/var/log"}
] ]
} }

7
src/graphql/graphqlModules/Mcu/McuStats.js
View File

@ -23,6 +23,7 @@ module.exports.typeDefs = `
minerTemperature: Int minerTemperature: Int
minerFanSpeed: Int minerFanSpeed: Int
activeWifi: String activeWifi: String
network: [NetworkStats!]
memory: MemoryStats memory: MemoryStats
cpu: CpuStats cpu: CpuStats
disks: [DiskStats!] disks: [DiskStats!]
@ -41,6 +42,12 @@ module.exports.typeDefs = `
usedPercent: Float usedPercent: Float
} }
type NetworkStats {
name: String
address: String
mac: String
}
type DiskStats { type DiskStats {
total: Float total: Float
used: Float used: Float