From 81024f0d4eda91540f3ae82176d8005cd96faf3d Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Fri, 6 Jan 2017 04:04:30 +0000 Subject: [PATCH] refactor: Moved simple os discovery into yaml config (#5313) --- includes/definitions/3com.yaml | 5 +++ includes/definitions/acs.yaml | 3 ++ includes/definitions/aen.yaml | 5 +++ includes/definitions/aerohive.yaml | 3 ++ includes/definitions/airport.yaml | 5 +++ includes/definitions/akcp.yaml | 3 ++ includes/definitions/apc.yaml | 7 ++++ includes/definitions/apic.yaml | 3 ++ includes/definitions/areca.yaml | 3 ++ includes/definitions/arista_eos.yaml | 3 ++ includes/definitions/avaya-vsp.yaml | 9 +++++ includes/definitions/avtech.yaml | 3 ++ includes/definitions/barracudangfirewall.yaml | 3 ++ .../definitions/barracudaspamfirewall.yaml | 3 ++ includes/definitions/bcm963.yaml | 3 ++ includes/definitions/bdcom.yaml | 3 ++ includes/definitions/binos.yaml | 3 ++ includes/definitions/binox.yaml | 3 ++ includes/definitions/bintec-smart.yaml | 3 ++ includes/definitions/buffalo.yaml | 3 ++ includes/definitions/calix.yaml | 5 +++ includes/definitions/canonprinter.yaml | 4 ++ includes/definitions/cat1900.yaml | 3 ++ includes/definitions/catos.yaml | 3 ++ includes/definitions/ceraos.yaml | 3 ++ includes/definitions/cimc.yaml | 3 ++ includes/definitions/ciscosb.yaml | 9 +++++ includes/definitions/ciscowlc.yaml | 3 ++ includes/definitions/cmts.yaml | 3 ++ includes/definitions/cucm.yaml | 3 ++ includes/definitions/datacom.yaml | 3 ++ includes/definitions/datadomain.yaml | 3 ++ includes/definitions/dcn-software.yaml | 3 ++ includes/definitions/deliberant.yaml | 3 ++ includes/definitions/dell-ups.yaml | 3 ++ includes/definitions/deltaups.yaml | 3 ++ includes/definitions/developprinter.yaml | 3 ++ includes/definitions/dnos.yaml | 18 +++++++++ includes/definitions/edgecos.yaml | 9 +++++ includes/definitions/epson.yaml | 3 ++ includes/definitions/equallogic.yaml | 3 ++ includes/definitions/extremeware.yaml | 3 ++ includes/definitions/f5.yaml | 3 ++ includes/definitions/fabos.yaml | 5 +++ includes/definitions/fireware.yaml | 4 ++ includes/definitions/flareos.yaml | 3 ++ includes/definitions/fortigate.yaml | 4 ++ includes/definitions/fortios.yaml | 3 ++ includes/definitions/foundryos.yaml | 3 ++ includes/definitions/ftos.yaml | 3 ++ includes/definitions/fujitsueternusos.yaml | 3 ++ includes/definitions/fujitsupyos.yaml | 3 ++ includes/definitions/fxos.yaml | 3 ++ includes/definitions/gaia.yaml | 3 ++ includes/definitions/hpblmos.yaml | 3 ++ includes/definitions/hpe-msl.yaml | 5 ++- includes/definitions/hpvc.yaml | 3 ++ includes/definitions/hwg-poseidon.yaml | 3 ++ includes/definitions/hwg-ste.yaml | 3 ++ includes/definitions/hwg-ste2.yaml | 3 ++ includes/definitions/hytera.yaml | 3 ++ includes/definitions/ibm-amm.yaml | 3 ++ includes/definitions/ibm-imm.yaml | 3 ++ includes/definitions/ibmnos.yaml | 5 +++ includes/definitions/informos.yaml | 3 ++ includes/definitions/iosxe.yaml | 6 ++- includes/definitions/iosxr.yaml | 5 ++- includes/definitions/ipoman.yaml | 3 ++ includes/definitions/ironware.yaml | 3 ++ includes/definitions/ise.yaml | 4 ++ includes/definitions/jetstream.yaml | 3 ++ includes/definitions/juniperex2500os.yaml | 3 ++ includes/definitions/junose.yaml | 3 ++ includes/definitions/jwos.yaml | 3 ++ includes/definitions/konica.yaml | 3 ++ includes/definitions/kyocera.yaml | 3 ++ includes/definitions/lanier.yaml | 3 ++ includes/definitions/lantronix-slc.yaml | 3 ++ includes/definitions/lcos.yaml | 4 ++ includes/definitions/lenovoemc.yaml | 5 ++- includes/definitions/lexmarkprinter.yaml | 3 ++ includes/definitions/liebert.yaml | 3 ++ includes/definitions/mellanox.yaml | 3 ++ includes/definitions/mgepdu.yaml | 3 ++ includes/definitions/microsemitime.yaml | 3 ++ includes/definitions/mimosa.yaml | 3 ++ includes/definitions/minkelsrms.yaml | 3 ++ includes/definitions/moxa-nport.yaml | 3 ++ includes/definitions/mypoweros.yaml | 3 ++ includes/definitions/netapp.yaml | 3 ++ includes/definitions/netonix.yaml | 3 ++ includes/definitions/netscaler.yaml | 3 ++ includes/definitions/netvision.yaml | 3 ++ includes/definitions/netware.yaml | 3 ++ includes/definitions/nimbleos.yaml | 3 ++ includes/definitions/nios.yaml | 3 ++ includes/definitions/nitro.yaml | 6 +++ includes/definitions/nrg.yaml | 3 ++ includes/definitions/nxos.yaml | 3 ++ includes/definitions/okilan.yaml | 3 ++ includes/definitions/onefs.yaml | 3 ++ includes/definitions/ons.yaml | 3 ++ includes/definitions/oracle-ilom.yaml | 3 ++ includes/definitions/packetshaper.yaml | 3 ++ includes/definitions/panos.yaml | 3 ++ includes/definitions/papouch-tme.yaml | 4 ++ includes/definitions/pbn-cp.yaml | 3 ++ includes/definitions/pbn.yaml | 4 ++ includes/definitions/perle.yaml | 3 ++ includes/definitions/pixos.yaml | 3 ++ includes/definitions/planetos.yaml | 3 ++ includes/definitions/powercode.yaml | 3 ++ includes/definitions/powervault.yaml | 3 ++ includes/definitions/powerware.yaml | 3 ++ includes/definitions/primeinfrastructure.yaml | 3 ++ includes/definitions/proxim.yaml | 3 ++ includes/definitions/pulse.yaml | 6 +++ includes/definitions/quanta.yaml | 8 ++++ includes/definitions/radlan.yaml | 3 ++ includes/definitions/raisecom.yaml | 3 ++ includes/definitions/raritan.yaml | 4 ++ includes/definitions/redback.yaml | 7 ++++ includes/definitions/ricoh.yaml | 4 ++ includes/definitions/riverbed.yaml | 3 ++ includes/definitions/ruckuswireless.yaml | 5 ++- includes/definitions/saf.yaml | 3 ++ includes/definitions/samsungprinter.yaml | 5 +++ includes/definitions/sanos.yaml | 3 ++ includes/definitions/screenos.yaml | 4 ++ includes/definitions/serveriron.yaml | 5 ++- includes/definitions/sgos.yaml | 3 ++ includes/definitions/sharp.yaml | 3 ++ includes/definitions/smartax.yaml | 3 ++ includes/definitions/sonicwall.yaml | 3 ++ includes/definitions/sonus-gsx.yaml | 3 ++ includes/definitions/sonus-sbc.yaml | 4 ++ includes/definitions/sub10.yaml | 3 ++ includes/definitions/symbol.yaml | 3 ++ includes/definitions/timos.yaml | 11 ++++++ includes/definitions/tpconductor.yaml | 3 ++ includes/definitions/tplink.yaml | 3 ++ includes/definitions/vccodec.yaml | 3 ++ includes/definitions/vcs.yaml | 3 ++ includes/definitions/viprinux.yaml | 3 ++ includes/definitions/vrp.yaml | 6 +++ includes/definitions/webpower.yaml | 3 ++ includes/definitions/wxgoos.yaml | 4 ++ includes/definitions/xerox.yaml | 5 +++ includes/definitions/xirrus_aos.yaml | 4 ++ includes/definitions/xos.yaml | 3 ++ includes/definitions/zxr10.yaml | 5 +++ includes/discovery/os/3com.inc.php | 5 --- includes/discovery/os/acs.inc.php | 5 --- includes/discovery/os/aen.inc.php | 16 -------- includes/discovery/os/aerohive.inc.php | 14 ------- includes/discovery/os/airport.inc.php | 5 --- includes/discovery/os/akcp.inc.php | 5 --- includes/discovery/os/apc.inc.php | 15 -------- includes/discovery/os/apic.inc.php | 28 -------------- includes/discovery/os/areca.inc.php | 6 --- includes/discovery/os/arista-eos.inc.php | 5 --- includes/discovery/os/avaya-vsp.inc.php | 24 ------------ includes/discovery/os/avtech.inc.php | 6 --- .../discovery/os/barracudangfirewall.inc.php | 15 -------- .../os/barracudaspamfirewall.inc.php | 15 -------- includes/discovery/os/bcm963.inc.php | 5 --- includes/discovery/os/bdcom.inc.php | 5 --- includes/discovery/os/binos.inc.php | 16 -------- includes/discovery/os/binox.inc.php | 16 -------- includes/discovery/os/bintec-smart.inc.php | 15 -------- includes/discovery/os/buffalo.inc.php | 15 -------- includes/discovery/os/calix.inc.php | 5 --- includes/discovery/os/canonprinter.inc.php | 5 --- includes/discovery/os/cat1900.inc.php | 5 --- includes/discovery/os/catos.inc.php | 5 --- includes/discovery/os/ceraos.inc.php | 5 --- includes/discovery/os/checkpoint.inc.php | 15 -------- includes/discovery/os/cimc.inc.php | 15 -------- includes/discovery/os/ciscosb.inc.php | 17 --------- includes/discovery/os/cmts.inc.php | 28 -------------- includes/discovery/os/cucm.inc.php | 15 -------- includes/discovery/os/datacom.inc.php | 5 --- includes/discovery/os/datadomain.inc.php | 5 --- includes/discovery/os/dcn-software.inc.php | 34 ----------------- includes/discovery/os/dell-ups.inc.php | 21 ---------- includes/discovery/os/deltaups.inc.php | 5 --- includes/discovery/os/developprinter.inc.php | 15 -------- includes/discovery/os/dnos.inc.php | 26 ------------- includes/discovery/os/edgecos.inc.php | 38 ------------------- includes/discovery/os/epson.inc.php | 5 --- includes/discovery/os/equallogic.inc.php | 5 --- includes/discovery/os/extremeware.inc.php | 5 --- includes/discovery/os/f5.inc.php | 5 --- includes/discovery/os/fabos.inc.php | 13 ------- includes/discovery/os/fireware.inc.php | 16 -------- includes/discovery/os/flareos.inc.php | 15 -------- includes/discovery/os/fortigate.inc.php | 5 --- includes/discovery/os/fortios.inc.php | 5 --- includes/discovery/os/foundryos.inc.php | 15 -------- includes/discovery/os/ftos.inc.php | 5 --- .../discovery/os/fujitsueternusos.inc.php | 21 ---------- includes/discovery/os/fujitsupyos.inc.php | 15 -------- includes/discovery/os/fxos.inc.php | 15 -------- includes/discovery/os/hpblmos.inc.php | 15 -------- includes/discovery/os/hpe-msl.inc.php | 34 ----------------- includes/discovery/os/hpvc.inc.php | 5 --- includes/discovery/os/hwg-poseidon.inc.php | 15 -------- includes/discovery/os/hwg-ste.inc.php | 15 -------- includes/discovery/os/hwg-ste2.inc.php | 15 -------- includes/discovery/os/hytera.inc.php | 5 --- includes/discovery/os/ibm-amm.inc.php | 15 -------- includes/discovery/os/ibm-imm.inc.php | 15 -------- includes/discovery/os/ibmnos.inc.php | 15 -------- includes/discovery/os/informos.inc.php | 15 -------- includes/discovery/os/iosxe.inc.php | 5 --- includes/discovery/os/iosxr.inc.php | 5 --- includes/discovery/os/ipoman.inc.php | 5 --- includes/discovery/os/ise.inc.php | 5 --- includes/discovery/os/jetstream.inc.php | 34 ----------------- includes/discovery/os/juniperex2500os.inc.php | 5 --- includes/discovery/os/junose.inc.php | 5 --- includes/discovery/os/konica.inc.php | 5 --- includes/discovery/os/kyocera.inc.php | 5 --- includes/discovery/os/lanier.inc.php | 5 --- includes/discovery/os/lantronix-slc.inc.php | 17 --------- includes/discovery/os/lenovoemc.inc.php | 5 --- includes/discovery/os/lexmarkprinter.inc.php | 5 --- includes/discovery/os/liebert.inc.php | 5 --- includes/discovery/os/linux.inc.php | 3 +- includes/discovery/os/maipu.inc.php | 15 -------- includes/discovery/os/mellanox.inc.php | 5 --- includes/discovery/os/mgepdu.inc.php | 5 --- includes/discovery/os/microsemitime.inc.php | 15 -------- includes/discovery/os/mimosa.inc.php | 15 -------- includes/discovery/os/minkelsrms.inc.php | 5 --- includes/discovery/os/moxa-nport.inc.php | 14 ------- includes/discovery/os/netapp.inc.php | 5 --- includes/discovery/os/netonix.inc.php | 28 -------------- includes/discovery/os/netscaler.inc.php | 5 --- includes/discovery/os/netvision.inc.php | 5 --- includes/discovery/os/netware.inc.php | 5 --- includes/discovery/os/nimbleos.inc.php | 15 -------- includes/discovery/os/nios.inc.php | 5 --- includes/discovery/os/nitro.inc.php | 5 --- includes/discovery/os/nrg.inc.php | 5 --- includes/discovery/os/nxos.inc.php | 5 --- includes/discovery/os/okilan.inc.php | 5 --- includes/discovery/os/onefs.inc.php | 5 --- includes/discovery/os/ons.inc.php | 5 --- includes/discovery/os/oracle-ilom.inc.php | 15 -------- includes/discovery/os/packetshaper.inc.php | 5 --- includes/discovery/os/panos.inc.php | 5 --- includes/discovery/os/papouch-tme.inc.php | 5 --- includes/discovery/os/pbn-cp.inc.php | 5 --- includes/discovery/os/pbn.inc.php | 8 ---- includes/discovery/os/perle.inc.php | 15 -------- includes/discovery/os/pix.inc.php | 5 --- includes/discovery/os/planetos.inc.php | 15 -------- includes/discovery/os/powercode.inc.php | 17 --------- includes/discovery/os/powervault.inc.php | 5 --- includes/discovery/os/powerware.inc.php | 5 --- .../discovery/os/primeinfrastructure.inc.php | 5 --- includes/discovery/os/proxim.inc.php | 5 --- includes/discovery/os/pulse.inc.php | 15 -------- includes/discovery/os/quanta.inc.php | 5 --- includes/discovery/os/radlan.inc.php | 5 --- includes/discovery/os/raritan.inc.php | 5 --- includes/discovery/os/redback.inc.php | 5 --- includes/discovery/os/ricoh.inc.php | 5 --- includes/discovery/os/riverbed.inc.php | 15 -------- includes/discovery/os/ruckuswireless.inc.php | 17 --------- includes/discovery/os/saf.inc.php | 5 --- includes/discovery/os/samsungprinter.inc.php | 5 --- includes/discovery/os/sanos.inc.php | 5 --- includes/discovery/os/screenos.inc.php | 5 --- includes/discovery/os/serveriron.inc.php | 16 -------- includes/discovery/os/sgos.inc.php | 4 -- includes/discovery/os/sharp.inc.php | 5 --- includes/discovery/os/smartax.inc.php | 28 -------------- includes/discovery/os/sonicwall.inc.php | 5 --- includes/discovery/os/sonus-gsx.inc.php | 15 -------- includes/discovery/os/sonus-sbc.inc.php | 15 -------- includes/discovery/os/sub10.inc.php | 8 ---- includes/discovery/os/symbol.inc.php | 5 --- includes/discovery/os/timos.inc.php | 15 -------- includes/discovery/os/tpconductor.inc.php | 5 --- includes/discovery/os/tplink.inc.php | 5 --- includes/discovery/os/vccodec.inc.php | 5 --- includes/discovery/os/vcs.inc.php | 5 --- includes/discovery/os/viprinux.inc.php | 5 --- includes/discovery/os/vrp.inc.php | 5 --- includes/discovery/os/webpower.inc.php | 5 --- includes/discovery/os/wxgoos.inc.php | 9 ----- includes/discovery/os/xerox.inc.php | 5 --- includes/discovery/os/xirrus.inc.php | 5 --- includes/discovery/os/xos.inc.php | 5 --- includes/discovery/os/zxr10.inc.php | 5 --- 297 files changed, 556 insertions(+), 1486 deletions(-) create mode 100644 includes/definitions/redback.yaml delete mode 100644 includes/discovery/os/3com.inc.php delete mode 100644 includes/discovery/os/acs.inc.php delete mode 100644 includes/discovery/os/aen.inc.php delete mode 100644 includes/discovery/os/aerohive.inc.php delete mode 100644 includes/discovery/os/airport.inc.php delete mode 100644 includes/discovery/os/akcp.inc.php delete mode 100644 includes/discovery/os/apc.inc.php delete mode 100644 includes/discovery/os/apic.inc.php delete mode 100644 includes/discovery/os/areca.inc.php delete mode 100644 includes/discovery/os/arista-eos.inc.php delete mode 100644 includes/discovery/os/avaya-vsp.inc.php delete mode 100644 includes/discovery/os/avtech.inc.php delete mode 100644 includes/discovery/os/barracudangfirewall.inc.php delete mode 100644 includes/discovery/os/barracudaspamfirewall.inc.php delete mode 100644 includes/discovery/os/bcm963.inc.php delete mode 100644 includes/discovery/os/bdcom.inc.php delete mode 100644 includes/discovery/os/binos.inc.php delete mode 100644 includes/discovery/os/binox.inc.php delete mode 100644 includes/discovery/os/bintec-smart.inc.php delete mode 100644 includes/discovery/os/buffalo.inc.php delete mode 100644 includes/discovery/os/calix.inc.php delete mode 100644 includes/discovery/os/canonprinter.inc.php delete mode 100644 includes/discovery/os/cat1900.inc.php delete mode 100644 includes/discovery/os/catos.inc.php delete mode 100644 includes/discovery/os/ceraos.inc.php delete mode 100644 includes/discovery/os/checkpoint.inc.php delete mode 100644 includes/discovery/os/cimc.inc.php delete mode 100644 includes/discovery/os/ciscosb.inc.php delete mode 100644 includes/discovery/os/cmts.inc.php delete mode 100644 includes/discovery/os/cucm.inc.php delete mode 100644 includes/discovery/os/datacom.inc.php delete mode 100644 includes/discovery/os/datadomain.inc.php delete mode 100644 includes/discovery/os/dcn-software.inc.php delete mode 100644 includes/discovery/os/dell-ups.inc.php delete mode 100644 includes/discovery/os/deltaups.inc.php delete mode 100644 includes/discovery/os/developprinter.inc.php delete mode 100644 includes/discovery/os/dnos.inc.php delete mode 100644 includes/discovery/os/edgecos.inc.php delete mode 100644 includes/discovery/os/epson.inc.php delete mode 100644 includes/discovery/os/equallogic.inc.php delete mode 100644 includes/discovery/os/extremeware.inc.php delete mode 100644 includes/discovery/os/f5.inc.php delete mode 100644 includes/discovery/os/fabos.inc.php delete mode 100644 includes/discovery/os/fireware.inc.php delete mode 100644 includes/discovery/os/flareos.inc.php delete mode 100644 includes/discovery/os/fortigate.inc.php delete mode 100644 includes/discovery/os/fortios.inc.php delete mode 100644 includes/discovery/os/foundryos.inc.php delete mode 100644 includes/discovery/os/ftos.inc.php delete mode 100644 includes/discovery/os/fujitsueternusos.inc.php delete mode 100644 includes/discovery/os/fujitsupyos.inc.php delete mode 100644 includes/discovery/os/fxos.inc.php delete mode 100644 includes/discovery/os/hpblmos.inc.php delete mode 100644 includes/discovery/os/hpe-msl.inc.php delete mode 100644 includes/discovery/os/hpvc.inc.php delete mode 100644 includes/discovery/os/hwg-poseidon.inc.php delete mode 100644 includes/discovery/os/hwg-ste.inc.php delete mode 100644 includes/discovery/os/hwg-ste2.inc.php delete mode 100644 includes/discovery/os/hytera.inc.php delete mode 100644 includes/discovery/os/ibm-amm.inc.php delete mode 100644 includes/discovery/os/ibm-imm.inc.php delete mode 100644 includes/discovery/os/ibmnos.inc.php delete mode 100644 includes/discovery/os/informos.inc.php delete mode 100644 includes/discovery/os/iosxe.inc.php delete mode 100644 includes/discovery/os/iosxr.inc.php delete mode 100644 includes/discovery/os/ipoman.inc.php delete mode 100644 includes/discovery/os/ise.inc.php delete mode 100644 includes/discovery/os/jetstream.inc.php delete mode 100644 includes/discovery/os/juniperex2500os.inc.php delete mode 100644 includes/discovery/os/junose.inc.php delete mode 100644 includes/discovery/os/konica.inc.php delete mode 100644 includes/discovery/os/kyocera.inc.php delete mode 100644 includes/discovery/os/lanier.inc.php delete mode 100644 includes/discovery/os/lantronix-slc.inc.php delete mode 100644 includes/discovery/os/lenovoemc.inc.php delete mode 100644 includes/discovery/os/lexmarkprinter.inc.php delete mode 100644 includes/discovery/os/liebert.inc.php delete mode 100644 includes/discovery/os/maipu.inc.php delete mode 100644 includes/discovery/os/mellanox.inc.php delete mode 100644 includes/discovery/os/mgepdu.inc.php delete mode 100644 includes/discovery/os/microsemitime.inc.php delete mode 100644 includes/discovery/os/mimosa.inc.php delete mode 100644 includes/discovery/os/minkelsrms.inc.php delete mode 100644 includes/discovery/os/moxa-nport.inc.php delete mode 100644 includes/discovery/os/netapp.inc.php delete mode 100644 includes/discovery/os/netonix.inc.php delete mode 100644 includes/discovery/os/netscaler.inc.php delete mode 100644 includes/discovery/os/netvision.inc.php delete mode 100644 includes/discovery/os/netware.inc.php delete mode 100644 includes/discovery/os/nimbleos.inc.php delete mode 100644 includes/discovery/os/nios.inc.php delete mode 100644 includes/discovery/os/nitro.inc.php delete mode 100644 includes/discovery/os/nrg.inc.php delete mode 100644 includes/discovery/os/nxos.inc.php delete mode 100644 includes/discovery/os/okilan.inc.php delete mode 100644 includes/discovery/os/onefs.inc.php delete mode 100644 includes/discovery/os/ons.inc.php delete mode 100644 includes/discovery/os/oracle-ilom.inc.php delete mode 100644 includes/discovery/os/packetshaper.inc.php delete mode 100644 includes/discovery/os/panos.inc.php delete mode 100644 includes/discovery/os/papouch-tme.inc.php delete mode 100644 includes/discovery/os/pbn-cp.inc.php delete mode 100644 includes/discovery/os/pbn.inc.php delete mode 100644 includes/discovery/os/perle.inc.php delete mode 100644 includes/discovery/os/pix.inc.php delete mode 100644 includes/discovery/os/planetos.inc.php delete mode 100644 includes/discovery/os/powercode.inc.php delete mode 100644 includes/discovery/os/powervault.inc.php delete mode 100644 includes/discovery/os/powerware.inc.php delete mode 100644 includes/discovery/os/primeinfrastructure.inc.php delete mode 100644 includes/discovery/os/proxim.inc.php delete mode 100644 includes/discovery/os/pulse.inc.php delete mode 100644 includes/discovery/os/quanta.inc.php delete mode 100644 includes/discovery/os/radlan.inc.php delete mode 100644 includes/discovery/os/raritan.inc.php delete mode 100644 includes/discovery/os/redback.inc.php delete mode 100644 includes/discovery/os/ricoh.inc.php delete mode 100644 includes/discovery/os/riverbed.inc.php delete mode 100644 includes/discovery/os/ruckuswireless.inc.php delete mode 100644 includes/discovery/os/saf.inc.php delete mode 100644 includes/discovery/os/samsungprinter.inc.php delete mode 100644 includes/discovery/os/sanos.inc.php delete mode 100644 includes/discovery/os/screenos.inc.php delete mode 100644 includes/discovery/os/serveriron.inc.php delete mode 100644 includes/discovery/os/sgos.inc.php delete mode 100644 includes/discovery/os/sharp.inc.php delete mode 100644 includes/discovery/os/smartax.inc.php delete mode 100644 includes/discovery/os/sonicwall.inc.php delete mode 100644 includes/discovery/os/sonus-gsx.inc.php delete mode 100644 includes/discovery/os/sonus-sbc.inc.php delete mode 100644 includes/discovery/os/sub10.inc.php delete mode 100644 includes/discovery/os/symbol.inc.php delete mode 100644 includes/discovery/os/timos.inc.php delete mode 100644 includes/discovery/os/tpconductor.inc.php delete mode 100644 includes/discovery/os/tplink.inc.php delete mode 100644 includes/discovery/os/vccodec.inc.php delete mode 100644 includes/discovery/os/vcs.inc.php delete mode 100644 includes/discovery/os/viprinux.inc.php delete mode 100644 includes/discovery/os/vrp.inc.php delete mode 100644 includes/discovery/os/webpower.inc.php delete mode 100644 includes/discovery/os/wxgoos.inc.php delete mode 100644 includes/discovery/os/xerox.inc.php delete mode 100644 includes/discovery/os/xirrus.inc.php delete mode 100644 includes/discovery/os/xos.inc.php delete mode 100644 includes/discovery/os/zxr10.inc.php diff --git a/includes/definitions/3com.yaml b/includes/definitions/3com.yaml index a8fd366c97..5f285814e7 100644 --- a/includes/definitions/3com.yaml +++ b/includes/definitions/3com.yaml @@ -3,3 +3,8 @@ text: 3Com over: - { graph: device_bits, text: Traffic } type: network +discovery: + - sysDescr: + - 3Com Switch + - 3Com SuperStack + - 3Com Baseline diff --git a/includes/definitions/acs.yaml b/includes/definitions/acs.yaml index 1f43d11f6e..ecbcf24804 100644 --- a/includes/definitions/acs.yaml +++ b/includes/definitions/acs.yaml @@ -28,3 +28,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.9.1.1117 diff --git a/includes/definitions/aen.yaml b/includes/definitions/aen.yaml index f14d325bd0..751bae625c 100644 --- a/includes/definitions/aen.yaml +++ b/includes/definitions/aen.yaml @@ -8,3 +8,8 @@ over: - { graph: device_mempool, text: 'Memory Usage' } mib_dir: - accedian +discovery: + - sysDescr: + - AMN- + - AEN- + - AMO- diff --git a/includes/definitions/aerohive.yaml b/includes/definitions/aerohive.yaml index c03bc37160..0251e3381c 100644 --- a/includes/definitions/aerohive.yaml +++ b/includes/definitions/aerohive.yaml @@ -4,3 +4,6 @@ type: wireless icon: aerohive over: - { graph: device_bits, text: Traffic } +discovery: + - sysDescr: + - HiveOS diff --git a/includes/definitions/airport.yaml b/includes/definitions/airport.yaml index 8653403760..5f5940e566 100644 --- a/includes/definitions/airport.yaml +++ b/includes/definitions/airport.yaml @@ -2,3 +2,8 @@ os: airport type: wireless text: 'Apple AirPort' icon: apple +discovery: + - sysDescr: + - Apple AirPort + - Apple Base Station + - Base Station V3.84 diff --git a/includes/definitions/akcp.yaml b/includes/definitions/akcp.yaml index 5eb3b22a85..52f86e3879 100644 --- a/includes/definitions/akcp.yaml +++ b/includes/definitions/akcp.yaml @@ -3,3 +3,6 @@ text: 'AKCP SensorProbe' type: environment over: - { graph: device_temperature, text: temperature } +discovery: + - sysDescr: + - SensorProbe diff --git a/includes/definitions/apc.yaml b/includes/definitions/apc.yaml index 97571fb9f9..b1e66ba76a 100644 --- a/includes/definitions/apc.yaml +++ b/includes/definitions/apc.yaml @@ -3,3 +3,10 @@ text: 'APC Management Module' type: power over: - { graph: device_current, text: Current } +discovery: + - sysDescr: + - APC Web/SNMP Management Card + - APC Switched Rack PDU + - APC MasterSwitch PDU + - APC Metered Rack PDU + - APC Embedded PowerNet diff --git a/includes/definitions/apic.yaml b/includes/definitions/apic.yaml index 16127ae2f1..2049f60c1a 100644 --- a/includes/definitions/apic.yaml +++ b/includes/definitions/apic.yaml @@ -25,3 +25,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.9.1.2238 diff --git a/includes/definitions/areca.yaml b/includes/definitions/areca.yaml index 041bbdc9f8..3d0fb0472a 100644 --- a/includes/definitions/areca.yaml +++ b/includes/definitions/areca.yaml @@ -3,3 +3,6 @@ text: 'Areca RAID Subsystem' type: appliance over: - { graph: '', text: '' } +discovery: + - sysDescr: + - Raid Subsystem V diff --git a/includes/definitions/arista_eos.yaml b/includes/definitions/arista_eos.yaml index 9c32574053..e1556e1c25 100644 --- a/includes/definitions/arista_eos.yaml +++ b/includes/definitions/arista_eos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - Arista Networks EOS diff --git a/includes/definitions/avaya-vsp.yaml b/includes/definitions/avaya-vsp.yaml index a7a631783f..3ffab0be1f 100644 --- a/includes/definitions/avaya-vsp.yaml +++ b/includes/definitions/avaya-vsp.yaml @@ -8,3 +8,12 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2272.202 + - .1.3.6.1.4.1.2272.203 + - .1.3.6.1.4.1.2272.205 + - .1.3.6.1.4.1.2272.206 + - .1.3.6.1.4.1.2272.208 + - .1.3.6.1.4.1.2272.209 + - .1.3.6.1.4.1.2272.210 diff --git a/includes/definitions/avtech.yaml b/includes/definitions/avtech.yaml index 1f7c73c009..045ee28c05 100644 --- a/includes/definitions/avtech.yaml +++ b/includes/definitions/avtech.yaml @@ -4,3 +4,6 @@ type: environment icon: avtech over: - { graph: device_temperature, text: Temperature } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.20916.1. diff --git a/includes/definitions/barracudangfirewall.yaml b/includes/definitions/barracudangfirewall.yaml index fa4ec850ce..206ebba0bb 100644 --- a/includes/definitions/barracudangfirewall.yaml +++ b/includes/definitions/barracudangfirewall.yaml @@ -4,3 +4,6 @@ type: firewall icon: barracuda over: - { graph: device_bits, text: Traffic } +discovery: + - sysDescr: + - Barracuda Firewall diff --git a/includes/definitions/barracudaspamfirewall.yaml b/includes/definitions/barracudaspamfirewall.yaml index e838c2076f..12f64b86a9 100644 --- a/includes/definitions/barracudaspamfirewall.yaml +++ b/includes/definitions/barracudaspamfirewall.yaml @@ -4,3 +4,6 @@ type: firewall icon: barracuda over: - { graph: device_bits, text: Traffic } +discovery: + - sysDescr: + - Barracuda Spam Firewall diff --git a/includes/definitions/bcm963.yaml b/includes/definitions/bcm963.yaml index f91e00e09c..edd2a9fad2 100644 --- a/includes/definitions/bcm963.yaml +++ b/includes/definitions/bcm963.yaml @@ -4,3 +4,6 @@ type: network icon: broadcom over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysDescr: + - bcm963 diff --git a/includes/definitions/bdcom.yaml b/includes/definitions/bdcom.yaml index 1cba8c5824..e8f68e4c28 100644 --- a/includes/definitions/bdcom.yaml +++ b/includes/definitions/bdcom.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.3320.1 diff --git a/includes/definitions/binos.yaml b/includes/definitions/binos.yaml index 13e27b7c2e..18394bd92f 100644 --- a/includes/definitions/binos.yaml +++ b/includes/definitions/binos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.738.1.5.100 diff --git a/includes/definitions/binox.yaml b/includes/definitions/binox.yaml index 08de139137..852ac7c463 100644 --- a/includes/definitions/binox.yaml +++ b/includes/definitions/binox.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.738.10.5.100 diff --git a/includes/definitions/bintec-smart.yaml b/includes/definitions/bintec-smart.yaml index 77ff0717de..60fd6de563 100644 --- a/includes/definitions/bintec-smart.yaml +++ b/includes/definitions/bintec-smart.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_fortigate_cpu, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.272.4.201.82.78.79.48 diff --git a/includes/definitions/buffalo.yaml b/includes/definitions/buffalo.yaml index cbd6a30ac6..e36aab8b5c 100644 --- a/includes/definitions/buffalo.yaml +++ b/includes/definitions/buffalo.yaml @@ -4,3 +4,6 @@ type: storage icon: buffalo over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysDescr: + - BUFFALO TeraStation diff --git a/includes/definitions/calix.yaml b/includes/definitions/calix.yaml index 0fe60267e7..29417f8afa 100644 --- a/includes/definitions/calix.yaml +++ b/includes/definitions/calix.yaml @@ -6,3 +6,8 @@ empty_ifdescr: 1 icon: calix over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.6321.1.2.2.5.3 + - .1.3.6.1.4.1.6066.1.44 + - .1.3.6.1.4.1.6321.1.2.3 diff --git a/includes/definitions/canonprinter.yaml b/includes/definitions/canonprinter.yaml index 1e1227d7d3..501c75c8a4 100644 --- a/includes/definitions/canonprinter.yaml +++ b/includes/definitions/canonprinter.yaml @@ -5,3 +5,7 @@ type: printer icon: canon over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - Canon MF + - Canon iR diff --git a/includes/definitions/cat1900.yaml b/includes/definitions/cat1900.yaml index aaae470374..c9e84c21fa 100644 --- a/includes/definitions/cat1900.yaml +++ b/includes/definitions/cat1900.yaml @@ -32,3 +32,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysDescr: + - Cisco Systems Catalyst 1900 diff --git a/includes/definitions/catos.yaml b/includes/definitions/catos.yaml index 2e67ef7bd8..62b60990f6 100644 --- a/includes/definitions/catos.yaml +++ b/includes/definitions/catos.yaml @@ -31,3 +31,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - Cisco Catalyst Operating System Software diff --git a/includes/definitions/ceraos.yaml b/includes/definitions/ceraos.yaml index a199ca5398..8027288c9c 100644 --- a/includes/definitions/ceraos.yaml +++ b/includes/definitions/ceraos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_ceraos_RxLevel, text: 'Rx Level' } - { graph: device_ping_perf, text: 'Ping Times' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2281 diff --git a/includes/definitions/cimc.yaml b/includes/definitions/cimc.yaml index 9466a75544..0cfa8539c0 100644 --- a/includes/definitions/cimc.yaml +++ b/includes/definitions/cimc.yaml @@ -25,3 +25,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - Cisco Integrated Management Controller diff --git a/includes/definitions/ciscosb.yaml b/includes/definitions/ciscosb.yaml index 6f4b6db823..99384b4e5c 100644 --- a/includes/definitions/ciscosb.yaml +++ b/includes/definitions/ciscosb.yaml @@ -35,3 +35,12 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.9.6.1.80 + - .1.3.6.1.4.1.9.6.1.81 + - .1.3.6.1.4.1.9.6.1.82 + - .1.3.6.1.4.1.9.6.1.83 + - .1.3.6.1.4.1.9.6.1.85 + - .1.3.6.1.4.1.9.6.1.88 + - .1.3.6.1.4.1.9.6.1.89 diff --git a/includes/definitions/ciscowlc.yaml b/includes/definitions/ciscowlc.yaml index 7037f4dc07..07806051e8 100644 --- a/includes/definitions/ciscowlc.yaml +++ b/includes/definitions/ciscowlc.yaml @@ -29,3 +29,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysDescr: + - Cisco Controller diff --git a/includes/definitions/cmts.yaml b/includes/definitions/cmts.yaml index ec0867f7dc..ff704b229c 100644 --- a/includes/definitions/cmts.yaml +++ b/includes/definitions/cmts.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.4998.2.1 diff --git a/includes/definitions/cucm.yaml b/includes/definitions/cucm.yaml index 24f78646ac..7d2b261793 100644 --- a/includes/definitions/cucm.yaml +++ b/includes/definitions/cucm.yaml @@ -26,3 +26,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysObjectId: + - .1.3.6.1.4.1.9.1.1348 diff --git a/includes/definitions/datacom.yaml b/includes/definitions/datacom.yaml index 4caedebf0f..126bc95886 100644 --- a/includes/definitions/datacom.yaml +++ b/includes/definitions/datacom.yaml @@ -2,3 +2,6 @@ os: datacom text: Datacom type: network icon: datacom +discovery: + - sysObjectId: + - .1.3.6.1.4.1.3709 diff --git a/includes/definitions/datadomain.yaml b/includes/definitions/datadomain.yaml index e75b354e3b..502e88a3da 100644 --- a/includes/definitions/datadomain.yaml +++ b/includes/definitions/datadomain.yaml @@ -7,3 +7,6 @@ over: - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } - { graph: device_storage, text: 'Storage Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.19746.3.1 diff --git a/includes/definitions/dcn-software.yaml b/includes/definitions/dcn-software.yaml index 4dd4b75a46..3293a00c9a 100644 --- a/includes/definitions/dcn-software.yaml +++ b/includes/definitions/dcn-software.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.6339.1.1.1.280 diff --git a/includes/definitions/deliberant.yaml b/includes/definitions/deliberant.yaml index c3014ffb27..5ba6d0a431 100644 --- a/includes/definitions/deliberant.yaml +++ b/includes/definitions/deliberant.yaml @@ -4,3 +4,6 @@ type: wireless icon: deliberant over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysDescr: + - Deliberant diff --git a/includes/definitions/dell-ups.yaml b/includes/definitions/dell-ups.yaml index 6c0bf0179c..9ca4a90f96 100644 --- a/includes/definitions/dell-ups.yaml +++ b/includes/definitions/dell-ups.yaml @@ -6,3 +6,6 @@ over: - { graph: device_current, text: Current } mib_dir: - dell +discovery: + - sysObjectId: + - .1.3.6.1.4.1.674.10902.2 diff --git a/includes/definitions/deltaups.yaml b/includes/definitions/deltaups.yaml index 7028b477d6..fc299a32a3 100644 --- a/includes/definitions/deltaups.yaml +++ b/includes/definitions/deltaups.yaml @@ -4,3 +4,6 @@ type: power icon: delta mib_dir: - delta +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2254.2.4 diff --git a/includes/definitions/developprinter.yaml b/includes/definitions/developprinter.yaml index 7e7b8fa100..e0418eee12 100644 --- a/includes/definitions/developprinter.yaml +++ b/includes/definitions/developprinter.yaml @@ -5,3 +5,6 @@ type: printer icon: develop over: - { graph: device_toner, text: Toner } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.18334.1.2.1.2.1.50.2.2 diff --git a/includes/definitions/dnos.yaml b/includes/definitions/dnos.yaml index 7cd29a0781..c7e4901f06 100644 --- a/includes/definitions/dnos.yaml +++ b/includes/definitions/dnos.yaml @@ -9,3 +9,21 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.6027.1. + - .1.3.6.1.4.1.674.10895.3042 + - .1.3.6.1.4.1.674.10895.3044 + - .1.3.6.1.4.1.674.10895.3045 + - .1.3.6.1.4.1.674.10895.3046 + - .1.3.6.1.4.1.674.10895.3053 + - .1.3.6.1.4.1.674.10895.3054 + - .1.3.6.1.4.1.674.10895.3055 + - .1.3.6.1.4.1.674.10895.3056 + - .1.3.6.1.4.1.674.10895.3057 + - .1.3.6.1.4.1.674.10895.3058 + - .1.3.6.1.4.1.674.10895.3059 + - .1.3.6.1.4.1.674.10895.3060 + - .1.3.6.1.4.1.674.10895.3061 + - .1.3.6.1.4.1.674.10895.3063 + - .1.3.6.1.4.1.674.10895.3066 diff --git a/includes/definitions/edgecos.yaml b/includes/definitions/edgecos.yaml index 0078b1c273..b0aaf357db 100644 --- a/includes/definitions/edgecos.yaml +++ b/includes/definitions/edgecos.yaml @@ -7,3 +7,12 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.259.6.10.94 + - .1.3.6.1.4.1.259.10.1.45.103 + - .1.3.6.1.4.1.259.10.1.24.104 + - .1.3.6.1.4.1.259.10.1.24.103 + - .1.3.6.1.4.1.259.10.1.22.101 + - .1.3.6.1.4.1.259.10.1.42.101 + - .1.3.6.1.4.1.259.10.1.27.102 diff --git a/includes/definitions/epson.yaml b/includes/definitions/epson.yaml index 533c1c0413..b2f5cbda63 100644 --- a/includes/definitions/epson.yaml +++ b/includes/definitions/epson.yaml @@ -5,3 +5,6 @@ type: printer icon: epson over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - EPSON Built-in diff --git a/includes/definitions/equallogic.yaml b/includes/definitions/equallogic.yaml index 00e7375ccd..0671ac0ef4 100644 --- a/includes/definitions/equallogic.yaml +++ b/includes/definitions/equallogic.yaml @@ -7,3 +7,6 @@ over: - { graph: device_storage, text: 'Storage Usage' } mib_dir: - dell +discovery: + - sysObjectId: + - .1.3.6.1.4.1.12740.17.1 diff --git a/includes/definitions/extremeware.yaml b/includes/definitions/extremeware.yaml index 7cdeba0322..ead1d4617a 100644 --- a/includes/definitions/extremeware.yaml +++ b/includes/definitions/extremeware.yaml @@ -7,3 +7,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.1916.2 diff --git a/includes/definitions/f5.yaml b/includes/definitions/f5.yaml index 1c5f2614d3..e167cc3eb2 100644 --- a/includes/definitions/f5.yaml +++ b/includes/definitions/f5.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_ucd_memory, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.3375.2.1 diff --git a/includes/definitions/fabos.yaml b/includes/definitions/fabos.yaml index 9502286399..6ed47c9080 100644 --- a/includes/definitions/fabos.yaml +++ b/includes/definitions/fabos.yaml @@ -4,3 +4,8 @@ type: network icon: brocade over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.1588.2.1.1.1 + - .1.3.6.1.4.1.1588.2.1.1.43 + - .1.3.6.1.4.1.1588.2.1.1.72 diff --git a/includes/definitions/fireware.yaml b/includes/definitions/fireware.yaml index a16bd21eb7..7c6755c430 100644 --- a/includes/definitions/fireware.yaml +++ b/includes/definitions/fireware.yaml @@ -6,3 +6,7 @@ over: - { graph: device_processor, text: 'CPU Usage' } icon: watchguard group: watchguard +discovery: + - sysObjectId: + - .1.3.6.1.4.1.3097.1.4 + - .1.3.6.1.4.1.3097.1.5 diff --git a/includes/definitions/flareos.yaml b/includes/definitions/flareos.yaml index 57ea3ad9a2..d0646aa12f 100644 --- a/includes/definitions/flareos.yaml +++ b/includes/definitions/flareos.yaml @@ -4,3 +4,6 @@ type: storage icon: emc over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.1981.1.1 diff --git a/includes/definitions/fortigate.yaml b/includes/definitions/fortigate.yaml index db987b46de..1a660940d5 100644 --- a/includes/definitions/fortigate.yaml +++ b/includes/definitions/fortigate.yaml @@ -8,3 +8,7 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_fortigate_cpu, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.12356.15 + - .1.3.6.1.4.1.12356.101.1 diff --git a/includes/definitions/fortios.yaml b/includes/definitions/fortios.yaml index 044ec8651e..eca50324b5 100644 --- a/includes/definitions/fortios.yaml +++ b/includes/definitions/fortios.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.12356.103 diff --git a/includes/definitions/foundryos.yaml b/includes/definitions/foundryos.yaml index a604a695c5..e42dec1c09 100644 --- a/includes/definitions/foundryos.yaml +++ b/includes/definitions/foundryos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - Foundry Networks diff --git a/includes/definitions/ftos.yaml b/includes/definitions/ftos.yaml index 075e362a38..c9edbd99b9 100644 --- a/includes/definitions/ftos.yaml +++ b/includes/definitions/ftos.yaml @@ -8,3 +8,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - Force10 Operating System diff --git a/includes/definitions/fujitsueternusos.yaml b/includes/definitions/fujitsueternusos.yaml index db7993739b..827b4da6ae 100644 --- a/includes/definitions/fujitsueternusos.yaml +++ b/includes/definitions/fujitsueternusos.yaml @@ -8,3 +8,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.211.1.21.1.150 diff --git a/includes/definitions/fujitsupyos.yaml b/includes/definitions/fujitsupyos.yaml index ef53b31f99..363d9ce46f 100644 --- a/includes/definitions/fujitsupyos.yaml +++ b/includes/definitions/fujitsupyos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - PY CB Eth Switch diff --git a/includes/definitions/fxos.yaml b/includes/definitions/fxos.yaml index 2b56c1725b..48c314581c 100644 --- a/includes/definitions/fxos.yaml +++ b/includes/definitions/fxos.yaml @@ -25,3 +25,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - Cisco FX-OS diff --git a/includes/definitions/gaia.yaml b/includes/definitions/gaia.yaml index a548c60f8e..e9f49bae4d 100644 --- a/includes/definitions/gaia.yaml +++ b/includes/definitions/gaia.yaml @@ -7,3 +7,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2620.1.6.123.1.49 diff --git a/includes/definitions/hpblmos.yaml b/includes/definitions/hpblmos.yaml index bd50eb6687..f24e868b64 100644 --- a/includes/definitions/hpblmos.yaml +++ b/includes/definitions/hpblmos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11.5.7.1.2 diff --git a/includes/definitions/hpe-msl.yaml b/includes/definitions/hpe-msl.yaml index c3726f4d00..d92658f62b 100644 --- a/includes/definitions/hpe-msl.yaml +++ b/includes/definitions/hpe-msl.yaml @@ -3,4 +3,7 @@ text: 'HPE StoreEver MSL' type: storage icon: hp over: - - { graph: device_bits, text: Traffic } \ No newline at end of file + - { graph: device_bits, text: Traffic } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11.10.2.1.3.25 diff --git a/includes/definitions/hpvc.yaml b/includes/definitions/hpvc.yaml index 20b75d51aa..596e700233 100644 --- a/includes/definitions/hpvc.yaml +++ b/includes/definitions/hpvc.yaml @@ -4,3 +4,6 @@ type: network icon: hp over: - { graph: device_bits, text: Traffic } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11.5.7.5.1 diff --git a/includes/definitions/hwg-poseidon.yaml b/includes/definitions/hwg-poseidon.yaml index 796d793608..1e382f9919 100644 --- a/includes/definitions/hwg-poseidon.yaml +++ b/includes/definitions/hwg-poseidon.yaml @@ -4,3 +4,6 @@ type: environment icon: hwg-poseidon over: - { graph: device_bits, text: Traffic } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.21796.3.3 diff --git a/includes/definitions/hwg-ste.yaml b/includes/definitions/hwg-ste.yaml index a17ea792af..9e1a980d81 100644 --- a/includes/definitions/hwg-ste.yaml +++ b/includes/definitions/hwg-ste.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } mib_dir: - hwg +discovery: + - sysObjectId: + - .1.3.6.1.4.1.21796.4.1 diff --git a/includes/definitions/hwg-ste2.yaml b/includes/definitions/hwg-ste2.yaml index 054f7c5a16..341ff591d2 100644 --- a/includes/definitions/hwg-ste2.yaml +++ b/includes/definitions/hwg-ste2.yaml @@ -7,3 +7,6 @@ over: - { graph: device_humidity, text: Humidity } mib_dir: - hwg +discovery: + - sysObjectId: + - .1.3.6.1.4.1.21796.4.9 diff --git a/includes/definitions/hytera.yaml b/includes/definitions/hytera.yaml index 13dac5e545..36f0dae910 100644 --- a/includes/definitions/hytera.yaml +++ b/includes/definitions/hytera.yaml @@ -2,3 +2,6 @@ os: hytera text: 'Hytera Repeater' type: wireless icon: hytera +discovery: + - sysObjectId: + - .1.3.6.1.4.1.26381 diff --git a/includes/definitions/ibm-amm.yaml b/includes/definitions/ibm-amm.yaml index df7e19a6b8..97e280a5c4 100644 --- a/includes/definitions/ibm-amm.yaml +++ b/includes/definitions/ibm-amm.yaml @@ -4,3 +4,6 @@ type: appliance icon: ibmnos mib_dir: - ibm +discovery: + - sysDescr: + - BladeCenter Advanced Management Module diff --git a/includes/definitions/ibm-imm.yaml b/includes/definitions/ibm-imm.yaml index 97074c9847..31f91e0e4a 100644 --- a/includes/definitions/ibm-imm.yaml +++ b/includes/definitions/ibm-imm.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2.3.51.3 diff --git a/includes/definitions/ibmnos.yaml b/includes/definitions/ibmnos.yaml index 2d91627c0c..96d34694a5 100644 --- a/includes/definitions/ibmnos.yaml +++ b/includes/definitions/ibmnos.yaml @@ -4,3 +4,8 @@ type: network icon: ibmnos over: - { graph: device_bits, text: Traffic } +discovery: + - sysDescr: + - IBM Networking Operating System + - IBM Flex System Fabric + - IBM Networking OS diff --git a/includes/definitions/informos.yaml b/includes/definitions/informos.yaml index 3f9c857b32..fb860134e3 100644 --- a/includes/definitions/informos.yaml +++ b/includes/definitions/informos.yaml @@ -4,3 +4,6 @@ type: storage icon: hp over: - { graph: device_bits, text: Traffic } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.12925.1 diff --git a/includes/definitions/iosxe.yaml b/includes/definitions/iosxe.yaml index f7f9f6cf70..4e1023c262 100644 --- a/includes/definitions/iosxe.yaml +++ b/includes/definitions/iosxe.yaml @@ -32,4 +32,8 @@ discovery_modules: cisco-vrf: 1 cisco-vrf-lite: 1 register_mibs: - ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB \ No newline at end of file + ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB +discovery: + - sysDescr: + - IOS-XE + - X86_64_LINUX_IOSD diff --git a/includes/definitions/iosxr.yaml b/includes/definitions/iosxr.yaml index c560fd308c..ba041a9bd7 100644 --- a/includes/definitions/iosxr.yaml +++ b/includes/definitions/iosxr.yaml @@ -32,4 +32,7 @@ discovery_modules: cisco-vrf: 1 cisco-vrf-lite: 1 register_mibs: - ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB \ No newline at end of file + ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB +discovery: + - sysDescr: + - IOS XR diff --git a/includes/definitions/ipoman.yaml b/includes/definitions/ipoman.yaml index 240db30fc4..5d91ed5bbb 100644 --- a/includes/definitions/ipoman.yaml +++ b/includes/definitions/ipoman.yaml @@ -7,3 +7,6 @@ mib_dir: over: - { graph: device_current, text: Current } - { graph: device_power, text: Power } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2468.1.4.2.1 diff --git a/includes/definitions/ironware.yaml b/includes/definitions/ironware.yaml index 9ae3d3089c..b385ec73c1 100644 --- a/includes/definitions/ironware.yaml +++ b/includes/definitions/ironware.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - IronWare diff --git a/includes/definitions/ise.yaml b/includes/definitions/ise.yaml index 729c86f86e..12359caed5 100644 --- a/includes/definitions/ise.yaml +++ b/includes/definitions/ise.yaml @@ -26,3 +26,7 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysObjectId: + - .1.3.6.1.4.1.9.1.2139 + - .1.3.6.1.4.1.9.1.1426 diff --git a/includes/definitions/jetstream.yaml b/includes/definitions/jetstream.yaml index 1f5c15d1a0..f7385a1fd2 100644 --- a/includes/definitions/jetstream.yaml +++ b/includes/definitions/jetstream.yaml @@ -2,3 +2,6 @@ os: jetstream text: 'TP-Link JetStream' type: network icon: tplink +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11863.5.34 diff --git a/includes/definitions/juniperex2500os.yaml b/includes/definitions/juniperex2500os.yaml index bad895b427..d98d2c3d02 100644 --- a/includes/definitions/juniperex2500os.yaml +++ b/includes/definitions/juniperex2500os.yaml @@ -9,3 +9,6 @@ poller_modules: toner: 0 discovery_modules: toner: 0 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.1411.102 diff --git a/includes/definitions/junose.yaml b/includes/definitions/junose.yaml index 52dd07b863..ed020982e5 100644 --- a/includes/definitions/junose.yaml +++ b/includes/definitions/junose.yaml @@ -13,3 +13,6 @@ poller_modules: discovery_modules: junose-atm-vp: 1 toner: 0 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.4874 diff --git a/includes/definitions/jwos.yaml b/includes/definitions/jwos.yaml index b38d979060..eae25a44b0 100644 --- a/includes/definitions/jwos.yaml +++ b/includes/definitions/jwos.yaml @@ -7,3 +7,6 @@ poller_modules: toner: 0 discovery_modules: toner: 0 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.8239.1.2.9 diff --git a/includes/definitions/konica.yaml b/includes/definitions/konica.yaml index df7132d7f3..d66dafdbb0 100644 --- a/includes/definitions/konica.yaml +++ b/includes/definitions/konica.yaml @@ -4,3 +4,6 @@ text: 'Konica-Minolta Printer' type: printer over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - KONICA MINOLTA diff --git a/includes/definitions/kyocera.yaml b/includes/definitions/kyocera.yaml index ab73a021bd..486bd57006 100644 --- a/includes/definitions/kyocera.yaml +++ b/includes/definitions/kyocera.yaml @@ -5,3 +5,6 @@ over: - { graph: device_toner, text: Toner } ifname: 1 type: printer +discovery: + - sysDescr: + - KYOCERA diff --git a/includes/definitions/lanier.yaml b/includes/definitions/lanier.yaml index cf0e32ef1e..ec43cbca81 100644 --- a/includes/definitions/lanier.yaml +++ b/includes/definitions/lanier.yaml @@ -5,3 +5,6 @@ type: printer icon: lanier over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - LANIER diff --git a/includes/definitions/lantronix-slc.yaml b/includes/definitions/lantronix-slc.yaml index 35b84428ff..6e7b58c598 100644 --- a/includes/definitions/lantronix-slc.yaml +++ b/includes/definitions/lantronix-slc.yaml @@ -8,3 +8,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.244.1.1 diff --git a/includes/definitions/lcos.yaml b/includes/definitions/lcos.yaml index b8e1d0a7e1..8b28fc12c7 100644 --- a/includes/definitions/lcos.yaml +++ b/includes/definitions/lcos.yaml @@ -6,3 +6,7 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2356.11.8.103 + - .1.3.6.1.4.1.2356.600.6.310 diff --git a/includes/definitions/lenovoemc.yaml b/includes/definitions/lenovoemc.yaml index 179b1a0b88..fa29bff10b 100644 --- a/includes/definitions/lenovoemc.yaml +++ b/includes/definitions/lenovoemc.yaml @@ -13,4 +13,7 @@ register_mibs: fanValue: IOMEGANAS-MIB tempValue: IOMEGANAS-MIB raidStatus: IOMEGANAS-MIB - diskStatus: IOMEGANAS-MIB \ No newline at end of file + diskStatus: IOMEGANAS-MIB +discovery: + - sysDescr: + - EMC SOHO-NAS Storage. diff --git a/includes/definitions/lexmarkprinter.yaml b/includes/definitions/lexmarkprinter.yaml index a21bbaa5a8..3a4e1b69ed 100644 --- a/includes/definitions/lexmarkprinter.yaml +++ b/includes/definitions/lexmarkprinter.yaml @@ -5,3 +5,6 @@ type: printer icon: lexmark over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - Lexmark diff --git a/includes/definitions/liebert.yaml b/includes/definitions/liebert.yaml index 36138163d4..ee099f63d7 100644 --- a/includes/definitions/liebert.yaml +++ b/includes/definitions/liebert.yaml @@ -2,3 +2,6 @@ os: liebert text: Liebert type: power icon: liebert +discovery: + - sysObjectId: + - .1.3.6.1.4.1.476.1.42 diff --git a/includes/definitions/mellanox.yaml b/includes/definitions/mellanox.yaml index 182b24f041..ff8d9dcb00 100644 --- a/includes/definitions/mellanox.yaml +++ b/includes/definitions/mellanox.yaml @@ -5,3 +5,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.33049.1.1.1. diff --git a/includes/definitions/mgepdu.yaml b/includes/definitions/mgepdu.yaml index 6f50182b98..98e6a85446 100644 --- a/includes/definitions/mgepdu.yaml +++ b/includes/definitions/mgepdu.yaml @@ -4,3 +4,6 @@ type: power icon: mge mib_dir: - mge +discovery: + - sysDescr: + - MGE Switched PDU diff --git a/includes/definitions/microsemitime.yaml b/includes/definitions/microsemitime.yaml index 47d289bfcc..2ed537a447 100644 --- a/includes/definitions/microsemitime.yaml +++ b/includes/definitions/microsemitime.yaml @@ -2,3 +2,6 @@ os: microsemitime text: 'Microsemi Timing' type: timing icon: microsemi +discovery: + - sysObjectId: + - .1.3.6.1.4.1.39165.1.6 diff --git a/includes/definitions/mimosa.yaml b/includes/definitions/mimosa.yaml index ec60a0f522..39384eed7e 100644 --- a/includes/definitions/mimosa.yaml +++ b/includes/definitions/mimosa.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - Mimosa diff --git a/includes/definitions/minkelsrms.yaml b/includes/definitions/minkelsrms.yaml index 4fa728ebee..4168f1bc1f 100644 --- a/includes/definitions/minkelsrms.yaml +++ b/includes/definitions/minkelsrms.yaml @@ -3,3 +3,6 @@ text: 'Minkels RMS' type: environment over: - { graph: device_temperature, text: temperature } +discovery: + - sysDescr: + - 8VD-X20 diff --git a/includes/definitions/moxa-nport.yaml b/includes/definitions/moxa-nport.yaml index 6c1d0d8291..3f14a91352 100644 --- a/includes/definitions/moxa-nport.yaml +++ b/includes/definitions/moxa-nport.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.8691.2.7 diff --git a/includes/definitions/mypoweros.yaml b/includes/definitions/mypoweros.yaml index f30f318604..d9b568af17 100644 --- a/includes/definitions/mypoweros.yaml +++ b/includes/definitions/mypoweros.yaml @@ -7,3 +7,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.5651.1.102.21 diff --git a/includes/definitions/netapp.yaml b/includes/definitions/netapp.yaml index a325b6ca46..e1d8d6cd7f 100644 --- a/includes/definitions/netapp.yaml +++ b/includes/definitions/netapp.yaml @@ -3,3 +3,6 @@ type: storage text: NetApp over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysDescr: + - NetApp diff --git a/includes/definitions/netonix.yaml b/includes/definitions/netonix.yaml index 3fd255601c..9526bb05dc 100644 --- a/includes/definitions/netonix.yaml +++ b/includes/definitions/netonix.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.46242 diff --git a/includes/definitions/netscaler.yaml b/includes/definitions/netscaler.yaml index f0e264c2ed..d0505d0029 100644 --- a/includes/definitions/netscaler.yaml +++ b/includes/definitions/netscaler.yaml @@ -7,3 +7,6 @@ over: - { graph: device_processor, text: 'CPU Usage' } poller_modules: netscaler-vsvr: 0 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.5951.1 diff --git a/includes/definitions/netvision.yaml b/includes/definitions/netvision.yaml index a0b56f61ba..024c9fb4c8 100644 --- a/includes/definitions/netvision.yaml +++ b/includes/definitions/netvision.yaml @@ -3,3 +3,6 @@ text: 'Socomec Net Vision' type: power over: - { graph: device_current, text: Current } +discovery: + - sysDescr: + - Net Vision diff --git a/includes/definitions/netware.yaml b/includes/definitions/netware.yaml index 79d9632696..5da6d9d8de 100644 --- a/includes/definitions/netware.yaml +++ b/includes/definitions/netware.yaml @@ -2,3 +2,6 @@ os: netware type: server text: 'Novell Netware' icon: novell +discovery: + - sysDescr: + - Novell NetWare diff --git a/includes/definitions/nimbleos.yaml b/includes/definitions/nimbleos.yaml index 901302ae61..a7cd419aa6 100644 --- a/includes/definitions/nimbleos.yaml +++ b/includes/definitions/nimbleos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - Nimble Storage diff --git a/includes/definitions/nios.yaml b/includes/definitions/nios.yaml index b7a5f3dfaa..b5416f05b4 100644 --- a/includes/definitions/nios.yaml +++ b/includes/definitions/nios.yaml @@ -4,3 +4,6 @@ type: appliance mib_dir: - infoblox icon: infoblox +discovery: + - sysObjectId: + - .1.3.6.1.4.1.7779. diff --git a/includes/definitions/nitro.yaml b/includes/definitions/nitro.yaml index ad76cc8d97..3b1630fac5 100644 --- a/includes/definitions/nitro.yaml +++ b/includes/definitions/nitro.yaml @@ -6,3 +6,9 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.23128.1000.1.1 + - .1.3.6.1.4.1.23128.1000.3.1 + - .1.3.6.1.4.1.23128.1000.7.1 + - .1.3.6.1.4.1.23128.1000.11.1 diff --git a/includes/definitions/nrg.yaml b/includes/definitions/nrg.yaml index 666fe3760b..fb120f1403 100644 --- a/includes/definitions/nrg.yaml +++ b/includes/definitions/nrg.yaml @@ -5,3 +5,6 @@ type: printer icon: nrg over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - NRG Network Printer diff --git a/includes/definitions/nxos.yaml b/includes/definitions/nxos.yaml index fa8098e7b8..a8b642a68a 100644 --- a/includes/definitions/nxos.yaml +++ b/includes/definitions/nxos.yaml @@ -30,3 +30,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - NX-OS(tm) diff --git a/includes/definitions/okilan.yaml b/includes/definitions/okilan.yaml index 4e568803a1..e2febe8be7 100644 --- a/includes/definitions/okilan.yaml +++ b/includes/definitions/okilan.yaml @@ -6,3 +6,6 @@ overgraph: overtext: Toner type: printer icon: oki +discovery: + - sysDescr: + - OKI OkiLAN diff --git a/includes/definitions/onefs.yaml b/includes/definitions/onefs.yaml index 5590560eee..d333801cbc 100644 --- a/includes/definitions/onefs.yaml +++ b/includes/definitions/onefs.yaml @@ -7,3 +7,6 @@ over: - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } - { graph: device_storage, text: 'Storage Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.12124.1 diff --git a/includes/definitions/ons.yaml b/includes/definitions/ons.yaml index 45a302a3bf..15c8adfc19 100644 --- a/includes/definitions/ons.yaml +++ b/includes/definitions/ons.yaml @@ -26,3 +26,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - Cisco ONS diff --git a/includes/definitions/oracle-ilom.yaml b/includes/definitions/oracle-ilom.yaml index b030d757fa..4fca5b569b 100644 --- a/includes/definitions/oracle-ilom.yaml +++ b/includes/definitions/oracle-ilom.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.42.2.200.2.1.1 diff --git a/includes/definitions/packetshaper.yaml b/includes/definitions/packetshaper.yaml index a1fe3a571b..3415c57a56 100644 --- a/includes/definitions/packetshaper.yaml +++ b/includes/definitions/packetshaper.yaml @@ -1,3 +1,6 @@ os: packetshaper text: 'Blue Coat Packetshaper' type: network +discovery: + - sysDescr: + - PacketShaper diff --git a/includes/definitions/panos.yaml b/includes/definitions/panos.yaml index 16ad46ce65..a8aff85901 100644 --- a/includes/definitions/panos.yaml +++ b/includes/definitions/panos.yaml @@ -2,3 +2,6 @@ os: panos text: PanOS type: firewall icon: panos +discovery: + - sysDescr: + - Palo Alto Networks diff --git a/includes/definitions/papouch-tme.yaml b/includes/definitions/papouch-tme.yaml index fab8e4978e..85fdfae259 100644 --- a/includes/definitions/papouch-tme.yaml +++ b/includes/definitions/papouch-tme.yaml @@ -3,3 +3,7 @@ text: 'Papouch TME' type: environment over: - { graph: device_temperature, text: temperature } +discovery: + - sysDescr: + - SNMP TME + - TME diff --git a/includes/definitions/pbn-cp.yaml b/includes/definitions/pbn-cp.yaml index c4479f7d1b..a858c616ae 100644 --- a/includes/definitions/pbn-cp.yaml +++ b/includes/definitions/pbn-cp.yaml @@ -14,3 +14,6 @@ poller_modules: ospf: 0 services: 0 storage: 0 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11606.24 diff --git a/includes/definitions/pbn.yaml b/includes/definitions/pbn.yaml index 857abc6c1c..612452be18 100644 --- a/includes/definitions/pbn.yaml +++ b/includes/definitions/pbn.yaml @@ -7,3 +7,7 @@ over: - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } icon: pbn +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11606.10 + - .1.3.6.1.4.1.11606.25 diff --git a/includes/definitions/perle.yaml b/includes/definitions/perle.yaml index 08d070084f..9e913c751b 100644 --- a/includes/definitions/perle.yaml +++ b/includes/definitions/perle.yaml @@ -4,3 +4,6 @@ type: network icon: perle over: - { graph: device_bits, text: Traffic } +discovery: + - sysDescr: + - Perle MCR-MGT diff --git a/includes/definitions/pixos.yaml b/includes/definitions/pixos.yaml index c002dd1c46..123354f20c 100644 --- a/includes/definitions/pixos.yaml +++ b/includes/definitions/pixos.yaml @@ -42,3 +42,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - Cisco PIX diff --git a/includes/definitions/planetos.yaml b/includes/definitions/planetos.yaml index 213eacad4a..b41a6e49c1 100644 --- a/includes/definitions/planetos.yaml +++ b/includes/definitions/planetos.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.10456.1.1516 diff --git a/includes/definitions/powercode.yaml b/includes/definitions/powercode.yaml index 0545548551..0430e31571 100644 --- a/includes/definitions/powercode.yaml +++ b/includes/definitions/powercode.yaml @@ -8,3 +8,6 @@ over: - { graph: device_mempool, text: 'Memory Usage' } type: server processor_stacked: 1 +discovery: + - sysDescr: + - Powercode BMU diff --git a/includes/definitions/powervault.yaml b/includes/definitions/powervault.yaml index 46ef176a55..d7fc2916ff 100644 --- a/includes/definitions/powervault.yaml +++ b/includes/definitions/powervault.yaml @@ -4,3 +4,6 @@ icon: dell type: storage mib_dir: - dell +discovery: + - sysObjectId: + - .1.3.6.1.4.1.674.10893.2.102 diff --git a/includes/definitions/powerware.yaml b/includes/definitions/powerware.yaml index bc0c6a8c25..e9f80dd13b 100644 --- a/includes/definitions/powerware.yaml +++ b/includes/definitions/powerware.yaml @@ -8,3 +8,6 @@ over: - { graph: device_frequency, text: Frequencies } mib_dir: - ups +discovery: + - sysObjectId: + - .1.3.6.1.4.1.534 diff --git a/includes/definitions/primeinfrastructure.yaml b/includes/definitions/primeinfrastructure.yaml index bffb98571a..a7f13613ce 100644 --- a/includes/definitions/primeinfrastructure.yaml +++ b/includes/definitions/primeinfrastructure.yaml @@ -27,3 +27,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysObjectId: + - .1.3.6.1.4.1.9.1.2307 diff --git a/includes/definitions/proxim.yaml b/includes/definitions/proxim.yaml index 5df7d682eb..644bc44a5f 100644 --- a/includes/definitions/proxim.yaml +++ b/includes/definitions/proxim.yaml @@ -4,3 +4,6 @@ type: network icon: proxim over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11898.2.4.9 diff --git a/includes/definitions/pulse.yaml b/includes/definitions/pulse.yaml index c6a9c54d39..5012e7195c 100644 --- a/includes/definitions/pulse.yaml +++ b/includes/definitions/pulse.yaml @@ -6,3 +6,9 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - Pulse Connect Secure + - Pulse Secure + - Juniper Networks,Inc,VA-DTE + - VA-SPE diff --git a/includes/definitions/quanta.yaml b/includes/definitions/quanta.yaml index 92938ba518..6787629f39 100644 --- a/includes/definitions/quanta.yaml +++ b/includes/definitions/quanta.yaml @@ -4,3 +4,11 @@ type: network icon: quanta over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.4413 + - .1.3.6.1.4.1.7244 + - sysDescr: + - vxworks + - quanta + - LB9, Runtime Code diff --git a/includes/definitions/radlan.yaml b/includes/definitions/radlan.yaml index 877e939202..71d4481440 100644 --- a/includes/definitions/radlan.yaml +++ b/includes/definitions/radlan.yaml @@ -5,3 +5,6 @@ type: network over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } +discovery: + - sysDescr: + - AT-8000 diff --git a/includes/definitions/raisecom.yaml b/includes/definitions/raisecom.yaml index 4fca1fdaed..a2eea773c9 100644 --- a/includes/definitions/raisecom.yaml +++ b/includes/definitions/raisecom.yaml @@ -6,3 +6,6 @@ over: - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } icon: raisecom +discovery: + - sysObjectId: + - .1.3.6.1.4.1.8886 diff --git a/includes/definitions/raritan.yaml b/includes/definitions/raritan.yaml index 78e468e41c..e63892a72b 100644 --- a/includes/definitions/raritan.yaml +++ b/includes/definitions/raritan.yaml @@ -4,3 +4,7 @@ type: power over: - { graph: device_current, text: Current } icon: raritan +discovery: + - sysDescr: + - Raritan + - PX2 diff --git a/includes/definitions/redback.yaml b/includes/definitions/redback.yaml new file mode 100644 index 0000000000..caac5581ec --- /dev/null +++ b/includes/definitions/redback.yaml @@ -0,0 +1,7 @@ +os: redback +text: 'Redback' +type: network +icon: generic +discovery: + - sysDescr: + - Redback diff --git a/includes/definitions/ricoh.yaml b/includes/definitions/ricoh.yaml index 204a65fc8e..6d2d07bfd7 100644 --- a/includes/definitions/ricoh.yaml +++ b/includes/definitions/ricoh.yaml @@ -5,3 +5,7 @@ type: printer icon: ricoh over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - RICOH Aficio + - RICOH Network Printer diff --git a/includes/definitions/riverbed.yaml b/includes/definitions/riverbed.yaml index 2d9dd80b04..34145c349a 100644 --- a/includes/definitions/riverbed.yaml +++ b/includes/definitions/riverbed.yaml @@ -4,3 +4,6 @@ type: network icon: riverbed over: - { graph: device_bits, text: Traffic } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.17163.1.1 diff --git a/includes/definitions/ruckuswireless.yaml b/includes/definitions/ruckuswireless.yaml index f0ded8d545..0ba4451ce5 100644 --- a/includes/definitions/ruckuswireless.yaml +++ b/includes/definitions/ruckuswireless.yaml @@ -10,4 +10,7 @@ register_mibs: ruckusZDSystemStats: RUCKUS-ZD-SYSTEM-MIB ruckusZDWLANTable: RUCKUS-ZD-WLAN-MIB ruckusZDWLANAPTable: RUCKUS-ZD-WLAN-MIB - ruckusZDWLANAPRadioStatsTable: RUCKUS-ZD-WLAN-MIB \ No newline at end of file + ruckusZDWLANAPRadioStatsTable: RUCKUS-ZD-WLAN-MIB +discovery: + - sysObjectId: + - .1.3.6.1.4.1.25053.3.1 diff --git a/includes/definitions/saf.yaml b/includes/definitions/saf.yaml index dcb9215ceb..29c69260eb 100644 --- a/includes/definitions/saf.yaml +++ b/includes/definitions/saf.yaml @@ -6,3 +6,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_saf_radioRxLevel, text: 'Rx Level' } - { graph: device_ping_perf, text: 'Ping Times' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.7571.100.1.1.5 diff --git a/includes/definitions/samsungprinter.yaml b/includes/definitions/samsungprinter.yaml index 4c2742ae2e..570800bd54 100644 --- a/includes/definitions/samsungprinter.yaml +++ b/includes/definitions/samsungprinter.yaml @@ -4,3 +4,8 @@ text: 'Samsung Printer' type: printer over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - Samsung C + - Samsung S + - Samsung ML diff --git a/includes/definitions/sanos.yaml b/includes/definitions/sanos.yaml index d70cd383d1..832c434191 100644 --- a/includes/definitions/sanos.yaml +++ b/includes/definitions/sanos.yaml @@ -27,3 +27,6 @@ discovery_modules: cisco-pw: 1 cisco-vrf: 1 cisco-vrf-lite: 1 +discovery: + - sysDescr: + - SAN-OS diff --git a/includes/definitions/screenos.yaml b/includes/definitions/screenos.yaml index 0229ef45f5..194a1120f8 100644 --- a/includes/definitions/screenos.yaml +++ b/includes/definitions/screenos.yaml @@ -10,3 +10,7 @@ poller_modules: toner: 0 discovery_modules: toner: 0 +discovery: + - sysObjectId: + - .1.3.6.1.4.1.674.3224.1 + - .1.3.6.1.4.1.3224 diff --git a/includes/definitions/serveriron.yaml b/includes/definitions/serveriron.yaml index e5ac39e451..17400ddf95 100644 --- a/includes/definitions/serveriron.yaml +++ b/includes/definitions/serveriron.yaml @@ -7,6 +7,9 @@ over: - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } icon: brocade +discovery: + - sysDescr: + - ServerIron register_mibs: snL4slbTotalConnections: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB snL4slbLimitExceeds: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB @@ -14,4 +17,4 @@ register_mibs: snL4slbReverseTraffic: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB snL4slbFinished: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB snL4FreeSessionCount: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB - snL4unsuccessfulConn: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB \ No newline at end of file + snL4unsuccessfulConn: FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB diff --git a/includes/definitions/sgos.yaml b/includes/definitions/sgos.yaml index 2d206ccd79..3605532296 100644 --- a/includes/definitions/sgos.yaml +++ b/includes/definitions/sgos.yaml @@ -9,3 +9,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - SGOS diff --git a/includes/definitions/sharp.yaml b/includes/definitions/sharp.yaml index beb1117aab..9734661ef9 100644 --- a/includes/definitions/sharp.yaml +++ b/includes/definitions/sharp.yaml @@ -5,3 +5,6 @@ type: printer icon: sharp over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - SHARP MX- diff --git a/includes/definitions/smartax.yaml b/includes/definitions/smartax.yaml index f383ca7c94..837b08a436 100644 --- a/includes/definitions/smartax.yaml +++ b/includes/definitions/smartax.yaml @@ -4,3 +4,6 @@ text: 'Huawei SmartAX' type: network icon: huawei ifname: 1 +discovery: + - sysDescr: + - Huawei Integrated Access Software diff --git a/includes/definitions/sonicwall.yaml b/includes/definitions/sonicwall.yaml index 20c7257572..343be7325a 100644 --- a/includes/definitions/sonicwall.yaml +++ b/includes/definitions/sonicwall.yaml @@ -5,3 +5,6 @@ over: - { graph: device_bits, text: Traffic } - { graph: device_processor, text: CPU } - { graph: device_mempool, text: Memory } +discovery: + - sysDescr: + - SonicWALL diff --git a/includes/definitions/sonus-gsx.yaml b/includes/definitions/sonus-gsx.yaml index 7597d60422..1ebf6a2c41 100644 --- a/includes/definitions/sonus-gsx.yaml +++ b/includes/definitions/sonus-gsx.yaml @@ -2,3 +2,6 @@ os: sonus-gsx text: 'Sonus GSX' type: appliance icon: sonus +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2879.1.1.2 diff --git a/includes/definitions/sonus-sbc.yaml b/includes/definitions/sonus-sbc.yaml index 1cad1a8059..89b31bd6f7 100644 --- a/includes/definitions/sonus-sbc.yaml +++ b/includes/definitions/sonus-sbc.yaml @@ -2,3 +2,7 @@ os: sonus-sbc text: 'Sonus SBC' type: appliance icon: sonus +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2879.1.9.2 + - .1.3.6.1.4.1.177.15.1.1.1 diff --git a/includes/definitions/sub10.yaml b/includes/definitions/sub10.yaml index bc96c9b56e..25edbb3bcc 100644 --- a/includes/definitions/sub10.yaml +++ b/includes/definitions/sub10.yaml @@ -4,3 +4,6 @@ type: wireless icon: sub10 over: - { graph: device_bits, text: Traffic } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.39003 diff --git a/includes/definitions/symbol.yaml b/includes/definitions/symbol.yaml index f6bd5d88c3..a502c954e0 100644 --- a/includes/definitions/symbol.yaml +++ b/includes/definitions/symbol.yaml @@ -2,3 +2,6 @@ os: symbol type: network text: 'Symbol AP' icon: symbol +discovery: + - sysObjectId: + - .1.3.6.1.4.1.388 diff --git a/includes/definitions/timos.yaml b/includes/definitions/timos.yaml index 8b07e2e769..13af4a0822 100644 --- a/includes/definitions/timos.yaml +++ b/includes/definitions/timos.yaml @@ -6,3 +6,14 @@ ifXmcbc: 1 over: - { graph: device_bits, text: 'Device Traffic' } icon: alcatellucent +discovery: + - sysObjectId: + - .1.3.6.1.4.1.6527.1.3 + - .1.3.6.1.4.1.6527.6.2.1.2.2. + - .1.3.6.1.4.1.6527.6.2.1.2.6. + - .1.3.6.1.4.1.6527.6.2.1.2.8. + - .1.3.6.1.4.1.6527.1.6.1 + - .1.3.6.1.4.1.6527.1.6.5 + - .1.3.6.1.4.1.6527.6.1.1.2. + - .1.3.6.1.4.1.6527.1.9.1 + - .1.3.6.1.4.1.6527.1.15. diff --git a/includes/definitions/tpconductor.yaml b/includes/definitions/tpconductor.yaml index 1a8b4d999e..b5dc30405c 100644 --- a/includes/definitions/tpconductor.yaml +++ b/includes/definitions/tpconductor.yaml @@ -22,3 +22,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysObjectId: + - .1.3.6.1.4.1.5596.180.6.4.1 diff --git a/includes/definitions/tplink.yaml b/includes/definitions/tplink.yaml index fb070b5e59..99bdf5e4bc 100644 --- a/includes/definitions/tplink.yaml +++ b/includes/definitions/tplink.yaml @@ -4,3 +4,6 @@ type: network icon: tplink over: - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.11863.1.1 diff --git a/includes/definitions/vccodec.yaml b/includes/definitions/vccodec.yaml index ca5cd46266..2bb99052c1 100644 --- a/includes/definitions/vccodec.yaml +++ b/includes/definitions/vccodec.yaml @@ -22,3 +22,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysObjectId: + - .1.3.6.1.4.1.5596.150.6.4.1 diff --git a/includes/definitions/vcs.yaml b/includes/definitions/vcs.yaml index badbb6c5f8..50712f48fa 100644 --- a/includes/definitions/vcs.yaml +++ b/includes/definitions/vcs.yaml @@ -22,3 +22,6 @@ discovery_modules: cisco-vrf-lite: 1 mib_dir: - cisco +discovery: + - sysObjectId: + - .1.3.6.1.4.1.5596.130.6.4.1 diff --git a/includes/definitions/viprinux.yaml b/includes/definitions/viprinux.yaml index 5872ec7cc8..b6a34386e1 100644 --- a/includes/definitions/viprinux.yaml +++ b/includes/definitions/viprinux.yaml @@ -7,3 +7,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } group: viprinet +discovery: + - sysDescr: + - Viprinet VPN Router diff --git a/includes/definitions/vrp.yaml b/includes/definitions/vrp.yaml index 3896f68ebc..a1900bbd55 100644 --- a/includes/definitions/vrp.yaml +++ b/includes/definitions/vrp.yaml @@ -3,3 +3,9 @@ group: vrp text: 'Huawei VRP' type: network icon: huawei +discovery: + - sysDescr: + - VRP (R) Software + - VRP Software Version + - Software Version VRP + - Versatile Routing Platform Software diff --git a/includes/definitions/webpower.yaml b/includes/definitions/webpower.yaml index 01b9b909c1..e1aaf600a8 100644 --- a/includes/definitions/webpower.yaml +++ b/includes/definitions/webpower.yaml @@ -3,3 +3,6 @@ text: WebPower type: power over: - { graph: device_current, text: Current } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2468.1.2.1 diff --git a/includes/definitions/wxgoos.yaml b/includes/definitions/wxgoos.yaml index 5dc23b5528..fd6faca1e5 100644 --- a/includes/definitions/wxgoos.yaml +++ b/includes/definitions/wxgoos.yaml @@ -3,3 +3,7 @@ text: 'ITWatchDogs Goose' type: environment over: - { graph: device_temperature, text: temperature } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.901.1 + - .1.3.6.1.4.1.17373 diff --git a/includes/definitions/xerox.yaml b/includes/definitions/xerox.yaml index ed6324f987..b9fa52d548 100644 --- a/includes/definitions/xerox.yaml +++ b/includes/definitions/xerox.yaml @@ -5,3 +5,8 @@ ifname: 1 type: printer over: - { graph: device_toner, text: Toner } +discovery: + - sysDescr: + - Xerox Phaser + - Xerox WorkCentre + - FUJI XEROX DocuPrint diff --git a/includes/definitions/xirrus_aos.yaml b/includes/definitions/xirrus_aos.yaml index 2af1908734..99da7e08fe 100644 --- a/includes/definitions/xirrus_aos.yaml +++ b/includes/definitions/xirrus_aos.yaml @@ -6,3 +6,7 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_xirrus_stations, text: 'Wifi Clients' } - { graph: device_xirrus_rssi, text: 'Signal RSSI' } +discovery: + - sysDescr: + - Xirrus + - ArrayOS diff --git a/includes/definitions/xos.yaml b/includes/definitions/xos.yaml index fee05a4a1f..e7f2246c6a 100644 --- a/includes/definitions/xos.yaml +++ b/includes/definitions/xos.yaml @@ -8,3 +8,6 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysDescr: + - XOS diff --git a/includes/definitions/zxr10.yaml b/includes/definitions/zxr10.yaml index 9f6af81190..ef44850663 100644 --- a/includes/definitions/zxr10.yaml +++ b/includes/definitions/zxr10.yaml @@ -3,3 +3,8 @@ group: zxr10 text: 'ZTE ZXR10' type: network icon: zte +discovery: + - sysDescr: + - ZXR10 + - ZTE Ethernet Switch + diff --git a/includes/discovery/os/3com.inc.php b/includes/discovery/os/3com.inc.php deleted file mode 100644 index ccbac33714..0000000000 --- a/includes/discovery/os/3com.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, array('AMN-','AEN-','AMO-'))) { - $os = 'aen'; -} diff --git a/includes/discovery/os/aerohive.inc.php b/includes/discovery/os/aerohive.inc.php deleted file mode 100644 index 74f98870fd..0000000000 --- a/includes/discovery/os/aerohive.inc.php +++ /dev/null @@ -1,14 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ -if (str_contains($sysDescr, 'HiveOS')) { - $os = 'aerohive'; -} diff --git a/includes/discovery/os/airport.inc.php b/includes/discovery/os/airport.inc.php deleted file mode 100644 index a70a04af59..0000000000 --- a/includes/discovery/os/airport.inc.php +++ /dev/null @@ -1,5 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Neil Lathwood - * @author Neil Lathwood - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.9.1.2238')) { - $os = 'apic'; -} diff --git a/includes/discovery/os/areca.inc.php b/includes/discovery/os/areca.inc.php deleted file mode 100644 index 5bb6cea3b3..0000000000 --- a/includes/discovery/os/areca.inc.php +++ /dev/null @@ -1,6 +0,0 @@ - - * Copyright (c) 2016 Daniel Cox - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, array( - '.1.3.6.1.4.1.2272.202', - '.1.3.6.1.4.1.2272.203', - '.1.3.6.1.4.1.2272.205', - '.1.3.6.1.4.1.2272.206', - '.1.3.6.1.4.1.2272.208', - '.1.3.6.1.4.1.2272.209', - '.1.3.6.1.4.1.2272.210', -))) { - $os = 'avaya-vsp'; -} diff --git a/includes/discovery/os/avtech.inc.php b/includes/discovery/os/avtech.inc.php deleted file mode 100644 index af5c3bf4fb..0000000000 --- a/includes/discovery/os/avtech.inc.php +++ /dev/null @@ -1,6 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Barracuda Firewall', true)) { - $os = 'barracudangfirewall'; -} diff --git a/includes/discovery/os/barracudaspamfirewall.inc.php b/includes/discovery/os/barracudaspamfirewall.inc.php deleted file mode 100644 index d573c14d52..0000000000 --- a/includes/discovery/os/barracudaspamfirewall.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Barracuda Spam Firewall', true)) { - $os = 'barracudaspamfirewall'; -} diff --git a/includes/discovery/os/bcm963.inc.php b/includes/discovery/os/bcm963.inc.php deleted file mode 100644 index 2fb0e09914..0000000000 --- a/includes/discovery/os/bcm963.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.738.1.5.100')) { - $os = 'binos'; -} diff --git a/includes/discovery/os/binox.inc.php b/includes/discovery/os/binox.inc.php deleted file mode 100644 index f35bf66d51..0000000000 --- a/includes/discovery/os/binox.inc.php +++ /dev/null @@ -1,16 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.738.10.5.100')) { - $os = 'binox'; -} diff --git a/includes/discovery/os/bintec-smart.inc.php b/includes/discovery/os/bintec-smart.inc.php deleted file mode 100644 index f7480127c6..0000000000 --- a/includes/discovery/os/bintec-smart.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.272.4.201.82.78.79.48')) { - $os = 'bintec-smart'; -} diff --git a/includes/discovery/os/buffalo.inc.php b/includes/discovery/os/buffalo.inc.php deleted file mode 100644 index 99c5809af9..0000000000 --- a/includes/discovery/os/buffalo.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'BUFFALO TeraStation')) { - $os = 'buffalo'; -} diff --git a/includes/discovery/os/calix.inc.php b/includes/discovery/os/calix.inc.php deleted file mode 100644 index 6e0b06e855..0000000000 --- a/includes/discovery/os/calix.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.2620.1.6.123.1.49')) { - $os = 'gaia'; -} diff --git a/includes/discovery/os/cimc.inc.php b/includes/discovery/os/cimc.inc.php deleted file mode 100644 index d1768fa00c..0000000000 --- a/includes/discovery/os/cimc.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Cisco Integrated Management Controller', true)) { - $os = 'cimc'; -} diff --git a/includes/discovery/os/ciscosb.inc.php b/includes/discovery/os/ciscosb.inc.php deleted file mode 100644 index 43c19e9576..0000000000 --- a/includes/discovery/os/ciscosb.inc.php +++ /dev/null @@ -1,17 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Neil Lathwood - * @author Neil Lathwood - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.4998.2.1')) { - $os = 'cmts'; -} diff --git a/includes/discovery/os/cucm.inc.php b/includes/discovery/os/cucm.inc.php deleted file mode 100644 index 54ebd8a07e..0000000000 --- a/includes/discovery/os/cucm.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.9.1.1348')) { - $os = 'cucm'; -} diff --git a/includes/discovery/os/datacom.inc.php b/includes/discovery/os/datacom.inc.php deleted file mode 100644 index 12239ec4e9..0000000000 --- a/includes/discovery/os/datacom.inc.php +++ /dev/null @@ -1,5 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Neil Lathwood - * @author Neil Lathwood - */ - -$dcn_oids = array( - '.1.3.6.1.4.1.6339.1.1.1.280', -); - -if (starts_with($sysObjectId, $dcn_oids)) { - $os = 'dcn-software'; -} - -unset($dcn_oids); diff --git a/includes/discovery/os/dell-ups.inc.php b/includes/discovery/os/dell-ups.inc.php deleted file mode 100644 index 3ecd219876..0000000000 --- a/includes/discovery/os/dell-ups.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -$dellups = array( - '.1.3.6.1.4.1.674.10902.2' -); - -if (starts_with($sysObjectId, $dellups)) { - $os = 'dell-ups'; -} - -unset($dellups); diff --git a/includes/discovery/os/deltaups.inc.php b/includes/discovery/os/deltaups.inc.php deleted file mode 100644 index 8d8d914308..0000000000 --- a/includes/discovery/os/deltaups.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.18334.1.2.1.2.1.50.2.2')) { - $os = 'developprinter'; -} diff --git a/includes/discovery/os/dnos.inc.php b/includes/discovery/os/dnos.inc.php deleted file mode 100644 index 2ec208b58f..0000000000 --- a/includes/discovery/os/dnos.inc.php +++ /dev/null @@ -1,26 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Neil Lathwood - * @author Neil Lathwood - */ - -$items = array( - '.1.3.6.1.4.1.259.6.10.94', - '.1.3.6.1.4.1.259.10.1.45.103', - '.1.3.6.1.4.1.259.10.1.24.104', - '.1.3.6.1.4.1.259.10.1.24.103', - '.1.3.6.1.4.1.259.10.1.22.101', - '.1.3.6.1.4.1.259.10.1.42.101', - '.1.3.6.1.4.1.259.10.1.27.102', -); - -if (starts_with($sysObjectId, $items)) { - $os = 'edgecos'; -} diff --git a/includes/discovery/os/epson.inc.php b/includes/discovery/os/epson.inc.php deleted file mode 100644 index 164326f794..0000000000 --- a/includes/discovery/os/epson.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, array('.1.3.6.1.4.1.3097.1.4', '.1.3.6.1.4.1.3097.1.5'))) { - $os = 'fireware'; -} diff --git a/includes/discovery/os/flareos.inc.php b/includes/discovery/os/flareos.inc.php deleted file mode 100644 index 9df430f2f0..0000000000 --- a/includes/discovery/os/flareos.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.1981.1.1')) { - $os = 'flareos'; -} diff --git a/includes/discovery/os/fortigate.inc.php b/includes/discovery/os/fortigate.inc.php deleted file mode 100644 index 7096566f4f..0000000000 --- a/includes/discovery/os/fortigate.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Foundry Networks')) { - $os = 'foundryos'; -} diff --git a/includes/discovery/os/ftos.inc.php b/includes/discovery/os/ftos.inc.php deleted file mode 100644 index eb55e46be4..0000000000 --- a/includes/discovery/os/ftos.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -$eternus = array( - '.1.3.6.1.4.1.211.1.21.1.150' -); - -if (starts_with($sysObjectId, $eternus)) { - $os = 'fujitsueternusos'; -} - -unset($eternus); diff --git a/includes/discovery/os/fujitsupyos.inc.php b/includes/discovery/os/fujitsupyos.inc.php deleted file mode 100644 index 82189c9b10..0000000000 --- a/includes/discovery/os/fujitsupyos.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'PY CB Eth Switch', true)) { - $os = 'fujitsupyos'; -} diff --git a/includes/discovery/os/fxos.inc.php b/includes/discovery/os/fxos.inc.php deleted file mode 100644 index 8734a5e227..0000000000 --- a/includes/discovery/os/fxos.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Cisco FX-OS')) { - $os = 'fxos'; -} diff --git a/includes/discovery/os/hpblmos.inc.php b/includes/discovery/os/hpblmos.inc.php deleted file mode 100644 index d0749e3ff6..0000000000 --- a/includes/discovery/os/hpblmos.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.11.5.7.1.2')) { - $os = 'hpblmos'; -} diff --git a/includes/discovery/os/hpe-msl.inc.php b/includes/discovery/os/hpe-msl.inc.php deleted file mode 100644 index 71b22037ab..0000000000 --- a/includes/discovery/os/hpe-msl.inc.php +++ /dev/null @@ -1,34 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Neil Lathwood - * @author Neil Lathwood - */ - -$msl_oids = array( - '.1.3.6.1.4.1.11.10.2.1.3.25', -); - -if (starts_with($sysObjectId, $msl_oids)) { - $os = 'hpe-msl'; -} - -unset($msl_oids); diff --git a/includes/discovery/os/hpvc.inc.php b/includes/discovery/os/hpvc.inc.php deleted file mode 100644 index 5a8959b4b2..0000000000 --- a/includes/discovery/os/hpvc.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.21796.3.3')) { - $os = 'hwg-poseidon'; -} diff --git a/includes/discovery/os/hwg-ste.inc.php b/includes/discovery/os/hwg-ste.inc.php deleted file mode 100644 index 86716f93de..0000000000 --- a/includes/discovery/os/hwg-ste.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.21796.4.1')) { - $os = 'hwg-ste'; -} diff --git a/includes/discovery/os/hwg-ste2.inc.php b/includes/discovery/os/hwg-ste2.inc.php deleted file mode 100644 index 93a9aa7317..0000000000 --- a/includes/discovery/os/hwg-ste2.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'BladeCenter Advanced Management Module', true)) { - $os = 'ibm-amm'; -} diff --git a/includes/discovery/os/ibm-imm.inc.php b/includes/discovery/os/ibm-imm.inc.php deleted file mode 100644 index 686d0d2bed..0000000000 --- a/includes/discovery/os/ibm-imm.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.2.3.51.3')) { - $os = 'ibm-imm'; -} diff --git a/includes/discovery/os/ibmnos.inc.php b/includes/discovery/os/ibmnos.inc.php deleted file mode 100644 index 8ae39167aa..0000000000 --- a/includes/discovery/os/ibmnos.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, array('IBM Networking Operating System', 'IBM Flex System Fabric', 'IBM Networking OS'), true)) { - $os = 'ibmnos'; -} diff --git a/includes/discovery/os/informos.inc.php b/includes/discovery/os/informos.inc.php deleted file mode 100644 index 772fb813d0..0000000000 --- a/includes/discovery/os/informos.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.12925.1')) { - $os = 'informos'; -} diff --git a/includes/discovery/os/iosxe.inc.php b/includes/discovery/os/iosxe.inc.php deleted file mode 100644 index e30e8a9192..0000000000 --- a/includes/discovery/os/iosxe.inc.php +++ /dev/null @@ -1,5 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Neil Lathwood - * @author Neil Lathwood - */ - -$jetstream = array( - '.1.3.6.1.4.1.11863.5.34' -); - -if (starts_with($sysObjectId, $jetstream)) { - $os = 'jetstream'; -} - -unset($jetstream); diff --git a/includes/discovery/os/juniperex2500os.inc.php b/includes/discovery/os/juniperex2500os.inc.php deleted file mode 100644 index 1468c7a865..0000000000 --- a/includes/discovery/os/juniperex2500os.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.244.1.1')) { - $os = 'lantronix-slc'; -} diff --git a/includes/discovery/os/lenovoemc.inc.php b/includes/discovery/os/lenovoemc.inc.php deleted file mode 100644 index 1eec47a4d2..0000000000 --- a/includes/discovery/os/lenovoemc.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.5651.1.102.21')) { - $os = 'mypoweros'; -} diff --git a/includes/discovery/os/mellanox.inc.php b/includes/discovery/os/mellanox.inc.php deleted file mode 100644 index 0c5549de4c..0000000000 --- a/includes/discovery/os/mellanox.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.39165.1.6')) { - $os = 'microsemitime'; -} diff --git a/includes/discovery/os/mimosa.inc.php b/includes/discovery/os/mimosa.inc.php deleted file mode 100644 index ec432e9e83..0000000000 --- a/includes/discovery/os/mimosa.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Mimosa')) { - $os = 'mimosa'; -} diff --git a/includes/discovery/os/minkelsrms.inc.php b/includes/discovery/os/minkelsrms.inc.php deleted file mode 100644 index 0679c6113b..0000000000 --- a/includes/discovery/os/minkelsrms.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ -if (str_contains($sysObjectId, '.1.3.6.1.4.1.8691.2.7')) { - $os = 'moxa-nport'; -} diff --git a/includes/discovery/os/netapp.inc.php b/includes/discovery/os/netapp.inc.php deleted file mode 100644 index 24b052b2b4..0000000000 --- a/includes/discovery/os/netapp.inc.php +++ /dev/null @@ -1,5 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Tony Murray - * @author Tony Murray - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.46242')) { - $os = 'netonix'; -} diff --git a/includes/discovery/os/netscaler.inc.php b/includes/discovery/os/netscaler.inc.php deleted file mode 100644 index a60c0bb088..0000000000 --- a/includes/discovery/os/netscaler.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Nimble Storage')) { - $os = 'nimbleos'; -} diff --git a/includes/discovery/os/nios.inc.php b/includes/discovery/os/nios.inc.php deleted file mode 100644 index 2a233edf37..0000000000 --- a/includes/discovery/os/nios.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.42.2.200.2.1.1')) { - $os = 'oracle-ilom'; -} diff --git a/includes/discovery/os/packetshaper.inc.php b/includes/discovery/os/packetshaper.inc.php deleted file mode 100644 index 840073d02b..0000000000 --- a/includes/discovery/os/packetshaper.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Perle MCR-MGT')) { - $os = 'perle'; -} diff --git a/includes/discovery/os/pix.inc.php b/includes/discovery/os/pix.inc.php deleted file mode 100644 index 79fad26baf..0000000000 --- a/includes/discovery/os/pix.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.10456.1.1516')) { - $os = 'planetos'; -} diff --git a/includes/discovery/os/powercode.inc.php b/includes/discovery/os/powercode.inc.php deleted file mode 100644 index 3118c7fd33..0000000000 --- a/includes/discovery/os/powercode.inc.php +++ /dev/null @@ -1,17 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, 'Powercode BMU')) { - $os = 'powercode'; -} diff --git a/includes/discovery/os/powervault.inc.php b/includes/discovery/os/powervault.inc.php deleted file mode 100644 index 4ca12199ac..0000000000 --- a/includes/discovery/os/powervault.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (str_contains($sysDescr, array('Pulse Connect Secure', 'Pulse Secure', 'Juniper Networks,Inc,VA-DTE', 'VA-SPE'))) { - $os = 'pulse'; -} diff --git a/includes/discovery/os/quanta.inc.php b/includes/discovery/os/quanta.inc.php deleted file mode 100644 index 60168f0682..0000000000 --- a/includes/discovery/os/quanta.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.17163.1.1')) { - $os = 'riverbed'; -} diff --git a/includes/discovery/os/ruckuswireless.inc.php b/includes/discovery/os/ruckuswireless.inc.php deleted file mode 100644 index 54cdfd124c..0000000000 --- a/includes/discovery/os/ruckuswireless.inc.php +++ /dev/null @@ -1,17 +0,0 @@ - - * Copyright (c) 2015 Gear Consulting Pty Ltd - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, '.1.3.6.1.4.1.25053.3.1')) { - $os = 'ruckuswireless'; -} diff --git a/includes/discovery/os/saf.inc.php b/includes/discovery/os/saf.inc.php deleted file mode 100644 index 9777790841..0000000000 --- a/includes/discovery/os/saf.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Total connections in this device - "snL4slbLimitExceeds" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // exceeds snL4TCPSynLimit (numbers of connection per second) - "snL4slbForwardTraffic" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Client->Server - "snL4slbReverseTraffic" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Server->Client - "snL4slbFinished" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // FIN_or_RST - "snL4FreeSessionCount" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Maximum sessions - used sessions - "snL4unsuccessfulConn" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Unsuccessfull connection - ); - - register_mibs($device, $serviron_mibs, "includes/discovery/os/serveriron.inc.php"); -} diff --git a/includes/discovery/os/sgos.inc.php b/includes/discovery/os/sgos.inc.php deleted file mode 100644 index 5137e1d1e6..0000000000 --- a/includes/discovery/os/sgos.inc.php +++ /dev/null @@ -1,4 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2016 Tony Murray - * @author Tony Murray - */ - -if (str_contains($sysDescr, 'Huawei Integrated Access Software')) { - $os = 'smartax'; -} diff --git a/includes/discovery/os/sonicwall.inc.php b/includes/discovery/os/sonicwall.inc.php deleted file mode 100644 index 0e6aadf8ac..0000000000 --- a/includes/discovery/os/sonicwall.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (strstr($sysObjectId, '.1.3.6.1.4.1.2879.1.1.2')) { - $os = 'sonus-gsx'; -} diff --git a/includes/discovery/os/sonus-sbc.inc.php b/includes/discovery/os/sonus-sbc.inc.php deleted file mode 100644 index a9a6c9bcb6..0000000000 --- a/includes/discovery/os/sonus-sbc.inc.php +++ /dev/null @@ -1,15 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. Please see LICENSE.txt at the top level of - * the source code distribution for details. - */ - -if (starts_with($sysObjectId, array('.1.3.6.1.4.1.2879.1.9.2', '.1.3.6.1.4.1.177.15.1.1.1'))) { - $os = 'sonus-sbc'; -} diff --git a/includes/discovery/os/sub10.inc.php b/includes/discovery/os/sub10.inc.php deleted file mode 100644 index f06cbb4101..0000000000 --- a/includes/discovery/os/sub10.inc.php +++ /dev/null @@ -1,8 +0,0 @@ -