Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

newdevice: initial proxmox detection #7543

Merged
merged 4 commits into from Oct 27, 2017
Merged

newdevice: initial proxmox detection #7543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
361f32e
initial proxmox detection
tomarch Oct 25, 2017
ec51126
minor changes
tomarch Oct 26, 2017
74bbe0f
fixed detection
tomarch Oct 26, 2017
6ba1db6
change sysdescr
tomarch Oct 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions html/images/logos/proxmox.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions html/images/os/proxmox.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions includes/definitions/proxmox.yaml
View file
Open in desktop
@@ -0,0 +1,28 @@
os: proxmox
type: server
group: unix
text: proxmox pve
icon: proxmox
ifXmcbc: 1
ifname: 1
over:
- { graph: device_processor, text: 'Processor Usage' }
- { graph: device_ucd_memory, text: 'Memory Usage' }
- { graph: device_storage, text: 'Storage Usage' }
poller_modules:
bgp-peers: 0
ospf: 0
stp: 0
discovery_modules:
applications: 1
bgp-peers: 0
stp: 0
vmware-vminfo: 0
libvirt-vminfo: 0
processor_stacked: 1
discovery:
-
sysObjectId:
- .1.3.6.1.4.1.8072.3.2.10
sysDescr_regex:
- '/ PVE /'
2 changes: 1 addition & 1 deletion includes/polling/os/unix.inc.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php

if ($device['os'] == "linux" || $device['os'] == "endian") {
if ($device['os'] == "linux" || $device['os'] == "endian" || $device['os'] == "proxmox") {
list(,,$version) = explode(" ", $poll_device['sysDescr']);
if (strstr($poll_device['sysDescr'], "386")|| strstr($poll_device['sysDescr'], "486")||strstr($poll_device['sysDescr'], "586")||strstr($poll_device['sysDescr'], "686")) {
$hardware = "Generic x86";
Expand Down
2 changes: 2 additions & 0 deletions tests/snmpsim/proxmox.snmprec
View file
Open in desktop
@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|Linux some.host.name 4.9.0 #1 SMP PVE Mon Dec 12 14:44:53 CST 2016 x86_64
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10