ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow API to return per-monitor disk usage 

* For monitor 1: api/host/getDiskPercent/1.json
 * For all: api/host/getDiskPercent.json
This commit is contained in:
Kyle Johnson 2014-11-24 19:56:44 +00:00
parent 941bf3535f
commit d44b89b7fc
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/api/app/Controller/HostController.php
View File

@ -34,8 +34,16 @@ class HostController extends AppController {
));
}
function getDiskPercent() {
function getDiskPercent($mid = null) {
$this->loadModel('Config');
$this->loadModel('Monitor');
if ($mid) {
if (!$this->Monitor->exists($mid)) {
throw new NotFoundException(__('Invalid monitor'));
}
}
$zm_dir_events = $this->Config->find('list', array(
'conditions' => array('Name' => 'ZM_DIR_EVENTS'),
'fields' => array('Name', 'Value')
@ -48,10 +56,16 @@ class HostController extends AppController {
$zm_dir_events = Configure::read('ZM_PATH_WEB') . '/' . $zm_dir_events;
}
$df = shell_exec( 'df '.$zm_dir_events);
$space = -1;
if ( preg_match( '/\s(\d+)%/ms', $df, $matches ) )
$space = $matches[1];
if ($mid) {
// Get disk usage for $mid
$space = shell_exec ("du -sh0 $zm_dir_events/$mid | awk '{print $1}'");
} else {
$space = shell_exec( 'df '.$zm_dir_events);
if ( preg_match( '/\s(\d+)%/ms', $space, $matches ) )
$space = $matches[1];
}
$this->set(array(
'space' => $space,