mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Tidy up sensor discovery (#5550)

Browse Source 
* refactor: Tidy up sensor discovery

* more files

* removed uneeded files

* updated array check

* updates for linux/supermicro

* small changes

* Update linux.inc.php

* Add supermicro temps back to linux.inc.php

* No need for is_file on rfc1628.inc.php, it exists

* Revert rfc1628 change

* Fix whitespace...

* rebased

* fixed $valid data not being passed to new sensors() function
This commit is contained in:
Neil Lathwood
2017-02-03 12:39:38 +00:00
committed by Tony Murray
parent 008af4cea0
commit d4e8c54516
252 changed files with 6669 additions and 7323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
includes/discovery/sensors.inc.php
View File

@@ -5,6 +5,7 @@ $valid['sensor'] = array();
// Pre-cache data for later use
require 'includes/discovery/sensors/pre-cache.inc.php';
// Run custom sensors
require 'includes/discovery/sensors/cisco-entity-sensor.inc.php';
require 'includes/discovery/sensors/entity-sensor.inc.php';
require 'includes/discovery/sensors/ipmi.inc.php';
@@ -17,17 +18,27 @@ if ($device['os'] == 'openbsd') {
include 'includes/discovery/sensors/openbsd.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/runtime.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/sensors/states.inc.php';
require 'includes/discovery/sensors/dbm.inc.php';
require 'includes/discovery/sensors/signal.inc.php';
require 'includes/discovery/sensors/airflow.inc.php';
if (strstr($device['hardware'], 'Dell')) {
include 'includes/discovery/sensors/fanspeeds/dell.inc.php';
include 'includes/discovery/sensors/states/dell.inc.php';
include 'includes/discovery/sensors/temperatures/dell.inc.php';
}
$run_sensors = array(
'airflow',
'current',
'charge',
'dbm',
'fanspeeds',
'frequencies',
'humidity',
'load',
'power',
'runtime',
'signal',
'states',
'temperatures',
'voltages',
);
sensors($run_sensors, $device, $valid, $pre_cache);
unset($pre_cache);