From b5d11550067a52f808c56036ac1f027597cdc624 Mon Sep 17 00:00:00 2001 From: laf Date: Sun, 17 Jan 2016 20:47:47 +0000 Subject: [PATCH] Updated discovery sensors module directory structure --- includes/discovery/sensors.inc.php | 28 +++++++++---------- .../discovery/{ => sensors}/charge.inc.php | 2 +- .../{ => sensors}/charge/apc.inc.php | 0 .../{ => sensors}/charge/dsm.inc.php | 0 .../{ => sensors}/charge/rfc1628.inc.php | 0 .../{ => sensors}/cisco-entity-sensor.inc.php | 0 .../discovery/{ => sensors}/current.inc.php | 2 +- .../{ => sensors}/current/apc.inc.php | 0 .../current/gamatronicups.inc.php | 0 .../{ => sensors}/current/ipoman.inc.php | 0 .../{ => sensors}/current/mgeups.inc.php | 0 .../{ => sensors}/current/netvision.inc.php | 0 .../{ => sensors}/current/raritan.inc.php | 0 .../{ => sensors}/current/rfc1628.inc.php | 0 .../{ => sensors}/current/sentry3.inc.php | 0 .../{ => sensors}/current/xups.inc.php | 0 .../{ => sensors}/entity-sensor.inc.php | 0 .../discovery/{ => sensors}/fanspeeds.inc.php | 2 +- .../{ => sensors}/fanspeeds/areca.inc.php | 0 .../{ => sensors}/fanspeeds/dell.inc.php | 0 .../{ => sensors}/fanspeeds/drac.inc.php | 0 .../fanspeeds/equallogic.inc.php | 0 .../{ => sensors}/fanspeeds/extreme.inc.php | 0 .../{ => sensors}/fanspeeds/lmsensors.inc.php | 0 .../{ => sensors}/fanspeeds/mikrotik.inc.php | 0 .../fanspeeds/supermicro.inc.php | 0 .../{ => sensors}/frequencies.inc.php | 2 +- .../{ => sensors}/frequencies/apc.inc.php | 0 .../{ => sensors}/frequencies/ipoman.inc.php | 0 .../{ => sensors}/frequencies/mgeups.inc.php | 0 .../frequencies/netvision.inc.php | 0 .../{ => sensors}/frequencies/raritan.inc.php | 0 .../{ => sensors}/frequencies/rfc1628.inc.php | 0 .../{ => sensors}/frequencies/xups.inc.php | 0 .../discovery/{ => sensors}/humidity.inc.php | 2 +- .../{ => sensors}/humidity/akcp.inc.php | 0 .../{ => sensors}/humidity/apc.inc.php | 0 .../{ => sensors}/humidity/ipoman.inc.php | 0 .../{ => sensors}/humidity/mgeups.inc.php | 0 .../{ => sensors}/humidity/netbotz.inc.php | 0 .../{ => sensors}/humidity/pcoweb.inc.php | 0 .../{ => sensors}/humidity/sentry3.inc.php | 0 includes/discovery/{ => sensors}/ipmi.inc.php | 0 includes/discovery/{ => sensors}/load.inc.php | 2 +- .../discovery/{ => sensors}/load/apc.inc.php | 0 .../discovery/{ => sensors}/load/dsm.inc.php | 0 .../{ => sensors}/load/rfc1628.inc.php | 0 .../netscaler.inc.php} | 0 .../openbsd.inc.php} | 0 .../discovery/{ => sensors}/power.inc.php | 2 +- .../discovery/{ => sensors}/power/dsm.inc.php | 0 .../{ => sensors}/power/extreme.inc.php | 0 .../{ => sensors}/power/ipoman.inc.php | 0 .../{ => sensors}/power/raritan.inc.php | 0 .../{ => sensors}/power/rfc1628.inc.php | 0 .../discovery/{ => sensors}/states.inc.php | 2 +- .../{ => sensors}/states/dell.inc.php | 0 .../{ => sensors}/states/drac.inc.php | 0 .../{ => sensors}/states/dsm.inc.php | 0 .../{ => sensors}/states/equallogic.inc.php | 0 .../{ => sensors}/states/pcoweb.inc.php | 0 .../{ => sensors}/states/rfc1628.inc.php | 0 .../{ => sensors}/temperatures.inc.php | 2 +- .../{ => sensors}/temperatures/adva.inc.php | 0 .../{ => sensors}/temperatures/akcp.inc.php | 0 .../temperatures/aos-device.inc.php | 0 .../{ => sensors}/temperatures/apc.inc.php | 0 .../{ => sensors}/temperatures/areca.inc.php | 0 .../temperatures/avaya-ers.inc.php | 0 .../temperatures/cisco-envmon.inc.php | 0 .../temperatures/ciscowlc.inc.php | 0 .../temperatures/cometsystem-p85xx.inc.php | 0 .../{ => sensors}/temperatures/dell.inc.php | 0 .../temperatures/dnos-ftos-s-series.inc.php | 0 .../{ => sensors}/temperatures/drac.inc.php | 0 .../{ => sensors}/temperatures/dsm.inc.php | 0 .../temperatures/equallogic.inc.php | 0 .../temperatures/extreme.inc.php | 0 .../temperatures/fiberhome.inc.php | 0 .../temperatures/ftos-c-series.inc.php | 0 .../temperatures/ftos-e-series.inc.php | 0 .../{ => sensors}/temperatures/hpilo.inc.php | 0 .../{ => sensors}/temperatures/ibmnos.inc.php | 0 .../{ => sensors}/temperatures/ipoman.inc.php | 0 .../temperatures/ironware.inc.php | 0 .../{ => sensors}/temperatures/junos.inc.php | 0 .../{ => sensors}/temperatures/junose.inc.php | 0 .../temperatures/lm-sensors.inc.php | 0 .../{ => sensors}/temperatures/mgeups.inc.php | 0 .../temperatures/mikrotik.inc.php | 0 .../{ => sensors}/temperatures/netapp.inc.php | 0 .../temperatures/netbotz.inc.php | 0 .../temperatures/observernms-custom.inc.php | 0 .../temperatures/papouch-tme.inc.php | 0 .../{ => sensors}/temperatures/pcoweb.inc.php | 0 .../temperatures/powerconnect.inc.php | 0 .../temperatures/rfc1628.inc.php | 0 .../temperatures/sentry3.inc.php | 0 .../{ => sensors}/temperatures/siklu.inc.php | 0 .../{ => sensors}/temperatures/sub10.inc.php | 0 .../temperatures/supermicro.inc.php | 0 .../{ => sensors}/temperatures/xups.inc.php | 0 .../temperatures/zyxel-ies.inc.php | 0 .../discovery/{ => sensors}/voltages.inc.php | 2 +- .../{ => sensors}/voltages/apc.inc.php | 0 .../{ => sensors}/voltages/areca.inc.php | 0 .../{ => sensors}/voltages/drac.inc.php | 0 .../{ => sensors}/voltages/dsm.inc.php | 0 .../voltages/gamatronicups.inc.php | 0 .../{ => sensors}/voltages/ipoman.inc.php | 0 .../{ => sensors}/voltages/linux.inc.php | 0 .../{ => sensors}/voltages/mgeups.inc.php | 0 .../{ => sensors}/voltages/mikrotik.inc.php | 0 .../{ => sensors}/voltages/netvision.inc.php | 0 .../{ => sensors}/voltages/rfc1628.inc.php | 0 .../{ => sensors}/voltages/sentry3.inc.php | 0 .../{ => sensors}/voltages/siklu.inc.php | 0 .../{ => sensors}/voltages/supermicro.inc.php | 0 .../{ => sensors}/voltages/xups.inc.php | 0 119 files changed, 24 insertions(+), 24 deletions(-) rename includes/discovery/{ => sensors}/charge.inc.php (80%) rename includes/discovery/{ => sensors}/charge/apc.inc.php (100%) rename includes/discovery/{ => sensors}/charge/dsm.inc.php (100%) rename includes/discovery/{ => sensors}/charge/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/cisco-entity-sensor.inc.php (100%) rename includes/discovery/{ => sensors}/current.inc.php (79%) rename includes/discovery/{ => sensors}/current/apc.inc.php (100%) rename includes/discovery/{ => sensors}/current/gamatronicups.inc.php (100%) rename includes/discovery/{ => sensors}/current/ipoman.inc.php (100%) rename includes/discovery/{ => sensors}/current/mgeups.inc.php (100%) rename includes/discovery/{ => sensors}/current/netvision.inc.php (100%) rename includes/discovery/{ => sensors}/current/raritan.inc.php (100%) rename includes/discovery/{ => sensors}/current/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/current/sentry3.inc.php (100%) rename includes/discovery/{ => sensors}/current/xups.inc.php (100%) rename includes/discovery/{ => sensors}/entity-sensor.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds.inc.php (79%) rename includes/discovery/{ => sensors}/fanspeeds/areca.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/dell.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/drac.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/equallogic.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/extreme.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/lmsensors.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/mikrotik.inc.php (100%) rename includes/discovery/{ => sensors}/fanspeeds/supermicro.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies.inc.php (79%) rename includes/discovery/{ => sensors}/frequencies/apc.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies/ipoman.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies/mgeups.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies/netvision.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies/raritan.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/frequencies/xups.inc.php (100%) rename includes/discovery/{ => sensors}/humidity.inc.php (79%) rename includes/discovery/{ => sensors}/humidity/akcp.inc.php (100%) rename includes/discovery/{ => sensors}/humidity/apc.inc.php (100%) rename includes/discovery/{ => sensors}/humidity/ipoman.inc.php (100%) rename includes/discovery/{ => sensors}/humidity/mgeups.inc.php (100%) rename includes/discovery/{ => sensors}/humidity/netbotz.inc.php (100%) rename includes/discovery/{ => sensors}/humidity/pcoweb.inc.php (100%) rename includes/discovery/{ => sensors}/humidity/sentry3.inc.php (100%) rename includes/discovery/{ => sensors}/ipmi.inc.php (100%) rename includes/discovery/{ => sensors}/load.inc.php (79%) rename includes/discovery/{ => sensors}/load/apc.inc.php (100%) rename includes/discovery/{ => sensors}/load/dsm.inc.php (100%) rename includes/discovery/{ => sensors}/load/rfc1628.inc.php (100%) rename includes/discovery/{sensors-netscaler.inc.php => sensors/netscaler.inc.php} (100%) rename includes/discovery/{sensors-openbsd.inc.php => sensors/openbsd.inc.php} (100%) rename includes/discovery/{ => sensors}/power.inc.php (79%) rename includes/discovery/{ => sensors}/power/dsm.inc.php (100%) rename includes/discovery/{ => sensors}/power/extreme.inc.php (100%) rename includes/discovery/{ => sensors}/power/ipoman.inc.php (100%) rename includes/discovery/{ => sensors}/power/raritan.inc.php (100%) rename includes/discovery/{ => sensors}/power/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/states.inc.php (92%) rename includes/discovery/{ => sensors}/states/dell.inc.php (100%) rename includes/discovery/{ => sensors}/states/drac.inc.php (100%) rename includes/discovery/{ => sensors}/states/dsm.inc.php (100%) rename includes/discovery/{ => sensors}/states/equallogic.inc.php (100%) rename includes/discovery/{ => sensors}/states/pcoweb.inc.php (100%) rename includes/discovery/{ => sensors}/states/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures.inc.php (79%) rename includes/discovery/{ => sensors}/temperatures/adva.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/akcp.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/aos-device.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/apc.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/areca.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/avaya-ers.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/cisco-envmon.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/ciscowlc.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/cometsystem-p85xx.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/dell.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/dnos-ftos-s-series.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/drac.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/dsm.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/equallogic.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/extreme.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/fiberhome.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/ftos-c-series.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/ftos-e-series.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/hpilo.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/ibmnos.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/ipoman.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/ironware.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/junos.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/junose.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/lm-sensors.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/mgeups.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/mikrotik.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/netapp.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/netbotz.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/observernms-custom.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/papouch-tme.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/pcoweb.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/powerconnect.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/sentry3.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/siklu.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/sub10.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/supermicro.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/xups.inc.php (100%) rename includes/discovery/{ => sensors}/temperatures/zyxel-ies.inc.php (100%) rename includes/discovery/{ => sensors}/voltages.inc.php (79%) rename includes/discovery/{ => sensors}/voltages/apc.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/areca.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/drac.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/dsm.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/gamatronicups.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/ipoman.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/linux.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/mgeups.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/mikrotik.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/netvision.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/rfc1628.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/sentry3.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/siklu.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/supermicro.inc.php (100%) rename includes/discovery/{ => sensors}/voltages/xups.inc.php (100%) diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php index 257777049..a5139e7d8 100644 --- a/includes/discovery/sensors.inc.php +++ b/includes/discovery/sensors.inc.php @@ -4,25 +4,25 @@ $valid['sensor'] = array(); echo 'Sensors: '; -require 'includes/discovery/cisco-entity-sensor.inc.php'; -require 'includes/discovery/entity-sensor.inc.php'; -require 'includes/discovery/ipmi.inc.php'; +require 'includes/discovery/sensors/cisco-entity-sensor.inc.php'; +require 'includes/discovery/sensors/entity-sensor.inc.php'; +require 'includes/discovery/sensors/ipmi.inc.php'; if ($device['os'] == 'netscaler') { - include 'includes/discovery/sensors-netscaler.inc.php'; + include 'includes/discovery/sensors/netscaler.inc.php'; } if ($device['os'] == 'openbsd') { - include 'includes/discovery/sensors-openbsd.inc.php'; + include 'includes/discovery/sensors/openbsd.inc.php'; } -require 'includes/discovery/temperatures.inc.php'; -require 'includes/discovery/humidity.inc.php'; -require 'includes/discovery/voltages.inc.php'; -require 'includes/discovery/frequencies.inc.php'; -require 'includes/discovery/current.inc.php'; -require 'includes/discovery/power.inc.php'; -require 'includes/discovery/fanspeeds.inc.php'; -require 'includes/discovery/charge.inc.php'; -require 'includes/discovery/load.inc.php'; +require 'includes/discovery/sensors/temperatures.inc.php'; +require 'includes/discovery/sensors/humidity.inc.php'; +require 'includes/discovery/sensors/voltages.inc.php'; +require 'includes/discovery/sensors/frequencies.inc.php'; +require 'includes/discovery/sensors/current.inc.php'; +require 'includes/discovery/sensors/power.inc.php'; +require 'includes/discovery/sensors/fanspeeds.inc.php'; +require 'includes/discovery/sensors/charge.inc.php'; +require 'includes/discovery/sensors/load.inc.php'; require 'includes/discovery/states.inc.php'; diff --git a/includes/discovery/charge.inc.php b/includes/discovery/sensors/charge.inc.php similarity index 80% rename from includes/discovery/charge.inc.php rename to includes/discovery/sensors/charge.inc.php index eeea0961f..c0dc66a6e 100644 --- a/includes/discovery/charge.inc.php +++ b/includes/discovery/sensors/charge.inc.php @@ -3,7 +3,7 @@ echo 'Battery Charge: '; // Include all discovery modules -$include_dir = 'includes/discovery/charge'; +$include_dir = 'includes/discovery/sensors/charge'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['charge']); diff --git a/includes/discovery/charge/apc.inc.php b/includes/discovery/sensors/charge/apc.inc.php similarity index 100% rename from includes/discovery/charge/apc.inc.php rename to includes/discovery/sensors/charge/apc.inc.php diff --git a/includes/discovery/charge/dsm.inc.php b/includes/discovery/sensors/charge/dsm.inc.php similarity index 100% rename from includes/discovery/charge/dsm.inc.php rename to includes/discovery/sensors/charge/dsm.inc.php diff --git a/includes/discovery/charge/rfc1628.inc.php b/includes/discovery/sensors/charge/rfc1628.inc.php similarity index 100% rename from includes/discovery/charge/rfc1628.inc.php rename to includes/discovery/sensors/charge/rfc1628.inc.php diff --git a/includes/discovery/cisco-entity-sensor.inc.php b/includes/discovery/sensors/cisco-entity-sensor.inc.php similarity index 100% rename from includes/discovery/cisco-entity-sensor.inc.php rename to includes/discovery/sensors/cisco-entity-sensor.inc.php diff --git a/includes/discovery/current.inc.php b/includes/discovery/sensors/current.inc.php similarity index 79% rename from includes/discovery/current.inc.php rename to includes/discovery/sensors/current.inc.php index 143d6068c..5c3cc4dbe 100644 --- a/includes/discovery/current.inc.php +++ b/includes/discovery/sensors/current.inc.php @@ -2,7 +2,7 @@ echo 'Current: '; // Include all discovery modules -$include_dir = 'includes/discovery/current'; +$include_dir = 'includes/discovery/sensors/current'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['current']); diff --git a/includes/discovery/current/apc.inc.php b/includes/discovery/sensors/current/apc.inc.php similarity index 100% rename from includes/discovery/current/apc.inc.php rename to includes/discovery/sensors/current/apc.inc.php diff --git a/includes/discovery/current/gamatronicups.inc.php b/includes/discovery/sensors/current/gamatronicups.inc.php similarity index 100% rename from includes/discovery/current/gamatronicups.inc.php rename to includes/discovery/sensors/current/gamatronicups.inc.php diff --git a/includes/discovery/current/ipoman.inc.php b/includes/discovery/sensors/current/ipoman.inc.php similarity index 100% rename from includes/discovery/current/ipoman.inc.php rename to includes/discovery/sensors/current/ipoman.inc.php diff --git a/includes/discovery/current/mgeups.inc.php b/includes/discovery/sensors/current/mgeups.inc.php similarity index 100% rename from includes/discovery/current/mgeups.inc.php rename to includes/discovery/sensors/current/mgeups.inc.php diff --git a/includes/discovery/current/netvision.inc.php b/includes/discovery/sensors/current/netvision.inc.php similarity index 100% rename from includes/discovery/current/netvision.inc.php rename to includes/discovery/sensors/current/netvision.inc.php diff --git a/includes/discovery/current/raritan.inc.php b/includes/discovery/sensors/current/raritan.inc.php similarity index 100% rename from includes/discovery/current/raritan.inc.php rename to includes/discovery/sensors/current/raritan.inc.php diff --git a/includes/discovery/current/rfc1628.inc.php b/includes/discovery/sensors/current/rfc1628.inc.php similarity index 100% rename from includes/discovery/current/rfc1628.inc.php rename to includes/discovery/sensors/current/rfc1628.inc.php diff --git a/includes/discovery/current/sentry3.inc.php b/includes/discovery/sensors/current/sentry3.inc.php similarity index 100% rename from includes/discovery/current/sentry3.inc.php rename to includes/discovery/sensors/current/sentry3.inc.php diff --git a/includes/discovery/current/xups.inc.php b/includes/discovery/sensors/current/xups.inc.php similarity index 100% rename from includes/discovery/current/xups.inc.php rename to includes/discovery/sensors/current/xups.inc.php diff --git a/includes/discovery/entity-sensor.inc.php b/includes/discovery/sensors/entity-sensor.inc.php similarity index 100% rename from includes/discovery/entity-sensor.inc.php rename to includes/discovery/sensors/entity-sensor.inc.php diff --git a/includes/discovery/fanspeeds.inc.php b/includes/discovery/sensors/fanspeeds.inc.php similarity index 79% rename from includes/discovery/fanspeeds.inc.php rename to includes/discovery/sensors/fanspeeds.inc.php index 536232149..4cfaacab4 100644 --- a/includes/discovery/fanspeeds.inc.php +++ b/includes/discovery/sensors/fanspeeds.inc.php @@ -3,7 +3,7 @@ echo 'Fanspeeds : '; // Include all discovery modules -$include_dir = 'includes/discovery/fanspeeds'; +$include_dir = 'includes/discovery/sensors/fanspeeds'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['fanspeed']); diff --git a/includes/discovery/fanspeeds/areca.inc.php b/includes/discovery/sensors/fanspeeds/areca.inc.php similarity index 100% rename from includes/discovery/fanspeeds/areca.inc.php rename to includes/discovery/sensors/fanspeeds/areca.inc.php diff --git a/includes/discovery/fanspeeds/dell.inc.php b/includes/discovery/sensors/fanspeeds/dell.inc.php similarity index 100% rename from includes/discovery/fanspeeds/dell.inc.php rename to includes/discovery/sensors/fanspeeds/dell.inc.php diff --git a/includes/discovery/fanspeeds/drac.inc.php b/includes/discovery/sensors/fanspeeds/drac.inc.php similarity index 100% rename from includes/discovery/fanspeeds/drac.inc.php rename to includes/discovery/sensors/fanspeeds/drac.inc.php diff --git a/includes/discovery/fanspeeds/equallogic.inc.php b/includes/discovery/sensors/fanspeeds/equallogic.inc.php similarity index 100% rename from includes/discovery/fanspeeds/equallogic.inc.php rename to includes/discovery/sensors/fanspeeds/equallogic.inc.php diff --git a/includes/discovery/fanspeeds/extreme.inc.php b/includes/discovery/sensors/fanspeeds/extreme.inc.php similarity index 100% rename from includes/discovery/fanspeeds/extreme.inc.php rename to includes/discovery/sensors/fanspeeds/extreme.inc.php diff --git a/includes/discovery/fanspeeds/lmsensors.inc.php b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php similarity index 100% rename from includes/discovery/fanspeeds/lmsensors.inc.php rename to includes/discovery/sensors/fanspeeds/lmsensors.inc.php diff --git a/includes/discovery/fanspeeds/mikrotik.inc.php b/includes/discovery/sensors/fanspeeds/mikrotik.inc.php similarity index 100% rename from includes/discovery/fanspeeds/mikrotik.inc.php rename to includes/discovery/sensors/fanspeeds/mikrotik.inc.php diff --git a/includes/discovery/fanspeeds/supermicro.inc.php b/includes/discovery/sensors/fanspeeds/supermicro.inc.php similarity index 100% rename from includes/discovery/fanspeeds/supermicro.inc.php rename to includes/discovery/sensors/fanspeeds/supermicro.inc.php diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/sensors/frequencies.inc.php similarity index 79% rename from includes/discovery/frequencies.inc.php rename to includes/discovery/sensors/frequencies.inc.php index 93fa17117..540ce055a 100644 --- a/includes/discovery/frequencies.inc.php +++ b/includes/discovery/sensors/frequencies.inc.php @@ -3,7 +3,7 @@ echo 'Frequencies: '; // Include all discovery modules -$include_dir = 'includes/discovery/frequencies'; +$include_dir = 'includes/discovery/sensors/frequencies'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['frequency']); diff --git a/includes/discovery/frequencies/apc.inc.php b/includes/discovery/sensors/frequencies/apc.inc.php similarity index 100% rename from includes/discovery/frequencies/apc.inc.php rename to includes/discovery/sensors/frequencies/apc.inc.php diff --git a/includes/discovery/frequencies/ipoman.inc.php b/includes/discovery/sensors/frequencies/ipoman.inc.php similarity index 100% rename from includes/discovery/frequencies/ipoman.inc.php rename to includes/discovery/sensors/frequencies/ipoman.inc.php diff --git a/includes/discovery/frequencies/mgeups.inc.php b/includes/discovery/sensors/frequencies/mgeups.inc.php similarity index 100% rename from includes/discovery/frequencies/mgeups.inc.php rename to includes/discovery/sensors/frequencies/mgeups.inc.php diff --git a/includes/discovery/frequencies/netvision.inc.php b/includes/discovery/sensors/frequencies/netvision.inc.php similarity index 100% rename from includes/discovery/frequencies/netvision.inc.php rename to includes/discovery/sensors/frequencies/netvision.inc.php diff --git a/includes/discovery/frequencies/raritan.inc.php b/includes/discovery/sensors/frequencies/raritan.inc.php similarity index 100% rename from includes/discovery/frequencies/raritan.inc.php rename to includes/discovery/sensors/frequencies/raritan.inc.php diff --git a/includes/discovery/frequencies/rfc1628.inc.php b/includes/discovery/sensors/frequencies/rfc1628.inc.php similarity index 100% rename from includes/discovery/frequencies/rfc1628.inc.php rename to includes/discovery/sensors/frequencies/rfc1628.inc.php diff --git a/includes/discovery/frequencies/xups.inc.php b/includes/discovery/sensors/frequencies/xups.inc.php similarity index 100% rename from includes/discovery/frequencies/xups.inc.php rename to includes/discovery/sensors/frequencies/xups.inc.php diff --git a/includes/discovery/humidity.inc.php b/includes/discovery/sensors/humidity.inc.php similarity index 79% rename from includes/discovery/humidity.inc.php rename to includes/discovery/sensors/humidity.inc.php index d32be07e4..7f5473adf 100644 --- a/includes/discovery/humidity.inc.php +++ b/includes/discovery/sensors/humidity.inc.php @@ -3,7 +3,7 @@ echo 'Humidity : '; // Include all discovery modules -$include_dir = 'includes/discovery/humidity'; +$include_dir = 'includes/discovery/sensors/humidity'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['humidity']); diff --git a/includes/discovery/humidity/akcp.inc.php b/includes/discovery/sensors/humidity/akcp.inc.php similarity index 100% rename from includes/discovery/humidity/akcp.inc.php rename to includes/discovery/sensors/humidity/akcp.inc.php diff --git a/includes/discovery/humidity/apc.inc.php b/includes/discovery/sensors/humidity/apc.inc.php similarity index 100% rename from includes/discovery/humidity/apc.inc.php rename to includes/discovery/sensors/humidity/apc.inc.php diff --git a/includes/discovery/humidity/ipoman.inc.php b/includes/discovery/sensors/humidity/ipoman.inc.php similarity index 100% rename from includes/discovery/humidity/ipoman.inc.php rename to includes/discovery/sensors/humidity/ipoman.inc.php diff --git a/includes/discovery/humidity/mgeups.inc.php b/includes/discovery/sensors/humidity/mgeups.inc.php similarity index 100% rename from includes/discovery/humidity/mgeups.inc.php rename to includes/discovery/sensors/humidity/mgeups.inc.php diff --git a/includes/discovery/humidity/netbotz.inc.php b/includes/discovery/sensors/humidity/netbotz.inc.php similarity index 100% rename from includes/discovery/humidity/netbotz.inc.php rename to includes/discovery/sensors/humidity/netbotz.inc.php diff --git a/includes/discovery/humidity/pcoweb.inc.php b/includes/discovery/sensors/humidity/pcoweb.inc.php similarity index 100% rename from includes/discovery/humidity/pcoweb.inc.php rename to includes/discovery/sensors/humidity/pcoweb.inc.php diff --git a/includes/discovery/humidity/sentry3.inc.php b/includes/discovery/sensors/humidity/sentry3.inc.php similarity index 100% rename from includes/discovery/humidity/sentry3.inc.php rename to includes/discovery/sensors/humidity/sentry3.inc.php diff --git a/includes/discovery/ipmi.inc.php b/includes/discovery/sensors/ipmi.inc.php similarity index 100% rename from includes/discovery/ipmi.inc.php rename to includes/discovery/sensors/ipmi.inc.php diff --git a/includes/discovery/load.inc.php b/includes/discovery/sensors/load.inc.php similarity index 79% rename from includes/discovery/load.inc.php rename to includes/discovery/sensors/load.inc.php index f09ae86e3..5a4a691bf 100644 --- a/includes/discovery/load.inc.php +++ b/includes/discovery/sensors/load.inc.php @@ -2,7 +2,7 @@ echo 'Load: '; // Include all discovery modules -$include_dir = 'includes/discovery/load'; +$include_dir = 'includes/discovery/sensors/load'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['load']); diff --git a/includes/discovery/load/apc.inc.php b/includes/discovery/sensors/load/apc.inc.php similarity index 100% rename from includes/discovery/load/apc.inc.php rename to includes/discovery/sensors/load/apc.inc.php diff --git a/includes/discovery/load/dsm.inc.php b/includes/discovery/sensors/load/dsm.inc.php similarity index 100% rename from includes/discovery/load/dsm.inc.php rename to includes/discovery/sensors/load/dsm.inc.php diff --git a/includes/discovery/load/rfc1628.inc.php b/includes/discovery/sensors/load/rfc1628.inc.php similarity index 100% rename from includes/discovery/load/rfc1628.inc.php rename to includes/discovery/sensors/load/rfc1628.inc.php diff --git a/includes/discovery/sensors-netscaler.inc.php b/includes/discovery/sensors/netscaler.inc.php similarity index 100% rename from includes/discovery/sensors-netscaler.inc.php rename to includes/discovery/sensors/netscaler.inc.php diff --git a/includes/discovery/sensors-openbsd.inc.php b/includes/discovery/sensors/openbsd.inc.php similarity index 100% rename from includes/discovery/sensors-openbsd.inc.php rename to includes/discovery/sensors/openbsd.inc.php diff --git a/includes/discovery/power.inc.php b/includes/discovery/sensors/power.inc.php similarity index 79% rename from includes/discovery/power.inc.php rename to includes/discovery/sensors/power.inc.php index d204c4b5c..e4ef1dc3b 100644 --- a/includes/discovery/power.inc.php +++ b/includes/discovery/sensors/power.inc.php @@ -3,7 +3,7 @@ echo 'Power: '; // Include all discovery modules -$include_dir = 'includes/discovery/power'; +$include_dir = 'includes/discovery/sensors/power'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['power']); diff --git a/includes/discovery/power/dsm.inc.php b/includes/discovery/sensors/power/dsm.inc.php similarity index 100% rename from includes/discovery/power/dsm.inc.php rename to includes/discovery/sensors/power/dsm.inc.php diff --git a/includes/discovery/power/extreme.inc.php b/includes/discovery/sensors/power/extreme.inc.php similarity index 100% rename from includes/discovery/power/extreme.inc.php rename to includes/discovery/sensors/power/extreme.inc.php diff --git a/includes/discovery/power/ipoman.inc.php b/includes/discovery/sensors/power/ipoman.inc.php similarity index 100% rename from includes/discovery/power/ipoman.inc.php rename to includes/discovery/sensors/power/ipoman.inc.php diff --git a/includes/discovery/power/raritan.inc.php b/includes/discovery/sensors/power/raritan.inc.php similarity index 100% rename from includes/discovery/power/raritan.inc.php rename to includes/discovery/sensors/power/raritan.inc.php diff --git a/includes/discovery/power/rfc1628.inc.php b/includes/discovery/sensors/power/rfc1628.inc.php similarity index 100% rename from includes/discovery/power/rfc1628.inc.php rename to includes/discovery/sensors/power/rfc1628.inc.php diff --git a/includes/discovery/states.inc.php b/includes/discovery/sensors/states.inc.php similarity index 92% rename from includes/discovery/states.inc.php rename to includes/discovery/sensors/states.inc.php index 2eb1c740e..a68aeccdc 100644 --- a/includes/discovery/states.inc.php +++ b/includes/discovery/sensors/states.inc.php @@ -14,7 +14,7 @@ echo 'States: '; -$include_dir = 'includes/discovery/states'; +$include_dir = 'includes/discovery/sensors/states'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['states']); diff --git a/includes/discovery/states/dell.inc.php b/includes/discovery/sensors/states/dell.inc.php similarity index 100% rename from includes/discovery/states/dell.inc.php rename to includes/discovery/sensors/states/dell.inc.php diff --git a/includes/discovery/states/drac.inc.php b/includes/discovery/sensors/states/drac.inc.php similarity index 100% rename from includes/discovery/states/drac.inc.php rename to includes/discovery/sensors/states/drac.inc.php diff --git a/includes/discovery/states/dsm.inc.php b/includes/discovery/sensors/states/dsm.inc.php similarity index 100% rename from includes/discovery/states/dsm.inc.php rename to includes/discovery/sensors/states/dsm.inc.php diff --git a/includes/discovery/states/equallogic.inc.php b/includes/discovery/sensors/states/equallogic.inc.php similarity index 100% rename from includes/discovery/states/equallogic.inc.php rename to includes/discovery/sensors/states/equallogic.inc.php diff --git a/includes/discovery/states/pcoweb.inc.php b/includes/discovery/sensors/states/pcoweb.inc.php similarity index 100% rename from includes/discovery/states/pcoweb.inc.php rename to includes/discovery/sensors/states/pcoweb.inc.php diff --git a/includes/discovery/states/rfc1628.inc.php b/includes/discovery/sensors/states/rfc1628.inc.php similarity index 100% rename from includes/discovery/states/rfc1628.inc.php rename to includes/discovery/sensors/states/rfc1628.inc.php diff --git a/includes/discovery/temperatures.inc.php b/includes/discovery/sensors/temperatures.inc.php similarity index 79% rename from includes/discovery/temperatures.inc.php rename to includes/discovery/sensors/temperatures.inc.php index 60e01b0ba..7e2892b91 100644 --- a/includes/discovery/temperatures.inc.php +++ b/includes/discovery/sensors/temperatures.inc.php @@ -3,7 +3,7 @@ echo 'Temperatures: '; // Include all discovery modules -$include_dir = 'includes/discovery/temperatures'; +$include_dir = 'includes/discovery/sensors/temperatures'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['temperature']); diff --git a/includes/discovery/temperatures/adva.inc.php b/includes/discovery/sensors/temperatures/adva.inc.php similarity index 100% rename from includes/discovery/temperatures/adva.inc.php rename to includes/discovery/sensors/temperatures/adva.inc.php diff --git a/includes/discovery/temperatures/akcp.inc.php b/includes/discovery/sensors/temperatures/akcp.inc.php similarity index 100% rename from includes/discovery/temperatures/akcp.inc.php rename to includes/discovery/sensors/temperatures/akcp.inc.php diff --git a/includes/discovery/temperatures/aos-device.inc.php b/includes/discovery/sensors/temperatures/aos-device.inc.php similarity index 100% rename from includes/discovery/temperatures/aos-device.inc.php rename to includes/discovery/sensors/temperatures/aos-device.inc.php diff --git a/includes/discovery/temperatures/apc.inc.php b/includes/discovery/sensors/temperatures/apc.inc.php similarity index 100% rename from includes/discovery/temperatures/apc.inc.php rename to includes/discovery/sensors/temperatures/apc.inc.php diff --git a/includes/discovery/temperatures/areca.inc.php b/includes/discovery/sensors/temperatures/areca.inc.php similarity index 100% rename from includes/discovery/temperatures/areca.inc.php rename to includes/discovery/sensors/temperatures/areca.inc.php diff --git a/includes/discovery/temperatures/avaya-ers.inc.php b/includes/discovery/sensors/temperatures/avaya-ers.inc.php similarity index 100% rename from includes/discovery/temperatures/avaya-ers.inc.php rename to includes/discovery/sensors/temperatures/avaya-ers.inc.php diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/sensors/temperatures/cisco-envmon.inc.php similarity index 100% rename from includes/discovery/temperatures/cisco-envmon.inc.php rename to includes/discovery/sensors/temperatures/cisco-envmon.inc.php diff --git a/includes/discovery/temperatures/ciscowlc.inc.php b/includes/discovery/sensors/temperatures/ciscowlc.inc.php similarity index 100% rename from includes/discovery/temperatures/ciscowlc.inc.php rename to includes/discovery/sensors/temperatures/ciscowlc.inc.php diff --git a/includes/discovery/temperatures/cometsystem-p85xx.inc.php b/includes/discovery/sensors/temperatures/cometsystem-p85xx.inc.php similarity index 100% rename from includes/discovery/temperatures/cometsystem-p85xx.inc.php rename to includes/discovery/sensors/temperatures/cometsystem-p85xx.inc.php diff --git a/includes/discovery/temperatures/dell.inc.php b/includes/discovery/sensors/temperatures/dell.inc.php similarity index 100% rename from includes/discovery/temperatures/dell.inc.php rename to includes/discovery/sensors/temperatures/dell.inc.php diff --git a/includes/discovery/temperatures/dnos-ftos-s-series.inc.php b/includes/discovery/sensors/temperatures/dnos-ftos-s-series.inc.php similarity index 100% rename from includes/discovery/temperatures/dnos-ftos-s-series.inc.php rename to includes/discovery/sensors/temperatures/dnos-ftos-s-series.inc.php diff --git a/includes/discovery/temperatures/drac.inc.php b/includes/discovery/sensors/temperatures/drac.inc.php similarity index 100% rename from includes/discovery/temperatures/drac.inc.php rename to includes/discovery/sensors/temperatures/drac.inc.php diff --git a/includes/discovery/temperatures/dsm.inc.php b/includes/discovery/sensors/temperatures/dsm.inc.php similarity index 100% rename from includes/discovery/temperatures/dsm.inc.php rename to includes/discovery/sensors/temperatures/dsm.inc.php diff --git a/includes/discovery/temperatures/equallogic.inc.php b/includes/discovery/sensors/temperatures/equallogic.inc.php similarity index 100% rename from includes/discovery/temperatures/equallogic.inc.php rename to includes/discovery/sensors/temperatures/equallogic.inc.php diff --git a/includes/discovery/temperatures/extreme.inc.php b/includes/discovery/sensors/temperatures/extreme.inc.php similarity index 100% rename from includes/discovery/temperatures/extreme.inc.php rename to includes/discovery/sensors/temperatures/extreme.inc.php diff --git a/includes/discovery/temperatures/fiberhome.inc.php b/includes/discovery/sensors/temperatures/fiberhome.inc.php similarity index 100% rename from includes/discovery/temperatures/fiberhome.inc.php rename to includes/discovery/sensors/temperatures/fiberhome.inc.php diff --git a/includes/discovery/temperatures/ftos-c-series.inc.php b/includes/discovery/sensors/temperatures/ftos-c-series.inc.php similarity index 100% rename from includes/discovery/temperatures/ftos-c-series.inc.php rename to includes/discovery/sensors/temperatures/ftos-c-series.inc.php diff --git a/includes/discovery/temperatures/ftos-e-series.inc.php b/includes/discovery/sensors/temperatures/ftos-e-series.inc.php similarity index 100% rename from includes/discovery/temperatures/ftos-e-series.inc.php rename to includes/discovery/sensors/temperatures/ftos-e-series.inc.php diff --git a/includes/discovery/temperatures/hpilo.inc.php b/includes/discovery/sensors/temperatures/hpilo.inc.php similarity index 100% rename from includes/discovery/temperatures/hpilo.inc.php rename to includes/discovery/sensors/temperatures/hpilo.inc.php diff --git a/includes/discovery/temperatures/ibmnos.inc.php b/includes/discovery/sensors/temperatures/ibmnos.inc.php similarity index 100% rename from includes/discovery/temperatures/ibmnos.inc.php rename to includes/discovery/sensors/temperatures/ibmnos.inc.php diff --git a/includes/discovery/temperatures/ipoman.inc.php b/includes/discovery/sensors/temperatures/ipoman.inc.php similarity index 100% rename from includes/discovery/temperatures/ipoman.inc.php rename to includes/discovery/sensors/temperatures/ipoman.inc.php diff --git a/includes/discovery/temperatures/ironware.inc.php b/includes/discovery/sensors/temperatures/ironware.inc.php similarity index 100% rename from includes/discovery/temperatures/ironware.inc.php rename to includes/discovery/sensors/temperatures/ironware.inc.php diff --git a/includes/discovery/temperatures/junos.inc.php b/includes/discovery/sensors/temperatures/junos.inc.php similarity index 100% rename from includes/discovery/temperatures/junos.inc.php rename to includes/discovery/sensors/temperatures/junos.inc.php diff --git a/includes/discovery/temperatures/junose.inc.php b/includes/discovery/sensors/temperatures/junose.inc.php similarity index 100% rename from includes/discovery/temperatures/junose.inc.php rename to includes/discovery/sensors/temperatures/junose.inc.php diff --git a/includes/discovery/temperatures/lm-sensors.inc.php b/includes/discovery/sensors/temperatures/lm-sensors.inc.php similarity index 100% rename from includes/discovery/temperatures/lm-sensors.inc.php rename to includes/discovery/sensors/temperatures/lm-sensors.inc.php diff --git a/includes/discovery/temperatures/mgeups.inc.php b/includes/discovery/sensors/temperatures/mgeups.inc.php similarity index 100% rename from includes/discovery/temperatures/mgeups.inc.php rename to includes/discovery/sensors/temperatures/mgeups.inc.php diff --git a/includes/discovery/temperatures/mikrotik.inc.php b/includes/discovery/sensors/temperatures/mikrotik.inc.php similarity index 100% rename from includes/discovery/temperatures/mikrotik.inc.php rename to includes/discovery/sensors/temperatures/mikrotik.inc.php diff --git a/includes/discovery/temperatures/netapp.inc.php b/includes/discovery/sensors/temperatures/netapp.inc.php similarity index 100% rename from includes/discovery/temperatures/netapp.inc.php rename to includes/discovery/sensors/temperatures/netapp.inc.php diff --git a/includes/discovery/temperatures/netbotz.inc.php b/includes/discovery/sensors/temperatures/netbotz.inc.php similarity index 100% rename from includes/discovery/temperatures/netbotz.inc.php rename to includes/discovery/sensors/temperatures/netbotz.inc.php diff --git a/includes/discovery/temperatures/observernms-custom.inc.php b/includes/discovery/sensors/temperatures/observernms-custom.inc.php similarity index 100% rename from includes/discovery/temperatures/observernms-custom.inc.php rename to includes/discovery/sensors/temperatures/observernms-custom.inc.php diff --git a/includes/discovery/temperatures/papouch-tme.inc.php b/includes/discovery/sensors/temperatures/papouch-tme.inc.php similarity index 100% rename from includes/discovery/temperatures/papouch-tme.inc.php rename to includes/discovery/sensors/temperatures/papouch-tme.inc.php diff --git a/includes/discovery/temperatures/pcoweb.inc.php b/includes/discovery/sensors/temperatures/pcoweb.inc.php similarity index 100% rename from includes/discovery/temperatures/pcoweb.inc.php rename to includes/discovery/sensors/temperatures/pcoweb.inc.php diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/sensors/temperatures/powerconnect.inc.php similarity index 100% rename from includes/discovery/temperatures/powerconnect.inc.php rename to includes/discovery/sensors/temperatures/powerconnect.inc.php diff --git a/includes/discovery/temperatures/rfc1628.inc.php b/includes/discovery/sensors/temperatures/rfc1628.inc.php similarity index 100% rename from includes/discovery/temperatures/rfc1628.inc.php rename to includes/discovery/sensors/temperatures/rfc1628.inc.php diff --git a/includes/discovery/temperatures/sentry3.inc.php b/includes/discovery/sensors/temperatures/sentry3.inc.php similarity index 100% rename from includes/discovery/temperatures/sentry3.inc.php rename to includes/discovery/sensors/temperatures/sentry3.inc.php diff --git a/includes/discovery/temperatures/siklu.inc.php b/includes/discovery/sensors/temperatures/siklu.inc.php similarity index 100% rename from includes/discovery/temperatures/siklu.inc.php rename to includes/discovery/sensors/temperatures/siklu.inc.php diff --git a/includes/discovery/temperatures/sub10.inc.php b/includes/discovery/sensors/temperatures/sub10.inc.php similarity index 100% rename from includes/discovery/temperatures/sub10.inc.php rename to includes/discovery/sensors/temperatures/sub10.inc.php diff --git a/includes/discovery/temperatures/supermicro.inc.php b/includes/discovery/sensors/temperatures/supermicro.inc.php similarity index 100% rename from includes/discovery/temperatures/supermicro.inc.php rename to includes/discovery/sensors/temperatures/supermicro.inc.php diff --git a/includes/discovery/temperatures/xups.inc.php b/includes/discovery/sensors/temperatures/xups.inc.php similarity index 100% rename from includes/discovery/temperatures/xups.inc.php rename to includes/discovery/sensors/temperatures/xups.inc.php diff --git a/includes/discovery/temperatures/zyxel-ies.inc.php b/includes/discovery/sensors/temperatures/zyxel-ies.inc.php similarity index 100% rename from includes/discovery/temperatures/zyxel-ies.inc.php rename to includes/discovery/sensors/temperatures/zyxel-ies.inc.php diff --git a/includes/discovery/voltages.inc.php b/includes/discovery/sensors/voltages.inc.php similarity index 79% rename from includes/discovery/voltages.inc.php rename to includes/discovery/sensors/voltages.inc.php index 5ce7b438d..e521ca717 100644 --- a/includes/discovery/voltages.inc.php +++ b/includes/discovery/sensors/voltages.inc.php @@ -3,7 +3,7 @@ echo 'Voltages: '; // Include all discovery modules -$include_dir = 'includes/discovery/voltages'; +$include_dir = 'includes/discovery/sensors/voltages'; require 'includes/include-dir.inc.php'; d_echo($valid['sensor']['voltage']); diff --git a/includes/discovery/voltages/apc.inc.php b/includes/discovery/sensors/voltages/apc.inc.php similarity index 100% rename from includes/discovery/voltages/apc.inc.php rename to includes/discovery/sensors/voltages/apc.inc.php diff --git a/includes/discovery/voltages/areca.inc.php b/includes/discovery/sensors/voltages/areca.inc.php similarity index 100% rename from includes/discovery/voltages/areca.inc.php rename to includes/discovery/sensors/voltages/areca.inc.php diff --git a/includes/discovery/voltages/drac.inc.php b/includes/discovery/sensors/voltages/drac.inc.php similarity index 100% rename from includes/discovery/voltages/drac.inc.php rename to includes/discovery/sensors/voltages/drac.inc.php diff --git a/includes/discovery/voltages/dsm.inc.php b/includes/discovery/sensors/voltages/dsm.inc.php similarity index 100% rename from includes/discovery/voltages/dsm.inc.php rename to includes/discovery/sensors/voltages/dsm.inc.php diff --git a/includes/discovery/voltages/gamatronicups.inc.php b/includes/discovery/sensors/voltages/gamatronicups.inc.php similarity index 100% rename from includes/discovery/voltages/gamatronicups.inc.php rename to includes/discovery/sensors/voltages/gamatronicups.inc.php diff --git a/includes/discovery/voltages/ipoman.inc.php b/includes/discovery/sensors/voltages/ipoman.inc.php similarity index 100% rename from includes/discovery/voltages/ipoman.inc.php rename to includes/discovery/sensors/voltages/ipoman.inc.php diff --git a/includes/discovery/voltages/linux.inc.php b/includes/discovery/sensors/voltages/linux.inc.php similarity index 100% rename from includes/discovery/voltages/linux.inc.php rename to includes/discovery/sensors/voltages/linux.inc.php diff --git a/includes/discovery/voltages/mgeups.inc.php b/includes/discovery/sensors/voltages/mgeups.inc.php similarity index 100% rename from includes/discovery/voltages/mgeups.inc.php rename to includes/discovery/sensors/voltages/mgeups.inc.php diff --git a/includes/discovery/voltages/mikrotik.inc.php b/includes/discovery/sensors/voltages/mikrotik.inc.php similarity index 100% rename from includes/discovery/voltages/mikrotik.inc.php rename to includes/discovery/sensors/voltages/mikrotik.inc.php diff --git a/includes/discovery/voltages/netvision.inc.php b/includes/discovery/sensors/voltages/netvision.inc.php similarity index 100% rename from includes/discovery/voltages/netvision.inc.php rename to includes/discovery/sensors/voltages/netvision.inc.php diff --git a/includes/discovery/voltages/rfc1628.inc.php b/includes/discovery/sensors/voltages/rfc1628.inc.php similarity index 100% rename from includes/discovery/voltages/rfc1628.inc.php rename to includes/discovery/sensors/voltages/rfc1628.inc.php diff --git a/includes/discovery/voltages/sentry3.inc.php b/includes/discovery/sensors/voltages/sentry3.inc.php similarity index 100% rename from includes/discovery/voltages/sentry3.inc.php rename to includes/discovery/sensors/voltages/sentry3.inc.php diff --git a/includes/discovery/voltages/siklu.inc.php b/includes/discovery/sensors/voltages/siklu.inc.php similarity index 100% rename from includes/discovery/voltages/siklu.inc.php rename to includes/discovery/sensors/voltages/siklu.inc.php diff --git a/includes/discovery/voltages/supermicro.inc.php b/includes/discovery/sensors/voltages/supermicro.inc.php similarity index 100% rename from includes/discovery/voltages/supermicro.inc.php rename to includes/discovery/sensors/voltages/supermicro.inc.php diff --git a/includes/discovery/voltages/xups.inc.php b/includes/discovery/sensors/voltages/xups.inc.php similarity index 100% rename from includes/discovery/voltages/xups.inc.php rename to includes/discovery/sensors/voltages/xups.inc.php