diff --git a/html/includes/graphs/application/auth.inc.php b/html/includes/graphs/application/auth.inc.php
index 15c8f01ca1..23eea41418 100644
--- a/html/includes/graphs/application/auth.inc.php
+++ b/html/includes/graphs/application/auth.inc.php
@@ -3,7 +3,11 @@
 if (is_numeric($vars['id']) && ($auth || application_permitted($vars['id']))) {
     $app    = get_application_by_id($vars['id']);
     $device = device_by_id_cache($app['device_id']);
-    $title  = generate_device_link($device);
-    $title .= $graph_subtype;
+    if ($app['app_type'] != 'proxmox') {
+        $title  = generate_device_link($device);
+        $title .= $graph_subtype;
+    } else {
+        $title = $vars['port'].'@'.$vars['hostname'].' on '.generate_device_link($device);
+    }
     $auth   = true;
 }
diff --git a/html/includes/graphs/application/proxmox_traffic.inc.php b/html/includes/graphs/application/proxmox_traffic.inc.php
new file mode 100644
index 0000000000..e37cd00d96
--- /dev/null
+++ b/html/includes/graphs/application/proxmox_traffic.inc.php
@@ -0,0 +1,15 @@
+<?php
+require 'includes/graphs/common.inc.php';
+
+$mysql_rrd = $config['rrd_dir'].'/proxmox/'.$vars['cluster'].'/'.$vars['vmid'].'_netif_'.$vars['port'].'.rrd';
+
+if (is_file($mysql_rrd)) {
+    $rrd_filename = $mysql_rrd;
+}
+
+$multiplier = 8;
+
+$ds_in  = 'INOCTETS';
+$ds_out = 'OUTOCTETS';
+
+require 'includes/graphs/generic_data.inc.php';
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 3e43f6c759..f24eb41c08 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -383,6 +383,26 @@ if ($_SESSION['userlevel'] >= '5' && ($app_count) > "0") {
 <?php
 }
 
+if (isset($config['enable_proxmox']) && $config['enable_proxmox']) {
+	$pmxcl = dbFetchRows("SELECT DISTINCT(`app_instance`) FROM `applications` WHERE `app_type` = ?", array('proxmox'));
+
+	if(count($pmxcl) > 0) {
+?>
+        <li class="dropdown">
+          <a href="proxmox/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-tasks fa-fw fa-lg fa-nav-icons"></i> Proxmox</a>
+          <ul class="dropdown-menu">
+<?php
+	  foreach ($pmxcl as $pmxc) {
+            echo('<li><a href="/proxmox/cluster='.$pmxc['app_instance'].'/"><i class="fa fa-angle-double-right fa-fw fa-lg"></i> '.nicecase($pmxc['app_instance']).' </a></li>');
+          }
+?>
+
+          </ul>
+        </li>
+<?php
+	}
+}
+
 $routing_count['bgp']  = dbFetchCell("SELECT COUNT(bgpPeer_id) from `bgpPeers` LEFT JOIN devices AS D ON bgpPeers.device_id=D.device_id WHERE D.device_id IS NOT NULL");
 $routing_count['ospf'] = dbFetchCell("SELECT COUNT(ospf_instance_id) FROM `ospf_instances` WHERE `ospfAdminStat` = 'enabled'");
 $routing_count['cef']  = dbFetchCell("SELECT COUNT(cef_switching_id) from `cef_switching`");
diff --git a/html/pages/proxmox.inc.php b/html/pages/proxmox.inc.php
new file mode 100644
index 0000000000..fc04dac9f6
--- /dev/null
+++ b/html/pages/proxmox.inc.php
@@ -0,0 +1,83 @@
+<?php
+
+function var_isset($v) {
+    global $vars;
+    return isset($vars[$v]);
+}
+
+function var_eq($v, $t) {
+    global $vars;
+    if (isset($vars[$v]) && $vars[$v] == $t) {
+        return true;
+    }
+
+    return false;
+}
+
+function var_get($v) {
+    global $vars;
+    if (isset($vars[$v])) {
+        return $vars[$v];
+    }
+
+    return false;
+}
+
+function proxmox_cluster_vms($c) {
+    return dbFetchRows("SELECT * FROM proxmox WHERE cluster = ? ORDER BY vmid", array($c));
+}
+
+function proxmox_vm_info($vmid, $c) {
+    $vm = dbFetchRow("SELECT pm.*, d.hostname AS host, d.device_id FROM proxmox pm, devices d WHERE pm.device_id = d.device_id AND pm.vmid = ? AND pm.cluster = ?", array($vmid, $c));
+    $appid = dbFetchRow("SELECT app_id FROM applications WHERE device_id = ? AND app_type = ?", array($vm['device_id'], 'proxmox'));
+
+    $vm['ports'] = dbFetchRows("SELECT * FROM proxmox_ports WHERE vm_id = ?", array($vm['id']));
+    $vm['app_id'] = $appid['app_id'];
+    return $vm;
+}
+$graphs['proxmox']    = array(
+    'netif'
+);
+
+print_optionbar_start();
+
+echo "<span style='font-weight: bold;'>Proxmox</span> &#187; ";
+
+unset($sep);
+
+foreach ($pmxcl as $pmxc) {
+    if (isset($sep)) { echo $sep; };
+
+    if (var_eq('cluster', $pmxc['app_instance'])) {
+        echo "<span class='pagemenu-selected'>";
+    }
+
+    echo generate_link(nicecase($pmxc['app_instance']), array('page' => 'proxmox', 'cluster' => $pmxc['app_instance']));
+
+    if (var_eq('cluster', $pmxc['app_instance'])) {
+        echo '</span>';
+    }
+
+    $sep = ' | ';
+}
+
+print_optionbar_end();
+
+if (!var_isset('cluster')) {
+    echo 'Select a cluster:';
+    echo '<ul>';
+    foreach ($pmxcl as $pmxc) {
+        echo '<li>'.generate_link(nicecase($pmxc['app_instance']), array('page' => 'proxmox', 'cluster' => $pmxc['app_instance'])).'</li>';
+    }
+    echo '</ul>';
+} elseif (!var_isset('vmid')) {
+    echo '<ul>';
+    foreach (proxmox_cluster_vms(var_get('cluster')) as $pmxvm) {
+        echo '<li>'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'proxmox', 'cluster' => $pmxc['app_instance'], 'vmid' => $pmxvm['vmid'])).'</li>';
+    }
+    echo '</ul>';
+} else {
+    include("pages/proxmox/vm.inc.php");
+}
+   
+$pagetitle[] = 'Proxmox';
diff --git a/html/pages/proxmox/vm.inc.php b/html/pages/proxmox/vm.inc.php
new file mode 100644
index 0000000000..cb43e3c9f7
--- /dev/null
+++ b/html/pages/proxmox/vm.inc.php
@@ -0,0 +1,48 @@
+<?php
+
+
+global $vars;
+
+$vm = proxmox_vm_info(var_get('vmid'), var_get('cluster'));
+
+print '<pre>';
+var_dump($vm);
+print '</pre>';
+$graphs = array(
+    'proxmox_traffic'       => 'Traffic',
+);
+
+foreach ($vm['ports'] as $port) {
+    foreach ($graphs as $key => $text) {
+        $graph_type = 'proxmox_traffic';
+
+        $graph_array['height']    = '100';
+        $graph_array['width']     = '215';
+        $graph_array['to']        = $config['time']['now'];
+        $graph_array['id']        = $vm['app_id'];
+        $graph_array['device_id'] = $vm['device_id'];
+        $graph_array['type']      = 'application_'.$key;
+        $graph_array['port']      = $port['port'];
+        $graph_array['vmid']      = $vm['vmid'];
+        $graph_array['cluster']   = $vm['cluster'];
+        $graph_array['hostname']  = $vm['description'];
+
+        echo '<h3>'.$text.' '.$port['port'].'@'.$vm['description'].'</h3>';
+
+        echo "<tr bgcolor='$row_colour'><td colspan=5>";
+
+        include 'includes/print-graphrow.inc.php';
+
+        echo '</td></tr>';
+    }
+}
+
+
+#if (is_numeric($vars['id']) && ($auth || application_permitted($vars['id']))) {
+#        $app    = get_application_by_id($vars['id']);
+#            $device = device_by_id_cache($app['device_id']);
+#                $title  = generate_device_link($device);
+#                    $title .= $graph_subtype;
+#                        $auth   = true;
+#}
+
diff --git a/includes/polling/applications/proxmox.inc.php b/includes/polling/applications/proxmox.inc.php
new file mode 100644
index 0000000000..65214d229a
--- /dev/null
+++ b/includes/polling/applications/proxmox.inc.php
@@ -0,0 +1,74 @@
+<?php
+
+if (!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'];
+    }
+
+    return false;
+}
+
+function proxmox_vm_exists($i, $c, &$pmxcache) {
+
+    if (isset($pmxcache[$c][$i]) && $pmxcache[$c][$i] > 0) {
+        return true;
+    }
+    if ($row = dbFetchRow("SELECT id FROM proxmox WHERE vmid = ? AND cluster = ?", array($i, $c))) {
+        $pmxcache[$c][$i] = (integer) $row['id'];
+        return true;
+    }
+
+    return false;
+}
+
+foreach ($pmxlines as $vm) {
+    list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);
+
+    $rrd_filename = join('/', array(
+        $pmxcdir,
+        $vmid.'_netif_'.$vmport.'.rrd'));
+
+    if (!is_file($rrd_filename)) {
+        rrdtool_create(
+            $rrd_filename,
+            ' --step 300 \
+            DS:INOCTETS:DERIVE:600:0:12500000000 \
+            DS:OUTOCTETS:DERIVE:600:0:12500000000 '.$config['rrd_rra']);
+    }
+
+    rrdtool_update($rrd_filename, 'N:'.$vmpin.':'.$vmpout);
+    if (proxmox_vm_exists($vmid, $pmxcluster, $pmxcache) === true) {
+        dbUpdate(array('device_id' => $device['device_id'], 'last_seen' => array('NOW()'), 'description' => $vmdesc), 'proxmox', '`vmid` = ? AND `cluster` = ?', array($vmid, $pmxcluster));
+    } else {
+        $pmxcache[$pmxcluster][$vmid] = dbInsert(array('cluster' => $pmxcluster, 'vmid' => $vmid, 'description' => $vmdesc, 'device_id' => $device['device_id']), 'proxmox');
+    }
+
+    if ($portid = proxmox_port_exists($vmid, $pmxcluster, $vmport) !== false) {
+        dbUpdate(array('last_seen' => array('NOW()')), 'proxmox_ports', '`vm_id` = ? AND `port` = ?', array($pmxcache[$pmxcluster][$vmid], $vmport));
+    } else {
+        dbInsert(array('vm_id' => $pmxcache[$pmxcluster][$vmid], 'port' => $vmport), 'proxmox_ports');
+    }
+
+}
+
+unset($pmxlines);
+unset($pmxcluster);
+unset($pmxcdir);
+unset($proxmox);
+unset($pmxcache);
diff --git a/includes/polling/unix-agent.inc.php b/includes/polling/unix-agent.inc.php
index 3d1754498c..5b78b682c9 100644
--- a/includes/polling/unix-agent.inc.php
+++ b/includes/polling/unix-agent.inc.php
@@ -50,6 +50,7 @@ if ($device['os_group'] == 'unix') {
                 "mysql",
                 "nginx",
                 "bind",
+                "proxmox",
                 "tinydns");
 
             if (in_array($section, $agentapps)) {
@@ -99,7 +100,7 @@ if ($device['os_group'] == 'unix') {
             if (file_exists("includes/polling/applications/$key.inc.php")) {
                 d_echo("Enabling $key for ".$device['hostname']." if not yet enabled\n");
 
-                if (in_array($key, array('apache', 'mysql', 'nginx'))) {
+                if (in_array($key, array('apache', 'mysql', 'nginx', 'proxmox'))) {
                     if (dbFetchCell('SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ?', array($device['device_id'], $key)) == '0') {
                         echo "Found new application '$key'\n";
                         dbInsert(array('device_id' => $device['device_id'], 'app_type' => $key), 'applications');