Skip to content

S
system-load
Commit bbb0e105 authored by Vladislav Gumerov's avatar Vladislav Gumerov
Browse files
Options

fixed bug 'average'

parent 3627399e
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 23 deletions
package-lock.json
View file @ bbb0e105
......@@ -2391,12 +2391,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -2411,17 +2413,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -2538,7 +2543,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -2550,6 +2556,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -2564,6 +2571,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -2571,12 +2579,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -2595,6 +2605,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -2675,7 +2686,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -2687,6 +2699,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -2808,6 +2821,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......
public/core/data.php
View file @ bbb0e105
......@@ -2,15 +2,24 @@
$cpu = shell_exec('ps aux | awk \'{s += $3} END {print s }\'');
$total_mem = shell_exec("cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ");
$free_mem = shell_exec("cat /proc/meminfo | grep Cached | awk '{ print $2 }' ");
$average1 = shell_exec("uptime | awk '{ print $10 }' ");
$average2 = shell_exec("uptime | awk '{ print $11 }' ");
$average3 = shell_exec("uptime | awk '{ print $12 }' ");
if(trim(shell_exec("uptime | awk '{ print $10 }' ")) == 'average:') {
$average1 = shell_exec("uptime | awk '{ print $11 }' ");
$average2 = shell_exec("uptime | awk '{ print $12 }' ");
$average3 = shell_exec("uptime | awk '{ print $13 }' ");
} else {
$average1 = shell_exec("uptime | awk '{ print $10 }' ");
$average2 = shell_exec("uptime | awk '{ print $11 }' ");
$average3 = shell_exec("uptime | awk '{ print $12 }' ");
}
header('Access-Control-Allow-Origin: *');
$arr = array('CPU' => trim($cpu),
'TotalMemory' => trim($total_mem),
'FreeMemory' => trim($free_mem),
"oneMinute" => substr(trim($average1), 0, -1),
"fiveMinutes" => substr(trim($average2), 0, -1),
"fifteenMinutes" => substr(trim($average3), 0, -1));
'TotalMemory' => trim($total_mem),
'FreeMemory' => trim($free_mem),
"oneMinute" => substr(trim($average1), 0, -1),
"fiveMinutes" => substr(trim($average2), 0, -1),
"fifteenMinutes" => substr(trim($average3), 0, -1));
exit (json_encode($arr));
......
src/core/data.php
View file @ bbb0e105
......@@ -2,15 +2,24 @@
$cpu = shell_exec('ps aux | awk \'{s += $3} END {print s }\'');
$total_mem = shell_exec("cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ");
$free_mem = shell_exec("cat /proc/meminfo | grep Cached | awk '{ print $2 }' ");
$average1 = shell_exec("uptime | awk '{ print $10 }' ");
$average2 = shell_exec("uptime | awk '{ print $11 }' ");
$average3 = shell_exec("uptime | awk '{ print $12 }' ");
if(trim(shell_exec("uptime | awk '{ print $10 }' ")) == 'average:') {
$average1 = shell_exec("uptime | awk '{ print $11 }' ");
$average2 = shell_exec("uptime | awk '{ print $12 }' ");
$average3 = shell_exec("uptime | awk '{ print $13 }' ");
} else {
$average1 = shell_exec("uptime | awk '{ print $10 }' ");
$average2 = shell_exec("uptime | awk '{ print $11 }' ");
$average3 = shell_exec("uptime | awk '{ print $12 }' ");
}
header('Access-Control-Allow-Origin: *');
$arr = array('CPU' => trim($cpu),
'TotalMemory' => trim($total_mem),
'FreeMemory' => trim($free_mem),
"oneMinute" => substr(trim($average1), 0, -1),
"fiveMinutes" => substr(trim($average2), 0, -1),
"fifteenMinutes" => substr(trim($average3), 0, -1));
'TotalMemory' => trim($total_mem),
'FreeMemory' => trim($free_mem),
"oneMinute" => substr(trim($average1), 0, -1),
"fiveMinutes" => substr(trim($average2), 0, -1),
"fifteenMinutes" => substr(trim($average3), 0, -1));
exit (json_encode($arr));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment