nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:/cschoonover91/librenms into issue-3394

Browse Source
This commit is contained in:
Casey Schoonover
2016-04-21 10:49:03 -05:00
parent 2131774fcf b84c265c15
commit f837e5b2ac
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/unix-agent.inc.php
+1 -1
View File
@@ -97,7 +97,7 @@ if ($device['os_group'] == 'unix') {
dbDelete('processes', 'device_id = ?', array($device['device_id']));
$data=array();
foreach (explode("\n", $agent_data['ps']) as $process) {
$process = preg_replace('/\((.*),([0-9]*),([0-9]*),([0-9\:]*),([0-9]*)\)\ (.*)/', '\\1|\\2|\\3|\\4|\\5|\\6', $process);
$process = preg_replace('/\((.*),([0-9]*),([0-9]*),([0-9\:\.]*),([0-9]*)\)\ (.*)/', '\\1|\\2|\\3|\\4|\\5|\\6', $process);
list($user, $vsz, $rss, $cputime, $pid, $command) = explode('|', $process, 6);
if (!empty($command)) {
$data[]=array('device_id' => $device['device_id'], 'pid' => $pid, 'user' => $user, 'vsz' => $vsz, 'rss' => $rss, 'cputime' => $cputime, 'command' => $command);