From 6993bd122c36fffef0c121985da53469a42811db Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 11 Mar 2017 18:03:04 -0600 Subject: [PATCH] fix: sensors not being removed from database (#6169) --- html/pages/device/overview.inc.php | 8 ++++---- .../{fanspeeds.inc.php => fanspeed.inc.php} | 0 ...{frequencies.inc.php => frequency.inc.php} | 0 ...mperatures.inc.php => temperature.inc.php} | 0 .../{voltages.inc.php => voltage.inc.php} | 0 includes/discovery/functions.inc.php | 10 +++++----- includes/discovery/sensors.inc.php | 20 +++++++++---------- .../{fanspeeds => fanspeed}/apc.inc.php | 0 .../{fanspeeds => fanspeed}/areca.inc.php | 0 .../{fanspeeds => fanspeed}/dell.inc.php | 0 .../{fanspeeds => fanspeed}/drac.inc.php | 0 .../equallogic.inc.php | 0 .../{fanspeeds => fanspeed}/f5.inc.php | 0 .../{fanspeeds => fanspeed}/fabos.inc.php | 0 .../{fanspeeds => fanspeed}/ibm-amm.inc.php | 0 .../{fanspeeds => fanspeed}/linux.inc.php | 0 .../{fanspeeds => fanspeed}/netonix.inc.php | 0 .../{fanspeeds => fanspeed}/nos.inc.php | 0 .../{fanspeeds => fanspeed}/qnap.inc.php | 0 .../{fanspeeds => fanspeed}/routeros.inc.php | 0 .../{fanspeeds => fanspeed}/sgos.inc.php | 0 .../supermicro.inc.php | 0 .../{fanspeeds => fanspeed}/unix.inc.php | 0 .../{fanspeeds => fanspeed}/windows.inc.php | 0 .../{fanspeeds => fanspeed}/xos.inc.php | 0 .../{frequencies => frequency}/apc.inc.php | 0 .../eatonups.inc.php | 0 .../{frequencies => frequency}/ipoman.inc.php | 0 .../{frequencies => frequency}/linux.inc.php | 0 .../{frequencies => frequency}/mgeups.inc.php | 0 .../netagent2.inc.php | 0 .../netvision.inc.php | 0 .../powerwalker.inc.php | 0 .../powerware.inc.php | 0 .../raritan.inc.php | 0 .../rfc1628.inc.php | 6 +++--- .../sinetica.inc.php | 0 .../sensors/{states => state}/apc.inc.php | 0 .../sensors/{states => state}/asa.inc.php | 0 .../sensors/{states => state}/avtech.inc.php | 0 .../sensors/{states => state}/cisco.inc.php | 0 .../sensors/{states => state}/comware.inc.php | 0 .../sensors/{states => state}/ddnos.inc.php | 0 .../{states => state}/dell-ups.inc.php | 0 .../sensors/{states => state}/dell.inc.php | 0 .../sensors/{states => state}/drac.inc.php | 0 .../sensors/{states => state}/dsm.inc.php | 0 .../{states => state}/edgeswitch.inc.php | 0 .../{states => state}/equallogic.inc.php | 0 .../sensors/{states => state}/f5.inc.php | 0 .../sensors/{states => state}/fabos.inc.php | 0 .../sensors/{states => state}/hp.inc.php | 0 .../sensors/{states => state}/hpblmos.inc.php | 0 .../sensors/{states => state}/hwg-ste.inc.php | 0 .../sensors/{states => state}/ibm-amm.inc.php | 0 .../{states => state}/ironware.inc.php | 0 .../sensors/{states => state}/junos.inc.php | 0 .../sensors/{states => state}/linux.inc.php | 0 .../sensors/{states => state}/mimosa.inc.php | 0 .../{states => state}/netagent2.inc.php | 0 .../sensors/{states => state}/netonix.inc.php | 0 .../sensors/{states => state}/nxos.inc.php | 0 .../sensors/{states => state}/pcoweb.inc.php | 0 .../{states => state}/powervault.inc.php | 0 .../{states => state}/powerwalker.inc.php | 0 .../sensors/{states => state}/qnap.inc.php | 0 .../sensors/{states => state}/rfc1628.inc.php | 0 .../{states => state}/riverbed.inc.php | 0 .../{states => state}/serveriron.inc.php | 0 .../sensors/{states => state}/waas.inc.php | 0 .../{temperatures => temperature}/aen.inc.php | 0 .../akcp.inc.php | 0 .../aos-emu2.inc.php | 0 .../{temperatures => temperature}/aos.inc.php | 0 .../{temperatures => temperature}/apc.inc.php | 0 .../areca.inc.php | 0 .../avaya-ers.inc.php | 0 .../avtech.inc.php | 0 .../binos.inc.php | 0 .../binox.inc.php | 0 .../calix.inc.php | 0 .../cambium.inc.php | 0 .../canopy.inc.php | 0 .../ceraos.inc.php | 0 .../cimc.inc.php | 0 .../cisco.inc.php | 0 .../ciscowlc.inc.php | 0 .../cometsystem-p85xx.inc.php | 0 .../comware.inc.php | 0 .../dell.inc.php | 0 .../dnos.inc.php | 0 .../drac.inc.php | 0 .../{temperatures => temperature}/dsm.inc.php | 0 .../edgeswitch.inc.php | 0 .../equallogic.inc.php | 0 .../{temperatures => temperature}/f5.inc.php | 0 .../fabos.inc.php | 0 .../fiberhome.inc.php | 0 .../ftos.inc.php | 0 .../hpblmos.inc.php | 0 .../hwg-ste.inc.php | 0 .../hwg-ste2.inc.php | 0 .../hytera.inc.php | 0 .../ibm-amm.inc.php | 0 .../ibmnos.inc.php | 0 .../{temperatures => temperature}/ies.inc.php | 0 .../ipoman.inc.php | 0 .../ironware.inc.php | 0 .../junos.inc.php | 0 .../junose.inc.php | 0 .../lantronix-slc.inc.php | 0 .../linux.inc.php | 2 +- .../mgeups.inc.php | 0 .../mimosa.inc.php | 0 .../minkelsrms.inc.php | 0 .../netagent2.inc.php | 0 .../netapp.inc.php | 0 .../netbotz.inc.php | 0 .../netonix.inc.php | 0 .../{temperatures => temperature}/nos.inc.php | 0 .../papouch-tme.inc.php | 0 .../{temperatures => temperature}/pbn.inc.php | 0 .../pcoweb.inc.php | 0 .../powerconnect.inc.php | 0 .../powerwalker.inc.php | 0 .../powerware.inc.php | 0 .../qnap.inc.php | 0 .../rfc1628.inc.php | 0 .../riverbed.inc.php | 0 .../routeros.inc.php | 0 .../{temperatures => temperature}/saf.inc.php | 0 .../sentry3.inc.php | 0 .../sentry4.inc.php | 0 .../seos.inc.php | 0 .../serveriron.inc.php | 0 .../sgos.inc.php | 0 .../siklu.inc.php | 0 .../sub10.inc.php | 0 .../supermicro.inc.php | 0 .../unix.inc.php | 0 .../{temperatures => temperature}/vrp.inc.php | 0 .../windows.inc.php | 2 +- .../{temperatures => temperature}/xos.inc.php | 0 .../sensors/{voltages => voltage}/apc.inc.php | 0 .../{voltages => voltage}/areca.inc.php | 0 .../{voltages => voltage}/ceraos.inc.php | 0 .../{voltages => voltage}/comware.inc.php | 0 .../{voltages => voltage}/cyberpower.inc.php | 0 .../{voltages => voltage}/dell.inc.php | 0 .../{voltages => voltage}/drac.inc.php | 0 .../sensors/{voltages => voltage}/dsm.inc.php | 0 .../{voltages => voltage}/eatonups.inc.php | 0 .../gamatronicups.inc.php | 0 .../{voltages => voltage}/hytera.inc.php | 0 .../{voltages => voltage}/ipoman.inc.php | 0 .../{voltages => voltage}/linux.inc.php | 0 .../{voltages => voltage}/mgeups.inc.php | 0 .../{voltages => voltage}/netagent2.inc.php | 0 .../{voltages => voltage}/netonix.inc.php | 0 .../{voltages => voltage}/netvision.inc.php | 0 .../sensors/{voltages => voltage}/pbn.inc.php | 0 .../{voltages => voltage}/powerwalker.inc.php | 0 .../{voltages => voltage}/powerware.inc.php | 0 .../{voltages => voltage}/rfc1628.inc.php | 8 ++++---- .../{voltages => voltage}/routeros.inc.php | 0 .../sensors/{voltages => voltage}/saf.inc.php | 0 .../{voltages => voltage}/sentry3.inc.php | 0 .../{voltages => voltage}/siklu.inc.php | 0 .../{voltages => voltage}/sinetica.inc.php | 0 .../{voltages => voltage}/unix.inc.php | 0 .../sensors/{voltages => voltage}/vrp.inc.php | 0 171 files changed, 28 insertions(+), 28 deletions(-) rename html/pages/device/overview/sensors/{fanspeeds.inc.php => fanspeed.inc.php} (100%) rename html/pages/device/overview/sensors/{frequencies.inc.php => frequency.inc.php} (100%) rename html/pages/device/overview/sensors/{temperatures.inc.php => temperature.inc.php} (100%) rename html/pages/device/overview/sensors/{voltages.inc.php => voltage.inc.php} (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/apc.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/areca.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/dell.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/drac.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/equallogic.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/f5.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/fabos.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/ibm-amm.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/linux.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/netonix.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/nos.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/qnap.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/routeros.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/sgos.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/supermicro.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/unix.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/windows.inc.php (100%) rename includes/discovery/sensors/{fanspeeds => fanspeed}/xos.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/apc.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/eatonups.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/ipoman.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/linux.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/mgeups.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/netagent2.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/netvision.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/powerwalker.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/powerware.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/raritan.inc.php (100%) rename includes/discovery/sensors/{frequencies => frequency}/rfc1628.inc.php (92%) rename includes/discovery/sensors/{frequencies => frequency}/sinetica.inc.php (100%) rename includes/discovery/sensors/{states => state}/apc.inc.php (100%) rename includes/discovery/sensors/{states => state}/asa.inc.php (100%) rename includes/discovery/sensors/{states => state}/avtech.inc.php (100%) rename includes/discovery/sensors/{states => state}/cisco.inc.php (100%) rename includes/discovery/sensors/{states => state}/comware.inc.php (100%) rename includes/discovery/sensors/{states => state}/ddnos.inc.php (100%) rename includes/discovery/sensors/{states => state}/dell-ups.inc.php (100%) rename includes/discovery/sensors/{states => state}/dell.inc.php (100%) rename includes/discovery/sensors/{states => state}/drac.inc.php (100%) rename includes/discovery/sensors/{states => state}/dsm.inc.php (100%) rename includes/discovery/sensors/{states => state}/edgeswitch.inc.php (100%) rename includes/discovery/sensors/{states => state}/equallogic.inc.php (100%) rename includes/discovery/sensors/{states => state}/f5.inc.php (100%) rename includes/discovery/sensors/{states => state}/fabos.inc.php (100%) rename includes/discovery/sensors/{states => state}/hp.inc.php (100%) rename includes/discovery/sensors/{states => state}/hpblmos.inc.php (100%) rename includes/discovery/sensors/{states => state}/hwg-ste.inc.php (100%) rename includes/discovery/sensors/{states => state}/ibm-amm.inc.php (100%) rename includes/discovery/sensors/{states => state}/ironware.inc.php (100%) rename includes/discovery/sensors/{states => state}/junos.inc.php (100%) rename includes/discovery/sensors/{states => state}/linux.inc.php (100%) rename includes/discovery/sensors/{states => state}/mimosa.inc.php (100%) rename includes/discovery/sensors/{states => state}/netagent2.inc.php (100%) rename includes/discovery/sensors/{states => state}/netonix.inc.php (100%) rename includes/discovery/sensors/{states => state}/nxos.inc.php (100%) rename includes/discovery/sensors/{states => state}/pcoweb.inc.php (100%) rename includes/discovery/sensors/{states => state}/powervault.inc.php (100%) rename includes/discovery/sensors/{states => state}/powerwalker.inc.php (100%) rename includes/discovery/sensors/{states => state}/qnap.inc.php (100%) rename includes/discovery/sensors/{states => state}/rfc1628.inc.php (100%) rename includes/discovery/sensors/{states => state}/riverbed.inc.php (100%) rename includes/discovery/sensors/{states => state}/serveriron.inc.php (100%) rename includes/discovery/sensors/{states => state}/waas.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/aen.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/akcp.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/aos-emu2.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/aos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/apc.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/areca.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/avaya-ers.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/avtech.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/binos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/binox.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/calix.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/cambium.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/canopy.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ceraos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/cimc.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/cisco.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ciscowlc.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/cometsystem-p85xx.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/comware.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/dell.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/dnos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/drac.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/dsm.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/edgeswitch.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/equallogic.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/f5.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/fabos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/fiberhome.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ftos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/hpblmos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/hwg-ste.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/hwg-ste2.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/hytera.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ibm-amm.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ibmnos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ies.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ipoman.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/ironware.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/junos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/junose.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/lantronix-slc.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/linux.inc.php (98%) rename includes/discovery/sensors/{temperatures => temperature}/mgeups.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/mimosa.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/minkelsrms.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/netagent2.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/netapp.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/netbotz.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/netonix.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/nos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/papouch-tme.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/pbn.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/pcoweb.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/powerconnect.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/powerwalker.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/powerware.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/qnap.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/rfc1628.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/riverbed.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/routeros.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/saf.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/sentry3.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/sentry4.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/seos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/serveriron.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/sgos.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/siklu.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/sub10.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/supermicro.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/unix.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/vrp.inc.php (100%) rename includes/discovery/sensors/{temperatures => temperature}/windows.inc.php (65%) rename includes/discovery/sensors/{temperatures => temperature}/xos.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/apc.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/areca.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/ceraos.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/comware.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/cyberpower.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/dell.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/drac.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/dsm.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/eatonups.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/gamatronicups.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/hytera.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/ipoman.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/linux.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/mgeups.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/netagent2.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/netonix.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/netvision.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/pbn.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/powerwalker.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/powerware.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/rfc1628.inc.php (95%) rename includes/discovery/sensors/{voltages => voltage}/routeros.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/saf.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/sentry3.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/siklu.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/sinetica.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/unix.inc.php (100%) rename includes/discovery/sensors/{voltages => voltage}/vrp.inc.php (100%) diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php index 9ed8044d32..c244aa701c 100644 --- a/html/pages/device/overview.inc.php +++ b/html/pages/device/overview.inc.php @@ -56,15 +56,15 @@ if (is_array($entity_state['group']['c6kxbar'])) { require 'overview/toner.inc.php'; require 'overview/sensors/charge.inc.php'; -require 'overview/sensors/temperatures.inc.php'; +require 'overview/sensors/temperature.inc.php'; require 'overview/sensors/humidity.inc.php'; -require 'overview/sensors/fanspeeds.inc.php'; +require 'overview/sensors/fanspeed.inc.php'; require 'overview/sensors/dbm.inc.php'; -require 'overview/sensors/voltages.inc.php'; +require 'overview/sensors/voltage.inc.php'; require 'overview/sensors/current.inc.php'; require 'overview/sensors/runtime.inc.php'; require 'overview/sensors/power.inc.php'; -require 'overview/sensors/frequencies.inc.php'; +require 'overview/sensors/frequency.inc.php'; require 'overview/sensors/load.inc.php'; require 'overview/sensors/state.inc.php'; require 'overview/sensors/signal.inc.php'; diff --git a/html/pages/device/overview/sensors/fanspeeds.inc.php b/html/pages/device/overview/sensors/fanspeed.inc.php similarity index 100% rename from html/pages/device/overview/sensors/fanspeeds.inc.php rename to html/pages/device/overview/sensors/fanspeed.inc.php diff --git a/html/pages/device/overview/sensors/frequencies.inc.php b/html/pages/device/overview/sensors/frequency.inc.php similarity index 100% rename from html/pages/device/overview/sensors/frequencies.inc.php rename to html/pages/device/overview/sensors/frequency.inc.php diff --git a/html/pages/device/overview/sensors/temperatures.inc.php b/html/pages/device/overview/sensors/temperature.inc.php similarity index 100% rename from html/pages/device/overview/sensors/temperatures.inc.php rename to html/pages/device/overview/sensors/temperature.inc.php diff --git a/html/pages/device/overview/sensors/voltages.inc.php b/html/pages/device/overview/sensors/voltage.inc.php similarity index 100% rename from html/pages/device/overview/sensors/voltages.inc.php rename to html/pages/device/overview/sensors/voltage.inc.php diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 59810c3a22..4cd7e2f58f 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -905,7 +905,7 @@ function avtech_add_sensor($device, $sensor) function get_device_divisor($device, $os_version, $sensor_type, $oid) { if ($device['os'] == 'poweralert') { - if ($sensor_type == 'current' || $sensor_type == 'frequencies') { + if ($sensor_type == 'current' || $sensor_type == 'frequency') { if (version_compare($os_version, '12.06.0068', '>=')) { return 10; } elseif (version_compare($os_version, '12.04.0055', '=')) { @@ -919,17 +919,17 @@ function get_device_divisor($device, $os_version, $sensor_type, $oid) } else { return 1; } - } elseif ($sensor_type == 'voltages') { + } elseif ($sensor_type == 'voltage') { return 1; } - } elseif (($device['os'] == 'huaweiups') && ($sensor_type == 'frequencies')) { + } elseif (($device['os'] == 'huaweiups') && ($sensor_type == 'frequency')) { return 100; - } elseif (($device['os'] == 'netmanplus') && ($sensor_type == 'voltages')) { + } elseif (($device['os'] == 'netmanplus') && ($sensor_type == 'voltage')) { return 1; } elseif ($device['os'] == 'generex-ups') { if ($sensor_type == 'load') { return 1; - } elseif ($sensor_type == 'voltages' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) { + } elseif ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) { return 1; } } diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php index c9a5b09922..2ab5ad2bc3 100644 --- a/includes/discovery/sensors.inc.php +++ b/includes/discovery/sensors.inc.php @@ -19,15 +19,15 @@ if ($device['os'] == 'openbsd') { } if (strstr($device['hardware'], 'Dell')) { - include 'includes/discovery/sensors/fanspeeds/dell.inc.php'; + include 'includes/discovery/sensors/fanspeed/dell.inc.php'; include 'includes/discovery/sensors/power/dell.inc.php'; - include 'includes/discovery/sensors/voltages/dell.inc.php'; - include 'includes/discovery/sensors/states/dell.inc.php'; - include 'includes/discovery/sensors/temperatures/dell.inc.php'; + include 'includes/discovery/sensors/voltage/dell.inc.php'; + include 'includes/discovery/sensors/state/dell.inc.php'; + include 'includes/discovery/sensors/temperature/dell.inc.php'; } if (strstr($device['hardware'], 'ProLiant')) { - include 'includes/discovery/sensors/states/hp.inc.php'; + include 'includes/discovery/sensors/state/hp.inc.php'; } $run_sensors = array( @@ -35,16 +35,16 @@ $run_sensors = array( 'current', 'charge', 'dbm', - 'fanspeeds', - 'frequencies', + 'fanspeed', + 'frequency', 'humidity', 'load', 'power', 'runtime', 'signal', - 'states', - 'temperatures', - 'voltages', + 'state', + 'temperature', + 'voltage', ); sensors($run_sensors, $device, $valid, $pre_cache); unset( diff --git a/includes/discovery/sensors/fanspeeds/apc.inc.php b/includes/discovery/sensors/fanspeed/apc.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/apc.inc.php rename to includes/discovery/sensors/fanspeed/apc.inc.php diff --git a/includes/discovery/sensors/fanspeeds/areca.inc.php b/includes/discovery/sensors/fanspeed/areca.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/areca.inc.php rename to includes/discovery/sensors/fanspeed/areca.inc.php diff --git a/includes/discovery/sensors/fanspeeds/dell.inc.php b/includes/discovery/sensors/fanspeed/dell.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/dell.inc.php rename to includes/discovery/sensors/fanspeed/dell.inc.php diff --git a/includes/discovery/sensors/fanspeeds/drac.inc.php b/includes/discovery/sensors/fanspeed/drac.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/drac.inc.php rename to includes/discovery/sensors/fanspeed/drac.inc.php diff --git a/includes/discovery/sensors/fanspeeds/equallogic.inc.php b/includes/discovery/sensors/fanspeed/equallogic.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/equallogic.inc.php rename to includes/discovery/sensors/fanspeed/equallogic.inc.php diff --git a/includes/discovery/sensors/fanspeeds/f5.inc.php b/includes/discovery/sensors/fanspeed/f5.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/f5.inc.php rename to includes/discovery/sensors/fanspeed/f5.inc.php diff --git a/includes/discovery/sensors/fanspeeds/fabos.inc.php b/includes/discovery/sensors/fanspeed/fabos.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/fabos.inc.php rename to includes/discovery/sensors/fanspeed/fabos.inc.php diff --git a/includes/discovery/sensors/fanspeeds/ibm-amm.inc.php b/includes/discovery/sensors/fanspeed/ibm-amm.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/ibm-amm.inc.php rename to includes/discovery/sensors/fanspeed/ibm-amm.inc.php diff --git a/includes/discovery/sensors/fanspeeds/linux.inc.php b/includes/discovery/sensors/fanspeed/linux.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/linux.inc.php rename to includes/discovery/sensors/fanspeed/linux.inc.php diff --git a/includes/discovery/sensors/fanspeeds/netonix.inc.php b/includes/discovery/sensors/fanspeed/netonix.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/netonix.inc.php rename to includes/discovery/sensors/fanspeed/netonix.inc.php diff --git a/includes/discovery/sensors/fanspeeds/nos.inc.php b/includes/discovery/sensors/fanspeed/nos.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/nos.inc.php rename to includes/discovery/sensors/fanspeed/nos.inc.php diff --git a/includes/discovery/sensors/fanspeeds/qnap.inc.php b/includes/discovery/sensors/fanspeed/qnap.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/qnap.inc.php rename to includes/discovery/sensors/fanspeed/qnap.inc.php diff --git a/includes/discovery/sensors/fanspeeds/routeros.inc.php b/includes/discovery/sensors/fanspeed/routeros.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/routeros.inc.php rename to includes/discovery/sensors/fanspeed/routeros.inc.php diff --git a/includes/discovery/sensors/fanspeeds/sgos.inc.php b/includes/discovery/sensors/fanspeed/sgos.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/sgos.inc.php rename to includes/discovery/sensors/fanspeed/sgos.inc.php diff --git a/includes/discovery/sensors/fanspeeds/supermicro.inc.php b/includes/discovery/sensors/fanspeed/supermicro.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/supermicro.inc.php rename to includes/discovery/sensors/fanspeed/supermicro.inc.php diff --git a/includes/discovery/sensors/fanspeeds/unix.inc.php b/includes/discovery/sensors/fanspeed/unix.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/unix.inc.php rename to includes/discovery/sensors/fanspeed/unix.inc.php diff --git a/includes/discovery/sensors/fanspeeds/windows.inc.php b/includes/discovery/sensors/fanspeed/windows.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/windows.inc.php rename to includes/discovery/sensors/fanspeed/windows.inc.php diff --git a/includes/discovery/sensors/fanspeeds/xos.inc.php b/includes/discovery/sensors/fanspeed/xos.inc.php similarity index 100% rename from includes/discovery/sensors/fanspeeds/xos.inc.php rename to includes/discovery/sensors/fanspeed/xos.inc.php diff --git a/includes/discovery/sensors/frequencies/apc.inc.php b/includes/discovery/sensors/frequency/apc.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/apc.inc.php rename to includes/discovery/sensors/frequency/apc.inc.php diff --git a/includes/discovery/sensors/frequencies/eatonups.inc.php b/includes/discovery/sensors/frequency/eatonups.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/eatonups.inc.php rename to includes/discovery/sensors/frequency/eatonups.inc.php diff --git a/includes/discovery/sensors/frequencies/ipoman.inc.php b/includes/discovery/sensors/frequency/ipoman.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/ipoman.inc.php rename to includes/discovery/sensors/frequency/ipoman.inc.php diff --git a/includes/discovery/sensors/frequencies/linux.inc.php b/includes/discovery/sensors/frequency/linux.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/linux.inc.php rename to includes/discovery/sensors/frequency/linux.inc.php diff --git a/includes/discovery/sensors/frequencies/mgeups.inc.php b/includes/discovery/sensors/frequency/mgeups.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/mgeups.inc.php rename to includes/discovery/sensors/frequency/mgeups.inc.php diff --git a/includes/discovery/sensors/frequencies/netagent2.inc.php b/includes/discovery/sensors/frequency/netagent2.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/netagent2.inc.php rename to includes/discovery/sensors/frequency/netagent2.inc.php diff --git a/includes/discovery/sensors/frequencies/netvision.inc.php b/includes/discovery/sensors/frequency/netvision.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/netvision.inc.php rename to includes/discovery/sensors/frequency/netvision.inc.php diff --git a/includes/discovery/sensors/frequencies/powerwalker.inc.php b/includes/discovery/sensors/frequency/powerwalker.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/powerwalker.inc.php rename to includes/discovery/sensors/frequency/powerwalker.inc.php diff --git a/includes/discovery/sensors/frequencies/powerware.inc.php b/includes/discovery/sensors/frequency/powerware.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/powerware.inc.php rename to includes/discovery/sensors/frequency/powerware.inc.php diff --git a/includes/discovery/sensors/frequencies/raritan.inc.php b/includes/discovery/sensors/frequency/raritan.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/raritan.inc.php rename to includes/discovery/sensors/frequency/raritan.inc.php diff --git a/includes/discovery/sensors/frequencies/rfc1628.inc.php b/includes/discovery/sensors/frequency/rfc1628.inc.php similarity index 92% rename from includes/discovery/sensors/frequencies/rfc1628.inc.php rename to includes/discovery/sensors/frequency/rfc1628.inc.php index 0bafe44cd5..14a9b5af2a 100644 --- a/includes/discovery/sensors/frequencies/rfc1628.inc.php +++ b/includes/discovery/sensors/frequency/rfc1628.inc.php @@ -12,7 +12,7 @@ for ($i = 1; $i <= $numPhase; $i++) { if ($numPhase > 1) { $descr .= " Phase $i"; } - $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies', $freq_oid); + $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid); $current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor); $type = 'rfc1628'; @@ -22,7 +22,7 @@ for ($i = 1; $i <= $numPhase; $i++) { $freq_oid = '.1.3.6.1.2.1.33.1.4.2.0'; $descr = 'Output'; -$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies', $freq_oid); +$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid); $current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor); $type = 'rfc1628'; @@ -31,7 +31,7 @@ discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type $freq_oid = '.1.3.6.1.2.1.33.1.5.1.0'; $descr = 'Bypass'; -$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies', $freq_oid); +$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid); $current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor); $type = 'rfc1628'; diff --git a/includes/discovery/sensors/frequencies/sinetica.inc.php b/includes/discovery/sensors/frequency/sinetica.inc.php similarity index 100% rename from includes/discovery/sensors/frequencies/sinetica.inc.php rename to includes/discovery/sensors/frequency/sinetica.inc.php diff --git a/includes/discovery/sensors/states/apc.inc.php b/includes/discovery/sensors/state/apc.inc.php similarity index 100% rename from includes/discovery/sensors/states/apc.inc.php rename to includes/discovery/sensors/state/apc.inc.php diff --git a/includes/discovery/sensors/states/asa.inc.php b/includes/discovery/sensors/state/asa.inc.php similarity index 100% rename from includes/discovery/sensors/states/asa.inc.php rename to includes/discovery/sensors/state/asa.inc.php diff --git a/includes/discovery/sensors/states/avtech.inc.php b/includes/discovery/sensors/state/avtech.inc.php similarity index 100% rename from includes/discovery/sensors/states/avtech.inc.php rename to includes/discovery/sensors/state/avtech.inc.php diff --git a/includes/discovery/sensors/states/cisco.inc.php b/includes/discovery/sensors/state/cisco.inc.php similarity index 100% rename from includes/discovery/sensors/states/cisco.inc.php rename to includes/discovery/sensors/state/cisco.inc.php diff --git a/includes/discovery/sensors/states/comware.inc.php b/includes/discovery/sensors/state/comware.inc.php similarity index 100% rename from includes/discovery/sensors/states/comware.inc.php rename to includes/discovery/sensors/state/comware.inc.php diff --git a/includes/discovery/sensors/states/ddnos.inc.php b/includes/discovery/sensors/state/ddnos.inc.php similarity index 100% rename from includes/discovery/sensors/states/ddnos.inc.php rename to includes/discovery/sensors/state/ddnos.inc.php diff --git a/includes/discovery/sensors/states/dell-ups.inc.php b/includes/discovery/sensors/state/dell-ups.inc.php similarity index 100% rename from includes/discovery/sensors/states/dell-ups.inc.php rename to includes/discovery/sensors/state/dell-ups.inc.php diff --git a/includes/discovery/sensors/states/dell.inc.php b/includes/discovery/sensors/state/dell.inc.php similarity index 100% rename from includes/discovery/sensors/states/dell.inc.php rename to includes/discovery/sensors/state/dell.inc.php diff --git a/includes/discovery/sensors/states/drac.inc.php b/includes/discovery/sensors/state/drac.inc.php similarity index 100% rename from includes/discovery/sensors/states/drac.inc.php rename to includes/discovery/sensors/state/drac.inc.php diff --git a/includes/discovery/sensors/states/dsm.inc.php b/includes/discovery/sensors/state/dsm.inc.php similarity index 100% rename from includes/discovery/sensors/states/dsm.inc.php rename to includes/discovery/sensors/state/dsm.inc.php diff --git a/includes/discovery/sensors/states/edgeswitch.inc.php b/includes/discovery/sensors/state/edgeswitch.inc.php similarity index 100% rename from includes/discovery/sensors/states/edgeswitch.inc.php rename to includes/discovery/sensors/state/edgeswitch.inc.php diff --git a/includes/discovery/sensors/states/equallogic.inc.php b/includes/discovery/sensors/state/equallogic.inc.php similarity index 100% rename from includes/discovery/sensors/states/equallogic.inc.php rename to includes/discovery/sensors/state/equallogic.inc.php diff --git a/includes/discovery/sensors/states/f5.inc.php b/includes/discovery/sensors/state/f5.inc.php similarity index 100% rename from includes/discovery/sensors/states/f5.inc.php rename to includes/discovery/sensors/state/f5.inc.php diff --git a/includes/discovery/sensors/states/fabos.inc.php b/includes/discovery/sensors/state/fabos.inc.php similarity index 100% rename from includes/discovery/sensors/states/fabos.inc.php rename to includes/discovery/sensors/state/fabos.inc.php diff --git a/includes/discovery/sensors/states/hp.inc.php b/includes/discovery/sensors/state/hp.inc.php similarity index 100% rename from includes/discovery/sensors/states/hp.inc.php rename to includes/discovery/sensors/state/hp.inc.php diff --git a/includes/discovery/sensors/states/hpblmos.inc.php b/includes/discovery/sensors/state/hpblmos.inc.php similarity index 100% rename from includes/discovery/sensors/states/hpblmos.inc.php rename to includes/discovery/sensors/state/hpblmos.inc.php diff --git a/includes/discovery/sensors/states/hwg-ste.inc.php b/includes/discovery/sensors/state/hwg-ste.inc.php similarity index 100% rename from includes/discovery/sensors/states/hwg-ste.inc.php rename to includes/discovery/sensors/state/hwg-ste.inc.php diff --git a/includes/discovery/sensors/states/ibm-amm.inc.php b/includes/discovery/sensors/state/ibm-amm.inc.php similarity index 100% rename from includes/discovery/sensors/states/ibm-amm.inc.php rename to includes/discovery/sensors/state/ibm-amm.inc.php diff --git a/includes/discovery/sensors/states/ironware.inc.php b/includes/discovery/sensors/state/ironware.inc.php similarity index 100% rename from includes/discovery/sensors/states/ironware.inc.php rename to includes/discovery/sensors/state/ironware.inc.php diff --git a/includes/discovery/sensors/states/junos.inc.php b/includes/discovery/sensors/state/junos.inc.php similarity index 100% rename from includes/discovery/sensors/states/junos.inc.php rename to includes/discovery/sensors/state/junos.inc.php diff --git a/includes/discovery/sensors/states/linux.inc.php b/includes/discovery/sensors/state/linux.inc.php similarity index 100% rename from includes/discovery/sensors/states/linux.inc.php rename to includes/discovery/sensors/state/linux.inc.php diff --git a/includes/discovery/sensors/states/mimosa.inc.php b/includes/discovery/sensors/state/mimosa.inc.php similarity index 100% rename from includes/discovery/sensors/states/mimosa.inc.php rename to includes/discovery/sensors/state/mimosa.inc.php diff --git a/includes/discovery/sensors/states/netagent2.inc.php b/includes/discovery/sensors/state/netagent2.inc.php similarity index 100% rename from includes/discovery/sensors/states/netagent2.inc.php rename to includes/discovery/sensors/state/netagent2.inc.php diff --git a/includes/discovery/sensors/states/netonix.inc.php b/includes/discovery/sensors/state/netonix.inc.php similarity index 100% rename from includes/discovery/sensors/states/netonix.inc.php rename to includes/discovery/sensors/state/netonix.inc.php diff --git a/includes/discovery/sensors/states/nxos.inc.php b/includes/discovery/sensors/state/nxos.inc.php similarity index 100% rename from includes/discovery/sensors/states/nxos.inc.php rename to includes/discovery/sensors/state/nxos.inc.php diff --git a/includes/discovery/sensors/states/pcoweb.inc.php b/includes/discovery/sensors/state/pcoweb.inc.php similarity index 100% rename from includes/discovery/sensors/states/pcoweb.inc.php rename to includes/discovery/sensors/state/pcoweb.inc.php diff --git a/includes/discovery/sensors/states/powervault.inc.php b/includes/discovery/sensors/state/powervault.inc.php similarity index 100% rename from includes/discovery/sensors/states/powervault.inc.php rename to includes/discovery/sensors/state/powervault.inc.php diff --git a/includes/discovery/sensors/states/powerwalker.inc.php b/includes/discovery/sensors/state/powerwalker.inc.php similarity index 100% rename from includes/discovery/sensors/states/powerwalker.inc.php rename to includes/discovery/sensors/state/powerwalker.inc.php diff --git a/includes/discovery/sensors/states/qnap.inc.php b/includes/discovery/sensors/state/qnap.inc.php similarity index 100% rename from includes/discovery/sensors/states/qnap.inc.php rename to includes/discovery/sensors/state/qnap.inc.php diff --git a/includes/discovery/sensors/states/rfc1628.inc.php b/includes/discovery/sensors/state/rfc1628.inc.php similarity index 100% rename from includes/discovery/sensors/states/rfc1628.inc.php rename to includes/discovery/sensors/state/rfc1628.inc.php diff --git a/includes/discovery/sensors/states/riverbed.inc.php b/includes/discovery/sensors/state/riverbed.inc.php similarity index 100% rename from includes/discovery/sensors/states/riverbed.inc.php rename to includes/discovery/sensors/state/riverbed.inc.php diff --git a/includes/discovery/sensors/states/serveriron.inc.php b/includes/discovery/sensors/state/serveriron.inc.php similarity index 100% rename from includes/discovery/sensors/states/serveriron.inc.php rename to includes/discovery/sensors/state/serveriron.inc.php diff --git a/includes/discovery/sensors/states/waas.inc.php b/includes/discovery/sensors/state/waas.inc.php similarity index 100% rename from includes/discovery/sensors/states/waas.inc.php rename to includes/discovery/sensors/state/waas.inc.php diff --git a/includes/discovery/sensors/temperatures/aen.inc.php b/includes/discovery/sensors/temperature/aen.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/aen.inc.php rename to includes/discovery/sensors/temperature/aen.inc.php diff --git a/includes/discovery/sensors/temperatures/akcp.inc.php b/includes/discovery/sensors/temperature/akcp.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/akcp.inc.php rename to includes/discovery/sensors/temperature/akcp.inc.php diff --git a/includes/discovery/sensors/temperatures/aos-emu2.inc.php b/includes/discovery/sensors/temperature/aos-emu2.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/aos-emu2.inc.php rename to includes/discovery/sensors/temperature/aos-emu2.inc.php diff --git a/includes/discovery/sensors/temperatures/aos.inc.php b/includes/discovery/sensors/temperature/aos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/aos.inc.php rename to includes/discovery/sensors/temperature/aos.inc.php diff --git a/includes/discovery/sensors/temperatures/apc.inc.php b/includes/discovery/sensors/temperature/apc.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/apc.inc.php rename to includes/discovery/sensors/temperature/apc.inc.php diff --git a/includes/discovery/sensors/temperatures/areca.inc.php b/includes/discovery/sensors/temperature/areca.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/areca.inc.php rename to includes/discovery/sensors/temperature/areca.inc.php diff --git a/includes/discovery/sensors/temperatures/avaya-ers.inc.php b/includes/discovery/sensors/temperature/avaya-ers.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/avaya-ers.inc.php rename to includes/discovery/sensors/temperature/avaya-ers.inc.php diff --git a/includes/discovery/sensors/temperatures/avtech.inc.php b/includes/discovery/sensors/temperature/avtech.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/avtech.inc.php rename to includes/discovery/sensors/temperature/avtech.inc.php diff --git a/includes/discovery/sensors/temperatures/binos.inc.php b/includes/discovery/sensors/temperature/binos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/binos.inc.php rename to includes/discovery/sensors/temperature/binos.inc.php diff --git a/includes/discovery/sensors/temperatures/binox.inc.php b/includes/discovery/sensors/temperature/binox.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/binox.inc.php rename to includes/discovery/sensors/temperature/binox.inc.php diff --git a/includes/discovery/sensors/temperatures/calix.inc.php b/includes/discovery/sensors/temperature/calix.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/calix.inc.php rename to includes/discovery/sensors/temperature/calix.inc.php diff --git a/includes/discovery/sensors/temperatures/cambium.inc.php b/includes/discovery/sensors/temperature/cambium.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/cambium.inc.php rename to includes/discovery/sensors/temperature/cambium.inc.php diff --git a/includes/discovery/sensors/temperatures/canopy.inc.php b/includes/discovery/sensors/temperature/canopy.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/canopy.inc.php rename to includes/discovery/sensors/temperature/canopy.inc.php diff --git a/includes/discovery/sensors/temperatures/ceraos.inc.php b/includes/discovery/sensors/temperature/ceraos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ceraos.inc.php rename to includes/discovery/sensors/temperature/ceraos.inc.php diff --git a/includes/discovery/sensors/temperatures/cimc.inc.php b/includes/discovery/sensors/temperature/cimc.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/cimc.inc.php rename to includes/discovery/sensors/temperature/cimc.inc.php diff --git a/includes/discovery/sensors/temperatures/cisco.inc.php b/includes/discovery/sensors/temperature/cisco.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/cisco.inc.php rename to includes/discovery/sensors/temperature/cisco.inc.php diff --git a/includes/discovery/sensors/temperatures/ciscowlc.inc.php b/includes/discovery/sensors/temperature/ciscowlc.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ciscowlc.inc.php rename to includes/discovery/sensors/temperature/ciscowlc.inc.php diff --git a/includes/discovery/sensors/temperatures/cometsystem-p85xx.inc.php b/includes/discovery/sensors/temperature/cometsystem-p85xx.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/cometsystem-p85xx.inc.php rename to includes/discovery/sensors/temperature/cometsystem-p85xx.inc.php diff --git a/includes/discovery/sensors/temperatures/comware.inc.php b/includes/discovery/sensors/temperature/comware.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/comware.inc.php rename to includes/discovery/sensors/temperature/comware.inc.php diff --git a/includes/discovery/sensors/temperatures/dell.inc.php b/includes/discovery/sensors/temperature/dell.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/dell.inc.php rename to includes/discovery/sensors/temperature/dell.inc.php diff --git a/includes/discovery/sensors/temperatures/dnos.inc.php b/includes/discovery/sensors/temperature/dnos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/dnos.inc.php rename to includes/discovery/sensors/temperature/dnos.inc.php diff --git a/includes/discovery/sensors/temperatures/drac.inc.php b/includes/discovery/sensors/temperature/drac.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/drac.inc.php rename to includes/discovery/sensors/temperature/drac.inc.php diff --git a/includes/discovery/sensors/temperatures/dsm.inc.php b/includes/discovery/sensors/temperature/dsm.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/dsm.inc.php rename to includes/discovery/sensors/temperature/dsm.inc.php diff --git a/includes/discovery/sensors/temperatures/edgeswitch.inc.php b/includes/discovery/sensors/temperature/edgeswitch.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/edgeswitch.inc.php rename to includes/discovery/sensors/temperature/edgeswitch.inc.php diff --git a/includes/discovery/sensors/temperatures/equallogic.inc.php b/includes/discovery/sensors/temperature/equallogic.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/equallogic.inc.php rename to includes/discovery/sensors/temperature/equallogic.inc.php diff --git a/includes/discovery/sensors/temperatures/f5.inc.php b/includes/discovery/sensors/temperature/f5.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/f5.inc.php rename to includes/discovery/sensors/temperature/f5.inc.php diff --git a/includes/discovery/sensors/temperatures/fabos.inc.php b/includes/discovery/sensors/temperature/fabos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/fabos.inc.php rename to includes/discovery/sensors/temperature/fabos.inc.php diff --git a/includes/discovery/sensors/temperatures/fiberhome.inc.php b/includes/discovery/sensors/temperature/fiberhome.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/fiberhome.inc.php rename to includes/discovery/sensors/temperature/fiberhome.inc.php diff --git a/includes/discovery/sensors/temperatures/ftos.inc.php b/includes/discovery/sensors/temperature/ftos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ftos.inc.php rename to includes/discovery/sensors/temperature/ftos.inc.php diff --git a/includes/discovery/sensors/temperatures/hpblmos.inc.php b/includes/discovery/sensors/temperature/hpblmos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/hpblmos.inc.php rename to includes/discovery/sensors/temperature/hpblmos.inc.php diff --git a/includes/discovery/sensors/temperatures/hwg-ste.inc.php b/includes/discovery/sensors/temperature/hwg-ste.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/hwg-ste.inc.php rename to includes/discovery/sensors/temperature/hwg-ste.inc.php diff --git a/includes/discovery/sensors/temperatures/hwg-ste2.inc.php b/includes/discovery/sensors/temperature/hwg-ste2.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/hwg-ste2.inc.php rename to includes/discovery/sensors/temperature/hwg-ste2.inc.php diff --git a/includes/discovery/sensors/temperatures/hytera.inc.php b/includes/discovery/sensors/temperature/hytera.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/hytera.inc.php rename to includes/discovery/sensors/temperature/hytera.inc.php diff --git a/includes/discovery/sensors/temperatures/ibm-amm.inc.php b/includes/discovery/sensors/temperature/ibm-amm.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ibm-amm.inc.php rename to includes/discovery/sensors/temperature/ibm-amm.inc.php diff --git a/includes/discovery/sensors/temperatures/ibmnos.inc.php b/includes/discovery/sensors/temperature/ibmnos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ibmnos.inc.php rename to includes/discovery/sensors/temperature/ibmnos.inc.php diff --git a/includes/discovery/sensors/temperatures/ies.inc.php b/includes/discovery/sensors/temperature/ies.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ies.inc.php rename to includes/discovery/sensors/temperature/ies.inc.php diff --git a/includes/discovery/sensors/temperatures/ipoman.inc.php b/includes/discovery/sensors/temperature/ipoman.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ipoman.inc.php rename to includes/discovery/sensors/temperature/ipoman.inc.php diff --git a/includes/discovery/sensors/temperatures/ironware.inc.php b/includes/discovery/sensors/temperature/ironware.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/ironware.inc.php rename to includes/discovery/sensors/temperature/ironware.inc.php diff --git a/includes/discovery/sensors/temperatures/junos.inc.php b/includes/discovery/sensors/temperature/junos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/junos.inc.php rename to includes/discovery/sensors/temperature/junos.inc.php diff --git a/includes/discovery/sensors/temperatures/junose.inc.php b/includes/discovery/sensors/temperature/junose.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/junose.inc.php rename to includes/discovery/sensors/temperature/junose.inc.php diff --git a/includes/discovery/sensors/temperatures/lantronix-slc.inc.php b/includes/discovery/sensors/temperature/lantronix-slc.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/lantronix-slc.inc.php rename to includes/discovery/sensors/temperature/lantronix-slc.inc.php diff --git a/includes/discovery/sensors/temperatures/linux.inc.php b/includes/discovery/sensors/temperature/linux.inc.php similarity index 98% rename from includes/discovery/sensors/temperatures/linux.inc.php rename to includes/discovery/sensors/temperature/linux.inc.php index d35697ae0f..708aa6b725 100644 --- a/includes/discovery/sensors/temperatures/linux.inc.php +++ b/includes/discovery/sensors/temperature/linux.inc.php @@ -43,4 +43,4 @@ if (starts_with($sysObjectId, '.1.3.6.1.4.1.232.')) { } } -include_once $config['install_dir'] . '/includes/discovery/sensors/temperatures/supermicro.inc.php'; +include_once $config['install_dir'] . '/includes/discovery/sensors/temperature/supermicro.inc.php'; diff --git a/includes/discovery/sensors/temperatures/mgeups.inc.php b/includes/discovery/sensors/temperature/mgeups.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/mgeups.inc.php rename to includes/discovery/sensors/temperature/mgeups.inc.php diff --git a/includes/discovery/sensors/temperatures/mimosa.inc.php b/includes/discovery/sensors/temperature/mimosa.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/mimosa.inc.php rename to includes/discovery/sensors/temperature/mimosa.inc.php diff --git a/includes/discovery/sensors/temperatures/minkelsrms.inc.php b/includes/discovery/sensors/temperature/minkelsrms.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/minkelsrms.inc.php rename to includes/discovery/sensors/temperature/minkelsrms.inc.php diff --git a/includes/discovery/sensors/temperatures/netagent2.inc.php b/includes/discovery/sensors/temperature/netagent2.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/netagent2.inc.php rename to includes/discovery/sensors/temperature/netagent2.inc.php diff --git a/includes/discovery/sensors/temperatures/netapp.inc.php b/includes/discovery/sensors/temperature/netapp.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/netapp.inc.php rename to includes/discovery/sensors/temperature/netapp.inc.php diff --git a/includes/discovery/sensors/temperatures/netbotz.inc.php b/includes/discovery/sensors/temperature/netbotz.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/netbotz.inc.php rename to includes/discovery/sensors/temperature/netbotz.inc.php diff --git a/includes/discovery/sensors/temperatures/netonix.inc.php b/includes/discovery/sensors/temperature/netonix.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/netonix.inc.php rename to includes/discovery/sensors/temperature/netonix.inc.php diff --git a/includes/discovery/sensors/temperatures/nos.inc.php b/includes/discovery/sensors/temperature/nos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/nos.inc.php rename to includes/discovery/sensors/temperature/nos.inc.php diff --git a/includes/discovery/sensors/temperatures/papouch-tme.inc.php b/includes/discovery/sensors/temperature/papouch-tme.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/papouch-tme.inc.php rename to includes/discovery/sensors/temperature/papouch-tme.inc.php diff --git a/includes/discovery/sensors/temperatures/pbn.inc.php b/includes/discovery/sensors/temperature/pbn.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/pbn.inc.php rename to includes/discovery/sensors/temperature/pbn.inc.php diff --git a/includes/discovery/sensors/temperatures/pcoweb.inc.php b/includes/discovery/sensors/temperature/pcoweb.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/pcoweb.inc.php rename to includes/discovery/sensors/temperature/pcoweb.inc.php diff --git a/includes/discovery/sensors/temperatures/powerconnect.inc.php b/includes/discovery/sensors/temperature/powerconnect.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/powerconnect.inc.php rename to includes/discovery/sensors/temperature/powerconnect.inc.php diff --git a/includes/discovery/sensors/temperatures/powerwalker.inc.php b/includes/discovery/sensors/temperature/powerwalker.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/powerwalker.inc.php rename to includes/discovery/sensors/temperature/powerwalker.inc.php diff --git a/includes/discovery/sensors/temperatures/powerware.inc.php b/includes/discovery/sensors/temperature/powerware.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/powerware.inc.php rename to includes/discovery/sensors/temperature/powerware.inc.php diff --git a/includes/discovery/sensors/temperatures/qnap.inc.php b/includes/discovery/sensors/temperature/qnap.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/qnap.inc.php rename to includes/discovery/sensors/temperature/qnap.inc.php diff --git a/includes/discovery/sensors/temperatures/rfc1628.inc.php b/includes/discovery/sensors/temperature/rfc1628.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/rfc1628.inc.php rename to includes/discovery/sensors/temperature/rfc1628.inc.php diff --git a/includes/discovery/sensors/temperatures/riverbed.inc.php b/includes/discovery/sensors/temperature/riverbed.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/riverbed.inc.php rename to includes/discovery/sensors/temperature/riverbed.inc.php diff --git a/includes/discovery/sensors/temperatures/routeros.inc.php b/includes/discovery/sensors/temperature/routeros.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/routeros.inc.php rename to includes/discovery/sensors/temperature/routeros.inc.php diff --git a/includes/discovery/sensors/temperatures/saf.inc.php b/includes/discovery/sensors/temperature/saf.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/saf.inc.php rename to includes/discovery/sensors/temperature/saf.inc.php diff --git a/includes/discovery/sensors/temperatures/sentry3.inc.php b/includes/discovery/sensors/temperature/sentry3.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/sentry3.inc.php rename to includes/discovery/sensors/temperature/sentry3.inc.php diff --git a/includes/discovery/sensors/temperatures/sentry4.inc.php b/includes/discovery/sensors/temperature/sentry4.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/sentry4.inc.php rename to includes/discovery/sensors/temperature/sentry4.inc.php diff --git a/includes/discovery/sensors/temperatures/seos.inc.php b/includes/discovery/sensors/temperature/seos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/seos.inc.php rename to includes/discovery/sensors/temperature/seos.inc.php diff --git a/includes/discovery/sensors/temperatures/serveriron.inc.php b/includes/discovery/sensors/temperature/serveriron.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/serveriron.inc.php rename to includes/discovery/sensors/temperature/serveriron.inc.php diff --git a/includes/discovery/sensors/temperatures/sgos.inc.php b/includes/discovery/sensors/temperature/sgos.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/sgos.inc.php rename to includes/discovery/sensors/temperature/sgos.inc.php diff --git a/includes/discovery/sensors/temperatures/siklu.inc.php b/includes/discovery/sensors/temperature/siklu.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/siklu.inc.php rename to includes/discovery/sensors/temperature/siklu.inc.php diff --git a/includes/discovery/sensors/temperatures/sub10.inc.php b/includes/discovery/sensors/temperature/sub10.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/sub10.inc.php rename to includes/discovery/sensors/temperature/sub10.inc.php diff --git a/includes/discovery/sensors/temperatures/supermicro.inc.php b/includes/discovery/sensors/temperature/supermicro.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/supermicro.inc.php rename to includes/discovery/sensors/temperature/supermicro.inc.php diff --git a/includes/discovery/sensors/temperatures/unix.inc.php b/includes/discovery/sensors/temperature/unix.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/unix.inc.php rename to includes/discovery/sensors/temperature/unix.inc.php diff --git a/includes/discovery/sensors/temperatures/vrp.inc.php b/includes/discovery/sensors/temperature/vrp.inc.php similarity index 100% rename from includes/discovery/sensors/temperatures/vrp.inc.php rename to includes/discovery/sensors/temperature/vrp.inc.php diff --git a/includes/discovery/sensors/temperatures/windows.inc.php b/includes/discovery/sensors/temperature/windows.inc.php similarity index 65% rename from includes/discovery/sensors/temperatures/windows.inc.php rename to includes/discovery/sensors/temperature/windows.inc.php index c9bb16a435..244519d13e 100644 --- a/includes/discovery/sensors/temperatures/windows.inc.php +++ b/includes/discovery/sensors/temperature/windows.inc.php @@ -1,3 +1,3 @@