fix: sensors not being removed from database (#6169)

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';

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;
         }
     }

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(

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';