nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 08:01:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not run the Proxmox-stuff unless it is explicitly enabled in the config

Browse Source
This commit is contained in:
Mark Schouten
2015-08-31 16:34:55 +02:00
parent fce9b44c32
commit 822a93b509
2 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device/apps/proxmox.inc.php
+9 -4
View File
@@ -20,11 +20,15 @@ include('includes/application/proxmox.inc.php');
global $config;
$graphs = array(
'proxmox_traffic' => 'Traffic',
);
if (!isset($config['enable_proxmox']) || !$config['enable_proxmox']) {
print_error('Proxmox agent was discovered on this host. Please enable Proxmox in your config.');
} else {
foreach (proxmox_node_vms(var_get('device')) as $nvm) {
$graphs = array(
'proxmox_traffic' => 'Traffic',
);
foreach (proxmox_node_vms(var_get('device')) as $nvm) {
$vm = proxmox_vm_info($nvm['vmid'], $nvm['cluster']);
foreach ($vm['ports'] as $port) {
@@ -51,4 +55,5 @@ foreach (proxmox_node_vms(var_get('device')) as $nvm) {
echo '</td></tr>';
}
}
}
}
includes/polling/applications/proxmox.inc.php
+23 -20
View File
@@ -1,21 +1,9 @@
<?php
if (!empty($agent_data['app']['proxmox'])) {
if (isset($config['enable_proxmox']) && $config['enable_proxmox'] && !empty($agent_data['app']['proxmox'])) {
$proxmox = $agent_data['app']['proxmox'];
}
$pmxlines = explode("\n", $proxmox);
$pmxcluster = array_shift($pmxlines);
$pmxcdir = join('/', array($config['rrd_dir'],'proxmox',$pmxcluster));
if (!is_dir($pmxcdir)) {
mkdir($pmxcdir, 0775, true);
}
dbUpdate(array('device_id' => $device['device_id'], 'app_type' => 'proxmox', 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], 'proxmox'));
$pmxcache = [];
function proxmox_port_exists($i, $c, $p) {
if ($row = dbFetchRow("SELECT pmp.id FROM proxmox_ports pmp, proxmox pm WHERE pm.id = pmp.vm_id AND pmp.port = ? AND pm.cluster = ? AND pm.vmid = ?", array($p, $c, $i))) {
return $row['id'];
@@ -37,7 +25,21 @@ function proxmox_vm_exists($i, $c, &$pmxcache) {
return false;
}
foreach ($pmxlines as $vm) {
$pmxlines = explode("\n", $proxmox);
if (count($pmxlines) > 2) {
$pmxcluster = array_shift($pmxlines);
$pmxcdir = join('/', array($config['rrd_dir'],'proxmox',$pmxcluster));
if (!is_dir($pmxcdir)) {
mkdir($pmxcdir, 0775, true);
}
dbUpdate(array('device_id' => $device['device_id'], 'app_type' => 'proxmox', 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], 'proxmox'));
$pmxcache = [];
foreach ($pmxlines as $vm) {
list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);
$rrd_filename = join('/', array(
@@ -65,10 +67,11 @@ foreach ($pmxlines as $vm) {
dbInsert(array('vm_id' => $pmxcache[$pmxcluster][$vmid], 'port' => $vmport), 'proxmox_ports');
}
}
}
unset($pmxlines);
unset($pmxcluster);
unset($pmxcdir);
unset($proxmox);
unset($pmxcache);
unset($pmxlines);
unset($pmxcluster);
unset($pmxcdir);
unset($proxmox);
unset($pmxcache);
}