mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Add load avg and uptime to VPS data

Browse source
This commit is contained in:
Ycarus 2018-11-29 14:47:53 +01:00
parent 29b1b63783
commit 3183a1c2f4
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -595,6 +595,17 @@ function interfaces_status()
mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter","vps","kernel") or "" mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter","vps","kernel") or ""
mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter","vps","machine") or "" mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter","vps","machine") or ""
mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter","vps","omr_version") or "" mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter","vps","omr_version") or ""
if mArray.openmptcprouter["service_addr"] ~= "" then
local token = uci:get("openmptcprouter","vps","token") or ""
if token ~= "" then
local vpsinfo_json = sys.exec('curl -4 --max-time 2 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. mArray.openmptcprouter["service_addr"] .. ":65500/status")
local vpsinfo = json.decode(vpsinfo_json) or ""
if vpsinfo.vps ~= nil then
mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or ""
mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or ""
end
end
end
-- Check openmptcprouter service are running -- Check openmptcprouter service are running
mArray.openmptcprouter["tun_service"] = false mArray.openmptcprouter["tun_service"] = false

12
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -216,6 +216,18 @@
{ {
content += "<br><i>(Latest available version " + mArray.openmptcprouter.latest_version_vps + ")</i>"; content += "<br><i>(Latest available version " + mArray.openmptcprouter.latest_version_vps + ")</i>";
} }
content += "<br />";
}
if (mArray.openmptcprouter.vps_loadavg)
{
content += "Load: " + mArray.openmptcprouter.vps_loadavg;
content += "<br />";
}
if (mArray.openmptcprouter.vps_uptime)
{
var date = new Date(null);
content += "Uptime: " + String.format('%t', mArray.openmptcprouter.vps_uptime);
content += "<br />";
} }
if (mArray.openmptcprouter.server_mptcp == "disabled") if (mArray.openmptcprouter.server_mptcp == "disabled")
{ {