Updated discovery sensors module directory structure

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/sensors/cisco-entity-sensor.inc.php';
-require 'includes/discovery/entity-sensor.inc.php';
+require 'includes/discovery/sensors/entity-sensor.inc.php';
-require 'includes/discovery/ipmi.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/sensors/temperatures.inc.php';
-require 'includes/discovery/humidity.inc.php';
+require 'includes/discovery/sensors/humidity.inc.php';
-require 'includes/discovery/voltages.inc.php';
+require 'includes/discovery/sensors/voltages.inc.php';
-require 'includes/discovery/frequencies.inc.php';
+require 'includes/discovery/sensors/frequencies.inc.php';
-require 'includes/discovery/current.inc.php';
+require 'includes/discovery/sensors/current.inc.php';
-require 'includes/discovery/power.inc.php';
+require 'includes/discovery/sensors/power.inc.php';
-require 'includes/discovery/fanspeeds.inc.php';
+require 'includes/discovery/sensors/fanspeeds.inc.php';
-require 'includes/discovery/charge.inc.php';
+require 'includes/discovery/sensors/charge.inc.php';
-require 'includes/discovery/load.inc.php';
+require 'includes/discovery/sensors/load.inc.php';
 require 'includes/discovery/states.inc.php';

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

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

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

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

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

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

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

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

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