diff --git a/.env.example b/.env.example index dbc8294..e81a70b 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,6 @@ +[MONITOR] +OFFLINE_THRESHOLD = 600 + [REDIS] HOST = '' PORT = 6027 diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 56a58fa..57e7019 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -4,6 +4,8 @@ use app\admin\validate\LoginTokenValidate; use app\common\lib\SystemMonitor; +use think\facade\Request; + class Index extends Base { /** @@ -15,15 +17,19 @@ public function index() { if (!session('?is_login')) $this->redirect('admin/index/login'); + $uuids = SystemMonitor::getUUIDs(); - $ip = SystemMonitor::fetchIPInfo(array_values($uuids)); + $data = SystemMonitor::getInfo(array_keys($uuids)); $hide = array_flip(SystemMonitor::getHide()); $names = SystemMonitor::getDisplayName(array_keys($uuids)); asort($uuids); $this->assign("names", $names); $this->assign("uuids", $uuids); $this->assign("hide", $hide); - $this->assign("ip", $ip); + $this->assign("data", $data); + + if(Request::isAjax()) + return $this->fetch('index_ajax'); return $this->fetch(); } diff --git a/application/admin/controller/Info.php b/application/admin/controller/Info.php index 31dc84e..0b3c195 100644 --- a/application/admin/controller/Info.php +++ b/application/admin/controller/Info.php @@ -16,7 +16,7 @@ public function index($uuid){ if ($this->request->isPatch()){ if (!empty($this->request->patch('display'))) - SystemMonitor::setDisplay($uuid, $this->request->patch('display')); + SystemMonitor::setHide($uuid, $this->request->patch('display')); if (!empty($this->request->patch('rename'))) SystemMonitor::setDisplayName($uuid, $this->request->patch('rename')); return json(['status' => 200, 'message' => "ok"]); diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 4908d4d..7b08e0b 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -27,8 +27,7 @@
Control
-
- {include file='admin@index/index_ajax' /} +
@@ -42,36 +41,10 @@ diff --git a/application/admin/view/index/index_ajax.html b/application/admin/view/index/index_ajax.html index 2ebf1ee..4417533 100644 --- a/application/admin/view/index/index_ajax.html +++ b/application/admin/view/index/index_ajax.html @@ -2,13 +2,13 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/application/common/lib/SystemMonitor.php b/application/common/lib/SystemMonitor.php index b2e1a6d..4843d71 100644 --- a/application/common/lib/SystemMonitor.php +++ b/application/common/lib/SystemMonitor.php @@ -4,6 +4,7 @@ use think\Exception; use think\facade\Cache; +use think\facade\Env; use think\facade\Log; class SystemMonitor @@ -11,20 +12,20 @@ class SystemMonitor static private $url = "http://ip-api.com/json/"; static private $cacheTime = 300; - static public function fetchIPInfo($ip){ + static public function fetchIPInfo($ip) + { $info = []; - $ips = is_array($ip)?$ip:[$ip]; - foreach ($ips as $v){ - $ip_without_cidr_24 = strrev(strstr(strrev($v), '.')). "0"; + $ips = is_array($ip) ? $ip : [$ip]; + foreach ($ips as $v) { + $ip_without_cidr_24 = strrev(strstr(strrev($v), '.')) . "0"; try { //For Multicast IP use TTL - $info[$v] = Cache::store('flag')->remember($v, function () use ($ip_without_cidr_24){ - $data = json_decode(self::curl_get(self::$url."$ip_without_cidr_24?fields=country,countryCode&lang="),true); - if($data == null) throw new Exception("Failed to query country code"); + $info[$v] = Cache::store('flag')->remember($v, function () use ($ip_without_cidr_24) { + $data = json_decode(self::curl_get(self::$url . "$ip_without_cidr_24?fields=country,countryCode&lang="), true); + if ($data == null) throw new Exception("Failed to query country code"); return $data; - }, 24*60*60); - } - catch (Exception $e){ + }, 24 * 60 * 60); + } catch (Exception $e) { Log::error($e->getMessage()); $info[$v] = [ 'countryCode' => '', @@ -32,69 +33,77 @@ static public function fetchIPInfo($ip){ ]; } - if(!is_array($ip)) return $info[$v]; + if (!is_array($ip)) return $info[$v]; } return $info; } - static public function getUUIDs(){ - return Cache::remember('system_monitor:hashes', function (){ + static public function getUUIDs() + { + return Cache::remember('system_monitor:hashes', function () { return Cache::store('redis')->handler() ->hGetAll("system_monitor:hashes"); }, self::$cacheTime); } - static public function setUUID($uuid, $ip){ + static public function setUUID($uuid, $ip) + { return Cache::store('redis')->handler() - ->hSet("system_monitor:hashes", $uuid, $ip); + ->hSet("system_monitor:hashes", $uuid, $ip); } - static public function getLatest($uuid) { + static public function getLatest($uuid) + { $stat = []; - $uuids = is_array($uuid)?$uuid:[$uuid]; + $uuids = is_array($uuid) ? $uuid : [$uuid]; - foreach ($uuids as $h){ + foreach ($uuids as $h) { $info = array_keys(self::getCollection($h)); $stat[$h] = array_pop($info); - if(!is_array($uuid)) return $stat[$h]; + if (!is_array($uuid)) return $stat[$h]; } return $stat; } - static public function getInfo($uuid) { + static public function getInfo($uuid) + { $info = []; - $uuids = is_array($uuid)?$uuid:[$uuid]; + $uuids = is_array($uuid) ? $uuid : [$uuid]; - foreach ($uuids as $u){ - $info[$u] = Cache::remember("system_monitor:info:$u", function () use ($u){ + foreach ($uuids as $u) { + $info[$u] = Cache::remember("system_monitor:info:$u", function () use ($u) { return Cache::store('redis')->handler()->hGetAll("system_monitor:info:$u"); }, self::$cacheTime); - if(!is_array($uuid)) return $info[$u]; + if (!is_array($uuid)) return $info[$u]; } return $info; } - static public function setInfo($uuid, $data) { + static public function setInfo($uuid, $data) + { try { Cache::store('redis')->handler()->hSetAll("system_monitor:info:$uuid", $data); - return ['code' => 200, 'message'=> "OK"]; + return ['code' => 200, 'message' => "OK"]; } catch (Exception $e) { - Log::error($e -> getMessage()); - return ['code' => 500, 'message'=> "Fail."]; + Log::error($e->getMessage()); + return ['code' => 500, 'message' => "Fail."]; } } - static public function timeFormat($time){ - return lang("Uptime Format", [floor($time / (24*60*60)), floor(($time / (60*60)) % 24) - , floor(($time / (60)) % 60), floor($time % 60)]); + static public function timeFormat($time) + { + return lang("Uptime Format", [ + floor($time / (24 * 60 * 60)), floor(($time / (60 * 60)) % 24), floor(($time / (60)) % 60), floor($time % 60) + ]); } - static private function curl_get($url){ + static private function curl_get($url) + { $header = ['Accept: application/json', 'User-Agent: Mozilla/5.0']; $curl = curl_init(); //设置抓取的url @@ -117,7 +126,7 @@ static private function curl_get($url){ $data = curl_exec($curl); // 显示错误信息 - if (curl_error($curl) || curl_getinfo($curl,CURLINFO_HTTP_CODE) != 200) + if (curl_error($curl) || curl_getinfo($curl, CURLINFO_HTTP_CODE) != 200) Log::error(curl_error($curl)); else curl_close($curl); @@ -125,32 +134,38 @@ static private function curl_get($url){ return $data; } - static public function getCollection($uuid){ - return Cache::remember("system_monitor:collection:$uuid", function () use ($uuid){ + static public function getCollection($uuid) + { + return Cache::remember("system_monitor:collection:$uuid", function () use ($uuid) { return Cache::store('redis')->handler() - ->zRangeByScore("system_monitor:collection:$uuid", 0, time() - , ['withscores' => TRUE]); + ->zRangeByScore( + "system_monitor:collection:$uuid", + 0, + time(), + ['withscores' => TRUE] + ); }, self::$cacheTime); } - static public function setCollection($uuid, $data){ + static public function setCollection($uuid, $data) + { try { Cache::store('redis')->handler() ->zAdd("system_monitor:collection:$uuid", time(), $data); - return ['code' => 200, 'message'=> "OK"]; + return ['code' => 200, 'message' => "OK"]; } catch (Exception $e) { - Log::error($e -> getMessage()); - return ['code' => 500, 'message'=> "Fail."]; + Log::error($e->getMessage()); + return ['code' => 500, 'message' => "Fail."]; } - } - static public function collectionFormat($data, $name){ + static public function collectionFormat($data, $name) + { $k = []; $v = []; - foreach ($data as $kk => $vv){ - $k[] = date('m-d H:i',$vv); + foreach ($data as $kk => $vv) { + $k[] = date('m-d H:i', $vv); foreach (json_decode($kk, true)[$name] as $kkk => $vvv) $v[$kkk][] = $vvv; } @@ -161,24 +176,25 @@ static public function collectionFormat($data, $name){ ]; } - static public function diskFormat($data){ + static public function diskFormat($data) + { $time = []; $value = []; - + //in case of missing mounting point periodically. $mount_points = []; foreach ($data as $kk => $_) $mount_points = array_unique(array_merge($mount_points, array_keys(json_decode($kk, true)['Disk']))); - foreach ($data as $kk => $date){ - $time[] = date('m-d H:i',$date); + foreach ($data as $kk => $date) { + $time[] = date('m-d H:i', $date); $json = json_decode($kk, true); - foreach ($mount_points as $_ => $mount_point){ + foreach ($mount_points as $_ => $mount_point) { if (empty($json['Disk'][$mount_point])) - $value[$mount_point][] = 0; + $value[$mount_point][] = 0; else - $value[$mount_point][] = $json['Disk'][$mount_point]['used']; + $value[$mount_point][] = $json['Disk'][$mount_point]['used']; } } @@ -188,13 +204,14 @@ static public function diskFormat($data){ ]; } - - static public function memoryFormat($data){ + + static public function memoryFormat($data) + { $k = []; $v = []; - foreach ($data as $kk => $vv){ - $k[] = date('m-d H:i',$vv); + foreach ($data as $kk => $vv) { + $k[] = date('m-d H:i', $vv); foreach (json_decode($kk, true)['Memory'] as $kkk => $vvv) $v[$kkk][] = $vvv['used']; } @@ -205,21 +222,22 @@ static public function memoryFormat($data){ ]; } - static public function networkFormat($data){ + static public function networkFormat($data) + { $k = []; $rx_packets = []; $rx_megabytes = []; $tx_packets = []; $tx_megabytes = []; - foreach ($data as $kk => $vv){ - $k[] = date('m-d H:i',$vv); + foreach ($data as $kk => $vv) { + $k[] = date('m-d H:i', $vv); $j = json_decode($kk, true)['Network']; // $arr = explode(',',json_decode($kk, true)['value']); - $rx_packets[] = (intval($j['RX']['packets'])*1.0)/1000; - $tx_packets[] = (intval($j['TX']['packets'])*1.0)/1000; - $rx_megabytes[] = intval(intval(intval($j['RX']['bytes'])*100.00)/1048576)*1.0/100; - $tx_megabytes[] = intval(intval(intval($j['TX']['bytes'])*100.00)/1048576)*1.0/100; + $rx_packets[] = (intval($j['RX']['packets']) * 1.0) / 1000; + $tx_packets[] = (intval($j['TX']['packets']) * 1.0) / 1000; + $rx_megabytes[] = intval(intval(intval($j['RX']['bytes']) * 100.00) / 1048576) * 1.0 / 100; + $tx_megabytes[] = intval(intval(intval($j['TX']['bytes']) * 100.00) / 1048576) * 1.0 / 100; } return [ @@ -232,18 +250,20 @@ static public function networkFormat($data){ 'time' => $k, 'packets' => $tx_packets, 'megabytes' => $tx_megabytes - ] - ]; + ] + ]; } - static public function getIPByUUID($uuid){ + static public function getIPByUUID($uuid) + { $uuids = SystemMonitor::getUUIDs(); - if(empty($uuids[$uuid])) + if (empty($uuids[$uuid])) throw new Exception("Wrong Token", 403); return $uuids[$uuid]; } - static public function deleteInfo($uuid){ + static public function deleteInfo($uuid) + { $ip = SystemMonitor::getIPByUUID($uuid); Cache::rm("system_monitor:collection:$uuid"); Cache::rm("system_monitor:info:$uuid"); @@ -253,8 +273,9 @@ static public function deleteInfo($uuid){ Cache::store('redis')->handler()->hDel("system_monitor:hashes", $uuid); } - static public function setDisplay($uuid, $display){ - if (!empty($display)) + static public function setHide($uuid, $hide) + { + if (!empty($hide)) Cache::store('redis')->handler() ->sRem("system_monitor:hide", $uuid); else @@ -264,63 +285,90 @@ static public function setDisplay($uuid, $display){ Cache::rm("system_monitor:hide"); } - static public function setDisplayName($uuid, $name){ - if (!empty($name)) + static public function setDisplayName($uuid, $name) + { + if (!empty($name)) { Cache::store('redis')->handler() ->hSet("system_monitor:name", $uuid, $name); - else + } else { Cache::store('redis')->handler() ->hDel("system_monitor:name", $uuid); - } - - static public function getDisplayName($uuid){ - $name = []; - $uuids = is_array($uuid)?$uuid:[$uuid]; - foreach ($uuids as $u){ - $name[$u] = Cache::store('redis')->handler()->hGet("system_monitor:name", $u); - if(!is_array($uuid)) return $name[$u]; } - return $name; + + Cache::rm("system_monitor:name"); } - static public function UUIDIsDisplay($uuid){ - if(!Cache::has("system_monitor:hide")){ - $data = Cache::store('redis')->handler() - ->sMembers("system_monitor:hide"); - Cache::set("system_monitor:hide",$data, self::$cacheTime); + + static public function getDisplayName($uuid) + { + $name = Cache::remember("system_monitor:name", function () { + return Cache::store('redis')->handler()->hGetAll("system_monitor:name"); + }, self::$cacheTime); + + if (!is_array($uuid)) { + return $name[$uuid]; } else { - $data = Cache::get("system_monitor:hide"); + $uuids = array_flip($uuid); + return array_intersect_key($name, $uuids); } - $data = array_flip($data); + } + + static public function UUIDIsDisplay($uuid) + { + $data = array_flip(self::getHide()); return !isset($data[$uuid]); } - static public function getHide(){ - if(!Cache::has("system_monitor:hide")){ - $data = Cache::store('redis')->handler() - ->sMembers("system_monitor:hide"); - Cache::set("system_monitor:hide",$data, self::$cacheTime); - } else { - $data = Cache::get("system_monitor:hide"); - } + static public function getHide() + { + return Cache::remember("system_monitor:hide", function () { + return Cache::store('redis')->handler()->sMembers("system_monitor:hide"); + }, self::$cacheTime); + } + + static public function getOnline() + { + $time = time(); + $uuids = array_keys(SystemMonitor::getUUIDs()); + $infos = SystemMonitor::getInfo($uuids); + + $data = array_filter($infos, function ($uuid) use ($infos, $time) { + return !empty($infos[$uuid]['Update Time']) && $time - intval($infos[$uuid]['Update Time']) <= Env::get("MONITOR.OFFLINE_THRESHOLD"); + }, ARRAY_FILTER_USE_KEY); + + return $data; + } + + static public function getOffline() + { + $time = time(); + $uuids = array_keys(SystemMonitor::getUUIDs()); + $infos = SystemMonitor::getInfo($uuids); + + $data = array_filter($infos, function ($uuid) use ($infos, $time) { + return !empty($infos[$uuid]['Update Time']) && ($time - intval($infos[$uuid]['Update Time']) > Env::get("MONITOR.OFFLINE_THRESHOLD")); + }, ARRAY_FILTER_USE_KEY); + return $data; } - static public function refreshCache(){ - foreach (self::getUUIDs() as $uuid => $ip){ + static public function refreshCache() + { + foreach (self::getUUIDs() as $uuid => $_) { self::getInfo($uuid); - self::fetchIPInfo($ip); self::getCollection($uuid); } } - static public function sortByCountry($arr){ + static public function sortByCountry($arr) + { uasort($arr, "self::countryCmp"); return $arr; } - static private function countryCmp($a,$b){ - if ($a["IP"]["country"] == $b["IP"]["country"]) return 0; - if ($a["IP"]["country"] == 'Private') return -1; - return ($a["IP"]["country"]<$b["IP"]["country"])?-1:1; + static private function countryCmp($a, $b) + { + if ($a["Country"] == $b["Country"]) return 0; + if ($a["Country"] == 'Private') return -1; + return ($a["Country"] < $b["Country"]) ? -1 : 1; } } diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index f656897..8b9af66 100644 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -3,7 +3,6 @@ namespace app\index\controller; use app\common\lib\SystemMonitor; -use think\Facade\Log; class Index extends Base @@ -17,36 +16,13 @@ public function index() { $uuids = SystemMonitor::getUUIDs(); $hide = array_flip(SystemMonitor::getHide()); - $uuids_online = []; - $uuids_offline = []; - $time = time(); - - foreach ($uuids as $uuid => $ip) { - $uuid_temp = [ - 'IP' => [], - 'INFO' => SystemMonitor::getInfo($uuid) - ]; - if (empty($uuid_temp['INFO'])) continue; - - if (!empty($uuid_temp['INFO']['Country']) && !empty($uuid_temp['INFO']['Country Code'])) - $uuid_temp['IP'] = [ - 'country' => $uuid_temp['INFO']['Country'], - "countryCode" => $uuid_temp['INFO']['Country Code'] - ]; - else - $uuid_temp['IP'] = SystemMonitor::fetchIPInfo($ip); - - if (($time - intval($uuid_temp['INFO']['Update Time'])) > 500) - $uuids_offline[$uuid] = $uuid_temp; - else - $uuids_online[$uuid] = $uuid_temp; - } - $uuids_online = SystemMonitor::sortByCountry($uuids_online); - $uuids_offline = SystemMonitor::sortByCountry($uuids_offline); + $online = SystemMonitor::sortByCountry(SystemMonitor::getOnline()); + $offline = SystemMonitor::sortByCountry(SystemMonitor::getOffline()); $names = SystemMonitor::getDisplayName(array_keys($uuids)); + $this->assign("names", $names); - $this->assign("uuids_online", $uuids_online); - $this->assign("uuids_offline", $uuids_offline); + $this->assign("online", $online); + $this->assign("offline", $offline); $this->assign("hide", $hide); return $this->fetch(); } @@ -56,25 +32,24 @@ public function info($uuid = '') $latest = json_decode(SystemMonitor::getLatest($uuid), TRUE); $info = SystemMonitor::getInfo($uuid); // $uptime_str = SystemMonitor::timeFormat(intval($info['Uptime'])); - if (!empty($info['Country']) && !empty($info['Country Code'])) - $ip = [ - 'country' => $info['Country'], - "countryCode" => $info['Country Code'] - ]; - else - $ip = SystemMonitor::fetchIPInfo(SystemMonitor::getIPByUUID($uuid)); - + ksort($info); $this->assign("latest", $latest); $this->assign("info", $info); $this->assign("uuid", $uuid); - $this->assign("ip", $ip); if ($this->request->isAjax()) return $this->fetch("index/info_ajax"); return $this->fetch(); } - + public function list() + { + $uuids = SystemMonitor::getUUIDs(); + //TODO + if ($this->request->isAjax()) + return $this->fetch("index/list_ajax"); + return $this->fetch(); + } public function manifest(){ $manifest = [ "short_name"=> "Monitor", diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html index 5565caf..5ffcacd 100644 --- a/application/index/view/index/index.html +++ b/application/index/view/index/index.html @@ -31,57 +31,57 @@
+
+ +
{:lang("Server List")}
+
-
{:lang("Online")} ({:count($uuids_online)})
+
{:lang("Online")} ({:count($online)})
keyboard_arrow_down
- {volist name="uuids_online" id="v"} + {volist name="online" id="v"} {if !isset($hide[$key])} - {if(!empty($v['INFO']))}
- +
- {:empty($names[$key])?$v['INFO']['IPV4']:$names[$key]} + {:empty($names[$key])?$v['IPV4']:$names[$key]}
- {$v['IP']['country']} + {$v['Country']}
{/if} - {/if} {/volist}
-
{:lang("Offline")} ({:count($uuids_offline)})
+
{:lang("Offline")} ({:count($offline)})
keyboard_arrow_down
- {volist name="uuids_offline" id="v"} + {volist name="offline" id="v"} {if !isset($hide[$key])} - {if(!empty($v['INFO']))}
- +
- {:empty($names[$key])?$v['INFO']['IPV4']:$names[$key]} + {:empty($names[$key])?$v['IPV4']:$names[$key]}
- {$v['IP']['country']|default="Unknown"} + {$v['Country']|default="Unknown"}
{/if} - {/if} {/volist}
diff --git a/application/index/view/index/info_template.html b/application/index/view/index/info_template.html index 7718adc..a62a0b9 100644 --- a/application/index/view/index/info_template.html +++ b/application/index/view/index/info_template.html @@ -51,7 +51,7 @@

{:lang("Throughput")}

{:lang("Uptime")}

{$info['Uptime']|default="N/A"}

{:lang("Country/Region")}

-

{$ip['country']}

+

{$info['Country']}

diff --git a/application/index/view/index/list.html b/application/index/view/index/list.html new file mode 100644 index 0000000..89f8fb9 --- /dev/null +++ b/application/index/view/index/list.html @@ -0,0 +1,23 @@ + + + + + Server List + + + + + +
+
+ + + + Server List +
+
+
+{include file='index@index/js_template' /} +{include file='index@index/list_template' /} + + \ No newline at end of file diff --git a/application/index/view/index/list_ajax.html b/application/index/view/index/list_ajax.html new file mode 100644 index 0000000..a3a642c --- /dev/null +++ b/application/index/view/index/list_ajax.html @@ -0,0 +1 @@ +{include file='index@index/list_template' /} \ No newline at end of file diff --git a/application/index/view/index/list_template.html b/application/index/view/index/list_template.html new file mode 100644 index 0000000..1b39ea1 --- /dev/null +++ b/application/index/view/index/list_template.html @@ -0,0 +1,32 @@ + + +
+
+
+ +
{:lang("System List")}
+ keyboard_arrow_down +
+
+ +
+
+
+ diff --git a/public/.gitignore b/public/.gitignore new file mode 100644 index 0000000..1eeb93d --- /dev/null +++ b/public/.gitignore @@ -0,0 +1 @@ +runtime/ \ No newline at end of file