mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rrd-create-remote

Browse Source
This commit is contained in:
Tony Murray
2016-08-08 20:23:15 -05:00
parent ead28f6acd b93a060458
commit 68303a96da
23 changed files with 193 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/polling/applications/proxmox.inc.php
View File

@@ -53,7 +53,7 @@ if (!is_dir($pmxcdir)) {
dbUpdate(array('device_id' => $device['device_id'], 'app_type' => $name, 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], $name));
if (count($pmxlines) > 0) {
$pmxcache = [];
$pmxcache = array();
foreach ($pmxlines as $vm) {
list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);